diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4b9897ff943f..6323e74ff2f9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -739,9 +739,6 @@
 # ServiceLabel: %Redis Cache
 # ServiceOwners:                                                   @yegu-ms
 
-# PRLabel: %Remote Rendering
-/sdk/remoterendering/                                              @MichaelZp0 @ChristopherManthei @Azure/azure-java-sdk
-
 # ServiceLabel: %Reservations
 # ServiceOwners:                                                   @Rkapso
 
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
index d07f0647fe0f..4c409cfc3a79 100644
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -68,7 +68,7 @@ Always cite the specific sections of documentation you've referenced in your res
 ### Java Version Compatibility
 
 - Code should be compatible with Java 8 as the baseline
-- Testing and forward support should work up to the latest Java LTS release (currently Java 21)
+- Testing and forward support should work up to the latest Java LTS release
 
 ### Documentation Requirements
 
diff --git a/eng/automation/api-specs.yaml b/eng/automation/api-specs.yaml
index 50836885dccf..a9c6e29202ac 100644
--- a/eng/automation/api-specs.yaml
+++ b/eng/automation/api-specs.yaml
@@ -125,6 +125,8 @@ redhatopenshift/Microsoft.RedHatOpenShift/openshiftclusters:
   service: redhatopenshift
 redis:
   suffix: generated
+redisenterprise/Microsoft.Cache/RedisEnterprise:
+  service: redisenterprise
 resources:
   suffix: generated
 resources/Microsoft.Resources/bicep:
diff --git a/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java
index ba3975a3717e..ec6c36db3a82 100644
--- a/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java
+++ b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/changelog/ChangeLog.java
@@ -9,7 +9,9 @@
 import com.azure.resourcemanager.tools.changelog.utils.MethodName;
 import japicmp.model.JApiChangeStatus;
 import japicmp.model.JApiClass;
+import japicmp.model.JApiConstructor;
 import japicmp.model.JApiMethod;
+import javassist.bytecode.AccessFlag;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -121,6 +123,7 @@ private void calcChangeLogForClass() {
             case REMOVED: breakingChange.setClassLevelChangeType(BreakingChange.Type.REMOVED); break;
             default:
                 boolean checkReturnType = !ClassName.name(getJApiClass()).equals("Definition");
+                allMethods.getConstructors().forEach(constructor -> this.calcChangelogForConstructor(constructor));
                 allMethods.getMethods().forEach(method -> this.calcChangelogForMethod(method, checkReturnType));
                 break;
         }
@@ -154,6 +157,24 @@ private void calcChangelogForMethod(JApiMethod method, boolean checkReturnType)
         }
     }
 
+    private void calcChangelogForConstructor(JApiConstructor constructor) {
+        switch (constructor.getChangeStatus()) {
+            case NEW:
+                addClassTitle(newFeature);
+                newFeature.add(String.format("* `%s` was added", MethodName.name(constructor.getNewConstructor().get())));
+                break;
+            case REMOVED:
+                breakingChange.addMethodLevelChange(String.format("`%s` was removed", MethodName.name(constructor.getOldConstructor().get())));
+                break;
+            case MODIFIED:
+                if ((constructor.getOldConstructor().get().getModifiers() & AccessFlag.PUBLIC) == AccessFlag.PUBLIC
+                        && (constructor.getNewConstructor().get().getModifiers() & AccessFlag.PRIVATE) == AccessFlag.PRIVATE) {
+                    breakingChange.addMethodLevelChange(String.format("`%s` was changed to private access", MethodName.name(constructor.getOldConstructor().get())));
+                }
+                break;
+        }
+    }
+
     public Collection<String> getBreakingChangeItems() {
         return breakingChange.getItems();
     }
diff --git a/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java
index a2293674eda7..f6836c3d40d6 100644
--- a/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java
+++ b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/AllMethods.java
@@ -4,6 +4,7 @@
 package com.azure.resourcemanager.tools.changelog.utils;
 
 import japicmp.model.JApiClass;
+import japicmp.model.JApiConstructor;
 import japicmp.model.JApiMethod;
 
 import java.util.ArrayList;
@@ -21,12 +22,18 @@ public List<JApiMethod> getMethods() {
         return methods;
     }
 
+    public List<JApiConstructor> getConstructors() {
+        return constructors;
+    }
+
     private JApiClass jApiClass;
     private List<JApiMethod> methods;
+    private List<JApiConstructor> constructors;
 
-    private AllMethods(JApiClass jApiClass, List<JApiMethod> methods) {
+    private AllMethods(JApiClass jApiClass, List<JApiMethod> methods, List<JApiConstructor> constructors) {
         this.jApiClass = jApiClass;
         this.methods = methods;
+        this.constructors = constructors;
     }
 
     public static void fromClasses(Map<String, JApiClass> classes, Map<String, AllMethods> results) {
@@ -47,6 +54,7 @@ private static void getAllMethods(JApiClass apiClass, Map<String, JApiClass> cla
                 methods.addAll(results.get(aInterface.getFullyQualifiedName()).getMethods());
             }
         });
-        results.put(apiClass.getFullyQualifiedName(), new AllMethods(apiClass, new ArrayList<>(methods)));
+        Set<JApiConstructor> contructors = new HashSet<>(apiClass.getConstructors());
+        results.put(apiClass.getFullyQualifiedName(), new AllMethods(apiClass, new ArrayList<>(methods), new ArrayList<>(contructors)));
     }
 }
diff --git a/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java
index 732ff8bc43ed..f0b13c0fb6aa 100644
--- a/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java
+++ b/eng/automation/changelog/src/main/java/com/azure/resourcemanager/tools/changelog/utils/MethodName.java
@@ -3,6 +3,7 @@
 
 package com.azure.resourcemanager.tools.changelog.utils;
 
+import javassist.CtConstructor;
 import javassist.CtMethod;
 import javassist.bytecode.Descriptor;
 
@@ -10,4 +11,8 @@ public class MethodName {
     public static String name(CtMethod method) {
         return method.getName() + Descriptor.toString(method.getSignature());
     }
+
+    public static String name(CtConstructor constructor) {
+        return constructor.getName() + Descriptor.toString(constructor.getSignature());
+    }
 }
diff --git a/eng/common/instructions/azsdk-tools/check-api-readiness.instructions.md b/eng/common/instructions/azsdk-tools/check-api-readiness.instructions.md
deleted file mode 100644
index 1daeeadf261f..000000000000
--- a/eng/common/instructions/azsdk-tools/check-api-readiness.instructions.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-description: 'Check API Readiness for SDK Generation'
----
-Your goal is to check if API spec pull request is ready for SDK generation. Identify the next action required from user  based on the comments on spec pull request if spec is not ready and notify the user.
-Before running, get spec pull request link for current branch or from user if not available in current context. If pull request has APIView links, then highlight them to user.
\ No newline at end of file
diff --git a/eng/common/instructions/azsdk-tools/create-spec-pullrequest.instructions.md b/eng/common/instructions/azsdk-tools/create-spec-pullrequest.instructions.md
deleted file mode 100644
index dca8369a8b5a..000000000000
--- a/eng/common/instructions/azsdk-tools/create-spec-pullrequest.instructions.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Your goal is to identify modified TypeSpec project in current branch and create a pull request for it.
-Check if a pull request already exists using GetPullRequestForCurrentBranch. If a pull request exists, inform the user and show the pull request details. If no pull request exists, create a new pull request using CreatePullRequest.
-
diff --git a/eng/common/instructions/azsdk-tools/run-sdk-gen-pipeline.instructions.md b/eng/common/instructions/azsdk-tools/run-sdk-gen-pipeline.instructions.md
deleted file mode 100644
index 3ed5cafefe9a..000000000000
--- a/eng/common/instructions/azsdk-tools/run-sdk-gen-pipeline.instructions.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-description: 'Generate SDKs from TypeSpec using pipeline'
----
-Your goal is to generate SDKs from the TypeSpec spec pull request. Get API spec pull request link for current branch or from user if not available in current context.
-Provide links to SDK pull request when generated for each language.
-
-## Steps for SDK Generation
-
-### Step 1: Check for Existing SDK Pull Requests
-- Check if SDK pull requests exist from local SDK generation for any languages
-- If SDK pull request exists for a language, skip SDK generation for that language
-- Link existing SDK pull request to release plan
-
-### Step 2: Retrieve and Validate Release Plan
-- Retrieve the release plan for the API spec
-- If API Lifecycle Stage is `Private Preview` then inform user that SDK generation is not supported for this stage and complete the workflow.
-- Check if SDK generation has already occurred for each language
-- Verify if SDK pull requests exist for each language:
-    - If an SDK pull request exists, display its details
-    - If no pull request exists or regeneration is needed, proceed to next step
-
-### Step 3: Execute SDK Generation Pipeline
-- Run SDK generation for each required language: Python, .NET, JavaScript, Java, and Go
-- Execute the SDK generation pipeline with the following required parameters:
-    - TypeSpec project root path
-    - Pull request number (if the API spec is not merged to the main branch)
-    - API version
-    - SDK release type (beta for preview API versions, stable otherwise)
-    - Language options: `Python`, `.NET`, `JavaScript`, `Java`, `Go`
-    - Release plan work item ID
-
-### Step 4: Monitor Pipeline Status
-- Check the status of SDK generation pipeline every 2 minutes
-- Continue monitoring until pipeline succeeds or fails
-- Get SDK pull request link from pipeline once available
-
-### Step 5: Display Results
-- Show all pipeline details once pipeline is in completed status
-- Highlight the language name for each SDK generation task when displaying details
-- Once SDK pull request URL is available:
-    - Inform the user of successful SDK generation
-    - Display the pull request details for each language
-    - Provide links to each generated SDK pull request
\ No newline at end of file
diff --git a/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md b/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md
index 4e9249e0baa0..042dd657a7d4 100644
--- a/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md
+++ b/eng/common/instructions/azsdk-tools/typespec-to-sdk.instructions.md
@@ -5,112 +5,69 @@ Your goal is to guide the user through the process of generating SDKs from TypeS
 
 > "Would you like to begin the SDK generation process now? (yes/no)"
 
-Wait for the user to respond with a confirmation before proceeding to Step 1. Use the provided tools to perform actions and gather information as needed.
+Wait for the user to respond with a confirmation before proceeding. Use the provided tools to perform actions and gather information as needed.
 
-## Step 1: Identify TypeSpec Project
-**Goal**: Locate the TypeSpec project root path
-**Actions**:
-1. Check if `tspconfig.yaml` or `main.tsp` files are open in editor
-2. If found, use the parent directory as project root
-3. If not found, prompt user: "Please provide the path to your TypeSpec project root directory"
-4. Validate the provided path contains required TypeSpec files
-**Success Criteria**: Valid TypeSpec project path identified
-
-## Step 2: Validate TypeSpec Specification
-**Goal**: Ensure TypeSpec specification compiles without errors
-**Actions**:
-1. Refer to #file:validate-typespec.instructions.md
-2. If validation succeeds, proceed to Step 3
-3. If validation fails:
-    - Display all compilation errors to user
-    - Prompt: "Please fix the TypeSpec compilation errors before proceeding"
-    - Wait for user to fix errors and re-run validation
-**Success Criteria**: TypeSpec compilation passes without errors
+SDK languages to be generated:
+- Management Plane: .NET, Go, Java, JavaScript, Python
+- Data Plane: .NET, Java, JavaScript, Python
 
-## Step 3: Verify Authentication and Repository Status
-**Goal**: Ensure user is authenticated and working in correct repository
-**Actions**:
-1. Run `azsdk_get_github_user_details` to verify login status
-2. If not logged in, prompt: "Please login to GitHub using `gh auth login`"
-3. Once logged in, display user details to confirm identity
-4. Run `azsdk_typespec_check_project_in_public_repo` to verify repository
-5. If not in public repo, inform: "Please make spec changes in Azure/azure-rest-api-specs public repo to generate SDKs"
-**Success Criteria**: User authenticated and working in public Azure repo
+Pre-requisites:
+- TypeSpec project path is available in the current context or provided by user. If not available, prompt user to provide the TypeSpec project root path (local path or GitHub URL).
 
-## Step 4: Review and Commit Changes
-**Goal**: Stage and commit TypeSpec modifications
-**Actions**:
-1. Run `azsdk_get_modified_typespec_projects` to identify changes
-2. If no changes found, inform: "No TypeSpec projects were modified in current branch"
-3. Display all modified files (excluding `.github` and `.vscode` folders)
-4. Prompt user: "Please review the modified files. Do you want to commit these changes? (yes/no)"
-5. If yes:
-    - If on main branch, prompt user: "You are currently on the main branch. Please create a new branch using `git checkout -b <branch-name>` before proceeding."
-    - Wait for user confirmation before continuing
-    - Run `git add <modified-files>`
-    - Prompt for commit message
-    - Run `git commit -m "<user-provided-message>"`
-    - Run `git push -u origin <current-branch-name>`
-**Success Criteria**: Changes committed and pushed to remote branch
-
-## Step 5: Choose SDK Generation Method
-**Goal**: Determine how to generate SDKs
-**Actions**:
-1. Present options: "How would you like to generate SDKs?"
-    - Option A: "Generate SDK locally".
-    - Option B: "Use SDK generation pipeline"
-2. Based on selection:
-    - If Option A: 
-        - Follow #file:./local-sdk-workflow.instructions.md to generate and compile the SDK.
-        - After SDK has been generated, to continue the SDK release, users can create the SDK pull request manually then proceed to Step 9.
-    - If Option B: Continue to Step 6
-**Success Criteria**: SDK generation method selected
+# SDK generation steps
 
-## Step 6: Create Specification Pull Request
-**Goal**: Create PR for TypeSpec changes if not already created
+## Step: Generate SDKs
+**Goal**: Generate SDKs
+**Message to user**: "SDK generation will take approximately 15-20 minutes. Currently, SDKs are generated using the Azure DevOps pipeline. SDK generation is supported only from a merged API spec or from an API spec pull request in the https://github.com/Azure/azure-rest-api-specs repository."
 **Actions**:
-1. Check if spec PR already exists using `azsdk_get_pull_request_link_for_current_branch`
-2. If PR exists, display PR details and proceed to Step 7
-3. If no PR exists:
-    - Refer to #file:create-spec-pullrequest.instructions.md
-    - Wait for PR creation confirmation
-    - Display created PR details
-**Success Criteria**: Specification pull request exists
-
-## Step 7: Generate SDKs via Pipeline
-**Goal**: Create release plan and generate SDKs
-**Actions**:
-1. Refer to #file:create-release-plan.instructions.md
-2. If SDK PRs exist, link them to the release plan
-3. Refer to #file:sdk-details-in-release-plan.instructions.md to add languages and package names to the release plan
-4. If TypeSpec project is for management plane, refer to #file:verify-namespace-approval.instructions.md to check package namespace approval.
-5. Refer to #file:run-sdk-gen-pipeline.instructions.md with the spec PR
-6. Monitor pipeline status and provide updates
-7. Display generated SDK PR links when available
+1. Identify whether TypeSpec is for Management Plane or Data Plane based on project structure and files. tspconfig.yaml file contains `resource-manager` for management plane and `data-plane` for data plane as resource provider.
+  - Execute the SDK generation pipeline with the following required parameters for all languages:
+    - TypeSpec project root path
+    - API spec pull request number (if the API spec is not merged to the main branch, otherwise use 0)
+    - API version
+    - SDK release type (`beta` for preview API versions, `stable` otherwise)
+    - Language options:
+        For management plane: `Python`, `.NET`, `JavaScript`, `Java`, `Go`
+        For data plane: `Python`, `.NET`, `JavaScript`, `Java`
+    - Each SDK generation tool call should show a label to indicate the language being generated.
+2. Monitor pipeline status after 15 minutes and provide updates. If pipeline is in progress, inform user that it may take additional time and check the status later.
+3. Display generated SDK PR links when available. If pipeline fails, inform user with error details and suggest to check pipeline logs for more information.
+4. If SDK pull request is available for all languages, ask user to review generated SDK pull request and mark them as ready for review when they are ready to get them reviewed and merged.
+5. If SDK pull request was created for test purposes, inform user to close the test SDK pull request.
 **Success Criteria**: SDK generation pipeline initiated and SDKs generated
 
-## Step 8: Show Generated SDK PRs
-**Goal**: Display all created SDK pull requests
-**Actions**:
-1. Run `azsdk_get_sdk_pull_request_link` to fetch generated SDK PR info.
-
-## Step 9: Create release plan
+## Step: SDK release plan
 **Goal**: Create a release plan for the generated SDKs
+**Condition**: Only if SDK PRs are created
+**Message to user**: "Creating a release plan is essential to manage the release of the generated SDKs. Each release plan must include SDKs for all required languages based on the TypeSpec project type (Management Plane or Data Plane) or request exclusion approval for any excluded language. SDK pull request needs to get approval and merged to main branch before releasing the SDK package."
 **Actions**:
-1. Refer to #file:create-release-plan.instructions.md to create a release plan using the spec pull request.
-2. If the release plan already exists, display the existing plan details.
-
-## Step 10: Mark Spec PR as Ready for Review
-**Goal**: Update spec PR to ready for review status
-**Actions**:
-1. Prompt user to change spec PR to ready for review: "Please change the spec pull request to ready for review status"
-2. Get approval and merge the spec PR
+1. Prompt the user to check if they generated the SDK just to test or do they intend to release it: "Do you want to create a release plan for the generated SDKs to publish them? (yes/no)"
+   - If no, inform user: "You can create a release plan later when ready to release the SDK" and end the workflow.
+2. Ask user if they have already created a release plan for the generated SDKs: "Have you already created a release plan for the generated SDKs? (yes/no)"
+   - If no, proceed to create a new release plan
+   - If yes, get release plan details and show them to user
+3. Prompt the user to provide the API spec pull request link if not already available in the current context.
+4. If unsure, check if a release plan already exists for API spec pull request.
+5. Prompt user to find the service id and product id in service tree `aka.ms/st` and provide them. Stress the importance of correct service id and product id for proper release plan creation.
+6. If a new release plan is needed, refer to #file:create-release-plan.instructions.md to create a release plan using the spec pull request. API spec pull request is required to create a release plan.
+7. Prompt user to change spec PR to ready for review: "Please change the spec pull request to ready for review status"
+8. Suggest users to follow the instructions on spec PR to get approval from API reviewers and merge the spec PR.
+9. Link SDK pull requests to the release plan.
+10. Each release plan must release SDK for all languages based on the TypeSpec project type (Management Plane or Data Plane). If any language is missing, inform user: "The release plan must include SDKs for all required languages: Python, .NET, JavaScript, Java, Go (for Management Plane) or Python, .NET, JavaScript, Java (for Data Plane)". If it is intentional to exclude a language then user must provide a justification for it.
+**Success Criteria**: Release plan created and linked to SDK PRs
 
-## Step 11: Release SDK Package
+## Step: Release SDK Package
 **Goal**: Release the SDK package using the release plan
 **Actions**:
-1. Run `ReleaseSdkPackage` to release the SDK package.
-2. Inform user to approve the package release using release pipeline.
+1. Prompt the user to confirm if they want to release the SDK package now: "Do you want to release the SDK package now? (yes/no)"
+   - If no, inform user: "You can release the SDK package later using the prompt `release <package name> for  <language>`" and end the workflow.
+2. Get SDK pull request status for all languages.
+3. Inform user that it needs to check SDK PR status. If any SDK pull request is not merged, inform user: "Please merge all SDK pull requests before releasing the package.". Show a summary of SDK PR status for all languages.
+4. If an SDK pull request is merged then run release readiness of the package for that language.
+5. Inform user if a language is ready for release and prompt user for a confirmation to proceed with the release.
+6. If user confirms, run the tool to release the SDK package.
+7. Inform user to approve the package release using release pipeline. Warn user that package will be published to public registries once approved.
+8. Identify remaining languages to be released and inform user to release SDK for all languages to complete the release plan. Release plan completion is required for KPI attestation in service tree.
 
 ## Process Complete
 Display summary of all created PRs and next steps for user.
diff --git a/eng/common/instructions/azsdk-tools/validate-typespec.instructions.md b/eng/common/instructions/azsdk-tools/validate-typespec.instructions.md
deleted file mode 100644
index c036d6cb195e..000000000000
--- a/eng/common/instructions/azsdk-tools/validate-typespec.instructions.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-description: 'Validate TypeSpec'
----
-Your goal is identify the TypeSpec project root if not available in current context and validate TypeSpec project.
-Before running, inform user that TypeSpec validation takes around 20 - 30 seconds. Provide complete summary after 
-running the tool and highlight any errors and help user fix them.
\ No newline at end of file
diff --git a/eng/common/pipelines/templates/archetype-typespec-emitter.yml b/eng/common/pipelines/templates/archetype-typespec-emitter.yml
index dab06ccb1588..443ac86a9f21 100644
--- a/eng/common/pipelines/templates/archetype-typespec-emitter.yml
+++ b/eng/common/pipelines/templates/archetype-typespec-emitter.yml
@@ -142,12 +142,34 @@ extends:
             # Create emitter identifier from package path for disambiguation
             $emitterIdentifier = ""
             if (-not [string]::IsNullOrWhiteSpace($emitterPackagePath)) {
-              # Extract filename without extension and make it safe for branch names
-              $emitterIdentifier = [System.IO.Path]::GetFileNameWithoutExtension($emitterPackagePath)
-              # Replace any characters that aren't alphanumeric, hyphens, or underscores
-              $emitterIdentifier = $emitterIdentifier -replace '[^a-zA-Z0-9\-_]', '-'
-              # Remove any leading/trailing hyphens and convert to lowercase
+              # Resolve emitterPackagePath to absolute path (it's relative to repo root)
+              # EmitterPackagePath is a directory, so append package.json
+              $absoluteEmitterPackagePath = Join-Path '$(Build.SourcesDirectory)' $emitterPackagePath
+              $packageJsonPath = Join-Path $absoluteEmitterPackagePath 'package.json'
+              
+              # Read the package name from package.json
+              if (Test-Path $packageJsonPath) {
+                try {
+                  $packageJson = Get-Content $packageJsonPath -Raw | ConvertFrom-Json
+                  if ($packageJson.name) {
+                    $emitterIdentifier = $packageJson.name
+                  }
+                } catch {
+                  Write-Host "Warning: Could not read package name from $packageJsonPath"
+                }
+              }
+              
+              # If we still don't have an identifier, fall back to filename
+              if ([string]::IsNullOrWhiteSpace($emitterIdentifier)) {
+                Write-Host "Warning: Could not read emitter name from package.json, falling back to package path"
+                $emitterIdentifier = [System.IO.Path]::GetFileNameWithoutExtension($emitterPackagePath)
+              }
+              
+              # Clean up the identifier: remove @ prefix, replace invalid chars
+              $emitterIdentifier = $emitterIdentifier -replace '^@', ''
+              $emitterIdentifier = $emitterIdentifier -replace '[^a-zA-Z0-9\-_/]', '-'
               $emitterIdentifier = $emitterIdentifier.Trim('-').ToLower()
+              
               if (-not [string]::IsNullOrWhiteSpace($emitterIdentifier)) {
                 $emitterIdentifier = "-$emitterIdentifier"
               }
@@ -163,6 +185,8 @@ extends:
 
             Write-Host "Setting variable 'branchName' to '$branchName'"
             Write-Host "##vso[task.setvariable variable=branchName;isOutput=true]$branchName"
+            Write-Host "Setting variable 'emitterIdentifier' to '$emitterIdentifier'"
+            Write-Host "##vso[task.setvariable variable=emitterIdentifier;isOutput=true]$emitterIdentifier"
           displayName: Set branch name
           name: set_branch_name
 
@@ -383,15 +407,18 @@ extends:
           displayName: Create PR
           dependsOn: 
           - Generate
+          condition: succeededOrFailed()
           variables:
             generateJobResult: $[dependencies.Generate.result]
             emitterVersion: $[stageDependencies.Build.Build.outputs['initialize.emitterVersion']]
+            emitterIdentifier: $[stageDependencies.Build.Build.outputs['set_branch_name.emitterIdentifier']]
           steps:
           - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
 
           - pwsh: |
               $generateJobResult = '$(generateJobResult)'
               $emitterVersion = '$(emitterVersion)'
+              $emitterIdentifier = '$(emitterIdentifier)'
               $collectionUri = '$(System.CollectionUri)'
               $project = '$(System.TeamProject)'
               $definitionName = '$(Build.DefinitionName)'
@@ -403,6 +430,12 @@ extends:
               $buildNumber = '$(Build.BuildNumber)'
               $preRelease = '${{ parameters.BuildPrereleaseVersion }}' -eq 'true'
               
+              # Use emitterIdentifier for PR title (remove leading dash if present)
+              $emitterName = "TypeSpec emitter"
+              if (-not [string]::IsNullOrWhiteSpace($emitterIdentifier)) {
+                $emitterName = $emitterIdentifier.TrimStart('-')
+              }
+              
               $prBody = "Generated by $definitionName build [$buildNumber]($collectionUri/$project/_build/results?buildId=$buildId)<br/>"
 
               if ($sourceBranch -match "^refs/heads/(.+)$") {
@@ -419,9 +452,9 @@ extends:
                 $prTitle = "Scheduled code regeneration test"
               } else {
                 if ($preRelease) {
-                  $prTitle = "Update TypeSpec emitter version to prerelease $emitterVersion"
+                  $prTitle = "Update $emitterName version to prerelease $emitterVersion"
                 } else {
-                  $prTitle = "Update TypeSpec emitter version to $emitterVersion"
+                  $prTitle = "Update $emitterName version to $emitterVersion"
                 }
 
                 if ($generateJobResult -ne 'Succeeded') {
@@ -446,7 +479,8 @@ extends:
                 Write-Error "Build.Repository.Name not in the expected {Owner}/{Name} format"
               }
 
-              $openAsDraft = -not ($reason -eq 'IndividualCI' -and $sourceBranch -eq 'refs/heads/main')
+              # Open PR as draft if generation failed, or if it's not an IndividualCI build from main
+              $openAsDraft = ($generateJobResult -ne 'Succeeded') -or (-not ($reason -eq 'IndividualCI' -and $sourceBranch -eq 'refs/heads/main'))
               Write-Host "Setting OpenAsDraftBool = $openAsDraft"
               Write-Host "##vso[task.setvariable variable=OpenAsDraft]$openAsDraft"
               if ($openAsDraft) {
diff --git a/eng/common/pipelines/templates/steps/create-apireview.yml b/eng/common/pipelines/templates/steps/create-apireview.yml
index 124e027308f4..6942abd0baa6 100644
--- a/eng/common/pipelines/templates/steps/create-apireview.yml
+++ b/eng/common/pipelines/templates/steps/create-apireview.yml
@@ -1,27 +1,47 @@
 parameters:
-  ArtifactPath: $(Build.ArtifactStagingDirectory)
-  Artifacts: []
-  ConfigFileDir: $(Build.ArtifactStagingDirectory)/PackageInfo
-  MarkPackageAsShipped: false
-  GenerateApiReviewForManualOnly: false
-  ArtifactName: 'packages'
-  PackageName: ''
-  SourceRootPath: $(Build.SourcesDirectory)
+  - name: ArtifactPath
+    type: string
+    default: $(Build.ArtifactStagingDirectory)
+  - name: Artifacts
+    type: object
+    default: []
+  - name: ConfigFileDir
+    type: string
+    default: $(Build.ArtifactStagingDirectory)/PackageInfo
+  - name: MarkPackageAsShipped
+    type: boolean
+    default: false
+  - name: GenerateApiReviewForManualOnly
+    type: boolean
+    default: false
+  - name: ArtifactName
+    type: string
+    default: 'packages'
+  - name: PackageName
+    type: string
+    default: ''
+  - name: SourceRootPath
+    type: string
+    default: $(Build.SourcesDirectory)
+  - name: PackageInfoFiles
+    type: object
+    default: []
 
 steps:
-  # ideally this should be done as initial step of a job in caller template
-  # We can remove this step later once it is added in caller
-  - template: /eng/common/pipelines/templates/steps/set-default-branch.yml
-    parameters:
-      WorkingDirectory: ${{ parameters.SourceRootPath }}
-
   # Automatic API review is generated for a package when pipeline runs irrespective of how pipeline gets triggered.
-  # Below condition ensures that API review is generated only for manual pipeline runs when flag GenerateApiReviewForManualOnly is set to true. 
+  # Below condition ensures that API review is generated only for manual pipeline runs when flag GenerateApiReviewForManualOnly is set to true.
   - ${{ if or(ne(parameters.GenerateApiReviewForManualOnly, true), eq(variables['Build.Reason'], 'Manual')) }}:
+    # ideally this should be done as initial step of a job in caller template
+    # We can remove this step later once it is added in caller
+    - template: /eng/common/pipelines/templates/steps/set-default-branch.yml
+      parameters:
+        WorkingDirectory: ${{ parameters.SourceRootPath }}
+
     - task: Powershell@2
       inputs:
         filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
         arguments: >
+          -PackageInfoFiles ('${{ convertToJson(parameters.PackageInfoFiles) }}' | ConvertFrom-Json -NoEnumerate)
           -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
           -ArtifactPath '${{parameters.ArtifactPath}}'
           -ArtifactName ${{ parameters.ArtifactName }}
@@ -31,7 +51,7 @@ steps:
           -DefaultBranch '$(DefaultBranch)'
           -ConfigFileDir '${{parameters.ConfigFileDir}}'
           -BuildId '$(Build.BuildId)'
-          -RepoName '$(Build.Repository.Name)'    
+          -RepoName '$(Build.Repository.Name)'
           -MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
         pwsh: true
       displayName: Create API Review
diff --git a/eng/common/pipelines/templates/steps/detect-api-changes.yml b/eng/common/pipelines/templates/steps/detect-api-changes.yml
index 3144f0b2f3dd..fadeaacc6791 100644
--- a/eng/common/pipelines/templates/steps/detect-api-changes.yml
+++ b/eng/common/pipelines/templates/steps/detect-api-changes.yml
@@ -10,7 +10,7 @@ steps:
         $apiChangeDetectRequestUrl = "https://apiview.dev/api/PullRequests/CreateAPIRevisionIfAPIHasChanges"
         echo "##vso[task.setvariable variable=ApiChangeDetectRequestUrl]$apiChangeDetectRequestUrl"
       displayName: "Set API change detect request URL"
-      condition: and(succeeded(), ${{ parameters.Condition}}, eq(variables['ApiChangeDetectRequestUrl'], ''))
+      condition: and(succeededOrFailed(), ${{ parameters.Condition}}, eq(variables['ApiChangeDetectRequestUrl'], ''))
 
     - task: Powershell@2
       inputs:
diff --git a/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml b/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
index 61d49cdb7db4..cb4d8ff33334 100644
--- a/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
+++ b/eng/common/pipelines/templates/steps/set-test-pipeline-version.yml
@@ -1,12 +1,25 @@
 parameters:
-  PackageName: ''
-  PackageNames: ''
-  ServiceDirectory: ''
-  TagSeparator: '_'
-  TestPipeline: false
+- name: PackageName
+  type: string
+  default: ''
+- name: PackageNames
+  type: string
+  default: ''
+- name: ServiceDirectory
+  type: string
+  default: ''
+- name: TagSeparator
+  type: string
+  default: '_'
+- name: TestPipeline
+  type: boolean
+  default: false
+- name: ArtifactsJson
+  type: string
+  default: ''
 
 steps:
-- ${{ if eq(parameters.TestPipeline, 'true') }}:
+- ${{ if eq(parameters.TestPipeline, true) }}:
     - task: PowerShell@2
       displayName: Prep template pipeline for release
       condition: and(succeeded(), ne(variables['Skip.SetTestPipelineVersion'], 'true'))
@@ -18,4 +31,5 @@ steps:
           -PackageNames '${{ coalesce(parameters.PackageName, parameters.PackageNames) }}'
           -ServiceDirectory '${{ parameters.ServiceDirectory }}'
           -TagSeparator '${{ parameters.TagSeparator }}'
+          -ArtifactsJson '${{ parameters.ArtifactsJson }}'
         pwsh: true
diff --git a/eng/common/scripts/Create-APIReview.ps1 b/eng/common/scripts/Create-APIReview.ps1
index 5438df067101..92e614f4a2d5 100644
--- a/eng/common/scripts/Create-APIReview.ps1
+++ b/eng/common/scripts/Create-APIReview.ps1
@@ -1,11 +1,11 @@
 [CmdletBinding()]
 Param (
-  [Parameter(Mandatory=$True)]
+  [Parameter(Mandatory=$False)]
   [array] $ArtifactList,
   [Parameter(Mandatory=$True)]
-  [string] $ArtifactPath,  
+  [string] $ArtifactPath,
   [Parameter(Mandatory=$True)]
-  [string] $APIKey,  
+  [string] $APIKey,
   [string] $SourceBranch,
   [string] $DefaultBranch,
   [string] $RepoName,
@@ -14,7 +14,9 @@ Param (
   [string] $ConfigFileDir = "",
   [string] $APIViewUri = "https://apiview.dev/AutoReview",
   [string] $ArtifactName = "packages",
-  [bool] $MarkPackageAsShipped = $false
+  [bool] $MarkPackageAsShipped = $false,
+  [Parameter(Mandatory=$False)]
+  [array] $PackageInfoFiles
 )
 
 Set-StrictMode -Version 3
@@ -51,7 +53,7 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
     $versionContent.Headers.ContentDisposition = $versionParam
     $multipartContent.Add($versionContent)
     Write-Host "Request param, packageVersion: $packageVersion"
-    
+
     $releaseTagParam = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("form-data")
     $releaseTagParam.Name = "setReleaseTag"
     $releaseTagParamContent = [System.Net.Http.StringContent]::new($MarkPackageAsShipped)
@@ -96,7 +98,7 @@ function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $review
     $fileName = Split-Path -Leaf $filePath
     Write-Host "OriginalFile name: $fileName"
 
-    $params = "buildId=${BuildId}&artifactName=${ArtifactName}&originalFilePath=${fileName}&reviewFilePath=${reviewFileName}"    
+    $params = "buildId=${BuildId}&artifactName=${ArtifactName}&originalFilePath=${fileName}&reviewFilePath=${reviewFileName}"
     $params += "&label=${apiLabel}&repoName=${RepoName}&packageName=${packageName}&project=internal&packageVersion=${packageVersion}"
     if($MarkPackageAsShipped) {
         $params += "&setReleaseTag=true"
@@ -141,17 +143,16 @@ function Get-APITokenFileName($packageName)
     }
 }
 
-function Submit-APIReview($packageInfo, $packagePath, $packageArtifactName)
+function Submit-APIReview($packageInfo, $packagePath)
 {
-    $packageName = $packageInfo.Name    
     $apiLabel = "Source Branch:${SourceBranch}"
 
     # Get generated review token file if present
     # APIView processes request using different API if token file is already generated
-    $reviewTokenFileName =  Get-APITokenFileName $packageArtifactName
+    $reviewTokenFileName =  Get-APITokenFileName $packageInfo.ArtifactName
     if ($reviewTokenFileName) {
         Write-Host "Uploading review token file $reviewTokenFileName to APIView."
-        return Upload-ReviewTokenFile $packageArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath
+        return Upload-ReviewTokenFile $packageInfo.ArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath
     }
     else {
         Write-Host "Uploading $packagePath to APIView."
@@ -172,12 +173,32 @@ function IsApiviewStatusCheckRequired($packageInfo)
     return $false
 }
 
-function ProcessPackage($packageName)
+function ProcessPackage($packageInfo)
 {
     $packages = @{}
     if ($FindArtifactForApiReviewFn -and (Test-Path "Function:$FindArtifactForApiReviewFn"))
     {
-        $packages = &$FindArtifactForApiReviewFn $ArtifactPath $packageName
+        $pkgArtifactName = $packageInfo.ArtifactName ?? $packageInfo.Name
+
+        # Check if the function supports the packageInfo parameter
+        $functionInfo = Get-Command $FindArtifactForApiReviewFn -ErrorAction SilentlyContinue
+        $supportsPackageInfoParam = $false
+        
+        if ($functionInfo -and $functionInfo.Parameters) {
+            # Check if function specifically supports packageInfo parameter
+            $parameterNames = $functionInfo.Parameters.Keys
+            $supportsPackageInfoParam = $parameterNames -contains 'packageInfo'
+        }
+        
+        # Call function with appropriate parameters
+        if ($supportsPackageInfoParam) {
+            LogInfo "Calling $FindArtifactForApiReviewFn with packageInfo parameter"
+            $packages = &$FindArtifactForApiReviewFn $ArtifactPath $packageInfo
+        }
+        else {
+            LogInfo "Calling $FindArtifactForApiReviewFn with legacy parameters"
+            $packages = &$FindArtifactForApiReviewFn $ArtifactPath $pkgArtifactName
+        }
     }
     else
     {
@@ -192,31 +213,23 @@ function ProcessPackage($packageName)
         foreach($pkgPath in $packages.Values)
         {
             $pkg = Split-Path -Leaf $pkgPath
-            $pkgPropPath = Join-Path -Path $ConfigFileDir "$packageName.json"
-            if (-Not (Test-Path $pkgPropPath))
-            {
-                Write-Host " Package property file path $($pkgPropPath) is invalid."
-                continue
-            }
-            # Get package info from json file created before updating version to daily dev
-            $pkgInfo = Get-Content $pkgPropPath | ConvertFrom-Json
-            $version = [AzureEngSemanticVersion]::ParseVersionString($pkgInfo.Version)
-            if ($version -eq $null)
+            $version = [AzureEngSemanticVersion]::ParseVersionString($packageInfo.Version)
+            if ($null -eq $version)
             {
-                Write-Host "Version info is not available for package $packageName, because version '$(pkgInfo.Version)' is invalid. Please check if the version follows Azure SDK package versioning guidelines."
+                Write-Host "Version info is not available for package $($packageInfo.ArtifactName), because version '$($packageInfo.Version)' is invalid. Please check if the version follows Azure SDK package versioning guidelines."
                 return 1
             }
-            
+
             Write-Host "Version: $($version)"
-            Write-Host "SDK Type: $($pkgInfo.SdkType)"
-            Write-Host "Release Status: $($pkgInfo.ReleaseStatus)"
+            Write-Host "SDK Type: $($packageInfo.SdkType)"
+            Write-Host "Release Status: $($packageInfo.ReleaseStatus)"
 
             # Run create review step only if build is triggered from main branch or if version is GA.
             # This is to avoid invalidating review status by a build triggered from feature branch
             if ( ($SourceBranch -eq $DefaultBranch) -or (-not $version.IsPrerelease) -or $MarkPackageAsShipped)
             {
                 Write-Host "Submitting API Review request for package $($pkg), File path: $($pkgPath)"
-                $respCode = Submit-APIReview $pkgInfo $pkgPath $packageName
+                $respCode = Submit-APIReview $packageInfo $pkgPath
                 Write-Host "HTTP Response code: $($respCode)"
 
                 # no need to check API review status when marking a package as shipped
@@ -224,10 +237,10 @@ function ProcessPackage($packageName)
                 {
                     if ($respCode -eq '500')
                     {
-                        Write-Host "Failed to mark package ${packageName} as released. Please reach out to Azure SDK engineering systems on teams channel."   
+                        Write-Host "Failed to mark package $($packageInfo.ArtifactName) as released. Please reach out to Azure SDK engineering systems on teams channel."
                         return 1
                     }
-                    Write-Host "Package ${packageName} is marked as released."   
+                    Write-Host "Package $($packageInfo.ArtifactName) is marked as released."
                     return 0
                 }
 
@@ -239,41 +252,41 @@ function ProcessPackage($packageName)
                     IsApproved = $false
                     Details = ""
                 }
-                Process-ReviewStatusCode $respCode $packageName $apiStatus $pkgNameStatus
+                Process-ReviewStatusCode $respCode $packageInfo.ArtifactName $apiStatus $pkgNameStatus
 
                 if ($apiStatus.IsApproved) {
                     Write-Host "API status: $($apiStatus.Details)"
                 }
-                elseif (!$pkgInfo.ReleaseStatus -or $pkgInfo.ReleaseStatus -eq "Unreleased") {
+                elseif (!$packageInfo.ReleaseStatus -or $packageInfo.ReleaseStatus -eq "Unreleased") {
                     Write-Host "Release date is not set for current version in change log file for package. Ignoring API review approval status since package is not yet ready for release."
                 }
                 elseif ($version.IsPrerelease)
                 {
                     # Check if package name is approved. Preview version cannot be released without package name approval
-                    if (!$pkgNameStatus.IsApproved) 
+                    if (!$pkgNameStatus.IsApproved)
                     {
-                        if (IsApiviewStatusCheckRequired $pkgInfo)
+                        if (IsApiviewStatusCheckRequired $packageInfo)
                         {
                             Write-Error $($pkgNameStatus.Details)
                             return 1
                         }
                         else{
-                            Write-Host "Package name is not approved for package $($packageName), however it is not required for this package type so it can still be released without API review approval."
-                        }                        
+                            Write-Host "Package name is not approved for package $($packageInfo.ArtifactName), however it is not required for this package type so it can still be released without API review approval."
+                        }
                     }
                     # Ignore API review status for prerelease version
                     Write-Host "Package version is not GA. Ignoring API view approval status"
-                }                
+                }
                 else
                 {
                     # Return error code if status code is 201 for new data plane package
                     # Temporarily enable API review for spring SDK types. Ideally this should be done be using 'IsReviewRequired' method in language side
                     # to override default check of SDK type client
-                    if (IsApiviewStatusCheckRequired $pkgInfo)
+                    if (IsApiviewStatusCheckRequired $packageInfo)
                     {
                         if (!$apiStatus.IsApproved)
                         {
-                            Write-Host "Package version $($version) is GA and automatic API Review is not yet approved for package $($packageName)."
+                            Write-Host "Package version $($version) is GA and automatic API Review is not yet approved for package $($packageInfo.ArtifactName)."
                             Write-Host "Build and release is not allowed for GA package without API review approval."
                             Write-Host "You will need to queue another build to proceed further after API review is approved"
                             Write-Host "You can check http://aka.ms/azsdk/engsys/apireview/faq for more details on API Approval."
@@ -281,7 +294,7 @@ function ProcessPackage($packageName)
                         return 1
                     }
                     else {
-                        Write-Host "API review is not approved for package $($packageName), however it is not required for this package type so it can still be released without API review approval."
+                        Write-Host "API review is not approved for package $($packageInfo.ArtifactName), however it is not required for this package type so it can still be released without API review approval."
                     }
                 }
             }
@@ -296,42 +309,84 @@ function ProcessPackage($packageName)
     return 0
 }
 
-$responses = @{}
-# Check if package config file is present. This file has package version, SDK type etc info.
-if (-not $ConfigFileDir)
-{
+Write-Host "Artifact path: $($ArtifactPath)"
+Write-Host "Source branch: $($SourceBranch)"
+Write-Host "Package Info Files: $($PackageInfoFiles)"
+Write-Host "Artifact List: $($ArtifactList)"
+Write-Host "Package Name: $($PackageName)"
+
+# Parameter priority and backward compatibility logic
+# Priority order: PackageName > Artifacts > PackageInfoFiles (for backward compatibility)
+
+if (-not $ConfigFileDir) {
     $ConfigFileDir = Join-Path -Path $ArtifactPath "PackageInfo"
 }
 
-Write-Host "Artifact path: $($ArtifactPath)"
-Write-Host "Source branch: $($SourceBranch)"
 Write-Host "Config File directory: $($ConfigFileDir)"
 
-# if package name param is not empty then process only that package
-if ($PackageName)
-{
-    Write-Host "Processing $($PackageName)"
-    $result = ProcessPackage -packageName $PackageName
-    $responses[$PackageName] = $result 
+# Initialize working variable
+$ProcessedPackageInfoFiles = @()
+
+if ($PackageName -and $PackageName -ne "") {
+    # Highest Priority: Single package mode (existing usage)
+    Write-Host "Using PackageName parameter: $PackageName"
+    $pkgPropPath = Join-Path -Path $ConfigFileDir "$PackageName.json"
+    if (Test-Path $pkgPropPath) {
+        $ProcessedPackageInfoFiles = @($pkgPropPath)
+    }
+    else {
+        Write-Error "Package property file path $pkgPropPath is invalid."
+        exit 1
+    }
 }
-else
-{
-    # process all packages in the artifact
-    foreach ($artifact in $ArtifactList)
-    {
-        Write-Host "Processing $($artifact.name)"
-        $result = ProcessPackage -packageName $artifact.name
-        $responses[$artifact.name] = $result
+elseif ($ArtifactList -and $ArtifactList.Count -gt 0) {
+    # Second Priority: Multiple artifacts mode (existing usage)
+    Write-Host "Using ArtifactList parameter with $($ArtifactList.Count) artifacts"
+    foreach ($artifact in $ArtifactList) {
+        $pkgPropPath = Join-Path -Path $ConfigFileDir "$($artifact.name).json"
+        if (Test-Path $pkgPropPath) {
+            $ProcessedPackageInfoFiles += $pkgPropPath
+        }
+        else {
+            Write-Warning "Package property file path $pkgPropPath is invalid."
+        }
     }
 }
+elseif ($PackageInfoFiles -and $PackageInfoFiles.Count -gt 0) {
+    # Lowest Priority: Direct PackageInfoFiles (new method)
+    Write-Host "Using PackageInfoFiles parameter with $($PackageInfoFiles.Count) files"
+    $ProcessedPackageInfoFiles = $PackageInfoFiles  # Use as-is
+}
+else {
+    Write-Error "No package information provided. Please provide either 'PackageName', 'ArtifactList', or 'PackageInfoFiles' parameters."
+    exit 1
+}
+
+# Validate that we have package info files to process
+if (-not $ProcessedPackageInfoFiles -or $ProcessedPackageInfoFiles.Count -eq 0) {
+    Write-Error "No package info files found after processing parameters."
+    exit 1
+}
+
+$responses = @{}
+Write-Host "Processed Package Info Files: $($ProcessedPackageInfoFiles -join ', ')"
+
+# Process all packages using the processed PackageInfoFiles array
+foreach ($packageInfoFile in $ProcessedPackageInfoFiles)
+{
+    $packageInfo = Get-Content $packageInfoFile | ConvertFrom-Json
+    Write-Host "Processing $($packageInfo.ArtifactName)"
+    $result = ProcessPackage -packageInfo $packageInfo
+    $responses[$packageInfo.ArtifactName] = $result
+}
 
 $exitCode = 0
 foreach($pkg in $responses.keys)
-{    
+{
     if ($responses[$pkg] -eq 1)
     {
         Write-Host "API changes are not approved for $($pkg)"
         $exitCode = 1
     }
 }
-exit $exitCode
\ No newline at end of file
+exit $exitCode
diff --git a/eng/common/scripts/Detect-Api-Changes.ps1 b/eng/common/scripts/Detect-Api-Changes.ps1
index 1e9bfc4a0030..8c3807e31820 100644
--- a/eng/common/scripts/Detect-Api-Changes.ps1
+++ b/eng/common/scripts/Detect-Api-Changes.ps1
@@ -132,17 +132,17 @@ foreach ($packageInfoFile in $packageInfoFiles)
     # Check if the function supports the packageInfo parameter
     $functionInfo = Get-Command $FindArtifactForApiReviewFn -ErrorAction SilentlyContinue
     $supportsPackageInfoParam = $false
-    
+
     if ($functionInfo -and $functionInfo.Parameters) {
         # Check if function specifically supports packageInfo parameter
         $parameterNames = $functionInfo.Parameters.Keys
         $supportsPackageInfoParam = $parameterNames -contains 'packageInfo'
     }
-    
+
     # Call function with appropriate parameters
     if ($supportsPackageInfoParam) {
         LogInfo "Calling $FindArtifactForApiReviewFn with packageInfo parameter"
-        $packages = &$FindArtifactForApiReviewFn $ArtifactPath $pkgArtifactName $packageInfo
+        $packages = &$FindArtifactForApiReviewFn $ArtifactPath $packageInfo
     }
     else {
         LogInfo "Calling $FindArtifactForApiReviewFn with legacy parameters"
diff --git a/eng/common/scripts/SetTestPipelineVersion.ps1 b/eng/common/scripts/SetTestPipelineVersion.ps1
index 2b2ee70ef97e..dea5496874e8 100644
--- a/eng/common/scripts/SetTestPipelineVersion.ps1
+++ b/eng/common/scripts/SetTestPipelineVersion.ps1
@@ -3,12 +3,14 @@
 param (
   [Parameter(mandatory = $true)]
   [string]$BuildID,
-  [Parameter(mandatory = $true)]
-  [string]$PackageNames,
+  [Parameter(mandatory = $false)]
+  [string]$PackageNames = "",
   [Parameter(mandatory = $true)]
   [string]$ServiceDirectory,
   [Parameter(mandatory = $false)]
-  [string]$TagSeparator = "_"
+  [string]$TagSeparator = "_",
+  [Parameter(mandatory = $false)]
+  [string]$ArtifactsJson = ""
 )
 
 . (Join-Path $PSScriptRoot common.ps1)
@@ -16,43 +18,117 @@ param (
 Write-Host "PackageNames: $PackageNames"
 Write-Host "ServiceDirectory: $ServiceDirectory"
 Write-Host "BuildID: $BuildID"
+Write-Host "ArtifactsJson: $ArtifactsJson"
 
 $packageNamesArray = @()
+$artifacts = $null
 
-if ([String]::IsNullOrWhiteSpace($PackageNames)) {
-  LogError "PackageNames cannot be empty."
-  exit 1
+# If ArtifactsJson is provided, extract package names from it
+if (![String]::IsNullOrWhiteSpace($ArtifactsJson)) {
+  Write-Host "Using ArtifactsJson to determine package names"
+  try {
+    $artifacts = $ArtifactsJson | ConvertFrom-Json
+    $packageNamesArray = $artifacts | ForEach-Object { $_.name }
+    Write-Host "Extracted package names from ArtifactsJson: $($packageNamesArray -join ', ')"
+  }
+  catch {
+    LogError "Failed to parse ArtifactsJson: $($_.Exception.Message)"
+    exit 1
+  }
 }
-else {
+elseif (![String]::IsNullOrWhiteSpace($PackageNames)) {
   $packageNamesArray = $PackageNames.Split(',')
 }
+else {
+  LogError "Either PackageNames or ArtifactsJson must be provided."
+  exit 1
+}
 
-foreach ($packageName in $packageNamesArray) {
-  Write-Host "Processing $packageName"
-  $newVersion = [AzureEngSemanticVersion]::new("1.0.0")
-  $prefix = "$packageName$TagSeparator"
-  Write-Host "Get Latest Tag : git tag -l $prefix*"
-  $latestTags = git tag -l "$prefix*"
+if ($artifacts) {
+  # When using ArtifactsJson, process each artifact with its name and groupId (if applicable)
+  try {
+    foreach ($artifact in $artifacts) {
+      $packageName = $artifact.name
+      $newVersion = [AzureEngSemanticVersion]::new("1.0.0")
+      $prefix = "$packageName$TagSeparator"
 
-  $semVars = @()
+      if ($Language -eq "java") {
+        $groupId = $artifact.groupId
+        Write-Host "Processing $packageName with groupId $groupId"
+        if ([String]::IsNullOrWhiteSpace($groupId)) {
+          LogError "GroupId is missing for package $packageName."
+          exit 1
+        }
+        # Use groupId+artifactName format for tag prefix (e.g., "com.azure.v2+azure-sdk-template_")
+        $prefix = "$groupId+$packageName$TagSeparator"
+      }
 
-  if ($latestTags -and ($latestTags.Length -gt 0)) {
-    foreach ($tag in $latestTags) {
-      $semVars += $tag.Substring($prefix.Length)
-    }
+      Write-Host "Get Latest Tag : git tag -l $prefix*"
+      $latestTags = git tag -l "$prefix*"
+
+      $semVars = @()
 
-    $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
-    Write-Host "Last Published Version $($semVarsSorted[0])"
-    $newVersion = [AzureEngSemanticVersion]::new($semVarsSorted[0])
+      if ($latestTags -and ($latestTags.Length -gt 0)) {
+        foreach ($tag in $latestTags) {
+          $semVars += $tag.Substring($prefix.Length)
+        }
+
+        $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
+        Write-Host "Last Published Version $($semVarsSorted[0])"
+        $newVersion = [AzureEngSemanticVersion]::new($semVarsSorted[0])
+      }
+
+      $newVersion.PrereleaseLabel = $newVersion.DefaultPrereleaseLabel
+      $newVersion.PrereleaseNumber = $BuildID
+      $newVersion.IsPrerelease = $True
+
+      Write-Host "Version to publish [ $($newVersion.ToString()) ]"
+
+      if ($Language -ne "java") {
+        SetPackageVersion -PackageName $packageName `
+          -Version $newVersion.ToString() `
+          -ServiceDirectory $ServiceDirectory
+      } else {
+        SetPackageVersion -PackageName $packageName `
+          -Version $newVersion.ToString() `
+          -ServiceDirectory $ServiceDirectory `
+          -GroupId $groupId
+      }
+    }
+  }
+  catch {
+    LogError "Failed to process ArtifactsJson: $ArtifactsJson, exception: $($_.Exception.Message)"
+    exit 1
   }
+} else {
+  # Fallback to original logic when using PackageNames string
+  foreach ($packageName in $packageNamesArray) {
+    Write-Host "Processing $packageName"
+    $newVersion = [AzureEngSemanticVersion]::new("1.0.0")
+    $prefix = "$packageName$TagSeparator"
+    Write-Host "Get Latest Tag : git tag -l $prefix*"
+    $latestTags = git tag -l "$prefix*"
 
-  $newVersion.PrereleaseLabel = $newVersion.DefaultPrereleaseLabel
-  $newVersion.PrereleaseNumber = $BuildID
-  $newVersion.IsPrerelease = $True
+    $semVars = @()
 
-  Write-Host "Version to publish [ $($newVersion.ToString()) ]"
+    if ($latestTags -and ($latestTags.Length -gt 0)) {
+      foreach ($tag in $latestTags) {
+        $semVars += $tag.Substring($prefix.Length)
+      }
 
-  SetPackageVersion -PackageName $packageName `
-    -Version $newVersion.ToString() `
-    -ServiceDirectory $ServiceDirectory
+      $semVarsSorted = [AzureEngSemanticVersion]::SortVersionStrings($semVars)
+      Write-Host "Last Published Version $($semVarsSorted[0])"
+      $newVersion = [AzureEngSemanticVersion]::new($semVarsSorted[0])
+    }
+
+    $newVersion.PrereleaseLabel = $newVersion.DefaultPrereleaseLabel
+    $newVersion.PrereleaseNumber = $BuildID
+    $newVersion.IsPrerelease = $True
+
+    Write-Host "Version to publish [ $($newVersion.ToString()) ]"
+
+    SetPackageVersion -PackageName $packageName `
+      -Version $newVersion.ToString() `
+      -ServiceDirectory $ServiceDirectory
+  }
 }
diff --git a/eng/common/scripts/job-matrix/Create-JobMatrix.ps1 b/eng/common/scripts/job-matrix/Create-JobMatrix.ps1
index d35b3c923a6d..2ca67e92a7d6 100644
--- a/eng/common/scripts/job-matrix/Create-JobMatrix.ps1
+++ b/eng/common/scripts/job-matrix/Create-JobMatrix.ps1
@@ -54,7 +54,9 @@ LogGroupEnd
 $serialized = SerializePipelineMatrix $matrix
 
 Write-Host "Generated matrix:"
-Write-Host $serialized.pretty
+
+# Write-Output required to support other scripts that call this script directly
+Write-Output $serialized.pretty
 
 if ($CI) {
     Write-Output "##vso[task.setVariable variable=matrix;isOutput=true]$($serialized.compressed)"
diff --git a/eng/common/tsp-client/README.md b/eng/common/tsp-client/README.md
index c0a6076a4b87..6f88d536c9e2 100644
--- a/eng/common/tsp-client/README.md
+++ b/eng/common/tsp-client/README.md
@@ -25,30 +25,32 @@ npm ci
 
 ## Usage
 
-After installation, you can run tsp-client by navigating to the directory and using npm exec:
+After installation, you can run `tsp-client` using `npm exec --prefix {path_to_the_eng/common/tsp-client}`. 
+Note that you should *not* navigate into the `eng/common/tsp-client` folder, since several `tsp-client` commands require the current working directory to be the client library's root.
 
 ```bash
-cd eng/common/tsp-client
+# Set the tsp-client directory path relative to your current working directory
+_TspClientDir=eng/common/tsp-client
 
 # Get help
-npm exec --no -- tsp-client --help
+npm exec --prefix ${_TspClientDir} --no -- tsp-client --help
 
 # Check version
-npm exec --no -- tsp-client version
+npm exec --prefix ${_TspClientDir} --no -- tsp-client version
 
 # Generate client code
-npm exec --no -- tsp-client generate --output-dir ./generated
+npm exec --prefix ${_TspClientDir} --no -- tsp-client generate --output-dir ./generated
 
 # Initialize a new project
-npm exec --no -- tsp-client init --tsp-config ./tspconfig.yaml
+npm exec --prefix ${_TspClientDir} --no -- tsp-client init --tsp-config ./tspconfig.yaml
 ```
 
 ## CI/CD Best Practices
 
 ```bash
-cd eng/common/tsp-client
-npm ci
-npm exec --no -- tsp-client init --update-if-exists --tsp-config https://github.com/Azure/azure-rest-api-specs/blob/dee71463cbde1d416c47cf544e34f7966a94ddcb/specification/contosowidgetmanager/Contoso.WidgetManager/tspconfig.yaml
+_TspClientDir=eng/common/tsp-client
+npm ci --prefix ${_TspClientDir}
+npm exec --prefix ${_TspClientDir} --no -- tsp-client init --update-if-exists --tsp-config https://github.com/Azure/azure-rest-api-specs/blob/dee71463cbde1d416c47cf544e34f7966a94ddcb/specification/contosowidgetmanager/Contoso.WidgetManager/tspconfig.yaml
 ```
 
 ## Package Management
diff --git a/eng/common/tsp-client/package-lock.json b/eng/common/tsp-client/package-lock.json
index b998c1b4fce0..0859bbbfb1ff 100644
--- a/eng/common/tsp-client/package-lock.json
+++ b/eng/common/tsp-client/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@azure-tools/typespec-client-generator-cli": "0.28.3"
+        "@azure-tools/typespec-client-generator-cli": "0.29.0"
       }
     },
     "node_modules/@autorest/codemodel": {
@@ -189,9 +189,9 @@
       }
     },
     "node_modules/@azure-tools/typespec-client-generator-cli": {
-      "version": "0.28.3",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-cli/-/typespec-client-generator-cli-0.28.3.tgz",
-      "integrity": "sha512-vWIuMHAlSC3mi+5YJregrxNSU3tZMkZZXTwCV53TX3f/eLYOCT8fTCmNHMOIseIX0OPPb4M1zoLFzZTr96Z7mQ==",
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-cli/-/typespec-client-generator-cli-0.29.0.tgz",
+      "integrity": "sha512-dQ8aHoouZ1SaDzan2xv2sa9Kzf/gXG3LFnas9io+3x6HzVCljlqiN/hPd8c35pn9mqVhlVoktg3CGlMKDwQN/Q==",
       "license": "MIT",
       "dependencies": {
         "@autorest/core": "^3.10.2",
diff --git a/eng/common/tsp-client/package.json b/eng/common/tsp-client/package.json
index aa5b6fff2493..8aa229e7cdad 100644
--- a/eng/common/tsp-client/package.json
+++ b/eng/common/tsp-client/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@azure-tools/typespec-client-generator-cli": "0.28.3"
+    "@azure-tools/typespec-client-generator-cli": "0.29.0"
   }
 }
diff --git a/eng/lintingconfigs/revapi/track2/revapi.json b/eng/lintingconfigs/revapi/track2/revapi.json
index d70aed935d08..b440728546f1 100644
--- a/eng/lintingconfigs/revapi/track2/revapi.json
+++ b/eng/lintingconfigs/revapi/track2/revapi.json
@@ -654,8 +654,8 @@
         {
           "ignore": true,
           "code": "java.method.removed",
-          "old": "method com.azure.resourcemanager.search.models.CheckNameAvailabilityInput com.azure.resourcemanager.search.models.CheckNameAvailabilityInput::withType(java.lang.String)",
-          "justification": "Bug fix. type property is a constant."
+          "old" : "method java.lang.String com.azure.resourcemanager.containerservice.models.ManagedClusterAgentPoolProfile::nodeImageVersion()",
+          "justification": "Not a break, same method exists on its parent class."
         }
       ]
     }
diff --git a/eng/pipelines/patch_release_client.txt b/eng/pipelines/patch_release_client.txt
index 616db5115a63..3ffb2b0eedb1 100644
--- a/eng/pipelines/patch_release_client.txt
+++ b/eng/pipelines/patch_release_client.txt
@@ -57,7 +57,6 @@ com.azure:azure-messaging-servicebus # Tests owner: ki1729
 com.azure:azure-messaging-webpubsub # Tests owner: weidongxu-microsoft
 com.azure:azure-messaging-webpubsub-client # Tests owner: weidongxu-microsoft
 com.azure:azure-mixedreality-authentication # Tests owner: craigktreasure, RamonArguelles
-com.azure:azure-mixedreality-remoterendering # Tests owner: FlorianBorn71, MichaelZp0, jloehr
 com.azure:azure-monitor-query-metrics # Tests owner: jairmyree, srnagar
 com.azure:azure-monitor-query-logs # Tests owner: jairmyree, srnagar
 com.azure:azure-monitor-ingestion # Tests owner: jairmyree, srnagar
diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
index fbd41cadd832..1a28d07abdb9 100644
--- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml
+++ b/eng/pipelines/templates/stages/cosmos-sdk-client.yml
@@ -61,7 +61,7 @@ extends:
               - ${{ parameters.MatrixFilters }}
             MatrixReplace:
               - AZURE_TEST.*=.*/
-              - .*Version=1.21/1.17
+              - .*Version=1.2(1|5)/1.17
             BuildParallelization: 1
             TestOptions: '-Punit'
 
diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json
index 07e7c68754cd..5dcd7237067d 100644
--- a/eng/pipelines/templates/stages/platform-matrix.json
+++ b/eng/pipelines/templates/stages/platform-matrix.json
@@ -11,7 +11,7 @@
       "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
       "macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
     },
-    "JavaTestVersion": [ "1.8", "1.21" ],
+    "JavaTestVersion": [ "1.8", "1.25" ],
     "AZURE_TEST_HTTP_CLIENTS": [ "okhttp", "netty" ],
     "Options": {
       "NotFromSource_TestsOnly": {
@@ -25,7 +25,7 @@
   "exclude": [
     {
       "Pool": "env:LINUXPOOL",
-      "JavaTestVersion": "1.21"
+      "JavaTestVersion": "1.25"
     }
   ],
   "include": [
@@ -33,7 +33,7 @@
       "Agent": {
           "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "Options": {
         "FromSource_SkipRebuild_Verify": {
@@ -48,7 +48,7 @@
       "Agent": {
         "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "Options": {
         "NotFromSource_AggregateReports_SkipRebuild_Verify": {
@@ -93,7 +93,22 @@
       "Agent": {
         "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
-      "JavaTestVersion": "1.17",
+      "JavaTestVersion": "1.21",
+      "AZURE_TEST_HTTP_CLIENTS": "netty",
+      "Options": {
+        "NotFromSource_TestsOnly": {
+          "TestFromSource": false,
+          "RunAggregateReports": false,
+          "TestOptions": "",
+          "TestGoals": "surefire:test failsafe:integration-test failsafe:verify"
+        }
+      }
+    },
+    {
+      "Agent": {
+        "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
+      },
+      "JavaTestVersion": "1.21",
       "AZURE_TEST_HTTP_CLIENTS": "JdkHttpClientProvider",
       "Options": {
         "NotFromSource_TestsOnly": {
@@ -108,7 +123,7 @@
       "Agent": {
         "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
-      "JavaTestVersion": "1.17",
+      "JavaTestVersion": "1.21",
       "AZURE_TEST_HTTP_CLIENTS": "VertxHttpClientProvider",
       "Options": {
         "NotFromSource_TestsOnly": {
diff --git a/eng/pipelines/templates/variables/globals.yml b/eng/pipelines/templates/variables/globals.yml
index 5fcd0cd876a7..674aaebc4750 100644
--- a/eng/pipelines/templates/variables/globals.yml
+++ b/eng/pipelines/templates/variables/globals.yml
@@ -1,14 +1,14 @@
 variables:
   DocWardenVersion: '0.7.2'
   # This is the default Java build version. It's the version used to build the shipping libraries, Spotbugs etc.
-  JavaBuildVersion: '1.21'
+  JavaBuildVersion: '1.25'
   # This is the highest LTS Java version we use to build the Cosmos Spark connectors and libraries baselined on Java 7.
   FallbackJavaBuildVersion: '1.17'
   # This is the default Java test version. It's the version used when running tests.
-  JavaTestVersion: '1.21'
+  JavaTestVersion: '1.25'
   # This is the latest non-LTS Java version released. It's used to run a non-failing job to validate the latest non-LTS Java version.
-  LatestNonLtsJavaVersion: '1.20'
-  LatestNonLtsJdkFeatureVersion: '20'
+  LatestNonLtsJavaVersion: '1.24'
+  LatestNonLtsJdkFeatureVersion: '24'
   # This is the version of Python used by various tools in the Java build/release processes
   PythonVersion: '3.11'
 
diff --git a/eng/scripts/aggregate_javadoc_configuration.txt b/eng/scripts/aggregate_javadoc_configuration.txt
index 50144e1906d8..e10c28e3c554 100644
--- a/eng/scripts/aggregate_javadoc_configuration.txt
+++ b/eng/scripts/aggregate_javadoc_configuration.txt
@@ -36,7 +36,6 @@ Group;Azure IoT Models Repository;com.azure.iot.modelsrepository*
 Group;Azure Key Vault;com.azure.security.keyvault*
 Group;Azure Metrics Advisor;com.azure.ai.metricsadvisor*
 Group;Azure Mixed Reality Authentication;com.azure.mixedreality.authentication*
-Group;Azure Mixed Reality Remote Rendering;com.azure.mixedreality.remoterendering*
 Group;Azure Monitor - Ingestion;com.azure.monitor.ingestion*
 Group;Azure Monitor - Logs and Metrics query;com.azure.monitor.query*
 Group;Azure Monitor - OpenTelemetry Exporter;com.azure.monitor.opentelemetry.exporter*
diff --git a/eng/versioning/supported_external_dependency_versions.json b/eng/versioning/supported_external_dependency_versions.json
index 66b9aa13654f..35fddef80f79 100644
--- a/eng/versioning/supported_external_dependency_versions.json
+++ b/eng/versioning/supported_external_dependency_versions.json
@@ -31,6 +31,14 @@
   [
     { "com.google.code.gson:gson": "2.11.0" }
   ],
+  "gson_2.12":
+  [
+    { "com.google.code.gson:gson": "2.12.0" }
+  ],
+  "gson_2.13":
+  [
+    { "com.google.code.gson:gson": "2.13.0" }
+  ],
   "jackson_2.10":
   [
     { "com.fasterxml.jackson.core:jackson-annotations": "2.10.0" },
@@ -130,6 +138,28 @@
     { "com.fasterxml.jackson.module:jackson-module-parameter-names": "2.18.0" },
     { "com.fasterxml.jackson.module:jackson-module-scala_2.12": "2.18.0" }
   ],
+  "jackson_2.19":
+  [
+    { "com.fasterxml.jackson.core:jackson-annotations": "2.19.0" },
+    { "com.fasterxml.jackson.core:jackson-core": "2.19.0" },
+    { "com.fasterxml.jackson.core:jackson-databind": "2.19.0" },
+    { "com.fasterxml.jackson.dataformat:jackson-dataformat-xml": "2.19.0" },
+    { "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": "2.19.0" },
+    { "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": "2.19.0" },
+    { "com.fasterxml.jackson.module:jackson-module-parameter-names": "2.19.0" },
+    { "com.fasterxml.jackson.module:jackson-module-scala_2.12": "2.19.0" }
+  ],
+  "jackson_2.20":
+  [
+    { "com.fasterxml.jackson.core:jackson-annotations": "2.20" },
+    { "com.fasterxml.jackson.core:jackson-core": "2.20.0" },
+    { "com.fasterxml.jackson.core:jackson-databind": "2.20.0" },
+    { "com.fasterxml.jackson.dataformat:jackson-dataformat-xml": "2.20.0" },
+    { "com.fasterxml.jackson.datatype:jackson-datatype-jdk8": "2.20.0" },
+    { "com.fasterxml.jackson.datatype:jackson-datatype-jsr310": "2.20.0" },
+    { "com.fasterxml.jackson.module:jackson-module-parameter-names": "2.20.0" },
+    { "com.fasterxml.jackson.module:jackson-module-scala_2.12": "2.20.0" }
+  ],
   "reactor_2025":
   [
     { "io.projectreactor.netty:reactor-netty": "1.3.0-M2" },
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index e126ba7d8ffc..2e63a78efb0f 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -129,9 +129,9 @@ com.azure:azure-health-deidentification;1.0.0;1.1.0-beta.2
 com.azure:azure-health-insights-clinicalmatching;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-health-insights-cancerprofiling;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-health-insights-radiologyinsights;1.1.4;1.2.0-beta.1
-com.azure:azure-identity;1.18.0;1.19.0-beta.1
+com.azure:azure-identity;1.18.1;1.19.0-beta.1
 com.azure:azure-identity-extensions;1.2.5;1.3.0-beta.1
-com.azure:azure-identity-broker;1.1.17;1.2.0-beta.1
+com.azure:azure-identity-broker;1.1.18;1.2.0-beta.1
 com.azure:azure-identity-broker-samples;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-iot-deviceupdate;1.0.30;1.1.0-beta.1
@@ -159,7 +159,6 @@ com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-messaging-webpubsub;1.5.2;1.6.0-beta.1
 com.azure:azure-messaging-webpubsub-client;1.1.5;1.2.0-beta.1
 com.azure:azure-mixedreality-authentication;1.2.36;1.3.0-beta.1
-com.azure:azure-mixedreality-remoterendering;1.1.41;1.2.0-beta.1
 com.azure:azure-monitor-opentelemetry-exporter;1.0.0-beta.32;1.0.0-beta.33
 com.azure:azure-monitor-opentelemetry-autoconfigure;1.4.0;1.5.0-beta.1
 com.azure:azure-monitor-ingestion;1.2.13;1.3.0-beta.1
@@ -171,7 +170,7 @@ com.azure:azure-monitor-query-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-openrewrite;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-perf-test-parent;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-quantum-jobs;1.0.0-beta.1;1.0.0-beta.2
-com.azure:azure-search-documents;11.7.10;11.8.0-beta.9
+com.azure:azure-search-documents;11.8.0;11.9.0-beta.1
 com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-security-attestation;1.1.36;1.2.0-beta.1
 com.azure:azure-security-confidentialledger;1.0.32;1.1.0-beta.2
@@ -277,14 +276,14 @@ com.azure.resourcemanager:azure-resourcemanager-cdn;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-compute;2.54.0;2.55.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.53.4;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.53.3;2.54.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-containerservice;2.54.1;2.55.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-containerservice;2.55.0;2.56.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-cosmos;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-dns;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-keyvault;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-monitor;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-msi;2.53.3;2.54.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-network;2.53.4;2.54.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-network;2.54.0;2.55.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-privatedns;2.53.3;2.54.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-resources;2.53.3;2.54.0-beta.1
@@ -299,7 +298,7 @@ com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.2;2.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-mediaservices;2.4.0;2.5.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-mysql;1.0.2;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-postgresql;1.1.0;1.2.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-hdinsight;1.0.0;1.1.0-beta.3
+com.azure.resourcemanager:azure-resourcemanager-hdinsight;1.0.0;1.1.0-beta.4
 com.azure.resourcemanager:azure-resourcemanager-sqlvirtualmachine;1.0.0-beta.5;1.0.0-beta.6
 com.azure.resourcemanager:azure-resourcemanager-relay;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-costmanagement;1.0.0;1.1.0-beta.1
@@ -310,9 +309,9 @@ com.azure.resourcemanager:azure-resourcemanager-eventgrid;1.2.0;1.3.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-healthbot;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-confluent;1.2.0;1.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-digitaltwins;1.3.0;1.4.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-netapp;1.9.0;1.10.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-netapp;1.9.0;1.10.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-storagecache;1.1.0;1.2.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-redisenterprise;2.0.0;2.1.0-beta.4
+com.azure.resourcemanager:azure-resourcemanager-redisenterprise;2.1.0;2.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-hybridkubernetes;1.0.0;1.1.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-iothub;1.3.0;1.4.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-datadog;1.1.0;1.2.0-beta.1
@@ -391,7 +390,7 @@ com.azure.resourcemanager:azure-resourcemanager-quota;2.0.0;2.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-extendedlocation;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-logz;1.0.0-beta.4;1.0.0-beta.5
 com.azure.resourcemanager:azure-resourcemanager-storagepool;1.0.0;1.1.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-dataprotection;1.4.0;1.5.0
+com.azure.resourcemanager:azure-resourcemanager-dataprotection;1.5.0;1.6.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-desktopvirtualization;1.2.0;1.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-loadtesting;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-automanage;1.0.0;1.1.0-beta.1
@@ -401,7 +400,7 @@ com.azure.resourcemanager:azure-resourcemanager-oep;1.0.0-beta.2;1.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-dnsresolver;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-mobilenetwork;1.3.0;1.4.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-azureadexternalidentities;1.0.0-beta.1;1.0.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-dashboard;1.1.0;1.2.0-beta.3
+com.azure.resourcemanager:azure-resourcemanager-dashboard;1.1.0;1.2.0
 com.azure.resourcemanager:azure-resourcemanager-servicelinker;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-appcontainers;1.1.0;1.2.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-scvmm;1.0.0;1.1.0-beta.1
@@ -432,7 +431,7 @@ com.azure.resourcemanager:azure-resourcemanager-billingbenefits;1.0.0-beta.2;1.0
 com.azure.resourcemanager:azure-resourcemanager-providerhub;2.0.0;2.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-reservations;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerservicefleet;1.2.0;1.3.0-beta.2
-com.azure.resourcemanager:azure-resourcemanager-storagemover;1.3.0;1.4.0
+com.azure.resourcemanager:azure-resourcemanager-storagemover;1.4.0;1.5.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-graphservices;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-voiceservices;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-paloaltonetworks-ngfw;1.2.0;1.3.0-beta.1
@@ -464,7 +463,7 @@ com.azure.resourcemanager:azure-resourcemanager-deviceregistry;1.0.0;1.1.0-beta.
 com.azure.resourcemanager:azure-resourcemanager-standbypool;1.1.0;1.2.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-edgezones;1.0.0-beta.2;1.0.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-devopsinfrastructure;1.0.0;1.1.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-oracledatabase;1.1.0;1.2.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-oracledatabase;1.2.0;1.3.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-informaticadatamanagement;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-mongocluster;1.0.0;1.1.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-computefleet;1.0.0;1.1.0-beta.3
@@ -473,7 +472,7 @@ com.azure.resourcemanager:azure-resourcemanager-healthdataaiservices;1.0.0;1.1.0
 com.azure.resourcemanager:azure-resourcemanager-redhatopenshift;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-fabric;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-computeschedule;1.1.0;1.2.0-beta.2
-com.azure.resourcemanager:azure-resourcemanager-trustedsigning;1.0.0-beta.1;1.0.0-beta.2
+com.azure.resourcemanager:azure-resourcemanager-trustedsigning;1.0.0-beta.1;1.0.0
 com.azure.resourcemanager:azure-resourcemanager-iotoperations;1.0.0;1.1.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-containerorchestratorruntime;1.0.0-beta.1;1.0.0-beta.2
 com.azure.resourcemanager:azure-resourcemanager-terraform;1.0.0-beta.1;1.0.0-beta.2
@@ -546,6 +545,7 @@ io.clientcore:optional-dependency-tests;1.0.0-beta.1;1.0.0-beta.1
 
 unreleased_com.azure.v2:azure-core;2.0.0-beta.1
 unreleased_com.azure.v2:azure-identity;2.0.0-beta.1
+unreleased_com.azure.v2:azure-data-appconfiguration;2.0.0-beta.1
 unreleased_io.clientcore:http-netty4;1.0.0-beta.1
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
diff --git a/pom.xml b/pom.xml
index 1456d696c436..05e3cac5cadb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -215,7 +215,6 @@
     <module>sdk/redis</module>
     <module>sdk/redisenterprise</module>
     <module>sdk/relay</module>
-    <module>sdk/remoterendering</module>
     <module>sdk/reservations</module>
     <module>sdk/resourceconnector</module>
     <module>sdk/resourcegraph</module>
diff --git a/sdk/advisor/azure-resourcemanager-advisor/pom.xml b/sdk/advisor/azure-resourcemanager-advisor/pom.xml
index 1e2be21082d3..b3039a0ea108 100644
--- a/sdk/advisor/azure-resourcemanager-advisor/pom.xml
+++ b/sdk/advisor/azure-resourcemanager-advisor/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/agrifood/azure-resourcemanager-agrifood/pom.xml b/sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
index 4f0b41d19fce..18849c625aa2 100644
--- a/sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
+++ b/sdk/agrifood/azure-resourcemanager-agrifood/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml b/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
index e5f4ff69e053..17477d599812 100644
--- a/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
+++ b/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/ai/azure-ai-agents-persistent/pom.xml b/sdk/ai/azure-ai-agents-persistent/pom.xml
index 0217b40e8e9b..245a8bb52ee7 100644
--- a/sdk/ai/azure-ai-agents-persistent/pom.xml
+++ b/sdk/ai/azure-ai-agents-persistent/pom.xml
@@ -70,7 +70,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/ai/azure-ai-inference/pom.xml b/sdk/ai/azure-ai-inference/pom.xml
index 39306be10a42..865b53e53644 100644
--- a/sdk/ai/azure-ai-inference/pom.xml
+++ b/sdk/ai/azure-ai-inference/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/ai/azure-ai-projects/pom.xml b/sdk/ai/azure-ai-projects/pom.xml
index 2230fc20803d..9bc12d3c6e5b 100644
--- a/sdk/ai/azure-ai-projects/pom.xml
+++ b/sdk/ai/azure-ai-projects/pom.xml
@@ -89,7 +89,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/alertsmanagement/azure-resourcemanager-alertsmanagement/pom.xml b/sdk/alertsmanagement/azure-resourcemanager-alertsmanagement/pom.xml
index e9f2adc9c29b..c6470cf6768f 100644
--- a/sdk/alertsmanagement/azure-resourcemanager-alertsmanagement/pom.xml
+++ b/sdk/alertsmanagement/azure-resourcemanager-alertsmanagement/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/README.md b/sdk/anomalydetector/azure-ai-anomalydetector/README.md
index 39caf337a6ca..1e203100530f 100644
--- a/sdk/anomalydetector/azure-ai-anomalydetector/README.md
+++ b/sdk/anomalydetector/azure-ai-anomalydetector/README.md
@@ -65,7 +65,7 @@ with the Azure SDK, please include the `azure-identity` package:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 
diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
index 02a912781df0..db8b1f75da2f 100644
--- a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
+++ b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/apicenter/azure-resourcemanager-apicenter/pom.xml b/sdk/apicenter/azure-resourcemanager-apicenter/pom.xml
index 777af12f573f..2411d286e2a0 100644
--- a/sdk/apicenter/azure-resourcemanager-apicenter/pom.xml
+++ b/sdk/apicenter/azure-resourcemanager-apicenter/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml b/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml
index 0f3520563867..53c0fc5c07b4 100644
--- a/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml
+++ b/sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/appcomplianceautomation/azure-resourcemanager-appcomplianceautomation/pom.xml b/sdk/appcomplianceautomation/azure-resourcemanager-appcomplianceautomation/pom.xml
index bffa2f59b38d..8f0bfc19c2bf 100644
--- a/sdk/appcomplianceautomation/azure-resourcemanager-appcomplianceautomation/pom.xml
+++ b/sdk/appcomplianceautomation/azure-resourcemanager-appcomplianceautomation/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
index 65cab96cd420..cc779b84be62 100644
--- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
+++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml b/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml
index 56c3f14873bc..945735ddafb2 100644
--- a/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml
+++ b/sdk/appconfiguration/azure-resourcemanager-appconfiguration/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/appcontainers/azure-resourcemanager-appcontainers/pom.xml b/sdk/appcontainers/azure-resourcemanager-appcontainers/pom.xml
index 7dc0a11c8fae..99993d84811f 100644
--- a/sdk/appcontainers/azure-resourcemanager-appcontainers/pom.xml
+++ b/sdk/appcontainers/azure-resourcemanager-appcontainers/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml b/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml
index 6ca2f8f9698b..35b9649c376f 100644
--- a/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml
+++ b/sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/arizeaiobservabilityeval/azure-resourcemanager-arizeaiobservabilityeval/pom.xml b/sdk/arizeaiobservabilityeval/azure-resourcemanager-arizeaiobservabilityeval/pom.xml
index 9fd82f6f6ee2..3687ac5b5fce 100644
--- a/sdk/arizeaiobservabilityeval/azure-resourcemanager-arizeaiobservabilityeval/pom.xml
+++ b/sdk/arizeaiobservabilityeval/azure-resourcemanager-arizeaiobservabilityeval/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/astro/azure-resourcemanager-astro/pom.xml b/sdk/astro/azure-resourcemanager-astro/pom.xml
index 4180962cce84..ea052b9a473c 100644
--- a/sdk/astro/azure-resourcemanager-astro/pom.xml
+++ b/sdk/astro/azure-resourcemanager-astro/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/attestation/azure-resourcemanager-attestation/pom.xml b/sdk/attestation/azure-resourcemanager-attestation/pom.xml
index eb5dd49518ee..d8cd521c4005 100644
--- a/sdk/attestation/azure-resourcemanager-attestation/pom.xml
+++ b/sdk/attestation/azure-resourcemanager-attestation/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/attestation/azure-security-attestation/pom.xml b/sdk/attestation/azure-security-attestation/pom.xml
index 2e5b7abebf21..433457b056f1 100644
--- a/sdk/attestation/azure-security-attestation/pom.xml
+++ b/sdk/attestation/azure-security-attestation/pom.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/automanage/azure-resourcemanager-automanage/pom.xml b/sdk/automanage/azure-resourcemanager-automanage/pom.xml
index 26db3eccb42d..557091f37f88 100644
--- a/sdk/automanage/azure-resourcemanager-automanage/pom.xml
+++ b/sdk/automanage/azure-resourcemanager-automanage/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/automation/azure-resourcemanager-automation/pom.xml b/sdk/automation/azure-resourcemanager-automation/pom.xml
index c4e13c582070..e89c016f169b 100644
--- a/sdk/automation/azure-resourcemanager-automation/pom.xml
+++ b/sdk/automation/azure-resourcemanager-automation/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/avs/azure-resourcemanager-avs/pom.xml b/sdk/avs/azure-resourcemanager-avs/pom.xml
index fb6bc4eeea73..042363739ca8 100644
--- a/sdk/avs/azure-resourcemanager-avs/pom.xml
+++ b/sdk/avs/azure-resourcemanager-avs/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml b/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml
index 0905643f45dd..ff4623009911 100644
--- a/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml
+++ b/sdk/azurearcdata/azure-resourcemanager-azurearcdata/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml b/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml
index 6e9a3daf1f16..6b762b8004b9 100644
--- a/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml
+++ b/sdk/azurestack/azure-resourcemanager-azurestack/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/azurestackhci/azure-resourcemanager-azurestackhci-vm/pom.xml b/sdk/azurestackhci/azure-resourcemanager-azurestackhci-vm/pom.xml
index 8ede0745e842..b5da7bd8fc7e 100644
--- a/sdk/azurestackhci/azure-resourcemanager-azurestackhci-vm/pom.xml
+++ b/sdk/azurestackhci/azure-resourcemanager-azurestackhci-vm/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml b/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml
index c81e1cd0d530..f3e3ba17a71b 100644
--- a/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml
+++ b/sdk/azurestackhci/azure-resourcemanager-azurestackhci/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml b/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml
index 10825b8cb083..11e9add85156 100644
--- a/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml
+++ b/sdk/baremetalinfrastructure/azure-resourcemanager-baremetalinfrastructure/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/batch/azure-compute-batch/pom.xml b/sdk/batch/azure-compute-batch/pom.xml
index ced65f80ceb9..834a3aaddcf1 100644
--- a/sdk/batch/azure-compute-batch/pom.xml
+++ b/sdk/batch/azure-compute-batch/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/batch/azure-resourcemanager-batch/pom.xml b/sdk/batch/azure-resourcemanager-batch/pom.xml
index d66f5a7965c3..1016657b6b43 100644
--- a/sdk/batch/azure-resourcemanager-batch/pom.xml
+++ b/sdk/batch/azure-resourcemanager-batch/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/billing/azure-resourcemanager-billing/pom.xml b/sdk/billing/azure-resourcemanager-billing/pom.xml
index cc10f39906f9..478dbaeb6a93 100644
--- a/sdk/billing/azure-resourcemanager-billing/pom.xml
+++ b/sdk/billing/azure-resourcemanager-billing/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/billingbenefits/azure-resourcemanager-billingbenefits/pom.xml b/sdk/billingbenefits/azure-resourcemanager-billingbenefits/pom.xml
index ad05765766ec..df7ea5d06199 100644
--- a/sdk/billingbenefits/azure-resourcemanager-billingbenefits/pom.xml
+++ b/sdk/billingbenefits/azure-resourcemanager-billingbenefits/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/boms/azure-sdk-bom/CHANGELOG.md b/sdk/boms/azure-sdk-bom/CHANGELOG.md
index d5037baac0b9..ff079def8dde 100644
--- a/sdk/boms/azure-sdk-bom/CHANGELOG.md
+++ b/sdk/boms/azure-sdk-bom/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release History
 
+## 1.3.1 (2025-10-10)
+
+### Breaking Changes
+
+- Removed the following libraries from the BOM:
+    - `azure-mixedreality-remoterendering` - Service is deprecated and non-functional since 2025-10-01 see: [retirement notice](https://azure.microsoft.com/updates?id=azure-remote-rendering-retirement)
+
+
 ## 1.3.0 (2025-10-02)
 
 ### Dependency Updates
diff --git a/sdk/boms/azure-sdk-bom/pom.xml b/sdk/boms/azure-sdk-bom/pom.xml
index 9883e320c9fa..0662dd6d0e25 100644
--- a/sdk/boms/azure-sdk-bom/pom.xml
+++ b/sdk/boms/azure-sdk-bom/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-sdk-bom</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <packaging>pom</packaging>
   <name>Azure Java SDK BOM (Bill of Materials)</name>
   <description>Azure Java SDK BOM (Bill of Materials)</description>
@@ -300,11 +300,6 @@
         <artifactId>azure-mixedreality-authentication</artifactId>
         <version>1.2.36</version>
       </dependency>
-      <dependency>
-        <groupId>com.azure</groupId>
-        <artifactId>azure-mixedreality-remoterendering</artifactId>
-        <version>1.1.41</version>
-      </dependency>
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-monitor-ingestion</artifactId>
diff --git a/sdk/botservice/azure-resourcemanager-botservice/pom.xml b/sdk/botservice/azure-resourcemanager-botservice/pom.xml
index 592e8361db09..8630245779d5 100644
--- a/sdk/botservice/azure-resourcemanager-botservice/pom.xml
+++ b/sdk/botservice/azure-resourcemanager-botservice/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/carbonoptimization/azure-resourcemanager-carbonoptimization/pom.xml b/sdk/carbonoptimization/azure-resourcemanager-carbonoptimization/pom.xml
index b1a7ec661052..5978d7748d4e 100644
--- a/sdk/carbonoptimization/azure-resourcemanager-carbonoptimization/pom.xml
+++ b/sdk/carbonoptimization/azure-resourcemanager-carbonoptimization/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml b/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml
index 114ed87ff060..4cc7416911ec 100644
--- a/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml
+++ b/sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/chaos/azure-resourcemanager-chaos/pom.xml b/sdk/chaos/azure-resourcemanager-chaos/pom.xml
index 0d7dc2a7978d..c7980b66cb52 100644
--- a/sdk/chaos/azure-resourcemanager-chaos/pom.xml
+++ b/sdk/chaos/azure-resourcemanager-chaos/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/clientcore/platform-matrix.json b/sdk/clientcore/platform-matrix.json
index 1b8052dfade6..9fc11136eb8b 100644
--- a/sdk/clientcore/platform-matrix.json
+++ b/sdk/clientcore/platform-matrix.json
@@ -9,7 +9,7 @@
       "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
       "macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
     },
-    "JavaTestVersion": [ "1.17", "1.21" ],
+    "JavaTestVersion": [ "1.17", "1.25" ],
     "TEST_HTTP_CLIENT_IMPLEMENTATION": [ "io.clientcore.core.http.client.DefaultHttpClientProvider", "io.clientcore.http.okhttp3.OkHttpHttpClientProvider" ],
     "Options": {
       "NotFromSource_TestsOnly": {
@@ -23,7 +23,7 @@
   "exclude": [
     {
       "Pool": "env:LINUXPOOL",
-      "JavaTestVersion": "1.21"
+      "JavaTestVersion": "1.25"
     }
   ],
   "include": [
@@ -59,9 +59,24 @@
     },
     {
       "Agent": {
-          "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
+        "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
       "JavaTestVersion": "1.21",
+      "TEST_HTTP_CLIENT_IMPLEMENTATION": "io.clientcore.http.okhttp3.OkHttpHttpClientProvider",
+      "Options": {
+        "NotFromSource_TestsOnly": {
+          "TestFromSource": false,
+          "RunAggregateReports": false,
+          "TestOptions": "-DskipCompile=true -DskipTestCompile=true -DcreateSourcesJar=false -Djacoco.skip",
+          "TestGoals": "verify"
+        }
+      }
+    },
+    {
+      "Agent": {
+          "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
+      },
+      "JavaTestVersion": "1.25",
       "TEST_HTTP_CLIENT_IMPLEMENTATION": "io.clientcore.core.http.client.DefaultHttpClientProvider",
       "Options": {
         "TestFromSource_SkipRebuild_Verify": {
@@ -76,7 +91,7 @@
       "Agent": {
         "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "TEST_HTTP_CLIENT_IMPLEMENTATION": "io.clientcore.core.http.client.DefaultHttpClientProvider",
       "Options": {
         "NotFromSource_AggregateReports_SkipRebuild_Verify": {
diff --git a/sdk/cloudhealth/azure-resourcemanager-cloudhealth/pom.xml b/sdk/cloudhealth/azure-resourcemanager-cloudhealth/pom.xml
index 47eb201b9464..17db44a636bf 100644
--- a/sdk/cloudhealth/azure-resourcemanager-cloudhealth/pom.xml
+++ b/sdk/cloudhealth/azure-resourcemanager-cloudhealth/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml
index acc7dc35a3fe..1c5c8f5d9fcd 100644
--- a/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml
+++ b/sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/commerce/azure-resourcemanager-commerce/pom.xml b/sdk/commerce/azure-resourcemanager-commerce/pom.xml
index efd94f7b90d9..cf60d87bb9b7 100644
--- a/sdk/commerce/azure-resourcemanager-commerce/pom.xml
+++ b/sdk/commerce/azure-resourcemanager-commerce/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/communication/azure-communication-callautomation/pom.xml b/sdk/communication/azure-communication-callautomation/pom.xml
index e8e477fdcdac..6a4e2c772c58 100644
--- a/sdk/communication/azure-communication-callautomation/pom.xml
+++ b/sdk/communication/azure-communication-callautomation/pom.xml
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml
index a1eb80b13164..e8c1ef440ffd 100644
--- a/sdk/communication/azure-communication-callingserver/pom.xml
+++ b/sdk/communication/azure-communication-callingserver/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/communication/azure-communication-email/pom.xml b/sdk/communication/azure-communication-email/pom.xml
index 5f68c7cdf257..beb3cb7487c2 100644
--- a/sdk/communication/azure-communication-email/pom.xml
+++ b/sdk/communication/azure-communication-email/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml
index f7adce10bd22..7bc525ba1f06 100644
--- a/sdk/communication/azure-communication-identity/pom.xml
+++ b/sdk/communication/azure-communication-identity/pom.xml
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/communication/azure-communication-messages/pom.xml b/sdk/communication/azure-communication-messages/pom.xml
index 8dbb8be8a3a1..a18a13baf037 100644
--- a/sdk/communication/azure-communication-messages/pom.xml
+++ b/sdk/communication/azure-communication-messages/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/communication/azure-communication-phonenumbers/phone-numbers-livetest-matrix.json b/sdk/communication/azure-communication-phonenumbers/phone-numbers-livetest-matrix.json
index 596c35c05549..c3b060edd289 100644
--- a/sdk/communication/azure-communication-phonenumbers/phone-numbers-livetest-matrix.json
+++ b/sdk/communication/azure-communication-phonenumbers/phone-numbers-livetest-matrix.json
@@ -14,7 +14,7 @@
             "macos-latest": {
                 "OSVmImage": "env:MACVMIMAGE",
                 "Pool": "env:MACPOOL",
-                "JavaTestVersion": "1.21",
+                "JavaTestVersion": "1.25",
                 "AZURE_TEST_HTTP_CLIENTS": "netty",
                 "AZURE_TEST_AGENT": "MACOS_1015_JAVA11"
             }
@@ -34,7 +34,7 @@
                     "Pool": "env:LINUXPOOL"
                 }
             },
-            "JavaTestVersion": "1.21",
+            "JavaTestVersion": "1.25",
             "AZURE_TEST_HTTP_CLIENTS": "netty",
             "TestFromSource": true,
             "TestGoals": "verify",
@@ -51,7 +51,7 @@
                     "Pool": "env:WINDOWSPOOL"
                 }
             },
-            "JavaTestVersion": "1.21",
+            "JavaTestVersion": "1.25",
             "RunAggregateReports": true,
             "AZURE_TEST_HTTP_CLIENTS": "netty",
             "TestFromSource": false,
diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml
index f56aa4055d04..6b27e0e1a8de 100644
--- a/sdk/communication/azure-communication-phonenumbers/pom.xml
+++ b/sdk/communication/azure-communication-phonenumbers/pom.xml
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/communication/azure-communication-rooms/pom.xml b/sdk/communication/azure-communication-rooms/pom.xml
index 266750ad257e..5118416296dc 100644
--- a/sdk/communication/azure-communication-rooms/pom.xml
+++ b/sdk/communication/azure-communication-rooms/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml
index 5e380b85916f..d54499bf4431 100644
--- a/sdk/communication/azure-communication-sms/pom.xml
+++ b/sdk/communication/azure-communication-sms/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/communication/azure-resourcemanager-communication/pom.xml b/sdk/communication/azure-resourcemanager-communication/pom.xml
index 8d2c216a418c..092cdf8a8cc9 100644
--- a/sdk/communication/azure-resourcemanager-communication/pom.xml
+++ b/sdk/communication/azure-resourcemanager-communication/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/compute/azure-resourcemanager-compute-recommender/pom.xml b/sdk/compute/azure-resourcemanager-compute-recommender/pom.xml
index 231ce406a8db..a686ec086d42 100644
--- a/sdk/compute/azure-resourcemanager-compute-recommender/pom.xml
+++ b/sdk/compute/azure-resourcemanager-compute-recommender/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/compute/azure-resourcemanager-compute/pom.xml b/sdk/compute/azure-resourcemanager-compute/pom.xml
index 56d6e67a0d9e..6b0b4f9a458c 100644
--- a/sdk/compute/azure-resourcemanager-compute/pom.xml
+++ b/sdk/compute/azure-resourcemanager-compute/pom.xml
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
diff --git a/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java b/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java
index 924fe2a25b23..0d60053b5432 100644
--- a/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java
+++ b/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineExtensionImageOperationsTests.java
@@ -38,6 +38,7 @@ public void canListExtensionImages() throws Exception {
     }
 
     @Test
+    @DoNotRecord(skipInPlayback = true) // This test took over 1 minute to finish in playback
     public void canGetExtensionTypeVersionAndImage() throws Exception {
         PagedIterable<VirtualMachineExtensionImage> extensionImages
             = computeManager.virtualMachineExtensionImages().listByRegion(Region.US_EAST);
diff --git a/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java b/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java
index 1eac89826db2..54d26dd2b639 100644
--- a/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java
+++ b/sdk/compute/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineImageOperationsTests.java
@@ -4,6 +4,7 @@
 package com.azure.resourcemanager.compute;
 
 import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.test.annotation.DoNotRecord;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.logging.LogLevel;
 import com.azure.resourcemanager.compute.models.DataDiskImage;
@@ -19,6 +20,7 @@ public class VirtualMachineImageOperationsTests extends ComputeManagementTest {
     private static final ClientLogger LOGGER = new ClientLogger(VirtualMachineImageOperationsTests.class);
 
     @Test
+    @DoNotRecord(skipInPlayback = true) // This test took over 1 minute to finish in playback
     public void canListVirtualMachineImages() throws Exception {
         /*
         PagedIterable<VirtualMachineImage> images = computeManager.virtualMachineImages().listByRegion(Region.US_EAST);
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/pom.xml b/sdk/computefleet/azure-resourcemanager-computefleet/pom.xml
index f90a72bbce14..c4a751c152ff 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/pom.xml
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/test/java/com/azure/resourcemanager/computefleet/ComputeFleetManagerTests.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/test/java/com/azure/resourcemanager/computefleet/ComputeFleetManagerTests.java
index 72967c36b08c..86d68fa0d088 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/src/test/java/com/azure/resourcemanager/computefleet/ComputeFleetManagerTests.java
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/test/java/com/azure/resourcemanager/computefleet/ComputeFleetManagerTests.java
@@ -61,7 +61,7 @@
 
 public class ComputeFleetManagerTests extends TestProxyTestBase {
     private static final Random RANDOM = new Random();
-    private static final Region REGION = Region.US_WEST2;
+    private static final Region REGION = Region.US_WEST3;
     private String resourceGroupName = "rg" + randomPadding();
     private ResourceManager resourceManager = null;
     private ComputeFleetManager computeFleetManager = null;
@@ -109,6 +109,9 @@ protected void afterTest() {
     @Test
     @LiveOnly
     public void testCreateComputeFleet() {
+        // trigger the auth, to mitigate https://github.com/Azure/azure-sdk-for-java/issues/46858
+        resourceManager.providers().getByName("Microsoft.AzureFleet");
+
         Fleet fleet = null;
         try {
             String fleetName = "fleet" + randomPadding();
diff --git a/sdk/computeschedule/azure-resourcemanager-computeschedule/pom.xml b/sdk/computeschedule/azure-resourcemanager-computeschedule/pom.xml
index 7adc5671b67a..c47581351ef7 100644
--- a/sdk/computeschedule/azure-resourcemanager-computeschedule/pom.xml
+++ b/sdk/computeschedule/azure-resourcemanager-computeschedule/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/confidentialledger/azure-resourcemanager-confidentialledger/pom.xml b/sdk/confidentialledger/azure-resourcemanager-confidentialledger/pom.xml
index b9a0e1dd1d7c..2145f45b503c 100644
--- a/sdk/confidentialledger/azure-resourcemanager-confidentialledger/pom.xml
+++ b/sdk/confidentialledger/azure-resourcemanager-confidentialledger/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/confidentialledger/azure-security-confidentialledger/pom.xml b/sdk/confidentialledger/azure-security-confidentialledger/pom.xml
index 46a4f5d172c5..9a7c2971beb6 100644
--- a/sdk/confidentialledger/azure-security-confidentialledger/pom.xml
+++ b/sdk/confidentialledger/azure-security-confidentialledger/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/confluent/azure-resourcemanager-confluent/pom.xml b/sdk/confluent/azure-resourcemanager-confluent/pom.xml
index 92f04d1e2708..c5f3d783e25d 100644
--- a/sdk/confluent/azure-resourcemanager-confluent/pom.xml
+++ b/sdk/confluent/azure-resourcemanager-confluent/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/connectedcache/azure-resourcemanager-connectedcache/pom.xml b/sdk/connectedcache/azure-resourcemanager-connectedcache/pom.xml
index d56007ce57c3..f092572dd17c 100644
--- a/sdk/connectedcache/azure-resourcemanager-connectedcache/pom.xml
+++ b/sdk/connectedcache/azure-resourcemanager-connectedcache/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/connectedvmware/azure-resourcemanager-connectedvmware/pom.xml b/sdk/connectedvmware/azure-resourcemanager-connectedvmware/pom.xml
index 14b36a6e2290..dae23d9e7419 100644
--- a/sdk/connectedvmware/azure-resourcemanager-connectedvmware/pom.xml
+++ b/sdk/connectedvmware/azure-resourcemanager-connectedvmware/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/consumption/azure-resourcemanager-consumption/pom.xml b/sdk/consumption/azure-resourcemanager-consumption/pom.xml
index ea58ee6595cb..bdb5f98d46dd 100644
--- a/sdk/consumption/azure-resourcemanager-consumption/pom.xml
+++ b/sdk/consumption/azure-resourcemanager-consumption/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml b/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml
index 688232039fd1..ac0488fb1f08 100644
--- a/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml
+++ b/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/containerorchestratorruntime/azure-resourcemanager-containerorchestratorruntime/pom.xml b/sdk/containerorchestratorruntime/azure-resourcemanager-containerorchestratorruntime/pom.xml
index 8a57c0d3108a..792db915b8df 100644
--- a/sdk/containerorchestratorruntime/azure-resourcemanager-containerorchestratorruntime/pom.xml
+++ b/sdk/containerorchestratorruntime/azure-resourcemanager-containerorchestratorruntime/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/containerregistry/azure-containers-containerregistry-perf/pom.xml b/sdk/containerregistry/azure-containers-containerregistry-perf/pom.xml
index 8ada79565264..1bdc885c8efe 100644
--- a/sdk/containerregistry/azure-containers-containerregistry-perf/pom.xml
+++ b/sdk/containerregistry/azure-containers-containerregistry-perf/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
   </dependencies>
 </project>
diff --git a/sdk/containerregistry/azure-containers-containerregistry/pom.xml b/sdk/containerregistry/azure-containers-containerregistry/pom.xml
index af3a6cabba90..fb13617a4d15 100644
--- a/sdk/containerregistry/azure-containers-containerregistry/pom.xml
+++ b/sdk/containerregistry/azure-containers-containerregistry/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/CHANGELOG.md b/sdk/containerservice/azure-resourcemanager-containerservice/CHANGELOG.md
index 62d5486ddf73..9f74574ecd4e 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/CHANGELOG.md
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 2.55.0-beta.1 (Unreleased)
+## 2.56.0-beta.2 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,22 @@
 
 ### Other Changes
 
+## 2.56.0-beta.1 (2025-10-15)
+
+### Other Changes
+
+#### Dependency Updates
+
+- Updated `api-version` to `2025-08-02-preview`.
+
+## 2.55.0 (2025-10-13)
+
+### Other Changes
+
+#### Dependency Updates
+
+- Updated `api-version` to `2025-08-01`.
+
 ## 2.54.1 (2025-09-24)
 
 ### Other Changes
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/README.md b/sdk/containerservice/azure-resourcemanager-containerservice/README.md
index f7ffa1bb5e42..2fd6355f8c2f 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/README.md
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/README.md
@@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-containerservice</artifactId>
-    <version>2.54.0</version>
+    <version>2.55.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/assets.json b/sdk/containerservice/azure-resourcemanager-containerservice/assets.json
index 6437d8017ddd..9c2c912e53ff 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/assets.json
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/containerservice/azure-resourcemanager-containerservice",
-  "Tag": "java/containerservice/azure-resourcemanager-containerservice_031759ab31"
+  "Tag": "java/containerservice/azure-resourcemanager-containerservice_8330934300"
 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml b/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml
index aef1384e3fe6..f4946e9f014a 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-containerservice</artifactId>
-  <version>2.55.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
+  <version>2.56.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Container Service Management</name>
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/AgentPoolsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/AgentPoolsClient.java
index f1ec76e42adb..d228cd8c62b4 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/AgentPoolsClient.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/AgentPoolsClient.java
@@ -30,7 +30,7 @@ public interface AgentPoolsClient {
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -49,7 +49,7 @@ Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String re
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -68,7 +68,7 @@ PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourc
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -87,7 +87,7 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -107,7 +107,7 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -125,7 +125,7 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -142,7 +142,7 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -620,6 +620,122 @@ Response<AgentPoolUpgradeProfileInner> getUpgradeProfileWithResponse(String reso
     @ServiceMethod(returns = ReturnType.SINGLE)
     AgentPoolUpgradeProfileInner getUpgradeProfile(String resourceGroupName, String resourceName, String agentPoolName);
 
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> completeUpgradeWithResponseAsync(String resourceGroupName, String resourceName,
+        String agentPoolName);
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginCompleteUpgradeAsync(String resourceGroupName, String resourceName,
+        String agentPoolName);
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginCompleteUpgrade(String resourceGroupName, String resourceName,
+        String agentPoolName);
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginCompleteUpgrade(String resourceGroupName, String resourceName,
+        String agentPoolName, Context context);
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> completeUpgradeAsync(String resourceGroupName, String resourceName, String agentPoolName);
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void completeUpgrade(String resourceGroupName, String resourceName, String agentPoolName);
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void completeUpgrade(String resourceGroupName, String resourceName, String agentPoolName, Context context);
+
     /**
      * Deletes specific machines in an agent pool.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceManagementClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceManagementClient.java
index f43c81c708c2..3fd176dbe278 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceManagementClient.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceManagementClient.java
@@ -68,6 +68,13 @@ public interface ContainerServiceManagementClient {
      */
     ManagedClustersClient getManagedClusters();
 
+    /**
+     * Gets the ContainerServiceOperationsClient object to access its operations.
+     * 
+     * @return the ContainerServiceOperationsClient object.
+     */
+    ContainerServiceOperationsClient getContainerServiceOperations();
+
     /**
      * Gets the MaintenanceConfigurationsClient object to access its operations.
      * 
@@ -75,6 +82,13 @@ public interface ContainerServiceManagementClient {
      */
     MaintenanceConfigurationsClient getMaintenanceConfigurations();
 
+    /**
+     * Gets the ManagedNamespacesClient object to access its operations.
+     * 
+     * @return the ManagedNamespacesClient object.
+     */
+    ManagedNamespacesClient getManagedNamespaces();
+
     /**
      * Gets the AgentPoolsClient object to access its operations.
      * 
@@ -82,6 +96,13 @@ public interface ContainerServiceManagementClient {
      */
     AgentPoolsClient getAgentPools();
 
+    /**
+     * Gets the MachinesClient object to access its operations.
+     * 
+     * @return the MachinesClient object.
+     */
+    MachinesClient getMachines();
+
     /**
      * Gets the PrivateEndpointConnectionsClient object to access its operations.
      * 
@@ -103,6 +124,13 @@ public interface ContainerServiceManagementClient {
      */
     ResolvePrivateLinkServiceIdsClient getResolvePrivateLinkServiceIds();
 
+    /**
+     * Gets the OperationStatusResultsClient object to access its operations.
+     * 
+     * @return the OperationStatusResultsClient object.
+     */
+    OperationStatusResultsClient getOperationStatusResults();
+
     /**
      * Gets the SnapshotsClient object to access its operations.
      * 
@@ -111,11 +139,11 @@ public interface ContainerServiceManagementClient {
     SnapshotsClient getSnapshots();
 
     /**
-     * Gets the TrustedAccessRoleBindingsClient object to access its operations.
+     * Gets the ManagedClusterSnapshotsClient object to access its operations.
      * 
-     * @return the TrustedAccessRoleBindingsClient object.
+     * @return the ManagedClusterSnapshotsClient object.
      */
-    TrustedAccessRoleBindingsClient getTrustedAccessRoleBindings();
+    ManagedClusterSnapshotsClient getManagedClusterSnapshots();
 
     /**
      * Gets the TrustedAccessRolesClient object to access its operations.
@@ -125,9 +153,37 @@ public interface ContainerServiceManagementClient {
     TrustedAccessRolesClient getTrustedAccessRoles();
 
     /**
-     * Gets the MachinesClient object to access its operations.
+     * Gets the TrustedAccessRoleBindingsClient object to access its operations.
      * 
-     * @return the MachinesClient object.
+     * @return the TrustedAccessRoleBindingsClient object.
      */
-    MachinesClient getMachines();
+    TrustedAccessRoleBindingsClient getTrustedAccessRoleBindings();
+
+    /**
+     * Gets the LoadBalancersClient object to access its operations.
+     * 
+     * @return the LoadBalancersClient object.
+     */
+    LoadBalancersClient getLoadBalancers();
+
+    /**
+     * Gets the IdentityBindingsClient object to access its operations.
+     * 
+     * @return the IdentityBindingsClient object.
+     */
+    IdentityBindingsClient getIdentityBindings();
+
+    /**
+     * Gets the JwtAuthenticatorsClient object to access its operations.
+     * 
+     * @return the JwtAuthenticatorsClient object.
+     */
+    JwtAuthenticatorsClient getJwtAuthenticators();
+
+    /**
+     * Gets the MeshMembershipsClient object to access its operations.
+     * 
+     * @return the MeshMembershipsClient object.
+     */
+    MeshMembershipsClient getMeshMemberships();
 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceOperationsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceOperationsClient.java
new file mode 100644
index 000000000000..07ef553d11c3
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ContainerServiceOperationsClient.java
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.containerservice.fluent.models.NodeImageVersionInner;
+
+/**
+ * An instance of this class provides access to all the operations defined in ContainerServiceOperationsClient.
+ */
+public interface ContainerServiceOperationsClient {
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<NodeImageVersionInner> listNodeImageVersionsAsync(String location);
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NodeImageVersionInner> listNodeImageVersions(String location);
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NodeImageVersionInner> listNodeImageVersions(String location, Context context);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/IdentityBindingsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/IdentityBindingsClient.java
new file mode 100644
index 000000000000..4fb01bb3c58a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/IdentityBindingsClient.java
@@ -0,0 +1,343 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.models.IdentityBindingInner;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in IdentityBindingsClient.
+ */
+public interface IdentityBindingsClient {
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<IdentityBindingInner> listByManagedClusterAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<IdentityBindingInner> listByManagedCluster(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<IdentityBindingInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context);
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<IdentityBindingInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName);
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<IdentityBindingInner> getAsync(String resourceGroupName, String resourceName, String identityBindingName);
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<IdentityBindingInner> getWithResponse(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context);
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    IdentityBindingInner get(String resourceGroupName, String resourceName, String identityBindingName);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, IdentityBindingInner parameters);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String identityBindingName, IdentityBindingInner parameters);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String identityBindingName, IdentityBindingInner parameters);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String identityBindingName, IdentityBindingInner parameters, Context context);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<IdentityBindingInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, IdentityBindingInner parameters);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    IdentityBindingInner createOrUpdate(String resourceGroupName, String resourceName, String identityBindingName,
+        IdentityBindingInner parameters);
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    IdentityBindingInner createOrUpdate(String resourceGroupName, String resourceName, String identityBindingName,
+        IdentityBindingInner parameters, Context context);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String identityBindingName);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String identityBindingName);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String identityBindingName);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String identityBindingName);
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String identityBindingName, Context context);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/JwtAuthenticatorsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/JwtAuthenticatorsClient.java
new file mode 100644
index 000000000000..96e9f9eaad93
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/JwtAuthenticatorsClient.java
@@ -0,0 +1,352 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.models.JwtAuthenticatorInner;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in JwtAuthenticatorsClient.
+ */
+public interface JwtAuthenticatorsClient {
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<JwtAuthenticatorInner> listByManagedClusterAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<JwtAuthenticatorInner> listByManagedCluster(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<JwtAuthenticatorInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context);
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster along with {@link Response} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<JwtAuthenticatorInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName);
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<JwtAuthenticatorInner> getAsync(String resourceGroupName, String resourceName, String jwtAuthenticatorName);
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<JwtAuthenticatorInner> getWithResponse(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context);
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    JwtAuthenticatorInner get(String resourceGroupName, String resourceName, String jwtAuthenticatorName);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, JwtAuthenticatorInner parameters);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters, Context context);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<JwtAuthenticatorInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, JwtAuthenticatorInner parameters);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    JwtAuthenticatorInner createOrUpdate(String resourceGroupName, String resourceName, String jwtAuthenticatorName,
+        JwtAuthenticatorInner parameters);
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    JwtAuthenticatorInner createOrUpdate(String resourceGroupName, String resourceName, String jwtAuthenticatorName,
+        JwtAuthenticatorInner parameters, Context context);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String jwtAuthenticatorName);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String jwtAuthenticatorName);
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String jwtAuthenticatorName, Context context);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/LoadBalancersClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/LoadBalancersClient.java
new file mode 100644
index 000000000000..305de7605086
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/LoadBalancersClient.java
@@ -0,0 +1,294 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.models.LoadBalancerInner;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in LoadBalancersClient.
+ */
+public interface LoadBalancersClient {
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<LoadBalancerInner> listByManagedClusterAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<LoadBalancerInner> listByManagedCluster(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<LoadBalancerInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context);
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<LoadBalancerInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName);
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<LoadBalancerInner> getAsync(String resourceGroupName, String resourceName, String loadBalancerName);
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<LoadBalancerInner> getWithResponse(String resourceGroupName, String resourceName, String loadBalancerName,
+        Context context);
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    LoadBalancerInner get(String resourceGroupName, String resourceName, String loadBalancerName);
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<LoadBalancerInner>> createOrUpdateWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName, LoadBalancerInner parameters);
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<LoadBalancerInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String loadBalancerName,
+        LoadBalancerInner parameters);
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<LoadBalancerInner> createOrUpdateWithResponse(String resourceGroupName, String resourceName,
+        String loadBalancerName, LoadBalancerInner parameters, Context context);
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    LoadBalancerInner createOrUpdate(String resourceGroupName, String resourceName, String loadBalancerName,
+        LoadBalancerInner parameters);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String loadBalancerName);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String loadBalancerName, Context context);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String loadBalancerName);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String loadBalancerName);
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String loadBalancerName, Context context);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MachinesClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MachinesClient.java
index 57a92d2b1623..8f41b71734a9 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MachinesClient.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MachinesClient.java
@@ -9,8 +9,13 @@
 import com.azure.core.http.rest.PagedFlux;
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
 import com.azure.core.util.Context;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.containerservice.fluent.models.MachineInner;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
@@ -67,7 +72,7 @@ PagedIterable<MachineInner> list(String resourceGroupName, String resourceName,
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -84,7 +89,7 @@ Mono<Response<MachineInner>> getWithResponseAsync(String resourceGroupName, Stri
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -100,7 +105,7 @@ Mono<MachineInner> getAsync(String resourceGroupName, String resourceName, Strin
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
@@ -117,7 +122,7 @@ Response<MachineInner> getWithResponse(String resourceGroupName, String resource
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -125,4 +130,178 @@ Response<MachineInner> getWithResponse(String resourceGroupName, String resource
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     MachineInner get(String resourceGroupName, String resourceName, String agentPoolName, String machineName);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName, String resourceName,
+        String agentPoolName, String machineName, MachineInner parameters, String ifMatch, String ifNoneMatch);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<MachineInner>, MachineInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<MachineInner>, MachineInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<MachineInner>, MachineInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<MachineInner>, MachineInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch, Context context);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<MachineInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters, String ifMatch, String ifNoneMatch);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<MachineInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MachineInner createOrUpdate(String resourceGroupName, String resourceName, String agentPoolName, String machineName,
+        MachineInner parameters);
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MachineInner createOrUpdate(String resourceGroupName, String resourceName, String agentPoolName, String machineName,
+        MachineInner parameters, String ifMatch, String ifNoneMatch, Context context);
 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClusterSnapshotsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClusterSnapshotsClient.java
new file mode 100644
index 000000000000..f2f1123351ba
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClusterSnapshotsClient.java
@@ -0,0 +1,327 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterSnapshotInner;
+import com.azure.resourcemanager.containerservice.models.TagsObject;
+import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsDelete;
+import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsGet;
+import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsListing;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in ManagedClusterSnapshotsClient.
+ */
+public interface ManagedClusterSnapshotsClient extends InnerSupportsGet<ManagedClusterSnapshotInner>,
+    InnerSupportsListing<ManagedClusterSnapshotInner>, InnerSupportsDelete<Void> {
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<ManagedClusterSnapshotInner> listAsync();
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ManagedClusterSnapshotInner> list();
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ManagedClusterSnapshotInner> list(Context context);
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<ManagedClusterSnapshotInner> listByResourceGroupAsync(String resourceGroupName);
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ManagedClusterSnapshotInner> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ManagedClusterSnapshotInner> listByResourceGroup(String resourceGroupName, Context context);
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<ManagedClusterSnapshotInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
+        String resourceName);
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<ManagedClusterSnapshotInner> getByResourceGroupAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ManagedClusterSnapshotInner> getByResourceGroupWithResponse(String resourceGroupName, String resourceName,
+        Context context);
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedClusterSnapshotInner getByResourceGroup(String resourceGroupName, String resourceName);
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<ManagedClusterSnapshotInner>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, ManagedClusterSnapshotInner parameters);
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<ManagedClusterSnapshotInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        ManagedClusterSnapshotInner parameters);
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ManagedClusterSnapshotInner> createOrUpdateWithResponse(String resourceGroupName, String resourceName,
+        ManagedClusterSnapshotInner parameters, Context context);
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedClusterSnapshotInner createOrUpdate(String resourceGroupName, String resourceName,
+        ManagedClusterSnapshotInner parameters);
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<ManagedClusterSnapshotInner>> updateTagsWithResponseAsync(String resourceGroupName,
+        String resourceName, TagsObject parameters);
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<ManagedClusterSnapshotInner> updateTagsAsync(String resourceGroupName, String resourceName,
+        TagsObject parameters);
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ManagedClusterSnapshotInner> updateTagsWithResponse(String resourceGroupName, String resourceName,
+        TagsObject parameters, Context context);
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedClusterSnapshotInner updateTags(String resourceGroupName, String resourceName, TagsObject parameters);
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<Void> deleteWithResponse(String resourceGroupName, String resourceName, Context context);
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
index 1e03332b8dff..e97cea4abd7d 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
@@ -14,6 +14,7 @@
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.containerservice.fluent.models.CredentialResultsInner;
+import com.azure.resourcemanager.containerservice.fluent.models.GuardrailsAvailableVersionInner;
 import com.azure.resourcemanager.containerservice.fluent.models.KubernetesVersionListResultInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterAccessProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterInner;
@@ -22,10 +23,12 @@
 import com.azure.resourcemanager.containerservice.fluent.models.MeshUpgradeProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.OutboundEnvironmentEndpointInner;
 import com.azure.resourcemanager.containerservice.fluent.models.RunCommandResultInner;
+import com.azure.resourcemanager.containerservice.fluent.models.SafeguardsAvailableVersionInner;
 import com.azure.resourcemanager.containerservice.models.Format;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAadProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterServicePrincipalProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClustersGetCommandResultResponse;
+import com.azure.resourcemanager.containerservice.models.RebalanceLoadBalancersRequestBody;
 import com.azure.resourcemanager.containerservice.models.RunCommandRequest;
 import com.azure.resourcemanager.containerservice.models.TagsObject;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsDelete;
@@ -838,6 +841,8 @@ ManagedClusterInner updateTags(String resourceGroupName, String resourceName, Ta
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -845,7 +850,7 @@ ManagedClusterInner updateTags(String resourceGroupName, String resourceName, Ta
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
-        String ifMatch);
+        String ifMatch, Boolean ignorePodDisruptionBudget);
 
     /**
      * Deletes a managed cluster.
@@ -853,13 +858,16 @@ Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupNam
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName, String ifMatch);
+    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName, String ifMatch,
+        Boolean ignorePodDisruptionBudget);
 
     /**
      * Deletes a managed cluster.
@@ -893,6 +901,8 @@ Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupNam
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
@@ -901,7 +911,7 @@ Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupNam
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName, String ifMatch,
-        Context context);
+        Boolean ignorePodDisruptionBudget, Context context);
 
     /**
      * Deletes a managed cluster.
@@ -909,13 +919,16 @@ SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String ifMatch);
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String ifMatch,
+        Boolean ignorePodDisruptionBudget);
 
     /**
      * Deletes a managed cluster.
@@ -948,13 +961,16 @@ SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void delete(String resourceGroupName, String resourceName, String ifMatch, Context context);
+    void delete(String resourceGroupName, String resourceName, String ifMatch, Boolean ignorePodDisruptionBudget,
+        Context context);
 
     /**
      * Reset the Service Principal Profile of a managed cluster.
@@ -1200,10 +1216,11 @@ void resetAadProfile(String resourceGroupName, String resourceName, ManagedClust
         Context context);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1213,14 +1230,15 @@ void resetAadProfile(String resourceGroupName, String resourceName, ManagedClust
      * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(String resourceGroupName,
+    Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String resourceGroupName,
         String resourceName);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1230,14 +1248,14 @@ Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(Stri
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String resourceGroupName,
-        String resourceName);
+    PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourceGroupName, String resourceName);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1247,13 +1265,14 @@ PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String re
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName, String resourceName);
+    SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1264,14 +1283,15 @@ PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String re
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName, String resourceName,
+    SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName,
         Context context);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1281,13 +1301,14 @@ SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourc
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, String resourceName);
+    Mono<Void> abortLatestOperationAsync(String resourceGroupName, String resourceName);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1296,13 +1317,14 @@ SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourc
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void rotateClusterCertificates(String resourceGroupName, String resourceName);
+    void abortLatestOperation(String resourceGroupName, String resourceName);
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1312,14 +1334,13 @@ SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourc
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void rotateClusterCertificates(String resourceGroupName, String resourceName, Context context);
+    void abortLatestOperation(String resourceGroupName, String resourceName, Context context);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1329,15 +1350,14 @@ SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourc
      * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String resourceGroupName,
+    Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(String resourceGroupName,
         String resourceName);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1347,14 +1367,14 @@ Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String re
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourceGroupName, String resourceName);
+    PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String resourceGroupName,
+        String resourceName);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1364,14 +1384,13 @@ Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String re
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName);
+    SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName, String resourceName);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1382,15 +1401,14 @@ Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String re
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName,
+    SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName, String resourceName,
         Context context);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1400,14 +1418,13 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Mono<Void> abortLatestOperationAsync(String resourceGroupName, String resourceName);
+    Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, String resourceName);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1416,14 +1433,13 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void abortLatestOperation(String resourceGroupName, String resourceName);
+    void rotateClusterCertificates(String resourceGroupName, String resourceName);
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -1433,7 +1449,7 @@ SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGrou
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    void abortLatestOperation(String resourceGroupName, String resourceName, Context context);
+    void rotateClusterCertificates(String resourceGroupName, String resourceName, Context context);
 
     /**
      * Rotates the service account signing keys of a managed cluster.
@@ -2014,6 +2030,224 @@ PagedIterable<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesE
     PagedIterable<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesEndpoints(String resourceGroupName,
         String resourceName, Context context);
 
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<GuardrailsAvailableVersionInner>> getGuardrailsVersionsWithResponseAsync(String location,
+        String version);
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<GuardrailsAvailableVersionInner> getGuardrailsVersionsAsync(String location, String version);
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<GuardrailsAvailableVersionInner> getGuardrailsVersionsWithResponse(String location, String version,
+        Context context);
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    GuardrailsAvailableVersionInner getGuardrailsVersions(String location, String version);
+
+    /**
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
+     * 
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<GuardrailsAvailableVersionInner> listGuardrailsVersionsAsync(String location);
+
+    /**
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
+     * 
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<GuardrailsAvailableVersionInner> listGuardrailsVersions(String location);
+
+    /**
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
+     * 
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<GuardrailsAvailableVersionInner> listGuardrailsVersions(String location, Context context);
+
+    /**
+     * Gets supported Safeguards version in the specified subscription and location.
+     * 
+     * Contains Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Safeguards Version along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<SafeguardsAvailableVersionInner>> getSafeguardsVersionsWithResponseAsync(String location,
+        String version);
+
+    /**
+     * Gets supported Safeguards version in the specified subscription and location.
+     * 
+     * Contains Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Safeguards Version on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<SafeguardsAvailableVersionInner> getSafeguardsVersionsAsync(String location, String version);
+
+    /**
+     * Gets supported Safeguards version in the specified subscription and location.
+     * 
+     * Contains Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Safeguards Version along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<SafeguardsAvailableVersionInner> getSafeguardsVersionsWithResponse(String location, String version,
+        Context context);
+
+    /**
+     * Gets supported Safeguards version in the specified subscription and location.
+     * 
+     * Contains Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Safeguards Version.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    SafeguardsAvailableVersionInner getSafeguardsVersions(String location, String version);
+
+    /**
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
+     * 
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<SafeguardsAvailableVersionInner> listSafeguardsVersionsAsync(String location);
+
+    /**
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
+     * 
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<SafeguardsAvailableVersionInner> listSafeguardsVersions(String location);
+
+    /**
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
+     * 
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<SafeguardsAvailableVersionInner> listSafeguardsVersions(String location, Context context);
+
     /**
      * Lists mesh revision profiles for all meshes in the specified location.
      * 
@@ -2227,4 +2461,116 @@ Response<MeshUpgradeProfileInner> getMeshUpgradeProfileWithResponse(String resou
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     MeshUpgradeProfileInner getMeshUpgradeProfile(String resourceGroupName, String resourceName, String mode);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> rebalanceLoadBalancersWithResponseAsync(String resourceGroupName,
+        String resourceName, RebalanceLoadBalancersRequestBody parameters);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginRebalanceLoadBalancersAsync(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginRebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginRebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters, Context context);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> rebalanceLoadBalancersAsync(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void rebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters);
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void rebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters, Context context);
 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedNamespacesClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedNamespacesClient.java
new file mode 100644
index 000000000000..580fc93ab426
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedNamespacesClient.java
@@ -0,0 +1,471 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.models.CredentialResultsInner;
+import com.azure.resourcemanager.containerservice.fluent.models.ManagedNamespaceInner;
+import com.azure.resourcemanager.containerservice.models.TagsObject;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in ManagedNamespacesClient.
+ */
+public interface ManagedNamespacesClient {
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<ManagedNamespaceInner> listByManagedClusterAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ManagedNamespaceInner> listByManagedCluster(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ManagedNamespaceInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context);
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<ManagedNamespaceInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName);
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<ManagedNamespaceInner> getAsync(String resourceGroupName, String resourceName, String managedNamespaceName);
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ManagedNamespaceInner> getWithResponse(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context);
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedNamespaceInner get(String resourceGroupName, String resourceName, String managedNamespaceName);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, ManagedNamespaceInner parameters);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters, Context context);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<ManagedNamespaceInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, ManagedNamespaceInner parameters);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedNamespaceInner createOrUpdate(String resourceGroupName, String resourceName, String managedNamespaceName,
+        ManagedNamespaceInner parameters);
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedNamespaceInner createOrUpdate(String resourceGroupName, String resourceName, String managedNamespaceName,
+        ManagedNamespaceInner parameters, Context context);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String managedNamespaceName);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String managedNamespaceName);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String managedNamespaceName);
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String managedNamespaceName, Context context);
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<ManagedNamespaceInner>> updateWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, TagsObject parameters);
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<ManagedNamespaceInner> updateAsync(String resourceGroupName, String resourceName, String managedNamespaceName,
+        TagsObject parameters);
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ManagedNamespaceInner> updateWithResponse(String resourceGroupName, String resourceName,
+        String managedNamespaceName, TagsObject parameters, Context context);
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ManagedNamespaceInner update(String resourceGroupName, String resourceName, String managedNamespaceName,
+        TagsObject parameters);
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<CredentialResultsInner>> listCredentialWithResponseAsync(String resourceGroupName,
+        String resourceName, String managedNamespaceName);
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<CredentialResultsInner> listCredentialAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName);
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<CredentialResultsInner> listCredentialWithResponse(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context);
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    CredentialResultsInner listCredential(String resourceGroupName, String resourceName, String managedNamespaceName);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MeshMembershipsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MeshMembershipsClient.java
new file mode 100644
index 000000000000..bf8ff69cb6ae
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/MeshMembershipsClient.java
@@ -0,0 +1,345 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.models.MeshMembershipInner;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in MeshMembershipsClient.
+ */
+public interface MeshMembershipsClient {
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<MeshMembershipInner> listByManagedClusterAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<MeshMembershipInner> listByManagedCluster(String resourceGroupName, String resourceName);
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<MeshMembershipInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context);
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<MeshMembershipInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName);
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<MeshMembershipInner> getAsync(String resourceGroupName, String resourceName, String meshMembershipName);
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<MeshMembershipInner> getWithResponse(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context);
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MeshMembershipInner get(String resourceGroupName, String resourceName, String meshMembershipName);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, MeshMembershipInner parameters);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String resourceName, String meshMembershipName, MeshMembershipInner parameters);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String meshMembershipName, MeshMembershipInner parameters);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String meshMembershipName, MeshMembershipInner parameters, Context context);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<MeshMembershipInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, MeshMembershipInner parameters);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MeshMembershipInner createOrUpdate(String resourceGroupName, String resourceName, String meshMembershipName,
+        MeshMembershipInner parameters);
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MeshMembershipInner createOrUpdate(String resourceGroupName, String resourceName, String meshMembershipName,
+        MeshMembershipInner parameters, Context context);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String meshMembershipName);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String meshMembershipName);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String meshMembershipName);
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceName, String meshMembershipName, Context context);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/OperationStatusResultsClient.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/OperationStatusResultsClient.java
new file mode 100644
index 000000000000..b937300f2a7a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/OperationStatusResultsClient.java
@@ -0,0 +1,186 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.containerservice.fluent.models.OperationStatusResultInner;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in OperationStatusResultsClient.
+ */
+public interface OperationStatusResultsClient {
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<OperationStatusResultInner> listAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<OperationStatusResultInner> list(String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<OperationStatusResultInner> list(String resourceGroupName, String resourceName, Context context);
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<OperationStatusResultInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String operationId);
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<OperationStatusResultInner> getAsync(String resourceGroupName, String resourceName, String operationId);
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<OperationStatusResultInner> getWithResponse(String resourceGroupName, String resourceName,
+        String operationId, Context context);
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    OperationStatusResultInner get(String resourceGroupName, String resourceName, String operationId);
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<OperationStatusResultInner>> getByAgentPoolWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String operationId);
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<OperationStatusResultInner> getByAgentPoolAsync(String resourceGroupName, String resourceName,
+        String agentPoolName, String operationId);
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<OperationStatusResultInner> getByAgentPoolWithResponse(String resourceGroupName, String resourceName,
+        String agentPoolName, String operationId, Context context);
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    OperationStatusResultInner getByAgentPool(String resourceGroupName, String resourceName, String agentPoolName,
+        String operationId);
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolInner.java
index 2c249c6a4406..72c8f983ce8f 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolInner.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolInner.java
@@ -9,6 +9,8 @@
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.AgentPoolArtifactStreamingProfile;
+import com.azure.resourcemanager.containerservice.models.AgentPoolBlueGreenUpgradeSettings;
 import com.azure.resourcemanager.containerservice.models.AgentPoolGatewayProfile;
 import com.azure.resourcemanager.containerservice.models.AgentPoolMode;
 import com.azure.resourcemanager.containerservice.models.AgentPoolNetworkProfile;
@@ -23,6 +25,8 @@
 import com.azure.resourcemanager.containerservice.models.KubeletConfig;
 import com.azure.resourcemanager.containerservice.models.KubeletDiskType;
 import com.azure.resourcemanager.containerservice.models.LinuxOSConfig;
+import com.azure.resourcemanager.containerservice.models.LocalDnsProfile;
+import com.azure.resourcemanager.containerservice.models.NodeCustomizationProfile;
 import com.azure.resourcemanager.containerservice.models.OSDiskType;
 import com.azure.resourcemanager.containerservice.models.OSSku;
 import com.azure.resourcemanager.containerservice.models.OSType;
@@ -31,6 +35,7 @@
 import com.azure.resourcemanager.containerservice.models.ScaleDownMode;
 import com.azure.resourcemanager.containerservice.models.ScaleSetEvictionPolicy;
 import com.azure.resourcemanager.containerservice.models.ScaleSetPriority;
+import com.azure.resourcemanager.containerservice.models.UpgradeStrategy;
 import com.azure.resourcemanager.containerservice.models.VirtualMachineNodes;
 import com.azure.resourcemanager.containerservice.models.VirtualMachinesProfile;
 import com.azure.resourcemanager.containerservice.models.WorkloadRuntime;
@@ -104,7 +109,7 @@ public AgentPoolInner withId(String id) {
     /**
      * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
      * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
-     * subsequent request to enable optimistic concurrency per the normal etag convention.
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
      * 
      * @return the etag value.
      */
@@ -425,9 +430,9 @@ public AgentPoolInner withOsType(OSType osType) {
     }
 
     /**
-     * Get the osSku property: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux.
-     * The default is Windows2019 when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is
-     * Windows.
+     * Get the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
      * 
      * @return the osSku value.
      */
@@ -436,9 +441,9 @@ public OSSku osSku() {
     }
 
     /**
-     * Set the osSku property: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux.
-     * The default is Windows2019 when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is
-     * Windows.
+     * Set the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
      * 
      * @param osSku the osSku value to set.
      * @return the AgentPoolInner object itself.
@@ -597,13 +602,13 @@ public AgentPoolInner withMode(AgentPoolMode mode) {
 
     /**
      * Get the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
-     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
-     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
-     * version cannot be greater than the control plane version. For more information see [upgrading a node
+     * &lt;major.minor.patch&gt; and &lt;major.minor&gt; are supported. When &lt;major.minor&gt; is specified, the
+     * latest supported patch version is chosen automatically. Updating the agent pool with the same &lt;major.minor&gt;
+     * once it has been created will not trigger an upgrade, even if a newer patch version is available. As a best
+     * practice, you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool
+     * version must have the same major version as the control plane. The node pool minor version must be within two
+     * minor versions of the control plane version. The node pool version cannot be greater than the control plane
+     * version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      * 
      * @return the orchestratorVersion value.
@@ -614,13 +619,13 @@ public String orchestratorVersion() {
 
     /**
      * Set the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
-     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
-     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
-     * version cannot be greater than the control plane version. For more information see [upgrading a node
+     * &lt;major.minor.patch&gt; and &lt;major.minor&gt; are supported. When &lt;major.minor&gt; is specified, the
+     * latest supported patch version is chosen automatically. Updating the agent pool with the same &lt;major.minor&gt;
+     * once it has been created will not trigger an upgrade, even if a newer patch version is available. As a best
+     * practice, you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool
+     * version must have the same major version as the control plane. The node pool minor version must be within two
+     * minor versions of the control plane version. The node pool version cannot be greater than the control plane
+     * version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      * 
      * @param orchestratorVersion the orchestratorVersion value to set.
@@ -635,9 +640,9 @@ public AgentPoolInner withOrchestratorVersion(String orchestratorVersion) {
     }
 
     /**
-     * Get the currentOrchestratorVersion property: The version of Kubernetes the Agent Pool is running. If
-     * orchestratorVersion is a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
-     * it. If orchestratorVersion is &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * Get the currentOrchestratorVersion property: The version of Kubernetes running on the Agent Pool. If
+     * orchestratorVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
      * version being used.
      * 
      * @return the currentOrchestratorVersion value.
@@ -656,7 +661,45 @@ public String nodeImageVersion() {
     }
 
     /**
-     * Get the upgradeSettings property: Settings for upgrading the agentpool.
+     * Set the nodeImageVersion property: The version of node image.
+     * 
+     * @param nodeImageVersion the nodeImageVersion value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withNodeImageVersion(String nodeImageVersion) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withNodeImageVersion(nodeImageVersion);
+        return this;
+    }
+
+    /**
+     * Get the upgradeStrategy property: Defines the upgrade strategy for the agent pool. The default is Rolling.
+     * 
+     * @return the upgradeStrategy value.
+     */
+    public UpgradeStrategy upgradeStrategy() {
+        return this.innerProperties() == null ? null : this.innerProperties().upgradeStrategy();
+    }
+
+    /**
+     * Set the upgradeStrategy property: Defines the upgrade strategy for the agent pool. The default is Rolling.
+     * 
+     * @param upgradeStrategy the upgradeStrategy value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withUpgradeStrategy(UpgradeStrategy upgradeStrategy) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withUpgradeStrategy(upgradeStrategy);
+        return this;
+    }
+
+    /**
+     * Get the upgradeSettings property: Settings for upgrading the agentpool. Applies when upgrade strategy is set to
+     * Rolling.
      * 
      * @return the upgradeSettings value.
      */
@@ -665,7 +708,8 @@ public AgentPoolUpgradeSettings upgradeSettings() {
     }
 
     /**
-     * Set the upgradeSettings property: Settings for upgrading the agentpool.
+     * Set the upgradeSettings property: Settings for upgrading the agentpool. Applies when upgrade strategy is set to
+     * Rolling.
      * 
      * @param upgradeSettings the upgradeSettings value to set.
      * @return the AgentPoolInner object itself.
@@ -678,6 +722,31 @@ public AgentPoolInner withUpgradeSettings(AgentPoolUpgradeSettings upgradeSettin
         return this;
     }
 
+    /**
+     * Get the upgradeSettingsBlueGreen property: Settings for Blue-Green upgrade on the agentpool. Applies when upgrade
+     * strategy is set to BlueGreen.
+     * 
+     * @return the upgradeSettingsBlueGreen value.
+     */
+    public AgentPoolBlueGreenUpgradeSettings upgradeSettingsBlueGreen() {
+        return this.innerProperties() == null ? null : this.innerProperties().upgradeSettingsBlueGreen();
+    }
+
+    /**
+     * Set the upgradeSettingsBlueGreen property: Settings for Blue-Green upgrade on the agentpool. Applies when upgrade
+     * strategy is set to BlueGreen.
+     * 
+     * @param upgradeSettingsBlueGreen the upgradeSettingsBlueGreen value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withUpgradeSettingsBlueGreen(AgentPoolBlueGreenUpgradeSettings upgradeSettingsBlueGreen) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withUpgradeSettingsBlueGreen(upgradeSettingsBlueGreen);
+        return this;
+    }
+
     /**
      * Get the provisioningState property: The current deployment or provisioning state.
      * 
@@ -953,6 +1022,39 @@ public AgentPoolInner withNodeTaints(List<String> nodeTaints) {
         return this;
     }
 
+    /**
+     * Get the nodeInitializationTaints property: Taints added on the nodes during creation that will not be reconciled
+     * by AKS. These taints will not be reconciled by AKS and can be removed with a kubectl call. This field can be
+     * modified after node pool is created, but nodes will not be recreated with new taints until another operation that
+     * requires recreation (e.g. node image upgrade) happens. These taints allow for required configuration to run
+     * before the node is ready to accept workloads, for example 'key1=value1:NoSchedule' that then can be removed with
+     * `kubectl taint nodes node1 key1=value1:NoSchedule-`.
+     * 
+     * @return the nodeInitializationTaints value.
+     */
+    public List<String> nodeInitializationTaints() {
+        return this.innerProperties() == null ? null : this.innerProperties().nodeInitializationTaints();
+    }
+
+    /**
+     * Set the nodeInitializationTaints property: Taints added on the nodes during creation that will not be reconciled
+     * by AKS. These taints will not be reconciled by AKS and can be removed with a kubectl call. This field can be
+     * modified after node pool is created, but nodes will not be recreated with new taints until another operation that
+     * requires recreation (e.g. node image upgrade) happens. These taints allow for required configuration to run
+     * before the node is ready to accept workloads, for example 'key1=value1:NoSchedule' that then can be removed with
+     * `kubectl taint nodes node1 key1=value1:NoSchedule-`.
+     * 
+     * @param nodeInitializationTaints the nodeInitializationTaints value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withNodeInitializationTaints(List<String> nodeInitializationTaints) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withNodeInitializationTaints(nodeInitializationTaints);
+        return this;
+    }
+
     /**
      * Get the proximityPlacementGroupId property: The ID for Proximity Placement Group.
      * 
@@ -1206,48 +1308,48 @@ public AgentPoolInner withHostGroupId(String hostGroupId) {
     }
 
     /**
-     * Get the networkProfile property: Network-related settings of an agent pool.
+     * Get the windowsProfile property: The Windows agent pool's specific profile.
      * 
-     * @return the networkProfile value.
+     * @return the windowsProfile value.
      */
-    public AgentPoolNetworkProfile networkProfile() {
-        return this.innerProperties() == null ? null : this.innerProperties().networkProfile();
+    public AgentPoolWindowsProfile windowsProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().windowsProfile();
     }
 
     /**
-     * Set the networkProfile property: Network-related settings of an agent pool.
+     * Set the windowsProfile property: The Windows agent pool's specific profile.
      * 
-     * @param networkProfile the networkProfile value to set.
+     * @param windowsProfile the windowsProfile value to set.
      * @return the AgentPoolInner object itself.
      */
-    public AgentPoolInner withNetworkProfile(AgentPoolNetworkProfile networkProfile) {
+    public AgentPoolInner withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
         if (this.innerProperties() == null) {
             this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
         }
-        this.innerProperties().withNetworkProfile(networkProfile);
+        this.innerProperties().withWindowsProfile(windowsProfile);
         return this;
     }
 
     /**
-     * Get the windowsProfile property: The Windows agent pool's specific profile.
+     * Get the networkProfile property: Network-related settings of an agent pool.
      * 
-     * @return the windowsProfile value.
+     * @return the networkProfile value.
      */
-    public AgentPoolWindowsProfile windowsProfile() {
-        return this.innerProperties() == null ? null : this.innerProperties().windowsProfile();
+    public AgentPoolNetworkProfile networkProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().networkProfile();
     }
 
     /**
-     * Set the windowsProfile property: The Windows agent pool's specific profile.
+     * Set the networkProfile property: Network-related settings of an agent pool.
      * 
-     * @param windowsProfile the windowsProfile value to set.
+     * @param networkProfile the networkProfile value to set.
      * @return the AgentPoolInner object itself.
      */
-    public AgentPoolInner withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
+    public AgentPoolInner withNetworkProfile(AgentPoolNetworkProfile networkProfile) {
         if (this.innerProperties() == null) {
             this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
         }
-        this.innerProperties().withWindowsProfile(windowsProfile);
+        this.innerProperties().withNetworkProfile(networkProfile);
         return this;
     }
 
@@ -1275,7 +1377,7 @@ public AgentPoolInner withSecurityProfile(AgentPoolSecurityProfile securityProfi
     }
 
     /**
-     * Get the gpuProfile property: GPU settings for the Agent Pool.
+     * Get the gpuProfile property: The GPU settings of an agent pool.
      * 
      * @return the gpuProfile value.
      */
@@ -1284,7 +1386,7 @@ public GpuProfile gpuProfile() {
     }
 
     /**
-     * Set the gpuProfile property: GPU settings for the Agent Pool.
+     * Set the gpuProfile property: The GPU settings of an agent pool.
      * 
      * @param gpuProfile the gpuProfile value to set.
      * @return the AgentPoolInner object itself.
@@ -1298,27 +1400,25 @@ public AgentPoolInner withGpuProfile(GpuProfile gpuProfile) {
     }
 
     /**
-     * Get the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
-     * set if agent pool mode is not Gateway.
+     * Get the artifactStreamingProfile property: Configuration for using artifact streaming on AKS.
      * 
-     * @return the gatewayProfile value.
+     * @return the artifactStreamingProfile value.
      */
-    public AgentPoolGatewayProfile gatewayProfile() {
-        return this.innerProperties() == null ? null : this.innerProperties().gatewayProfile();
+    public AgentPoolArtifactStreamingProfile artifactStreamingProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().artifactStreamingProfile();
     }
 
     /**
-     * Set the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
-     * set if agent pool mode is not Gateway.
+     * Set the artifactStreamingProfile property: Configuration for using artifact streaming on AKS.
      * 
-     * @param gatewayProfile the gatewayProfile value to set.
+     * @param artifactStreamingProfile the artifactStreamingProfile value to set.
      * @return the AgentPoolInner object itself.
      */
-    public AgentPoolInner withGatewayProfile(AgentPoolGatewayProfile gatewayProfile) {
+    public AgentPoolInner withArtifactStreamingProfile(AgentPoolArtifactStreamingProfile artifactStreamingProfile) {
         if (this.innerProperties() == null) {
             this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
         }
-        this.innerProperties().withGatewayProfile(gatewayProfile);
+        this.innerProperties().withArtifactStreamingProfile(artifactStreamingProfile);
         return this;
     }
 
@@ -1368,6 +1468,31 @@ public AgentPoolInner withVirtualMachineNodesStatus(List<VirtualMachineNodes> vi
         return this;
     }
 
+    /**
+     * Get the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
+     * set if agent pool mode is not Gateway.
+     * 
+     * @return the gatewayProfile value.
+     */
+    public AgentPoolGatewayProfile gatewayProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().gatewayProfile();
+    }
+
+    /**
+     * Set the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
+     * set if agent pool mode is not Gateway.
+     * 
+     * @param gatewayProfile the gatewayProfile value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withGatewayProfile(AgentPoolGatewayProfile gatewayProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withGatewayProfile(gatewayProfile);
+        return this;
+    }
+
     /**
      * Get the status property: Contains read-only information about the Agent Pool.
      * 
@@ -1391,6 +1516,58 @@ public AgentPoolInner withStatus(AgentPoolStatus status) {
         return this;
     }
 
+    /**
+     * Get the localDnsProfile property: Configures the per-node local DNS, with VnetDNS and KubeDNS overrides. LocalDNS
+     * helps improve performance and reliability of DNS resolution in an AKS cluster. For more details see
+     * aka.ms/aks/localdns.
+     * 
+     * @return the localDnsProfile value.
+     */
+    public LocalDnsProfile localDnsProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().localDnsProfile();
+    }
+
+    /**
+     * Set the localDnsProfile property: Configures the per-node local DNS, with VnetDNS and KubeDNS overrides. LocalDNS
+     * helps improve performance and reliability of DNS resolution in an AKS cluster. For more details see
+     * aka.ms/aks/localdns.
+     * 
+     * @param localDnsProfile the localDnsProfile value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withLocalDnsProfile(LocalDnsProfile localDnsProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withLocalDnsProfile(localDnsProfile);
+        return this;
+    }
+
+    /**
+     * Get the nodeCustomizationProfile property: Settings to determine the node customization used to provision nodes
+     * in a pool.
+     * 
+     * @return the nodeCustomizationProfile value.
+     */
+    public NodeCustomizationProfile nodeCustomizationProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().nodeCustomizationProfile();
+    }
+
+    /**
+     * Set the nodeCustomizationProfile property: Settings to determine the node customization used to provision nodes
+     * in a pool.
+     * 
+     * @param nodeCustomizationProfile the nodeCustomizationProfile value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withNodeCustomizationProfile(NodeCustomizationProfile nodeCustomizationProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withNodeCustomizationProfile(nodeCustomizationProfile);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileInner.java
index 79cc3cd76425..c1c9ff4eea55 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileInner.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileInner.java
@@ -10,7 +10,9 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.AgentPoolRecentlyUsedVersion;
 import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeProfilePropertiesUpgradesItem;
+import com.azure.resourcemanager.containerservice.models.ComponentsByRelease;
 import com.azure.resourcemanager.containerservice.models.OSType;
 import java.io.IOException;
 import java.util.List;
@@ -151,6 +153,38 @@ public AgentPoolUpgradeProfileInner withUpgrades(List<AgentPoolUpgradeProfilePro
         return this;
     }
 
+    /**
+     * Get the componentsByReleases property: List of components grouped by kubernetes major.minor version.
+     * 
+     * @return the componentsByReleases value.
+     */
+    public List<ComponentsByRelease> componentsByReleases() {
+        return this.innerProperties() == null ? null : this.innerProperties().componentsByReleases();
+    }
+
+    /**
+     * Set the componentsByReleases property: List of components grouped by kubernetes major.minor version.
+     * 
+     * @param componentsByReleases the componentsByReleases value to set.
+     * @return the AgentPoolUpgradeProfileInner object itself.
+     */
+    public AgentPoolUpgradeProfileInner withComponentsByReleases(List<ComponentsByRelease> componentsByReleases) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new AgentPoolUpgradeProfileProperties();
+        }
+        this.innerProperties().withComponentsByReleases(componentsByReleases);
+        return this;
+    }
+
+    /**
+     * Get the recentlyUsedVersions property: List of historical good versions for rollback operations.
+     * 
+     * @return the recentlyUsedVersions value.
+     */
+    public List<AgentPoolRecentlyUsedVersion> recentlyUsedVersions() {
+        return this.innerProperties() == null ? null : this.innerProperties().recentlyUsedVersions();
+    }
+
     /**
      * Get the latestNodeImageVersion property: The latest AKS supported node image version.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileProperties.java
index 98880ef60067..231732f5543f 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolUpgradeProfileProperties.java
@@ -10,7 +10,9 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.AgentPoolRecentlyUsedVersion;
 import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeProfilePropertiesUpgradesItem;
+import com.azure.resourcemanager.containerservice.models.ComponentsByRelease;
 import com.azure.resourcemanager.containerservice.models.OSType;
 import java.io.IOException;
 import java.util.List;
@@ -35,6 +37,16 @@ public final class AgentPoolUpgradeProfileProperties implements JsonSerializable
      */
     private List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades;
 
+    /*
+     * List of components grouped by kubernetes major.minor version.
+     */
+    private List<ComponentsByRelease> componentsByReleases;
+
+    /*
+     * List of historical good versions for rollback operations.
+     */
+    private List<AgentPoolRecentlyUsedVersion> recentlyUsedVersions;
+
     /*
      * The latest AKS supported node image version.
      */
@@ -107,6 +119,35 @@ public List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades() {
         return this;
     }
 
+    /**
+     * Get the componentsByReleases property: List of components grouped by kubernetes major.minor version.
+     * 
+     * @return the componentsByReleases value.
+     */
+    public List<ComponentsByRelease> componentsByReleases() {
+        return this.componentsByReleases;
+    }
+
+    /**
+     * Set the componentsByReleases property: List of components grouped by kubernetes major.minor version.
+     * 
+     * @param componentsByReleases the componentsByReleases value to set.
+     * @return the AgentPoolUpgradeProfileProperties object itself.
+     */
+    public AgentPoolUpgradeProfileProperties withComponentsByReleases(List<ComponentsByRelease> componentsByReleases) {
+        this.componentsByReleases = componentsByReleases;
+        return this;
+    }
+
+    /**
+     * Get the recentlyUsedVersions property: List of historical good versions for rollback operations.
+     * 
+     * @return the recentlyUsedVersions value.
+     */
+    public List<AgentPoolRecentlyUsedVersion> recentlyUsedVersions() {
+        return this.recentlyUsedVersions;
+    }
+
     /**
      * Get the latestNodeImageVersion property: The latest AKS supported node image version.
      * 
@@ -146,6 +187,12 @@ public void validate() {
         if (upgrades() != null) {
             upgrades().forEach(e -> e.validate());
         }
+        if (componentsByReleases() != null) {
+            componentsByReleases().forEach(e -> e.validate());
+        }
+        if (recentlyUsedVersions() != null) {
+            recentlyUsedVersions().forEach(e -> e.validate());
+        }
     }
 
     private static final ClientLogger LOGGER = new ClientLogger(AgentPoolUpgradeProfileProperties.class);
@@ -159,6 +206,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("kubernetesVersion", this.kubernetesVersion);
         jsonWriter.writeStringField("osType", this.osType == null ? null : this.osType.toString());
         jsonWriter.writeArrayField("upgrades", this.upgrades, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeArrayField("componentsByReleases", this.componentsByReleases,
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("latestNodeImageVersion", this.latestNodeImageVersion);
         return jsonWriter.writeEndObject();
     }
@@ -188,6 +237,14 @@ public static AgentPoolUpgradeProfileProperties fromJson(JsonReader jsonReader)
                     List<AgentPoolUpgradeProfilePropertiesUpgradesItem> upgrades
                         = reader.readArray(reader1 -> AgentPoolUpgradeProfilePropertiesUpgradesItem.fromJson(reader1));
                     deserializedAgentPoolUpgradeProfileProperties.upgrades = upgrades;
+                } else if ("componentsByReleases".equals(fieldName)) {
+                    List<ComponentsByRelease> componentsByReleases
+                        = reader.readArray(reader1 -> ComponentsByRelease.fromJson(reader1));
+                    deserializedAgentPoolUpgradeProfileProperties.componentsByReleases = componentsByReleases;
+                } else if ("recentlyUsedVersions".equals(fieldName)) {
+                    List<AgentPoolRecentlyUsedVersion> recentlyUsedVersions
+                        = reader.readArray(reader1 -> AgentPoolRecentlyUsedVersion.fromJson(reader1));
+                    deserializedAgentPoolUpgradeProfileProperties.recentlyUsedVersions = recentlyUsedVersions;
                 } else if ("latestNodeImageVersion".equals(fieldName)) {
                     deserializedAgentPoolUpgradeProfileProperties.latestNodeImageVersion = reader.getString();
                 } else {
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/GuardrailsAvailableVersionInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/GuardrailsAvailableVersionInner.java
new file mode 100644
index 000000000000..79aaab7e8e08
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/GuardrailsAvailableVersionInner.java
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.GuardrailsAvailableVersionsProperties;
+import java.io.IOException;
+
+/**
+ * Available Guardrails Version.
+ */
+@Fluent
+public final class GuardrailsAvailableVersionInner extends ProxyResource {
+    /*
+     * Whether the version is default or not and support info.
+     */
+    private GuardrailsAvailableVersionsProperties properties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of GuardrailsAvailableVersionInner class.
+     */
+    public GuardrailsAvailableVersionInner() {
+    }
+
+    /**
+     * Get the properties property: Whether the version is default or not and support info.
+     * 
+     * @return the properties value.
+     */
+    public GuardrailsAvailableVersionsProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: Whether the version is default or not and support info.
+     * 
+     * @param properties the properties value to set.
+     * @return the GuardrailsAvailableVersionInner object itself.
+     */
+    public GuardrailsAvailableVersionInner withProperties(GuardrailsAvailableVersionsProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (properties() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property properties in model GuardrailsAvailableVersionInner"));
+        } else {
+            properties().validate();
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(GuardrailsAvailableVersionInner.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of GuardrailsAvailableVersionInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of GuardrailsAvailableVersionInner if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the GuardrailsAvailableVersionInner.
+     */
+    public static GuardrailsAvailableVersionInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            GuardrailsAvailableVersionInner deserializedGuardrailsAvailableVersionInner
+                = new GuardrailsAvailableVersionInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionInner.properties
+                        = GuardrailsAvailableVersionsProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedGuardrailsAvailableVersionInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/IdentityBindingInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/IdentityBindingInner.java
new file mode 100644
index 000000000000..5b53f9fe6097
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/IdentityBindingInner.java
@@ -0,0 +1,186 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.IdentityBindingProperties;
+import java.io.IOException;
+
+/**
+ * The IdentityBinding resource.
+ */
+@Fluent
+public final class IdentityBindingInner extends ProxyResource {
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private IdentityBindingProperties properties;
+
+    /*
+     * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
+     * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
+     * optimistic concurrency per the normal eTag convention.
+     */
+    private String etag;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of IdentityBindingInner class.
+     */
+    public IdentityBindingInner() {
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public IdentityBindingProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The resource-specific properties for this resource.
+     * 
+     * @param properties the properties value to set.
+     * @return the IdentityBindingInner object itself.
+     */
+    public IdentityBindingInner withProperties(IdentityBindingProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
+     * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
+     * 
+     * @return the etag value.
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (properties() != null) {
+            properties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of IdentityBindingInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of IdentityBindingInner if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the IdentityBindingInner.
+     */
+    public static IdentityBindingInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            IdentityBindingInner deserializedIdentityBindingInner = new IdentityBindingInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedIdentityBindingInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedIdentityBindingInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedIdentityBindingInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedIdentityBindingInner.properties = IdentityBindingProperties.fromJson(reader);
+                } else if ("eTag".equals(fieldName)) {
+                    deserializedIdentityBindingInner.etag = reader.getString();
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedIdentityBindingInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedIdentityBindingInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/JwtAuthenticatorInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/JwtAuthenticatorInner.java
new file mode 100644
index 000000000000..9b4df46d0e88
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/JwtAuthenticatorInner.java
@@ -0,0 +1,185 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.JwtAuthenticatorProperties;
+import java.io.IOException;
+
+/**
+ * Configuration for JWT authenticator in the managed cluster.
+ */
+@Fluent
+public final class JwtAuthenticatorInner extends ProxyResource {
+    /*
+     * The properties of JWTAuthenticator. For details on how to configure the properties of a JWT authenticator, please
+     * refer to the Kubernetes documentation:
+     * https://kubernetes.io/docs/reference/access-authn-authz/authentication/#using-authentication-configuration.
+     * Please note that not all fields available in the Kubernetes documentation are supported by AKS. For
+     * troubleshooting, please see https://aka.ms/aks-external-issuers-docs.
+     */
+    private JwtAuthenticatorProperties properties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of JwtAuthenticatorInner class.
+     */
+    public JwtAuthenticatorInner() {
+    }
+
+    /**
+     * Get the properties property: The properties of JWTAuthenticator. For details on how to configure the properties
+     * of a JWT authenticator, please refer to the Kubernetes documentation:
+     * https://kubernetes.io/docs/reference/access-authn-authz/authentication/#using-authentication-configuration.
+     * Please note that not all fields available in the Kubernetes documentation are supported by AKS. For
+     * troubleshooting, please see https://aka.ms/aks-external-issuers-docs.
+     * 
+     * @return the properties value.
+     */
+    public JwtAuthenticatorProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The properties of JWTAuthenticator. For details on how to configure the properties
+     * of a JWT authenticator, please refer to the Kubernetes documentation:
+     * https://kubernetes.io/docs/reference/access-authn-authz/authentication/#using-authentication-configuration.
+     * Please note that not all fields available in the Kubernetes documentation are supported by AKS. For
+     * troubleshooting, please see https://aka.ms/aks-external-issuers-docs.
+     * 
+     * @param properties the properties value to set.
+     * @return the JwtAuthenticatorInner object itself.
+     */
+    public JwtAuthenticatorInner withProperties(JwtAuthenticatorProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (properties() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property properties in model JwtAuthenticatorInner"));
+        } else {
+            properties().validate();
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorInner.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorInner if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorInner.
+     */
+    public static JwtAuthenticatorInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorInner deserializedJwtAuthenticatorInner = new JwtAuthenticatorInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedJwtAuthenticatorInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedJwtAuthenticatorInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedJwtAuthenticatorInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedJwtAuthenticatorInner.properties = JwtAuthenticatorProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedJwtAuthenticatorInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/LoadBalancerInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/LoadBalancerInner.java
new file mode 100644
index 000000000000..090dfb7eef8c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/LoadBalancerInner.java
@@ -0,0 +1,298 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.LabelSelector;
+import java.io.IOException;
+
+/**
+ * The configurations regarding multiple standard load balancers. If not supplied, single load balancer mode will be
+ * used. Multiple standard load balancers mode will be used if at lease one configuration is supplied. There has to be a
+ * configuration named `kubernetes`. The name field will be the name of the corresponding public load balancer. There
+ * will be an internal load balancer created if needed, and the name will be `&lt;name&gt;-internal`. The internal lb
+ * shares the same configurations as the external one. The internal lbs are not needed to be included in LoadBalancer
+ * list.
+ */
+@Fluent
+public final class LoadBalancerInner extends ProxyResource {
+    /*
+     * The properties of the load balancer.
+     */
+    private LoadBalancerProperties innerProperties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of LoadBalancerInner class.
+     */
+    public LoadBalancerInner() {
+    }
+
+    /**
+     * Get the innerProperties property: The properties of the load balancer.
+     * 
+     * @return the innerProperties value.
+     */
+    private LoadBalancerProperties innerProperties() {
+        return this.innerProperties;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the primaryAgentPoolName property: Required field. A string value that must specify the ID of an existing
+     * agent pool. All nodes in the given pool will always be added to this load balancer. This agent pool must have at
+     * least one node and minCount&gt;=1 for autoscaling operations. An agent pool can only be the primary pool for a
+     * single load balancer.
+     * 
+     * @return the primaryAgentPoolName value.
+     */
+    public String primaryAgentPoolName() {
+        return this.innerProperties() == null ? null : this.innerProperties().primaryAgentPoolName();
+    }
+
+    /**
+     * Set the primaryAgentPoolName property: Required field. A string value that must specify the ID of an existing
+     * agent pool. All nodes in the given pool will always be added to this load balancer. This agent pool must have at
+     * least one node and minCount&gt;=1 for autoscaling operations. An agent pool can only be the primary pool for a
+     * single load balancer.
+     * 
+     * @param primaryAgentPoolName the primaryAgentPoolName value to set.
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withPrimaryAgentPoolName(String primaryAgentPoolName) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new LoadBalancerProperties();
+        }
+        this.innerProperties().withPrimaryAgentPoolName(primaryAgentPoolName);
+        return this;
+    }
+
+    /**
+     * Get the allowServicePlacement property: Whether to automatically place services on the load balancer. If not
+     * supplied, the default value is true. If set to false manually, both of the external and the internal load
+     * balancer will not be selected for services unless they explicitly target it.
+     * 
+     * @return the allowServicePlacement value.
+     */
+    public Boolean allowServicePlacement() {
+        return this.innerProperties() == null ? null : this.innerProperties().allowServicePlacement();
+    }
+
+    /**
+     * Set the allowServicePlacement property: Whether to automatically place services on the load balancer. If not
+     * supplied, the default value is true. If set to false manually, both of the external and the internal load
+     * balancer will not be selected for services unless they explicitly target it.
+     * 
+     * @param allowServicePlacement the allowServicePlacement value to set.
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withAllowServicePlacement(Boolean allowServicePlacement) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new LoadBalancerProperties();
+        }
+        this.innerProperties().withAllowServicePlacement(allowServicePlacement);
+        return this;
+    }
+
+    /**
+     * Get the serviceLabelSelector property: Only services that must match this selector can be placed on this load
+     * balancer.
+     * 
+     * @return the serviceLabelSelector value.
+     */
+    public LabelSelector serviceLabelSelector() {
+        return this.innerProperties() == null ? null : this.innerProperties().serviceLabelSelector();
+    }
+
+    /**
+     * Set the serviceLabelSelector property: Only services that must match this selector can be placed on this load
+     * balancer.
+     * 
+     * @param serviceLabelSelector the serviceLabelSelector value to set.
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withServiceLabelSelector(LabelSelector serviceLabelSelector) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new LoadBalancerProperties();
+        }
+        this.innerProperties().withServiceLabelSelector(serviceLabelSelector);
+        return this;
+    }
+
+    /**
+     * Get the serviceNamespaceSelector property: Services created in namespaces that match the selector can be placed
+     * on this load balancer.
+     * 
+     * @return the serviceNamespaceSelector value.
+     */
+    public LabelSelector serviceNamespaceSelector() {
+        return this.innerProperties() == null ? null : this.innerProperties().serviceNamespaceSelector();
+    }
+
+    /**
+     * Set the serviceNamespaceSelector property: Services created in namespaces that match the selector can be placed
+     * on this load balancer.
+     * 
+     * @param serviceNamespaceSelector the serviceNamespaceSelector value to set.
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withServiceNamespaceSelector(LabelSelector serviceNamespaceSelector) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new LoadBalancerProperties();
+        }
+        this.innerProperties().withServiceNamespaceSelector(serviceNamespaceSelector);
+        return this;
+    }
+
+    /**
+     * Get the nodeSelector property: Nodes that match this selector will be possible members of this load balancer.
+     * 
+     * @return the nodeSelector value.
+     */
+    public LabelSelector nodeSelector() {
+        return this.innerProperties() == null ? null : this.innerProperties().nodeSelector();
+    }
+
+    /**
+     * Set the nodeSelector property: Nodes that match this selector will be possible members of this load balancer.
+     * 
+     * @param nodeSelector the nodeSelector value to set.
+     * @return the LoadBalancerInner object itself.
+     */
+    public LoadBalancerInner withNodeSelector(LabelSelector nodeSelector) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new LoadBalancerProperties();
+        }
+        this.innerProperties().withNodeSelector(nodeSelector);
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: The current provisioning state.
+     * 
+     * @return the provisioningState value.
+     */
+    public String provisioningState() {
+        return this.innerProperties() == null ? null : this.innerProperties().provisioningState();
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (innerProperties() != null) {
+            innerProperties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.innerProperties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LoadBalancerInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LoadBalancerInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the LoadBalancerInner.
+     */
+    public static LoadBalancerInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LoadBalancerInner deserializedLoadBalancerInner = new LoadBalancerInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedLoadBalancerInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedLoadBalancerInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedLoadBalancerInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedLoadBalancerInner.innerProperties = LoadBalancerProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedLoadBalancerInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLoadBalancerInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/LoadBalancerProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/LoadBalancerProperties.java
new file mode 100644
index 000000000000..e6cd72bd6fc5
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/LoadBalancerProperties.java
@@ -0,0 +1,259 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.LabelSelector;
+import java.io.IOException;
+
+/**
+ * The LoadBalancerProperties model.
+ */
+@Fluent
+public final class LoadBalancerProperties implements JsonSerializable<LoadBalancerProperties> {
+    /*
+     * Required field. A string value that must specify the ID of an existing agent pool. All nodes in the given pool
+     * will always be added to this load balancer. This agent pool must have at least one node and minCount>=1 for
+     * autoscaling operations. An agent pool can only be the primary pool for a single load balancer.
+     */
+    private String primaryAgentPoolName;
+
+    /*
+     * Whether to automatically place services on the load balancer. If not supplied, the default value is true. If set
+     * to false manually, both of the external and the internal load balancer will not be selected for services unless
+     * they explicitly target it.
+     */
+    private Boolean allowServicePlacement;
+
+    /*
+     * Only services that must match this selector can be placed on this load balancer.
+     */
+    private LabelSelector serviceLabelSelector;
+
+    /*
+     * Services created in namespaces that match the selector can be placed on this load balancer.
+     */
+    private LabelSelector serviceNamespaceSelector;
+
+    /*
+     * Nodes that match this selector will be possible members of this load balancer.
+     */
+    private LabelSelector nodeSelector;
+
+    /*
+     * The current provisioning state.
+     */
+    private String provisioningState;
+
+    /**
+     * Creates an instance of LoadBalancerProperties class.
+     */
+    public LoadBalancerProperties() {
+    }
+
+    /**
+     * Get the primaryAgentPoolName property: Required field. A string value that must specify the ID of an existing
+     * agent pool. All nodes in the given pool will always be added to this load balancer. This agent pool must have at
+     * least one node and minCount&gt;=1 for autoscaling operations. An agent pool can only be the primary pool for a
+     * single load balancer.
+     * 
+     * @return the primaryAgentPoolName value.
+     */
+    public String primaryAgentPoolName() {
+        return this.primaryAgentPoolName;
+    }
+
+    /**
+     * Set the primaryAgentPoolName property: Required field. A string value that must specify the ID of an existing
+     * agent pool. All nodes in the given pool will always be added to this load balancer. This agent pool must have at
+     * least one node and minCount&gt;=1 for autoscaling operations. An agent pool can only be the primary pool for a
+     * single load balancer.
+     * 
+     * @param primaryAgentPoolName the primaryAgentPoolName value to set.
+     * @return the LoadBalancerProperties object itself.
+     */
+    public LoadBalancerProperties withPrimaryAgentPoolName(String primaryAgentPoolName) {
+        this.primaryAgentPoolName = primaryAgentPoolName;
+        return this;
+    }
+
+    /**
+     * Get the allowServicePlacement property: Whether to automatically place services on the load balancer. If not
+     * supplied, the default value is true. If set to false manually, both of the external and the internal load
+     * balancer will not be selected for services unless they explicitly target it.
+     * 
+     * @return the allowServicePlacement value.
+     */
+    public Boolean allowServicePlacement() {
+        return this.allowServicePlacement;
+    }
+
+    /**
+     * Set the allowServicePlacement property: Whether to automatically place services on the load balancer. If not
+     * supplied, the default value is true. If set to false manually, both of the external and the internal load
+     * balancer will not be selected for services unless they explicitly target it.
+     * 
+     * @param allowServicePlacement the allowServicePlacement value to set.
+     * @return the LoadBalancerProperties object itself.
+     */
+    public LoadBalancerProperties withAllowServicePlacement(Boolean allowServicePlacement) {
+        this.allowServicePlacement = allowServicePlacement;
+        return this;
+    }
+
+    /**
+     * Get the serviceLabelSelector property: Only services that must match this selector can be placed on this load
+     * balancer.
+     * 
+     * @return the serviceLabelSelector value.
+     */
+    public LabelSelector serviceLabelSelector() {
+        return this.serviceLabelSelector;
+    }
+
+    /**
+     * Set the serviceLabelSelector property: Only services that must match this selector can be placed on this load
+     * balancer.
+     * 
+     * @param serviceLabelSelector the serviceLabelSelector value to set.
+     * @return the LoadBalancerProperties object itself.
+     */
+    public LoadBalancerProperties withServiceLabelSelector(LabelSelector serviceLabelSelector) {
+        this.serviceLabelSelector = serviceLabelSelector;
+        return this;
+    }
+
+    /**
+     * Get the serviceNamespaceSelector property: Services created in namespaces that match the selector can be placed
+     * on this load balancer.
+     * 
+     * @return the serviceNamespaceSelector value.
+     */
+    public LabelSelector serviceNamespaceSelector() {
+        return this.serviceNamespaceSelector;
+    }
+
+    /**
+     * Set the serviceNamespaceSelector property: Services created in namespaces that match the selector can be placed
+     * on this load balancer.
+     * 
+     * @param serviceNamespaceSelector the serviceNamespaceSelector value to set.
+     * @return the LoadBalancerProperties object itself.
+     */
+    public LoadBalancerProperties withServiceNamespaceSelector(LabelSelector serviceNamespaceSelector) {
+        this.serviceNamespaceSelector = serviceNamespaceSelector;
+        return this;
+    }
+
+    /**
+     * Get the nodeSelector property: Nodes that match this selector will be possible members of this load balancer.
+     * 
+     * @return the nodeSelector value.
+     */
+    public LabelSelector nodeSelector() {
+        return this.nodeSelector;
+    }
+
+    /**
+     * Set the nodeSelector property: Nodes that match this selector will be possible members of this load balancer.
+     * 
+     * @param nodeSelector the nodeSelector value to set.
+     * @return the LoadBalancerProperties object itself.
+     */
+    public LoadBalancerProperties withNodeSelector(LabelSelector nodeSelector) {
+        this.nodeSelector = nodeSelector;
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: The current provisioning state.
+     * 
+     * @return the provisioningState value.
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (primaryAgentPoolName() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property primaryAgentPoolName in model LoadBalancerProperties"));
+        }
+        if (serviceLabelSelector() != null) {
+            serviceLabelSelector().validate();
+        }
+        if (serviceNamespaceSelector() != null) {
+            serviceNamespaceSelector().validate();
+        }
+        if (nodeSelector() != null) {
+            nodeSelector().validate();
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(LoadBalancerProperties.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("primaryAgentPoolName", this.primaryAgentPoolName);
+        jsonWriter.writeBooleanField("allowServicePlacement", this.allowServicePlacement);
+        jsonWriter.writeJsonField("serviceLabelSelector", this.serviceLabelSelector);
+        jsonWriter.writeJsonField("serviceNamespaceSelector", this.serviceNamespaceSelector);
+        jsonWriter.writeJsonField("nodeSelector", this.nodeSelector);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LoadBalancerProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LoadBalancerProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the LoadBalancerProperties.
+     */
+    public static LoadBalancerProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LoadBalancerProperties deserializedLoadBalancerProperties = new LoadBalancerProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("primaryAgentPoolName".equals(fieldName)) {
+                    deserializedLoadBalancerProperties.primaryAgentPoolName = reader.getString();
+                } else if ("allowServicePlacement".equals(fieldName)) {
+                    deserializedLoadBalancerProperties.allowServicePlacement
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("serviceLabelSelector".equals(fieldName)) {
+                    deserializedLoadBalancerProperties.serviceLabelSelector = LabelSelector.fromJson(reader);
+                } else if ("serviceNamespaceSelector".equals(fieldName)) {
+                    deserializedLoadBalancerProperties.serviceNamespaceSelector = LabelSelector.fromJson(reader);
+                } else if ("nodeSelector".equals(fieldName)) {
+                    deserializedLoadBalancerProperties.nodeSelector = LabelSelector.fromJson(reader);
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedLoadBalancerProperties.provisioningState = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLoadBalancerProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MachineInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MachineInner.java
index 5bedf80fe172..747f7e188dbf 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MachineInner.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MachineInner.java
@@ -14,8 +14,8 @@
 import java.util.List;
 
 /**
- * A machine. Contains details about the underlying virtual machine. A machine may be visible here but not in kubectl
- * get nodes; if so it may be because the machine has not been registered with the Kubernetes API Server yet.
+ * A machine provides detailed information about its configuration and status. A machine may be visible here but not in
+ * kubectl get nodes; if so, it may be because the machine has not been registered with the Kubernetes API Server yet.
  */
 @Fluent
 public final class MachineInner extends SubResource {
@@ -54,6 +54,17 @@ public List<String> zones() {
         return this.zones;
     }
 
+    /**
+     * Set the zones property: The Availability zone in which machine is located.
+     * 
+     * @param zones the zones value to set.
+     * @return the MachineInner object itself.
+     */
+    public MachineInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
     /**
      * Get the properties property: The properties of the machine.
      * 
@@ -63,6 +74,17 @@ public MachineProperties properties() {
         return this.properties;
     }
 
+    /**
+     * Set the properties property: The properties of the machine.
+     * 
+     * @param properties the properties value to set.
+     * @return the MachineInner object itself.
+     */
+    public MachineInner withProperties(MachineProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
     /**
      * Get the name property: The name of the resource that is unique within a resource group. This name can be used to
      * access the resource.
@@ -109,6 +131,8 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("id", id());
+        jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.properties);
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java
index e319bf954b04..0cf5ed623b74 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java
@@ -9,6 +9,8 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.AgentPoolArtifactStreamingProfile;
+import com.azure.resourcemanager.containerservice.models.AgentPoolBlueGreenUpgradeSettings;
 import com.azure.resourcemanager.containerservice.models.AgentPoolGatewayProfile;
 import com.azure.resourcemanager.containerservice.models.AgentPoolMode;
 import com.azure.resourcemanager.containerservice.models.AgentPoolNetworkProfile;
@@ -23,6 +25,8 @@
 import com.azure.resourcemanager.containerservice.models.KubeletConfig;
 import com.azure.resourcemanager.containerservice.models.KubeletDiskType;
 import com.azure.resourcemanager.containerservice.models.LinuxOSConfig;
+import com.azure.resourcemanager.containerservice.models.LocalDnsProfile;
+import com.azure.resourcemanager.containerservice.models.NodeCustomizationProfile;
 import com.azure.resourcemanager.containerservice.models.OSDiskType;
 import com.azure.resourcemanager.containerservice.models.OSSku;
 import com.azure.resourcemanager.containerservice.models.OSType;
@@ -31,6 +35,7 @@
 import com.azure.resourcemanager.containerservice.models.ScaleDownMode;
 import com.azure.resourcemanager.containerservice.models.ScaleSetEvictionPolicy;
 import com.azure.resourcemanager.containerservice.models.ScaleSetPriority;
+import com.azure.resourcemanager.containerservice.models.UpgradeStrategy;
 import com.azure.resourcemanager.containerservice.models.VirtualMachineNodes;
 import com.azure.resourcemanager.containerservice.models.VirtualMachinesProfile;
 import com.azure.resourcemanager.containerservice.models.WorkloadRuntime;
@@ -47,7 +52,7 @@ public class ManagedClusterAgentPoolProfileProperties
     /*
      * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
      * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
-     * optimistic concurrency per the normal etag convention.
+     * optimistic concurrency per the normal eTag convention.
      */
     private String etag;
 
@@ -129,8 +134,9 @@ public class ManagedClusterAgentPoolProfileProperties
     private OSType osType;
 
     /*
-     * Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux. The default is Windows2019
-     * when Kubernetes <= 1.24 or Windows2022 when Kubernetes >= 1.25 if OSType is Windows.
+     * Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if OSType=Linux or
+     * Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after Windows2019 is
+     * deprecated.
      */
     private OSSku osSku;
 
@@ -168,20 +174,20 @@ public class ManagedClusterAgentPoolProfileProperties
     private AgentPoolMode mode;
 
     /*
-     * The version of Kubernetes specified by the user. Both patch version <major.minor.patch> (e.g. 1.20.13) and
-     * <major.minor> (e.g. 1.20) are supported. When <major.minor> is specified, the latest supported GA patch version
-     * is chosen automatically. Updating the cluster with the same <major.minor> once it has been created (e.g. 1.14.x
-     * -> 1.14) will not trigger an upgrade, even if a newer patch version is available. As a best practice, you should
-     * upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool version must have the same
-     * major version as the control plane. The node pool minor version must be within two minor versions of the control
-     * plane version. The node pool version cannot be greater than the control plane version. For more information see
-     * [upgrading a node pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
+     * The version of Kubernetes specified by the user. Both patch version <major.minor.patch> and <major.minor> are
+     * supported. When <major.minor> is specified, the latest supported patch version is chosen automatically. Updating
+     * the agent pool with the same <major.minor> once it has been created will not trigger an upgrade, even if a newer
+     * patch version is available. As a best practice, you should upgrade all node pools in an AKS cluster to the same
+     * Kubernetes version. The node pool version must have the same major version as the control plane. The node pool
+     * minor version must be within two minor versions of the control plane version. The node pool version cannot be
+     * greater than the control plane version. For more information see [upgrading a node
+     * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      */
     private String orchestratorVersion;
 
     /*
-     * The version of Kubernetes the Agent Pool is running. If orchestratorVersion is a fully specified version
-     * <major.minor.patch>, this field will be exactly equal to it. If orchestratorVersion is <major.minor>, this field
+     * The version of Kubernetes running on the Agent Pool. If orchestratorVersion was a fully specified version
+     * <major.minor.patch>, this field will be exactly equal to it. If orchestratorVersion was <major.minor>, this field
      * will contain the full <major.minor.patch> version being used.
      */
     private String currentOrchestratorVersion;
@@ -192,10 +198,20 @@ public class ManagedClusterAgentPoolProfileProperties
     private String nodeImageVersion;
 
     /*
-     * Settings for upgrading the agentpool
+     * Defines the upgrade strategy for the agent pool. The default is Rolling.
+     */
+    private UpgradeStrategy upgradeStrategy;
+
+    /*
+     * Settings for upgrading the agentpool. Applies when upgrade strategy is set to Rolling.
      */
     private AgentPoolUpgradeSettings upgradeSettings;
 
+    /*
+     * Settings for Blue-Green upgrade on the agentpool. Applies when upgrade strategy is set to BlueGreen.
+     */
+    private AgentPoolBlueGreenUpgradeSettings upgradeSettingsBlueGreen;
+
     /*
      * The current deployment or provisioning state.
      */
@@ -265,6 +281,16 @@ public class ManagedClusterAgentPoolProfileProperties
      */
     private List<String> nodeTaints;
 
+    /*
+     * Taints added on the nodes during creation that will not be reconciled by AKS. These taints will not be reconciled
+     * by AKS and can be removed with a kubectl call. This field can be modified after node pool is created, but nodes
+     * will not be recreated with new taints until another operation that requires recreation (e.g. node image upgrade)
+     * happens. These taints allow for required configuration to run before the node is ready to accept workloads, for
+     * example 'key1=value1:NoSchedule' that then can be removed with `kubectl taint nodes node1
+     * key1=value1:NoSchedule-`
+     */
+    private List<String> nodeInitializationTaints;
+
     /*
      * The ID for Proximity Placement Group.
      */
@@ -324,14 +350,14 @@ public class ManagedClusterAgentPoolProfileProperties
     private String hostGroupId;
 
     /*
-     * Network-related settings of an agent pool.
+     * The Windows agent pool's specific profile.
      */
-    private AgentPoolNetworkProfile networkProfile;
+    private AgentPoolWindowsProfile windowsProfile;
 
     /*
-     * The Windows agent pool's specific profile.
+     * Network-related settings of an agent pool.
      */
-    private AgentPoolWindowsProfile windowsProfile;
+    private AgentPoolNetworkProfile networkProfile;
 
     /*
      * The security settings of an agent pool.
@@ -339,15 +365,14 @@ public class ManagedClusterAgentPoolProfileProperties
     private AgentPoolSecurityProfile securityProfile;
 
     /*
-     * GPU settings for the Agent Pool.
+     * The GPU settings of an agent pool.
      */
     private GpuProfile gpuProfile;
 
     /*
-     * Profile specific to a managed agent pool in Gateway mode. This field cannot be set if agent pool mode is not
-     * Gateway.
+     * Configuration for using artifact streaming on AKS.
      */
-    private AgentPoolGatewayProfile gatewayProfile;
+    private AgentPoolArtifactStreamingProfile artifactStreamingProfile;
 
     /*
      * Specifications on VirtualMachines agent pool.
@@ -359,11 +384,28 @@ public class ManagedClusterAgentPoolProfileProperties
      */
     private List<VirtualMachineNodes> virtualMachineNodesStatus;
 
+    /*
+     * Profile specific to a managed agent pool in Gateway mode. This field cannot be set if agent pool mode is not
+     * Gateway.
+     */
+    private AgentPoolGatewayProfile gatewayProfile;
+
     /*
      * Contains read-only information about the Agent Pool.
      */
     private AgentPoolStatus status;
 
+    /*
+     * Configures the per-node local DNS, with VnetDNS and KubeDNS overrides. LocalDNS helps improve performance and
+     * reliability of DNS resolution in an AKS cluster. For more details see aka.ms/aks/localdns.
+     */
+    private LocalDnsProfile localDnsProfile;
+
+    /*
+     * Settings to determine the node customization used to provision nodes in a pool.
+     */
+    private NodeCustomizationProfile nodeCustomizationProfile;
+
     /**
      * Creates an instance of ManagedClusterAgentPoolProfileProperties class.
      */
@@ -373,7 +415,7 @@ public ManagedClusterAgentPoolProfileProperties() {
     /**
      * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
      * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
-     * subsequent request to enable optimistic concurrency per the normal etag convention.
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
      * 
      * @return the etag value.
      */
@@ -384,7 +426,7 @@ public String etag() {
     /**
      * Set the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
      * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
-     * subsequent request to enable optimistic concurrency per the normal etag convention.
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
      * 
      * @param etag the etag value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
@@ -671,9 +713,9 @@ public ManagedClusterAgentPoolProfileProperties withOsType(OSType osType) {
     }
 
     /**
-     * Get the osSku property: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux.
-     * The default is Windows2019 when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is
-     * Windows.
+     * Get the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
      * 
      * @return the osSku value.
      */
@@ -682,9 +724,9 @@ public OSSku osSku() {
     }
 
     /**
-     * Set the osSku property: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux.
-     * The default is Windows2019 when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is
-     * Windows.
+     * Set the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
      * 
      * @param osSku the osSku value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
@@ -822,13 +864,13 @@ public ManagedClusterAgentPoolProfileProperties withMode(AgentPoolMode mode) {
 
     /**
      * Get the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
-     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
-     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
-     * version cannot be greater than the control plane version. For more information see [upgrading a node
+     * &lt;major.minor.patch&gt; and &lt;major.minor&gt; are supported. When &lt;major.minor&gt; is specified, the
+     * latest supported patch version is chosen automatically. Updating the agent pool with the same &lt;major.minor&gt;
+     * once it has been created will not trigger an upgrade, even if a newer patch version is available. As a best
+     * practice, you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool
+     * version must have the same major version as the control plane. The node pool minor version must be within two
+     * minor versions of the control plane version. The node pool version cannot be greater than the control plane
+     * version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      * 
      * @return the orchestratorVersion value.
@@ -839,13 +881,13 @@ public String orchestratorVersion() {
 
     /**
      * Set the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
-     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
-     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
-     * version cannot be greater than the control plane version. For more information see [upgrading a node
+     * &lt;major.minor.patch&gt; and &lt;major.minor&gt; are supported. When &lt;major.minor&gt; is specified, the
+     * latest supported patch version is chosen automatically. Updating the agent pool with the same &lt;major.minor&gt;
+     * once it has been created will not trigger an upgrade, even if a newer patch version is available. As a best
+     * practice, you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool
+     * version must have the same major version as the control plane. The node pool minor version must be within two
+     * minor versions of the control plane version. The node pool version cannot be greater than the control plane
+     * version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      * 
      * @param orchestratorVersion the orchestratorVersion value to set.
@@ -857,9 +899,9 @@ public ManagedClusterAgentPoolProfileProperties withOrchestratorVersion(String o
     }
 
     /**
-     * Get the currentOrchestratorVersion property: The version of Kubernetes the Agent Pool is running. If
-     * orchestratorVersion is a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
-     * it. If orchestratorVersion is &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * Get the currentOrchestratorVersion property: The version of Kubernetes running on the Agent Pool. If
+     * orchestratorVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
      * version being used.
      * 
      * @return the currentOrchestratorVersion value.
@@ -869,9 +911,9 @@ public String currentOrchestratorVersion() {
     }
 
     /**
-     * Set the currentOrchestratorVersion property: The version of Kubernetes the Agent Pool is running. If
-     * orchestratorVersion is a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
-     * it. If orchestratorVersion is &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * Set the currentOrchestratorVersion property: The version of Kubernetes running on the Agent Pool. If
+     * orchestratorVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
      * version being used.
      * 
      * @param currentOrchestratorVersion the currentOrchestratorVersion value to set.
@@ -897,13 +939,34 @@ public String nodeImageVersion() {
      * @param nodeImageVersion the nodeImageVersion value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
      */
-    ManagedClusterAgentPoolProfileProperties withNodeImageVersion(String nodeImageVersion) {
+    public ManagedClusterAgentPoolProfileProperties withNodeImageVersion(String nodeImageVersion) {
         this.nodeImageVersion = nodeImageVersion;
         return this;
     }
 
     /**
-     * Get the upgradeSettings property: Settings for upgrading the agentpool.
+     * Get the upgradeStrategy property: Defines the upgrade strategy for the agent pool. The default is Rolling.
+     * 
+     * @return the upgradeStrategy value.
+     */
+    public UpgradeStrategy upgradeStrategy() {
+        return this.upgradeStrategy;
+    }
+
+    /**
+     * Set the upgradeStrategy property: Defines the upgrade strategy for the agent pool. The default is Rolling.
+     * 
+     * @param upgradeStrategy the upgradeStrategy value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withUpgradeStrategy(UpgradeStrategy upgradeStrategy) {
+        this.upgradeStrategy = upgradeStrategy;
+        return this;
+    }
+
+    /**
+     * Get the upgradeSettings property: Settings for upgrading the agentpool. Applies when upgrade strategy is set to
+     * Rolling.
      * 
      * @return the upgradeSettings value.
      */
@@ -912,7 +975,8 @@ public AgentPoolUpgradeSettings upgradeSettings() {
     }
 
     /**
-     * Set the upgradeSettings property: Settings for upgrading the agentpool.
+     * Set the upgradeSettings property: Settings for upgrading the agentpool. Applies when upgrade strategy is set to
+     * Rolling.
      * 
      * @param upgradeSettings the upgradeSettings value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
@@ -922,6 +986,29 @@ public ManagedClusterAgentPoolProfileProperties withUpgradeSettings(AgentPoolUpg
         return this;
     }
 
+    /**
+     * Get the upgradeSettingsBlueGreen property: Settings for Blue-Green upgrade on the agentpool. Applies when upgrade
+     * strategy is set to BlueGreen.
+     * 
+     * @return the upgradeSettingsBlueGreen value.
+     */
+    public AgentPoolBlueGreenUpgradeSettings upgradeSettingsBlueGreen() {
+        return this.upgradeSettingsBlueGreen;
+    }
+
+    /**
+     * Set the upgradeSettingsBlueGreen property: Settings for Blue-Green upgrade on the agentpool. Applies when upgrade
+     * strategy is set to BlueGreen.
+     * 
+     * @param upgradeSettingsBlueGreen the upgradeSettingsBlueGreen value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties
+        withUpgradeSettingsBlueGreen(AgentPoolBlueGreenUpgradeSettings upgradeSettingsBlueGreen) {
+        this.upgradeSettingsBlueGreen = upgradeSettingsBlueGreen;
+        return this;
+    }
+
     /**
      * Get the provisioningState property: The current deployment or provisioning state.
      * 
@@ -1179,6 +1266,37 @@ public ManagedClusterAgentPoolProfileProperties withNodeTaints(List<String> node
         return this;
     }
 
+    /**
+     * Get the nodeInitializationTaints property: Taints added on the nodes during creation that will not be reconciled
+     * by AKS. These taints will not be reconciled by AKS and can be removed with a kubectl call. This field can be
+     * modified after node pool is created, but nodes will not be recreated with new taints until another operation that
+     * requires recreation (e.g. node image upgrade) happens. These taints allow for required configuration to run
+     * before the node is ready to accept workloads, for example 'key1=value1:NoSchedule' that then can be removed with
+     * `kubectl taint nodes node1 key1=value1:NoSchedule-`.
+     * 
+     * @return the nodeInitializationTaints value.
+     */
+    public List<String> nodeInitializationTaints() {
+        return this.nodeInitializationTaints;
+    }
+
+    /**
+     * Set the nodeInitializationTaints property: Taints added on the nodes during creation that will not be reconciled
+     * by AKS. These taints will not be reconciled by AKS and can be removed with a kubectl call. This field can be
+     * modified after node pool is created, but nodes will not be recreated with new taints until another operation that
+     * requires recreation (e.g. node image upgrade) happens. These taints allow for required configuration to run
+     * before the node is ready to accept workloads, for example 'key1=value1:NoSchedule' that then can be removed with
+     * `kubectl taint nodes node1 key1=value1:NoSchedule-`.
+     * 
+     * @param nodeInitializationTaints the nodeInitializationTaints value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties
+        withNodeInitializationTaints(List<String> nodeInitializationTaints) {
+        this.nodeInitializationTaints = nodeInitializationTaints;
+        return this;
+    }
+
     /**
      * Get the proximityPlacementGroupId property: The ID for Proximity Placement Group.
      * 
@@ -1402,42 +1520,42 @@ public ManagedClusterAgentPoolProfileProperties withHostGroupId(String hostGroup
     }
 
     /**
-     * Get the networkProfile property: Network-related settings of an agent pool.
+     * Get the windowsProfile property: The Windows agent pool's specific profile.
      * 
-     * @return the networkProfile value.
+     * @return the windowsProfile value.
      */
-    public AgentPoolNetworkProfile networkProfile() {
-        return this.networkProfile;
+    public AgentPoolWindowsProfile windowsProfile() {
+        return this.windowsProfile;
     }
 
     /**
-     * Set the networkProfile property: Network-related settings of an agent pool.
+     * Set the windowsProfile property: The Windows agent pool's specific profile.
      * 
-     * @param networkProfile the networkProfile value to set.
+     * @param windowsProfile the windowsProfile value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
      */
-    public ManagedClusterAgentPoolProfileProperties withNetworkProfile(AgentPoolNetworkProfile networkProfile) {
-        this.networkProfile = networkProfile;
+    public ManagedClusterAgentPoolProfileProperties withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
+        this.windowsProfile = windowsProfile;
         return this;
     }
 
     /**
-     * Get the windowsProfile property: The Windows agent pool's specific profile.
+     * Get the networkProfile property: Network-related settings of an agent pool.
      * 
-     * @return the windowsProfile value.
+     * @return the networkProfile value.
      */
-    public AgentPoolWindowsProfile windowsProfile() {
-        return this.windowsProfile;
+    public AgentPoolNetworkProfile networkProfile() {
+        return this.networkProfile;
     }
 
     /**
-     * Set the windowsProfile property: The Windows agent pool's specific profile.
+     * Set the networkProfile property: Network-related settings of an agent pool.
      * 
-     * @param windowsProfile the windowsProfile value to set.
+     * @param networkProfile the networkProfile value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
      */
-    public ManagedClusterAgentPoolProfileProperties withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
-        this.windowsProfile = windowsProfile;
+    public ManagedClusterAgentPoolProfileProperties withNetworkProfile(AgentPoolNetworkProfile networkProfile) {
+        this.networkProfile = networkProfile;
         return this;
     }
 
@@ -1462,7 +1580,7 @@ public ManagedClusterAgentPoolProfileProperties withSecurityProfile(AgentPoolSec
     }
 
     /**
-     * Get the gpuProfile property: GPU settings for the Agent Pool.
+     * Get the gpuProfile property: The GPU settings of an agent pool.
      * 
      * @return the gpuProfile value.
      */
@@ -1471,7 +1589,7 @@ public GpuProfile gpuProfile() {
     }
 
     /**
-     * Set the gpuProfile property: GPU settings for the Agent Pool.
+     * Set the gpuProfile property: The GPU settings of an agent pool.
      * 
      * @param gpuProfile the gpuProfile value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
@@ -1482,24 +1600,23 @@ public ManagedClusterAgentPoolProfileProperties withGpuProfile(GpuProfile gpuPro
     }
 
     /**
-     * Get the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
-     * set if agent pool mode is not Gateway.
+     * Get the artifactStreamingProfile property: Configuration for using artifact streaming on AKS.
      * 
-     * @return the gatewayProfile value.
+     * @return the artifactStreamingProfile value.
      */
-    public AgentPoolGatewayProfile gatewayProfile() {
-        return this.gatewayProfile;
+    public AgentPoolArtifactStreamingProfile artifactStreamingProfile() {
+        return this.artifactStreamingProfile;
     }
 
     /**
-     * Set the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
-     * set if agent pool mode is not Gateway.
+     * Set the artifactStreamingProfile property: Configuration for using artifact streaming on AKS.
      * 
-     * @param gatewayProfile the gatewayProfile value to set.
+     * @param artifactStreamingProfile the artifactStreamingProfile value to set.
      * @return the ManagedClusterAgentPoolProfileProperties object itself.
      */
-    public ManagedClusterAgentPoolProfileProperties withGatewayProfile(AgentPoolGatewayProfile gatewayProfile) {
-        this.gatewayProfile = gatewayProfile;
+    public ManagedClusterAgentPoolProfileProperties
+        withArtifactStreamingProfile(AgentPoolArtifactStreamingProfile artifactStreamingProfile) {
+        this.artifactStreamingProfile = artifactStreamingProfile;
         return this;
     }
 
@@ -1545,6 +1662,28 @@ public List<VirtualMachineNodes> virtualMachineNodesStatus() {
         return this;
     }
 
+    /**
+     * Get the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
+     * set if agent pool mode is not Gateway.
+     * 
+     * @return the gatewayProfile value.
+     */
+    public AgentPoolGatewayProfile gatewayProfile() {
+        return this.gatewayProfile;
+    }
+
+    /**
+     * Set the gatewayProfile property: Profile specific to a managed agent pool in Gateway mode. This field cannot be
+     * set if agent pool mode is not Gateway.
+     * 
+     * @param gatewayProfile the gatewayProfile value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withGatewayProfile(AgentPoolGatewayProfile gatewayProfile) {
+        this.gatewayProfile = gatewayProfile;
+        return this;
+    }
+
     /**
      * Get the status property: Contains read-only information about the Agent Pool.
      * 
@@ -1565,6 +1704,53 @@ public ManagedClusterAgentPoolProfileProperties withStatus(AgentPoolStatus statu
         return this;
     }
 
+    /**
+     * Get the localDnsProfile property: Configures the per-node local DNS, with VnetDNS and KubeDNS overrides. LocalDNS
+     * helps improve performance and reliability of DNS resolution in an AKS cluster. For more details see
+     * aka.ms/aks/localdns.
+     * 
+     * @return the localDnsProfile value.
+     */
+    public LocalDnsProfile localDnsProfile() {
+        return this.localDnsProfile;
+    }
+
+    /**
+     * Set the localDnsProfile property: Configures the per-node local DNS, with VnetDNS and KubeDNS overrides. LocalDNS
+     * helps improve performance and reliability of DNS resolution in an AKS cluster. For more details see
+     * aka.ms/aks/localdns.
+     * 
+     * @param localDnsProfile the localDnsProfile value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withLocalDnsProfile(LocalDnsProfile localDnsProfile) {
+        this.localDnsProfile = localDnsProfile;
+        return this;
+    }
+
+    /**
+     * Get the nodeCustomizationProfile property: Settings to determine the node customization used to provision nodes
+     * in a pool.
+     * 
+     * @return the nodeCustomizationProfile value.
+     */
+    public NodeCustomizationProfile nodeCustomizationProfile() {
+        return this.nodeCustomizationProfile;
+    }
+
+    /**
+     * Set the nodeCustomizationProfile property: Settings to determine the node customization used to provision nodes
+     * in a pool.
+     * 
+     * @param nodeCustomizationProfile the nodeCustomizationProfile value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties
+        withNodeCustomizationProfile(NodeCustomizationProfile nodeCustomizationProfile) {
+        this.nodeCustomizationProfile = nodeCustomizationProfile;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -1574,6 +1760,9 @@ public void validate() {
         if (upgradeSettings() != null) {
             upgradeSettings().validate();
         }
+        if (upgradeSettingsBlueGreen() != null) {
+            upgradeSettingsBlueGreen().validate();
+        }
         if (powerState() != null) {
             powerState().validate();
         }
@@ -1586,20 +1775,20 @@ public void validate() {
         if (creationData() != null) {
             creationData().validate();
         }
-        if (networkProfile() != null) {
-            networkProfile().validate();
-        }
         if (windowsProfile() != null) {
             windowsProfile().validate();
         }
+        if (networkProfile() != null) {
+            networkProfile().validate();
+        }
         if (securityProfile() != null) {
             securityProfile().validate();
         }
         if (gpuProfile() != null) {
             gpuProfile().validate();
         }
-        if (gatewayProfile() != null) {
-            gatewayProfile().validate();
+        if (artifactStreamingProfile() != null) {
+            artifactStreamingProfile().validate();
         }
         if (virtualMachinesProfile() != null) {
             virtualMachinesProfile().validate();
@@ -1607,9 +1796,18 @@ public void validate() {
         if (virtualMachineNodesStatus() != null) {
             virtualMachineNodesStatus().forEach(e -> e.validate());
         }
+        if (gatewayProfile() != null) {
+            gatewayProfile().validate();
+        }
         if (status() != null) {
             status().validate();
         }
+        if (localDnsProfile() != null) {
+            localDnsProfile().validate();
+        }
+        if (nodeCustomizationProfile() != null) {
+            nodeCustomizationProfile().validate();
+        }
     }
 
     /**
@@ -1641,7 +1839,11 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
         jsonWriter.writeStringField("mode", this.mode == null ? null : this.mode.toString());
         jsonWriter.writeStringField("orchestratorVersion", this.orchestratorVersion);
+        jsonWriter.writeStringField("nodeImageVersion", this.nodeImageVersion);
+        jsonWriter.writeStringField("upgradeStrategy",
+            this.upgradeStrategy == null ? null : this.upgradeStrategy.toString());
         jsonWriter.writeJsonField("upgradeSettings", this.upgradeSettings);
+        jsonWriter.writeJsonField("upgradeSettingsBlueGreen", this.upgradeSettingsBlueGreen);
         jsonWriter.writeJsonField("powerState", this.powerState);
         jsonWriter.writeArrayField("availabilityZones", this.availabilityZones,
             (writer, element) -> writer.writeString(element));
@@ -1655,6 +1857,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
         jsonWriter.writeMapField("nodeLabels", this.nodeLabels, (writer, element) -> writer.writeString(element));
         jsonWriter.writeArrayField("nodeTaints", this.nodeTaints, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeArrayField("nodeInitializationTaints", this.nodeInitializationTaints,
+            (writer, element) -> writer.writeString(element));
         jsonWriter.writeStringField("proximityPlacementGroupID", this.proximityPlacementGroupId);
         jsonWriter.writeJsonField("kubeletConfig", this.kubeletConfig);
         jsonWriter.writeJsonField("linuxOSConfig", this.linuxOSConfig);
@@ -1666,15 +1870,18 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeJsonField("creationData", this.creationData);
         jsonWriter.writeStringField("capacityReservationGroupID", this.capacityReservationGroupId);
         jsonWriter.writeStringField("hostGroupID", this.hostGroupId);
-        jsonWriter.writeJsonField("networkProfile", this.networkProfile);
         jsonWriter.writeJsonField("windowsProfile", this.windowsProfile);
+        jsonWriter.writeJsonField("networkProfile", this.networkProfile);
         jsonWriter.writeJsonField("securityProfile", this.securityProfile);
         jsonWriter.writeJsonField("gpuProfile", this.gpuProfile);
-        jsonWriter.writeJsonField("gatewayProfile", this.gatewayProfile);
+        jsonWriter.writeJsonField("artifactStreamingProfile", this.artifactStreamingProfile);
         jsonWriter.writeJsonField("virtualMachinesProfile", this.virtualMachinesProfile);
         jsonWriter.writeArrayField("virtualMachineNodesStatus", this.virtualMachineNodesStatus,
             (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeJsonField("gatewayProfile", this.gatewayProfile);
         jsonWriter.writeJsonField("status", this.status);
+        jsonWriter.writeJsonField("localDNSProfile", this.localDnsProfile);
+        jsonWriter.writeJsonField("nodeCustomizationProfile", this.nodeCustomizationProfile);
         return jsonWriter.writeEndObject();
     }
 
@@ -1753,9 +1960,15 @@ public static ManagedClusterAgentPoolProfileProperties fromJson(JsonReader jsonR
                         = reader.getString();
                 } else if ("nodeImageVersion".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.nodeImageVersion = reader.getString();
+                } else if ("upgradeStrategy".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.upgradeStrategy
+                        = UpgradeStrategy.fromString(reader.getString());
                 } else if ("upgradeSettings".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.upgradeSettings
                         = AgentPoolUpgradeSettings.fromJson(reader);
+                } else if ("upgradeSettingsBlueGreen".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.upgradeSettingsBlueGreen
+                        = AgentPoolBlueGreenUpgradeSettings.fromJson(reader);
                 } else if ("provisioningState".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.provisioningState = reader.getString();
                 } else if ("powerState".equals(fieldName)) {
@@ -1786,6 +1999,10 @@ public static ManagedClusterAgentPoolProfileProperties fromJson(JsonReader jsonR
                 } else if ("nodeTaints".equals(fieldName)) {
                     List<String> nodeTaints = reader.readArray(reader1 -> reader1.getString());
                     deserializedManagedClusterAgentPoolProfileProperties.nodeTaints = nodeTaints;
+                } else if ("nodeInitializationTaints".equals(fieldName)) {
+                    List<String> nodeInitializationTaints = reader.readArray(reader1 -> reader1.getString());
+                    deserializedManagedClusterAgentPoolProfileProperties.nodeInitializationTaints
+                        = nodeInitializationTaints;
                 } else if ("proximityPlacementGroupID".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.proximityPlacementGroupId = reader.getString();
                 } else if ("kubeletConfig".equals(fieldName)) {
@@ -1811,20 +2028,20 @@ public static ManagedClusterAgentPoolProfileProperties fromJson(JsonReader jsonR
                         = reader.getString();
                 } else if ("hostGroupID".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.hostGroupId = reader.getString();
-                } else if ("networkProfile".equals(fieldName)) {
-                    deserializedManagedClusterAgentPoolProfileProperties.networkProfile
-                        = AgentPoolNetworkProfile.fromJson(reader);
                 } else if ("windowsProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.windowsProfile
                         = AgentPoolWindowsProfile.fromJson(reader);
+                } else if ("networkProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.networkProfile
+                        = AgentPoolNetworkProfile.fromJson(reader);
                 } else if ("securityProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.securityProfile
                         = AgentPoolSecurityProfile.fromJson(reader);
                 } else if ("gpuProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.gpuProfile = GpuProfile.fromJson(reader);
-                } else if ("gatewayProfile".equals(fieldName)) {
-                    deserializedManagedClusterAgentPoolProfileProperties.gatewayProfile
-                        = AgentPoolGatewayProfile.fromJson(reader);
+                } else if ("artifactStreamingProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.artifactStreamingProfile
+                        = AgentPoolArtifactStreamingProfile.fromJson(reader);
                 } else if ("virtualMachinesProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.virtualMachinesProfile
                         = VirtualMachinesProfile.fromJson(reader);
@@ -1833,8 +2050,17 @@ public static ManagedClusterAgentPoolProfileProperties fromJson(JsonReader jsonR
                         = reader.readArray(reader1 -> VirtualMachineNodes.fromJson(reader1));
                     deserializedManagedClusterAgentPoolProfileProperties.virtualMachineNodesStatus
                         = virtualMachineNodesStatus;
+                } else if ("gatewayProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.gatewayProfile
+                        = AgentPoolGatewayProfile.fromJson(reader);
                 } else if ("status".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfileProperties.status = AgentPoolStatus.fromJson(reader);
+                } else if ("localDNSProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.localDnsProfile
+                        = LocalDnsProfile.fromJson(reader);
+                } else if ("nodeCustomizationProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfileProperties.nodeCustomizationProfile
+                        = NodeCustomizationProfile.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
index c690f6573ec7..ab8f77b4ba2f 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.containerservice.models.ClusterUpgradeSettings;
 import com.azure.resourcemanager.containerservice.models.ContainerServiceLinuxProfile;
 import com.azure.resourcemanager.containerservice.models.ContainerServiceNetworkProfile;
+import com.azure.resourcemanager.containerservice.models.CreationData;
 import com.azure.resourcemanager.containerservice.models.ExtendedLocation;
 import com.azure.resourcemanager.containerservice.models.KubernetesSupportPlan;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAIToolchainOperatorProfile;
@@ -23,6 +24,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAutoUpgradeProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAzureMonitorProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterBootstrapProfile;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterHostedSystemProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterHttpProxyConfig;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterIdentity;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterIngressProfile;
@@ -41,6 +43,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterWorkloadAutoScalerProfile;
 import com.azure.resourcemanager.containerservice.models.PowerState;
 import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
+import com.azure.resourcemanager.containerservice.models.SchedulerProfile;
 import com.azure.resourcemanager.containerservice.models.ServiceMeshProfile;
 import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
 import java.io.IOException;
@@ -55,7 +58,7 @@ public final class ManagedClusterInner extends Resource {
     /*
      * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
      * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
-     * optimistic concurrency per the normal etag convention.
+     * optimistic concurrency per the normal eTag convention.
      */
     private String etag;
 
@@ -113,7 +116,7 @@ public ManagedClusterInner() {
     /**
      * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
      * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
-     * subsequent request to enable optimistic concurrency per the normal etag convention.
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
      * 
      * @return the etag value.
      */
@@ -287,6 +290,31 @@ public PowerState powerState() {
         return this.innerProperties() == null ? null : this.innerProperties().powerState();
     }
 
+    /**
+     * Get the creationData property: CreationData to be used to specify the source Snapshot ID if the cluster will be
+     * created/upgraded using a snapshot.
+     * 
+     * @return the creationData value.
+     */
+    public CreationData creationData() {
+        return this.innerProperties() == null ? null : this.innerProperties().creationData();
+    }
+
+    /**
+     * Set the creationData property: CreationData to be used to specify the source Snapshot ID if the cluster will be
+     * created/upgraded using a snapshot.
+     * 
+     * @param creationData the creationData value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withCreationData(CreationData creationData) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withCreationData(creationData);
+        return this;
+    }
+
     /**
      * Get the maxAgentPools property: The max number of agent pools for the managed cluster.
      * 
@@ -297,14 +325,11 @@ public Integer maxAgentPools() {
     }
 
     /**
-     * Get the kubernetesVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. When you upgrade a supported AKS cluster, Kubernetes minor
-     * versions cannot be skipped. All upgrades must be performed sequentially by major version number. For example,
-     * upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed, however 1.14.x -&gt; 1.16.x is not
-     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
+     * Get the kubernetesVersion property: The version of Kubernetes the Managed Cluster is requested to run. When you
+     * upgrade a supported AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed
+     * sequentially by major version number. For example, upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x
+     * are allowed, however 1.14.x -&gt; 1.16.x is not allowed. See [upgrading an AKS
+     * cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      * 
      * @return the kubernetesVersion value.
      */
@@ -313,14 +338,11 @@ public String kubernetesVersion() {
     }
 
     /**
-     * Set the kubernetesVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. When you upgrade a supported AKS cluster, Kubernetes minor
-     * versions cannot be skipped. All upgrades must be performed sequentially by major version number. For example,
-     * upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed, however 1.14.x -&gt; 1.16.x is not
-     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
+     * Set the kubernetesVersion property: The version of Kubernetes the Managed Cluster is requested to run. When you
+     * upgrade a supported AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed
+     * sequentially by major version number. For example, upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x
+     * are allowed, however 1.14.x -&gt; 1.16.x is not allowed. See [upgrading an AKS
+     * cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      * 
      * @param kubernetesVersion the kubernetesVersion value to set.
      * @return the ManagedClusterInner object itself.
@@ -334,10 +356,7 @@ public ManagedClusterInner withKubernetesVersion(String kubernetesVersion) {
     }
 
     /**
-     * Get the currentKubernetesVersion property: The version of Kubernetes the Managed Cluster is running. If
-     * kubernetesVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
-     * it. If kubernetesVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
-     * version being used.
+     * Get the currentKubernetesVersion property: The version of Kubernetes the Managed Cluster is running.
      * 
      * @return the currentKubernetesVersion value.
      */
@@ -617,7 +636,7 @@ public ManagedClusterInner withNodeResourceGroup(String nodeResourceGroup) {
     }
 
     /**
-     * Get the nodeResourceGroupProfile property: Profile of the node resource group configuration.
+     * Get the nodeResourceGroupProfile property: The node resource group configuration profile.
      * 
      * @return the nodeResourceGroupProfile value.
      */
@@ -626,7 +645,7 @@ public ManagedClusterNodeResourceGroupProfile nodeResourceGroupProfile() {
     }
 
     /**
-     * Set the nodeResourceGroupProfile property: Profile of the node resource group configuration.
+     * Set the nodeResourceGroupProfile property: The node resource group configuration profile.
      * 
      * @param nodeResourceGroupProfile the nodeResourceGroupProfile value to set.
      * @return the ManagedClusterInner object itself.
@@ -688,6 +707,35 @@ public ManagedClusterInner withSupportPlan(KubernetesSupportPlan supportPlan) {
         return this;
     }
 
+    /**
+     * Get the enableNamespaceResources property: Enable namespace as Azure resource. The default value is false. It can
+     * be enabled/disabled on creation and updating of the managed cluster. See
+     * [https://aka.ms/NamespaceARMResource](https://aka.ms/NamespaceARMResource) for more details on Namespace as a ARM
+     * Resource.
+     * 
+     * @return the enableNamespaceResources value.
+     */
+    public Boolean enableNamespaceResources() {
+        return this.innerProperties() == null ? null : this.innerProperties().enableNamespaceResources();
+    }
+
+    /**
+     * Set the enableNamespaceResources property: Enable namespace as Azure resource. The default value is false. It can
+     * be enabled/disabled on creation and updating of the managed cluster. See
+     * [https://aka.ms/NamespaceARMResource](https://aka.ms/NamespaceARMResource) for more details on Namespace as a ARM
+     * Resource.
+     * 
+     * @param enableNamespaceResources the enableNamespaceResources value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withEnableNamespaceResources(Boolean enableNamespaceResources) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withEnableNamespaceResources(enableNamespaceResources);
+        return this;
+    }
+
     /**
      * Get the networkProfile property: The network configuration profile.
      * 
@@ -1076,7 +1124,7 @@ public ManagedClusterWorkloadAutoScalerProfile workloadAutoScalerProfile() {
     }
 
     /**
-     * Get the azureMonitorProfile property: Azure Monitor addon profiles for monitoring the managed cluster.
+     * Get the azureMonitorProfile property: Prometheus addon profile for the container service cluster.
      * 
      * @return the azureMonitorProfile value.
      */
@@ -1085,7 +1133,7 @@ public ManagedClusterAzureMonitorProfile azureMonitorProfile() {
     }
 
     /**
-     * Set the azureMonitorProfile property: Azure Monitor addon profiles for monitoring the managed cluster.
+     * Set the azureMonitorProfile property: Prometheus addon profile for the container service cluster.
      * 
      * @param azureMonitorProfile the azureMonitorProfile value to set.
      * @return the ManagedClusterInner object itself.
@@ -1154,6 +1202,30 @@ public ManagedClusterInner withMetricsProfile(ManagedClusterMetricsProfile metri
         return this;
     }
 
+    /**
+     * Get the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * 
+     * @return the aiToolchainOperatorProfile value.
+     */
+    public ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().aiToolchainOperatorProfile();
+    }
+
+    /**
+     * Set the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * 
+     * @param aiToolchainOperatorProfile the aiToolchainOperatorProfile value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner
+        withAiToolchainOperatorProfile(ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withAiToolchainOperatorProfile(aiToolchainOperatorProfile);
+        return this;
+    }
+
     /**
      * Get the nodeProvisioningProfile property: Node provisioning settings that apply to the whole cluster.
      * 
@@ -1202,26 +1274,50 @@ public ManagedClusterInner withBootstrapProfile(ManagedClusterBootstrapProfile b
     }
 
     /**
-     * Get the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * Get the schedulerProfile property: Profile of the pod scheduler configuration.
      * 
-     * @return the aiToolchainOperatorProfile value.
+     * @return the schedulerProfile value.
      */
-    public ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile() {
-        return this.innerProperties() == null ? null : this.innerProperties().aiToolchainOperatorProfile();
+    public SchedulerProfile schedulerProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().schedulerProfile();
     }
 
     /**
-     * Set the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * Set the schedulerProfile property: Profile of the pod scheduler configuration.
      * 
-     * @param aiToolchainOperatorProfile the aiToolchainOperatorProfile value to set.
+     * @param schedulerProfile the schedulerProfile value to set.
      * @return the ManagedClusterInner object itself.
      */
-    public ManagedClusterInner
-        withAiToolchainOperatorProfile(ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile) {
+    public ManagedClusterInner withSchedulerProfile(SchedulerProfile schedulerProfile) {
         if (this.innerProperties() == null) {
             this.innerProperties = new ManagedClusterProperties();
         }
-        this.innerProperties().withAiToolchainOperatorProfile(aiToolchainOperatorProfile);
+        this.innerProperties().withSchedulerProfile(schedulerProfile);
+        return this;
+    }
+
+    /**
+     * Get the hostedSystemProfile property: Settings for hosted system addons. For more information, see
+     * https://aka.ms/aks/automatic/systemcomponents.
+     * 
+     * @return the hostedSystemProfile value.
+     */
+    public ManagedClusterHostedSystemProfile hostedSystemProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().hostedSystemProfile();
+    }
+
+    /**
+     * Set the hostedSystemProfile property: Settings for hosted system addons. For more information, see
+     * https://aka.ms/aks/automatic/systemcomponents.
+     * 
+     * @param hostedSystemProfile the hostedSystemProfile value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withHostedSystemProfile(ManagedClusterHostedSystemProfile hostedSystemProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withHostedSystemProfile(hostedSystemProfile);
         return this;
     }
 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
index 2d3a5904c461..cef395af214b 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.containerservice.models.ClusterUpgradeSettings;
 import com.azure.resourcemanager.containerservice.models.ContainerServiceLinuxProfile;
 import com.azure.resourcemanager.containerservice.models.ContainerServiceNetworkProfile;
+import com.azure.resourcemanager.containerservice.models.CreationData;
 import com.azure.resourcemanager.containerservice.models.KubernetesSupportPlan;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAIToolchainOperatorProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAadProfile;
@@ -21,6 +22,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAutoUpgradeProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAzureMonitorProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterBootstrapProfile;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterHostedSystemProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterHttpProxyConfig;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterIngressProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterMetricsProfile;
@@ -37,6 +39,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterWorkloadAutoScalerProfile;
 import com.azure.resourcemanager.containerservice.models.PowerState;
 import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
+import com.azure.resourcemanager.containerservice.models.SchedulerProfile;
 import com.azure.resourcemanager.containerservice.models.ServiceMeshProfile;
 import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
 import java.io.IOException;
@@ -58,27 +61,27 @@ public final class ManagedClusterProperties implements JsonSerializable<ManagedC
      */
     private PowerState powerState;
 
+    /*
+     * CreationData to be used to specify the source Snapshot ID if the cluster will be created/upgraded using a
+     * snapshot.
+     */
+    private CreationData creationData;
+
     /*
      * The max number of agent pools for the managed cluster.
      */
     private Integer maxAgentPools;
 
     /*
-     * The version of Kubernetes specified by the user. Both patch version <major.minor.patch> (e.g. 1.20.13) and
-     * <major.minor> (e.g. 1.20) are supported. When <major.minor> is specified, the latest supported GA patch version
-     * is chosen automatically. Updating the cluster with the same <major.minor> once it has been created (e.g. 1.14.x
-     * -> 1.14) will not trigger an upgrade, even if a newer patch version is available. When you upgrade a supported
-     * AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed sequentially by major
-     * version number. For example, upgrades between 1.14.x -> 1.15.x or 1.15.x -> 1.16.x are allowed, however 1.14.x ->
-     * 1.16.x is not allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for
-     * more details.
+     * The version of Kubernetes the Managed Cluster is requested to run. When you upgrade a supported AKS cluster,
+     * Kubernetes minor versions cannot be skipped. All upgrades must be performed sequentially by major version number.
+     * For example, upgrades between 1.14.x -> 1.15.x or 1.15.x -> 1.16.x are allowed, however 1.14.x -> 1.16.x is not
+     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      */
     private String kubernetesVersion;
 
     /*
-     * The version of Kubernetes the Managed Cluster is running. If kubernetesVersion was a fully specified version
-     * <major.minor.patch>, this field will be exactly equal to it. If kubernetesVersion was <major.minor>, this field
-     * will contain the full <major.minor.patch> version being used.
+     * The version of Kubernetes the Managed Cluster is running.
      */
     private String currentKubernetesVersion;
 
@@ -154,7 +157,7 @@ public final class ManagedClusterProperties implements JsonSerializable<ManagedC
     private String nodeResourceGroup;
 
     /*
-     * Profile of the node resource group configuration.
+     * The node resource group configuration profile.
      */
     private ManagedClusterNodeResourceGroupProfile nodeResourceGroupProfile;
 
@@ -168,6 +171,13 @@ public final class ManagedClusterProperties implements JsonSerializable<ManagedC
      */
     private KubernetesSupportPlan supportPlan;
 
+    /*
+     * Enable namespace as Azure resource. The default value is false. It can be enabled/disabled on creation and
+     * updating of the managed cluster. See [https://aka.ms/NamespaceARMResource](https://aka.ms/NamespaceARMResource)
+     * for more details on Namespace as a ARM Resource.
+     */
+    private Boolean enableNamespaceResources;
+
     /*
      * The network configuration profile.
      */
@@ -255,7 +265,7 @@ public final class ManagedClusterProperties implements JsonSerializable<ManagedC
     private ManagedClusterWorkloadAutoScalerProfile workloadAutoScalerProfile;
 
     /*
-     * Azure Monitor addon profiles for monitoring the managed cluster.
+     * Prometheus addon profile for the container service cluster
      */
     private ManagedClusterAzureMonitorProfile azureMonitorProfile;
 
@@ -275,6 +285,11 @@ public final class ManagedClusterProperties implements JsonSerializable<ManagedC
      */
     private ManagedClusterMetricsProfile metricsProfile;
 
+    /*
+     * AI toolchain operator settings that apply to the whole cluster.
+     */
+    private ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile;
+
     /*
      * Node provisioning settings that apply to the whole cluster.
      */
@@ -286,9 +301,14 @@ public final class ManagedClusterProperties implements JsonSerializable<ManagedC
     private ManagedClusterBootstrapProfile bootstrapProfile;
 
     /*
-     * AI toolchain operator settings that apply to the whole cluster.
+     * Profile of the pod scheduler configuration.
      */
-    private ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile;
+    private SchedulerProfile schedulerProfile;
+
+    /*
+     * Settings for hosted system addons. For more information, see https://aka.ms/aks/automatic/systemcomponents.
+     */
+    private ManagedClusterHostedSystemProfile hostedSystemProfile;
 
     /*
      * Contains read-only information about the Managed Cluster.
@@ -319,6 +339,28 @@ public PowerState powerState() {
         return this.powerState;
     }
 
+    /**
+     * Get the creationData property: CreationData to be used to specify the source Snapshot ID if the cluster will be
+     * created/upgraded using a snapshot.
+     * 
+     * @return the creationData value.
+     */
+    public CreationData creationData() {
+        return this.creationData;
+    }
+
+    /**
+     * Set the creationData property: CreationData to be used to specify the source Snapshot ID if the cluster will be
+     * created/upgraded using a snapshot.
+     * 
+     * @param creationData the creationData value to set.
+     * @return the ManagedClusterProperties object itself.
+     */
+    public ManagedClusterProperties withCreationData(CreationData creationData) {
+        this.creationData = creationData;
+        return this;
+    }
+
     /**
      * Get the maxAgentPools property: The max number of agent pools for the managed cluster.
      * 
@@ -329,14 +371,11 @@ public Integer maxAgentPools() {
     }
 
     /**
-     * Get the kubernetesVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. When you upgrade a supported AKS cluster, Kubernetes minor
-     * versions cannot be skipped. All upgrades must be performed sequentially by major version number. For example,
-     * upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed, however 1.14.x -&gt; 1.16.x is not
-     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
+     * Get the kubernetesVersion property: The version of Kubernetes the Managed Cluster is requested to run. When you
+     * upgrade a supported AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed
+     * sequentially by major version number. For example, upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x
+     * are allowed, however 1.14.x -&gt; 1.16.x is not allowed. See [upgrading an AKS
+     * cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      * 
      * @return the kubernetesVersion value.
      */
@@ -345,14 +384,11 @@ public String kubernetesVersion() {
     }
 
     /**
-     * Set the kubernetesVersion property: The version of Kubernetes specified by the user. Both patch version
-     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
-     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
-     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
-     * upgrade, even if a newer patch version is available. When you upgrade a supported AKS cluster, Kubernetes minor
-     * versions cannot be skipped. All upgrades must be performed sequentially by major version number. For example,
-     * upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed, however 1.14.x -&gt; 1.16.x is not
-     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
+     * Set the kubernetesVersion property: The version of Kubernetes the Managed Cluster is requested to run. When you
+     * upgrade a supported AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed
+     * sequentially by major version number. For example, upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x
+     * are allowed, however 1.14.x -&gt; 1.16.x is not allowed. See [upgrading an AKS
+     * cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      * 
      * @param kubernetesVersion the kubernetesVersion value to set.
      * @return the ManagedClusterProperties object itself.
@@ -363,10 +399,7 @@ public ManagedClusterProperties withKubernetesVersion(String kubernetesVersion)
     }
 
     /**
-     * Get the currentKubernetesVersion property: The version of Kubernetes the Managed Cluster is running. If
-     * kubernetesVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
-     * it. If kubernetesVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
-     * version being used.
+     * Get the currentKubernetesVersion property: The version of Kubernetes the Managed Cluster is running.
      * 
      * @return the currentKubernetesVersion value.
      */
@@ -616,7 +649,7 @@ public ManagedClusterProperties withNodeResourceGroup(String nodeResourceGroup)
     }
 
     /**
-     * Get the nodeResourceGroupProfile property: Profile of the node resource group configuration.
+     * Get the nodeResourceGroupProfile property: The node resource group configuration profile.
      * 
      * @return the nodeResourceGroupProfile value.
      */
@@ -625,7 +658,7 @@ public ManagedClusterNodeResourceGroupProfile nodeResourceGroupProfile() {
     }
 
     /**
-     * Set the nodeResourceGroupProfile property: Profile of the node resource group configuration.
+     * Set the nodeResourceGroupProfile property: The node resource group configuration profile.
      * 
      * @param nodeResourceGroupProfile the nodeResourceGroupProfile value to set.
      * @return the ManagedClusterProperties object itself.
@@ -678,6 +711,32 @@ public ManagedClusterProperties withSupportPlan(KubernetesSupportPlan supportPla
         return this;
     }
 
+    /**
+     * Get the enableNamespaceResources property: Enable namespace as Azure resource. The default value is false. It can
+     * be enabled/disabled on creation and updating of the managed cluster. See
+     * [https://aka.ms/NamespaceARMResource](https://aka.ms/NamespaceARMResource) for more details on Namespace as a ARM
+     * Resource.
+     * 
+     * @return the enableNamespaceResources value.
+     */
+    public Boolean enableNamespaceResources() {
+        return this.enableNamespaceResources;
+    }
+
+    /**
+     * Set the enableNamespaceResources property: Enable namespace as Azure resource. The default value is false. It can
+     * be enabled/disabled on creation and updating of the managed cluster. See
+     * [https://aka.ms/NamespaceARMResource](https://aka.ms/NamespaceARMResource) for more details on Namespace as a ARM
+     * Resource.
+     * 
+     * @param enableNamespaceResources the enableNamespaceResources value to set.
+     * @return the ManagedClusterProperties object itself.
+     */
+    public ManagedClusterProperties withEnableNamespaceResources(Boolean enableNamespaceResources) {
+        this.enableNamespaceResources = enableNamespaceResources;
+        return this;
+    }
+
     /**
      * Get the networkProfile property: The network configuration profile.
      * 
@@ -1019,7 +1078,7 @@ public ManagedClusterWorkloadAutoScalerProfile workloadAutoScalerProfile() {
     }
 
     /**
-     * Get the azureMonitorProfile property: Azure Monitor addon profiles for monitoring the managed cluster.
+     * Get the azureMonitorProfile property: Prometheus addon profile for the container service cluster.
      * 
      * @return the azureMonitorProfile value.
      */
@@ -1028,7 +1087,7 @@ public ManagedClusterAzureMonitorProfile azureMonitorProfile() {
     }
 
     /**
-     * Set the azureMonitorProfile property: Azure Monitor addon profiles for monitoring the managed cluster.
+     * Set the azureMonitorProfile property: Prometheus addon profile for the container service cluster.
      * 
      * @param azureMonitorProfile the azureMonitorProfile value to set.
      * @return the ManagedClusterProperties object itself.
@@ -1088,6 +1147,27 @@ public ManagedClusterProperties withMetricsProfile(ManagedClusterMetricsProfile
         return this;
     }
 
+    /**
+     * Get the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * 
+     * @return the aiToolchainOperatorProfile value.
+     */
+    public ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile() {
+        return this.aiToolchainOperatorProfile;
+    }
+
+    /**
+     * Set the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * 
+     * @param aiToolchainOperatorProfile the aiToolchainOperatorProfile value to set.
+     * @return the ManagedClusterProperties object itself.
+     */
+    public ManagedClusterProperties
+        withAiToolchainOperatorProfile(ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile) {
+        this.aiToolchainOperatorProfile = aiToolchainOperatorProfile;
+        return this;
+    }
+
     /**
      * Get the nodeProvisioningProfile property: Node provisioning settings that apply to the whole cluster.
      * 
@@ -1130,23 +1210,44 @@ public ManagedClusterProperties withBootstrapProfile(ManagedClusterBootstrapProf
     }
 
     /**
-     * Get the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * Get the schedulerProfile property: Profile of the pod scheduler configuration.
      * 
-     * @return the aiToolchainOperatorProfile value.
+     * @return the schedulerProfile value.
      */
-    public ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile() {
-        return this.aiToolchainOperatorProfile;
+    public SchedulerProfile schedulerProfile() {
+        return this.schedulerProfile;
     }
 
     /**
-     * Set the aiToolchainOperatorProfile property: AI toolchain operator settings that apply to the whole cluster.
+     * Set the schedulerProfile property: Profile of the pod scheduler configuration.
      * 
-     * @param aiToolchainOperatorProfile the aiToolchainOperatorProfile value to set.
+     * @param schedulerProfile the schedulerProfile value to set.
      * @return the ManagedClusterProperties object itself.
      */
-    public ManagedClusterProperties
-        withAiToolchainOperatorProfile(ManagedClusterAIToolchainOperatorProfile aiToolchainOperatorProfile) {
-        this.aiToolchainOperatorProfile = aiToolchainOperatorProfile;
+    public ManagedClusterProperties withSchedulerProfile(SchedulerProfile schedulerProfile) {
+        this.schedulerProfile = schedulerProfile;
+        return this;
+    }
+
+    /**
+     * Get the hostedSystemProfile property: Settings for hosted system addons. For more information, see
+     * https://aka.ms/aks/automatic/systemcomponents.
+     * 
+     * @return the hostedSystemProfile value.
+     */
+    public ManagedClusterHostedSystemProfile hostedSystemProfile() {
+        return this.hostedSystemProfile;
+    }
+
+    /**
+     * Set the hostedSystemProfile property: Settings for hosted system addons. For more information, see
+     * https://aka.ms/aks/automatic/systemcomponents.
+     * 
+     * @param hostedSystemProfile the hostedSystemProfile value to set.
+     * @return the ManagedClusterProperties object itself.
+     */
+    public ManagedClusterProperties withHostedSystemProfile(ManagedClusterHostedSystemProfile hostedSystemProfile) {
+        this.hostedSystemProfile = hostedSystemProfile;
         return this;
     }
 
@@ -1179,6 +1280,9 @@ public void validate() {
         if (powerState() != null) {
             powerState().validate();
         }
+        if (creationData() != null) {
+            creationData().validate();
+        }
         if (agentPoolProfiles() != null) {
             agentPoolProfiles().forEach(e -> e.validate());
         }
@@ -1259,14 +1363,20 @@ public void validate() {
         if (metricsProfile() != null) {
             metricsProfile().validate();
         }
+        if (aiToolchainOperatorProfile() != null) {
+            aiToolchainOperatorProfile().validate();
+        }
         if (nodeProvisioningProfile() != null) {
             nodeProvisioningProfile().validate();
         }
         if (bootstrapProfile() != null) {
             bootstrapProfile().validate();
         }
-        if (aiToolchainOperatorProfile() != null) {
-            aiToolchainOperatorProfile().validate();
+        if (schedulerProfile() != null) {
+            schedulerProfile().validate();
+        }
+        if (hostedSystemProfile() != null) {
+            hostedSystemProfile().validate();
         }
         if (status() != null) {
             status().validate();
@@ -1279,6 +1389,7 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("creationData", this.creationData);
         jsonWriter.writeStringField("kubernetesVersion", this.kubernetesVersion);
         jsonWriter.writeStringField("dnsPrefix", this.dnsPrefix);
         jsonWriter.writeStringField("fqdnSubdomain", this.fqdnSubdomain);
@@ -1294,6 +1405,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeJsonField("nodeResourceGroupProfile", this.nodeResourceGroupProfile);
         jsonWriter.writeBooleanField("enableRBAC", this.enableRbac);
         jsonWriter.writeStringField("supportPlan", this.supportPlan == null ? null : this.supportPlan.toString());
+        jsonWriter.writeBooleanField("enableNamespaceResources", this.enableNamespaceResources);
         jsonWriter.writeJsonField("networkProfile", this.networkProfile);
         jsonWriter.writeJsonField("aadProfile", this.aadProfile);
         jsonWriter.writeJsonField("autoUpgradeProfile", this.autoUpgradeProfile);
@@ -1316,9 +1428,11 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeJsonField("azureMonitorProfile", this.azureMonitorProfile);
         jsonWriter.writeJsonField("serviceMeshProfile", this.serviceMeshProfile);
         jsonWriter.writeJsonField("metricsProfile", this.metricsProfile);
+        jsonWriter.writeJsonField("aiToolchainOperatorProfile", this.aiToolchainOperatorProfile);
         jsonWriter.writeJsonField("nodeProvisioningProfile", this.nodeProvisioningProfile);
         jsonWriter.writeJsonField("bootstrapProfile", this.bootstrapProfile);
-        jsonWriter.writeJsonField("aiToolchainOperatorProfile", this.aiToolchainOperatorProfile);
+        jsonWriter.writeJsonField("schedulerProfile", this.schedulerProfile);
+        jsonWriter.writeJsonField("hostedSystemProfile", this.hostedSystemProfile);
         jsonWriter.writeJsonField("status", this.status);
         return jsonWriter.writeEndObject();
     }
@@ -1342,6 +1456,8 @@ public static ManagedClusterProperties fromJson(JsonReader jsonReader) throws IO
                     deserializedManagedClusterProperties.provisioningState = reader.getString();
                 } else if ("powerState".equals(fieldName)) {
                     deserializedManagedClusterProperties.powerState = PowerState.fromJson(reader);
+                } else if ("creationData".equals(fieldName)) {
+                    deserializedManagedClusterProperties.creationData = CreationData.fromJson(reader);
                 } else if ("maxAgentPools".equals(fieldName)) {
                     deserializedManagedClusterProperties.maxAgentPools = reader.getNullable(JsonReader::getInt);
                 } else if ("kubernetesVersion".equals(fieldName)) {
@@ -1389,6 +1505,9 @@ public static ManagedClusterProperties fromJson(JsonReader jsonReader) throws IO
                 } else if ("supportPlan".equals(fieldName)) {
                     deserializedManagedClusterProperties.supportPlan
                         = KubernetesSupportPlan.fromString(reader.getString());
+                } else if ("enableNamespaceResources".equals(fieldName)) {
+                    deserializedManagedClusterProperties.enableNamespaceResources
+                        = reader.getNullable(JsonReader::getBoolean);
                 } else if ("networkProfile".equals(fieldName)) {
                     deserializedManagedClusterProperties.networkProfile
                         = ContainerServiceNetworkProfile.fromJson(reader);
@@ -1443,15 +1562,20 @@ public static ManagedClusterProperties fromJson(JsonReader jsonReader) throws IO
                     deserializedManagedClusterProperties.resourceUid = reader.getString();
                 } else if ("metricsProfile".equals(fieldName)) {
                     deserializedManagedClusterProperties.metricsProfile = ManagedClusterMetricsProfile.fromJson(reader);
+                } else if ("aiToolchainOperatorProfile".equals(fieldName)) {
+                    deserializedManagedClusterProperties.aiToolchainOperatorProfile
+                        = ManagedClusterAIToolchainOperatorProfile.fromJson(reader);
                 } else if ("nodeProvisioningProfile".equals(fieldName)) {
                     deserializedManagedClusterProperties.nodeProvisioningProfile
                         = ManagedClusterNodeProvisioningProfile.fromJson(reader);
                 } else if ("bootstrapProfile".equals(fieldName)) {
                     deserializedManagedClusterProperties.bootstrapProfile
                         = ManagedClusterBootstrapProfile.fromJson(reader);
-                } else if ("aiToolchainOperatorProfile".equals(fieldName)) {
-                    deserializedManagedClusterProperties.aiToolchainOperatorProfile
-                        = ManagedClusterAIToolchainOperatorProfile.fromJson(reader);
+                } else if ("schedulerProfile".equals(fieldName)) {
+                    deserializedManagedClusterProperties.schedulerProfile = SchedulerProfile.fromJson(reader);
+                } else if ("hostedSystemProfile".equals(fieldName)) {
+                    deserializedManagedClusterProperties.hostedSystemProfile
+                        = ManagedClusterHostedSystemProfile.fromJson(reader);
                 } else if ("status".equals(fieldName)) {
                     deserializedManagedClusterProperties.status = ManagedClusterStatus.fromJson(reader);
                 } else {
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterSnapshotInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterSnapshotInner.java
new file mode 100644
index 000000000000..fd06a6dfebc5
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterSnapshotInner.java
@@ -0,0 +1,240 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.Resource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.CreationData;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterPropertiesForSnapshot;
+import com.azure.resourcemanager.containerservice.models.SnapshotType;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * A managed cluster snapshot resource.
+ */
+@Fluent
+public final class ManagedClusterSnapshotInner extends Resource {
+    /*
+     * Properties of a managed cluster snapshot.
+     */
+    private ManagedClusterSnapshotProperties innerProperties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of ManagedClusterSnapshotInner class.
+     */
+    public ManagedClusterSnapshotInner() {
+    }
+
+    /**
+     * Get the innerProperties property: Properties of a managed cluster snapshot.
+     * 
+     * @return the innerProperties value.
+     */
+    private ManagedClusterSnapshotProperties innerProperties() {
+        return this.innerProperties;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterSnapshotInner withLocation(String location) {
+        super.withLocation(location);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterSnapshotInner withTags(Map<String, String> tags) {
+        super.withTags(tags);
+        return this;
+    }
+
+    /**
+     * Get the creationData property: CreationData to be used to specify the source resource ID to create this snapshot.
+     * 
+     * @return the creationData value.
+     */
+    public CreationData creationData() {
+        return this.innerProperties() == null ? null : this.innerProperties().creationData();
+    }
+
+    /**
+     * Set the creationData property: CreationData to be used to specify the source resource ID to create this snapshot.
+     * 
+     * @param creationData the creationData value to set.
+     * @return the ManagedClusterSnapshotInner object itself.
+     */
+    public ManagedClusterSnapshotInner withCreationData(CreationData creationData) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterSnapshotProperties();
+        }
+        this.innerProperties().withCreationData(creationData);
+        return this;
+    }
+
+    /**
+     * Get the snapshotType property: The type of a snapshot. The default is NodePool.
+     * 
+     * @return the snapshotType value.
+     */
+    public SnapshotType snapshotType() {
+        return this.innerProperties() == null ? null : this.innerProperties().snapshotType();
+    }
+
+    /**
+     * Set the snapshotType property: The type of a snapshot. The default is NodePool.
+     * 
+     * @param snapshotType the snapshotType value to set.
+     * @return the ManagedClusterSnapshotInner object itself.
+     */
+    public ManagedClusterSnapshotInner withSnapshotType(SnapshotType snapshotType) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterSnapshotProperties();
+        }
+        this.innerProperties().withSnapshotType(snapshotType);
+        return this;
+    }
+
+    /**
+     * Get the managedClusterPropertiesReadOnly property: What the properties will be showed when getting managed
+     * cluster snapshot. Those properties are read-only.
+     * 
+     * @return the managedClusterPropertiesReadOnly value.
+     */
+    public ManagedClusterPropertiesForSnapshot managedClusterPropertiesReadOnly() {
+        return this.innerProperties() == null ? null : this.innerProperties().managedClusterPropertiesReadOnly();
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (innerProperties() != null) {
+            innerProperties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("location", location());
+        jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.innerProperties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSnapshotInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSnapshotInner if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the ManagedClusterSnapshotInner.
+     */
+    public static ManagedClusterSnapshotInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSnapshotInner deserializedManagedClusterSnapshotInner = new ManagedClusterSnapshotInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotInner.type = reader.getString();
+                } else if ("location".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotInner.withLocation(reader.getString());
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedManagedClusterSnapshotInner.withTags(tags);
+                } else if ("properties".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotInner.innerProperties
+                        = ManagedClusterSnapshotProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSnapshotInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterSnapshotProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterSnapshotProperties.java
new file mode 100644
index 000000000000..d977923de150
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterSnapshotProperties.java
@@ -0,0 +1,150 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.CreationData;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterPropertiesForSnapshot;
+import com.azure.resourcemanager.containerservice.models.SnapshotType;
+import java.io.IOException;
+
+/**
+ * Properties for a managed cluster snapshot.
+ */
+@Fluent
+public final class ManagedClusterSnapshotProperties implements JsonSerializable<ManagedClusterSnapshotProperties> {
+    /*
+     * CreationData to be used to specify the source resource ID to create this snapshot.
+     */
+    private CreationData creationData;
+
+    /*
+     * The type of a snapshot. The default is NodePool.
+     */
+    private SnapshotType snapshotType;
+
+    /*
+     * What the properties will be showed when getting managed cluster snapshot. Those properties are read-only.
+     */
+    private ManagedClusterPropertiesForSnapshot managedClusterPropertiesReadOnly;
+
+    /**
+     * Creates an instance of ManagedClusterSnapshotProperties class.
+     */
+    public ManagedClusterSnapshotProperties() {
+    }
+
+    /**
+     * Get the creationData property: CreationData to be used to specify the source resource ID to create this snapshot.
+     * 
+     * @return the creationData value.
+     */
+    public CreationData creationData() {
+        return this.creationData;
+    }
+
+    /**
+     * Set the creationData property: CreationData to be used to specify the source resource ID to create this snapshot.
+     * 
+     * @param creationData the creationData value to set.
+     * @return the ManagedClusterSnapshotProperties object itself.
+     */
+    public ManagedClusterSnapshotProperties withCreationData(CreationData creationData) {
+        this.creationData = creationData;
+        return this;
+    }
+
+    /**
+     * Get the snapshotType property: The type of a snapshot. The default is NodePool.
+     * 
+     * @return the snapshotType value.
+     */
+    public SnapshotType snapshotType() {
+        return this.snapshotType;
+    }
+
+    /**
+     * Set the snapshotType property: The type of a snapshot. The default is NodePool.
+     * 
+     * @param snapshotType the snapshotType value to set.
+     * @return the ManagedClusterSnapshotProperties object itself.
+     */
+    public ManagedClusterSnapshotProperties withSnapshotType(SnapshotType snapshotType) {
+        this.snapshotType = snapshotType;
+        return this;
+    }
+
+    /**
+     * Get the managedClusterPropertiesReadOnly property: What the properties will be showed when getting managed
+     * cluster snapshot. Those properties are read-only.
+     * 
+     * @return the managedClusterPropertiesReadOnly value.
+     */
+    public ManagedClusterPropertiesForSnapshot managedClusterPropertiesReadOnly() {
+        return this.managedClusterPropertiesReadOnly;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (creationData() != null) {
+            creationData().validate();
+        }
+        if (managedClusterPropertiesReadOnly() != null) {
+            managedClusterPropertiesReadOnly().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("creationData", this.creationData);
+        jsonWriter.writeStringField("snapshotType", this.snapshotType == null ? null : this.snapshotType.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSnapshotProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSnapshotProperties if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterSnapshotProperties.
+     */
+    public static ManagedClusterSnapshotProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSnapshotProperties deserializedManagedClusterSnapshotProperties
+                = new ManagedClusterSnapshotProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("creationData".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotProperties.creationData = CreationData.fromJson(reader);
+                } else if ("snapshotType".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotProperties.snapshotType
+                        = SnapshotType.fromString(reader.getString());
+                } else if ("managedClusterPropertiesReadOnly".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotProperties.managedClusterPropertiesReadOnly
+                        = ManagedClusterPropertiesForSnapshot.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSnapshotProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedNamespaceInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedNamespaceInner.java
new file mode 100644
index 000000000000..86f4f3c9e671
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedNamespaceInner.java
@@ -0,0 +1,237 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.SubResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.NamespaceProperties;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Namespace managed by ARM.
+ */
+@Fluent
+public final class ManagedNamespaceInner extends SubResource {
+    /*
+     * The system metadata relating to this resource.
+     */
+    private SystemData systemData;
+
+    /*
+     * The tags to be persisted on the managed cluster namespace.
+     */
+    private Map<String, String> tags;
+
+    /*
+     * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
+     * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
+     * optimistic concurrency per the normal eTag convention.
+     */
+    private String etag;
+
+    /*
+     * The location of the namespace.
+     */
+    private String location;
+
+    /*
+     * Properties of a namespace.
+     */
+    private NamespaceProperties properties;
+
+    /*
+     * The name of the resource that is unique within a resource group. This name can be used to access the resource.
+     */
+    private String name;
+
+    /*
+     * Resource type
+     */
+    private String type;
+
+    /**
+     * Creates an instance of ManagedNamespaceInner class.
+     */
+    public ManagedNamespaceInner() {
+    }
+
+    /**
+     * Get the systemData property: The system metadata relating to this resource.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the tags property: The tags to be persisted on the managed cluster namespace.
+     * 
+     * @return the tags value.
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: The tags to be persisted on the managed cluster namespace.
+     * 
+     * @param tags the tags value to set.
+     * @return the ManagedNamespaceInner object itself.
+     */
+    public ManagedNamespaceInner withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
+     * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
+     * 
+     * @return the etag value.
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the location property: The location of the namespace.
+     * 
+     * @return the location value.
+     */
+    public String location() {
+        return this.location;
+    }
+
+    /**
+     * Set the location property: The location of the namespace.
+     * 
+     * @param location the location value to set.
+     * @return the ManagedNamespaceInner object itself.
+     */
+    public ManagedNamespaceInner withLocation(String location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Get the properties property: Properties of a namespace.
+     * 
+     * @return the properties value.
+     */
+    public NamespaceProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: Properties of a namespace.
+     * 
+     * @param properties the properties value to set.
+     * @return the ManagedNamespaceInner object itself.
+     */
+    public ManagedNamespaceInner withProperties(NamespaceProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the name property: The name of the resource that is unique within a resource group. This name can be used to
+     * access the resource.
+     * 
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the type property: Resource type.
+     * 
+     * @return the type value.
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedNamespaceInner withId(String id) {
+        super.withId(id);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (properties() != null) {
+            properties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("id", id());
+        jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeStringField("location", this.location);
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedNamespaceInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedNamespaceInner if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedNamespaceInner.
+     */
+    public static ManagedNamespaceInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedNamespaceInner deserializedManagedNamespaceInner = new ManagedNamespaceInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.withId(reader.getString());
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.systemData = SystemData.fromJson(reader);
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedManagedNamespaceInner.tags = tags;
+                } else if ("eTag".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.etag = reader.getString();
+                } else if ("location".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.location = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.properties = NamespaceProperties.fromJson(reader);
+                } else if ("name".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedManagedNamespaceInner.type = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedNamespaceInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MeshMembershipInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MeshMembershipInner.java
new file mode 100644
index 000000000000..051c41567de4
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/MeshMembershipInner.java
@@ -0,0 +1,220 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.MeshMembershipProperties;
+import java.io.IOException;
+
+/**
+ * Mesh membership of a managed cluster.
+ */
+@Fluent
+public final class MeshMembershipInner extends ProxyResource {
+    /*
+     * The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed
+     * by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is
+     * removed from the template since it is managed by another resource.
+     */
+    private String managedBy;
+
+    /*
+     * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
+     * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
+     * optimistic concurrency per the normal eTag convention.
+     */
+    private String etag;
+
+    /*
+     * Mesh membership properties of a managed cluster.
+     */
+    private MeshMembershipProperties properties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of MeshMembershipInner class.
+     */
+    public MeshMembershipInner() {
+    }
+
+    /**
+     * Get the managedBy property: The fully qualified resource ID of the resource that manages this resource. Indicates
+     * if this resource is managed by another Azure resource. If this is present, complete mode deployment will not
+     * delete the resource if it is removed from the template since it is managed by another resource.
+     * 
+     * @return the managedBy value.
+     */
+    public String managedBy() {
+        return this.managedBy;
+    }
+
+    /**
+     * Set the managedBy property: The fully qualified resource ID of the resource that manages this resource. Indicates
+     * if this resource is managed by another Azure resource. If this is present, complete mode deployment will not
+     * delete the resource if it is removed from the template since it is managed by another resource.
+     * 
+     * @param managedBy the managedBy value to set.
+     * @return the MeshMembershipInner object itself.
+     */
+    public MeshMembershipInner withManagedBy(String managedBy) {
+        this.managedBy = managedBy;
+        return this;
+    }
+
+    /**
+     * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
+     * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
+     * 
+     * @return the etag value.
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the properties property: Mesh membership properties of a managed cluster.
+     * 
+     * @return the properties value.
+     */
+    public MeshMembershipProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: Mesh membership properties of a managed cluster.
+     * 
+     * @param properties the properties value to set.
+     * @return the MeshMembershipInner object itself.
+     */
+    public MeshMembershipInner withProperties(MeshMembershipProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (properties() != null) {
+            properties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("managedBy", this.managedBy);
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MeshMembershipInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MeshMembershipInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the MeshMembershipInner.
+     */
+    public static MeshMembershipInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MeshMembershipInner deserializedMeshMembershipInner = new MeshMembershipInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedMeshMembershipInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedMeshMembershipInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedMeshMembershipInner.type = reader.getString();
+                } else if ("managedBy".equals(fieldName)) {
+                    deserializedMeshMembershipInner.managedBy = reader.getString();
+                } else if ("eTag".equals(fieldName)) {
+                    deserializedMeshMembershipInner.etag = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedMeshMembershipInner.properties = MeshMembershipProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedMeshMembershipInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMeshMembershipInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/NodeImageVersionInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/NodeImageVersionInner.java
new file mode 100644
index 000000000000..2b958e625f33
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/NodeImageVersionInner.java
@@ -0,0 +1,179 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * node image version profile for given major.minor.patch release.
+ */
+@Fluent
+public final class NodeImageVersionInner implements JsonSerializable<NodeImageVersionInner> {
+    /*
+     * The operating system of the node image. Example: AKSUbuntu
+     */
+    private String os;
+
+    /*
+     * The SKU or flavor of the node image. Example: 2004gen2containerd
+     */
+    private String sku;
+
+    /*
+     * major.minor.patch version of the node image version release. Example: 2024.02.02
+     */
+    private String version;
+
+    /*
+     * The OS + SKU + version of the node image. Example: AKSUbuntu-1804gen2containerd-2024.02.02
+     */
+    private String fullName;
+
+    /**
+     * Creates an instance of NodeImageVersionInner class.
+     */
+    public NodeImageVersionInner() {
+    }
+
+    /**
+     * Get the os property: The operating system of the node image. Example: AKSUbuntu.
+     * 
+     * @return the os value.
+     */
+    public String os() {
+        return this.os;
+    }
+
+    /**
+     * Set the os property: The operating system of the node image. Example: AKSUbuntu.
+     * 
+     * @param os the os value to set.
+     * @return the NodeImageVersionInner object itself.
+     */
+    public NodeImageVersionInner withOs(String os) {
+        this.os = os;
+        return this;
+    }
+
+    /**
+     * Get the sku property: The SKU or flavor of the node image. Example: 2004gen2containerd.
+     * 
+     * @return the sku value.
+     */
+    public String sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the sku property: The SKU or flavor of the node image. Example: 2004gen2containerd.
+     * 
+     * @param sku the sku value to set.
+     * @return the NodeImageVersionInner object itself.
+     */
+    public NodeImageVersionInner withSku(String sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the version property: major.minor.patch version of the node image version release. Example: 2024.02.02.
+     * 
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: major.minor.patch version of the node image version release. Example: 2024.02.02.
+     * 
+     * @param version the version value to set.
+     * @return the NodeImageVersionInner object itself.
+     */
+    public NodeImageVersionInner withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the fullName property: The OS + SKU + version of the node image. Example:
+     * AKSUbuntu-1804gen2containerd-2024.02.02.
+     * 
+     * @return the fullName value.
+     */
+    public String fullName() {
+        return this.fullName;
+    }
+
+    /**
+     * Set the fullName property: The OS + SKU + version of the node image. Example:
+     * AKSUbuntu-1804gen2containerd-2024.02.02.
+     * 
+     * @param fullName the fullName value to set.
+     * @return the NodeImageVersionInner object itself.
+     */
+    public NodeImageVersionInner withFullName(String fullName) {
+        this.fullName = fullName;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("os", this.os);
+        jsonWriter.writeStringField("sku", this.sku);
+        jsonWriter.writeStringField("version", this.version);
+        jsonWriter.writeStringField("fullName", this.fullName);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NodeImageVersionInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NodeImageVersionInner if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NodeImageVersionInner.
+     */
+    public static NodeImageVersionInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NodeImageVersionInner deserializedNodeImageVersionInner = new NodeImageVersionInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("os".equals(fieldName)) {
+                    deserializedNodeImageVersionInner.os = reader.getString();
+                } else if ("sku".equals(fieldName)) {
+                    deserializedNodeImageVersionInner.sku = reader.getString();
+                } else if ("version".equals(fieldName)) {
+                    deserializedNodeImageVersionInner.version = reader.getString();
+                } else if ("fullName".equals(fieldName)) {
+                    deserializedNodeImageVersionInner.fullName = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNodeImageVersionInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/OperationStatusResultInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/OperationStatusResultInner.java
new file mode 100644
index 000000000000..60efc41645de
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/OperationStatusResultInner.java
@@ -0,0 +1,329 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.exception.ManagementError;
+import com.azure.core.util.CoreUtils;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * The current status of an async operation.
+ */
+@Fluent
+public final class OperationStatusResultInner implements JsonSerializable<OperationStatusResultInner> {
+    /*
+     * Fully qualified ID for the async operation.
+     */
+    private String id;
+
+    /*
+     * Fully qualified ID of the resource against which the original async operation was started.
+     */
+    private String resourceId;
+
+    /*
+     * Name of the async operation.
+     */
+    private String name;
+
+    /*
+     * Operation status.
+     */
+    private String status;
+
+    /*
+     * Percent of the operation that is complete.
+     */
+    private Float percentComplete;
+
+    /*
+     * The start time of the operation.
+     */
+    private OffsetDateTime startTime;
+
+    /*
+     * The end time of the operation.
+     */
+    private OffsetDateTime endTime;
+
+    /*
+     * The operations list.
+     */
+    private List<OperationStatusResultInner> operations;
+
+    /*
+     * If present, details of the operation error.
+     */
+    private ManagementError error;
+
+    /**
+     * Creates an instance of OperationStatusResultInner class.
+     */
+    public OperationStatusResultInner() {
+    }
+
+    /**
+     * Get the id property: Fully qualified ID for the async operation.
+     * 
+     * @return the id value.
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the id property: Fully qualified ID for the async operation.
+     * 
+     * @param id the id value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get the resourceId property: Fully qualified ID of the resource against which the original async operation was
+     * started.
+     * 
+     * @return the resourceId value.
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Get the name property: Name of the async operation.
+     * 
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name property: Name of the async operation.
+     * 
+     * @param name the name value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the status property: Operation status.
+     * 
+     * @return the status value.
+     */
+    public String status() {
+        return this.status;
+    }
+
+    /**
+     * Set the status property: Operation status.
+     * 
+     * @param status the status value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withStatus(String status) {
+        this.status = status;
+        return this;
+    }
+
+    /**
+     * Get the percentComplete property: Percent of the operation that is complete.
+     * 
+     * @return the percentComplete value.
+     */
+    public Float percentComplete() {
+        return this.percentComplete;
+    }
+
+    /**
+     * Set the percentComplete property: Percent of the operation that is complete.
+     * 
+     * @param percentComplete the percentComplete value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withPercentComplete(Float percentComplete) {
+        this.percentComplete = percentComplete;
+        return this;
+    }
+
+    /**
+     * Get the startTime property: The start time of the operation.
+     * 
+     * @return the startTime value.
+     */
+    public OffsetDateTime startTime() {
+        return this.startTime;
+    }
+
+    /**
+     * Set the startTime property: The start time of the operation.
+     * 
+     * @param startTime the startTime value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withStartTime(OffsetDateTime startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    /**
+     * Get the endTime property: The end time of the operation.
+     * 
+     * @return the endTime value.
+     */
+    public OffsetDateTime endTime() {
+        return this.endTime;
+    }
+
+    /**
+     * Set the endTime property: The end time of the operation.
+     * 
+     * @param endTime the endTime value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withEndTime(OffsetDateTime endTime) {
+        this.endTime = endTime;
+        return this;
+    }
+
+    /**
+     * Get the operations property: The operations list.
+     * 
+     * @return the operations value.
+     */
+    public List<OperationStatusResultInner> operations() {
+        return this.operations;
+    }
+
+    /**
+     * Set the operations property: The operations list.
+     * 
+     * @param operations the operations value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withOperations(List<OperationStatusResultInner> operations) {
+        this.operations = operations;
+        return this;
+    }
+
+    /**
+     * Get the error property: If present, details of the operation error.
+     * 
+     * @return the error value.
+     */
+    public ManagementError error() {
+        return this.error;
+    }
+
+    /**
+     * Set the error property: If present, details of the operation error.
+     * 
+     * @param error the error value to set.
+     * @return the OperationStatusResultInner object itself.
+     */
+    public OperationStatusResultInner withError(ManagementError error) {
+        this.error = error;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (status() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property status in model OperationStatusResultInner"));
+        }
+        if (operations() != null) {
+            operations().forEach(e -> e.validate());
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(OperationStatusResultInner.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("status", this.status);
+        jsonWriter.writeStringField("id", this.id);
+        jsonWriter.writeStringField("name", this.name);
+        jsonWriter.writeNumberField("percentComplete", this.percentComplete);
+        jsonWriter.writeStringField("startTime",
+            this.startTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.startTime));
+        jsonWriter.writeStringField("endTime",
+            this.endTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.endTime));
+        jsonWriter.writeArrayField("operations", this.operations, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeJsonField("error", this.error);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of OperationStatusResultInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of OperationStatusResultInner if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the OperationStatusResultInner.
+     */
+    public static OperationStatusResultInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            OperationStatusResultInner deserializedOperationStatusResultInner = new OperationStatusResultInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("status".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.status = reader.getString();
+                } else if ("id".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.id = reader.getString();
+                } else if ("resourceId".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.resourceId = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.name = reader.getString();
+                } else if ("percentComplete".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.percentComplete = reader.getNullable(JsonReader::getFloat);
+                } else if ("startTime".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.startTime = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("endTime".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.endTime = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("operations".equals(fieldName)) {
+                    List<OperationStatusResultInner> operations
+                        = reader.readArray(reader1 -> OperationStatusResultInner.fromJson(reader1));
+                    deserializedOperationStatusResultInner.operations = operations;
+                } else if ("error".equals(fieldName)) {
+                    deserializedOperationStatusResultInner.error = ManagementError.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedOperationStatusResultInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SafeguardsAvailableVersionInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SafeguardsAvailableVersionInner.java
new file mode 100644
index 000000000000..a2de612e5b19
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SafeguardsAvailableVersionInner.java
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.models.SafeguardsAvailableVersionsProperties;
+import java.io.IOException;
+
+/**
+ * Available Safeguards Version.
+ */
+@Fluent
+public final class SafeguardsAvailableVersionInner extends ProxyResource {
+    /*
+     * Whether the version is default or not and support info.
+     */
+    private SafeguardsAvailableVersionsProperties properties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of SafeguardsAvailableVersionInner class.
+     */
+    public SafeguardsAvailableVersionInner() {
+    }
+
+    /**
+     * Get the properties property: Whether the version is default or not and support info.
+     * 
+     * @return the properties value.
+     */
+    public SafeguardsAvailableVersionsProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: Whether the version is default or not and support info.
+     * 
+     * @param properties the properties value to set.
+     * @return the SafeguardsAvailableVersionInner object itself.
+     */
+    public SafeguardsAvailableVersionInner withProperties(SafeguardsAvailableVersionsProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (properties() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property properties in model SafeguardsAvailableVersionInner"));
+        } else {
+            properties().validate();
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(SafeguardsAvailableVersionInner.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of SafeguardsAvailableVersionInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of SafeguardsAvailableVersionInner if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the SafeguardsAvailableVersionInner.
+     */
+    public static SafeguardsAvailableVersionInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            SafeguardsAvailableVersionInner deserializedSafeguardsAvailableVersionInner
+                = new SafeguardsAvailableVersionInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionInner.properties
+                        = SafeguardsAvailableVersionsProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedSafeguardsAvailableVersionInner;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotInner.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotInner.java
index 70b300a40509..da39cf8be25d 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotInner.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotInner.java
@@ -195,9 +195,9 @@ public OSType osType() {
     }
 
     /**
-     * Get the osSku property: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux.
-     * The default is Windows2019 when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is
-     * Windows.
+     * Get the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
      * 
      * @return the osSku value.
      */
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotProperties.java
index dc9593d1697f..ebeef6c8b15a 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/SnapshotProperties.java
@@ -46,8 +46,9 @@ public final class SnapshotProperties implements JsonSerializable<SnapshotProper
     private OSType osType;
 
     /*
-     * Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux. The default is Windows2019
-     * when Kubernetes <= 1.24 or Windows2022 when Kubernetes >= 1.25 if OSType is Windows.
+     * Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if OSType=Linux or
+     * Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after Windows2019 is
+     * deprecated.
      */
     private OSSku osSku;
 
@@ -137,9 +138,9 @@ public OSType osType() {
     }
 
     /**
-     * Get the osSku property: Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux.
-     * The default is Windows2019 when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is
-     * Windows.
+     * Get the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
      * 
      * @return the osSku value.
      */
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java
index 0d0c0de36d6a..e693e2ed7402 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java
@@ -132,6 +132,15 @@ Mono<Response<AgentPoolUpgradeProfileInner>> getUpgradeProfile(@HostParam("$host
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
             @PathParam("agentPoolName") String agentPoolName, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/completeUpgrade")
+        @ExpectedResponses({ 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> completeUpgrade(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("agentPoolName") String agentPoolName, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/deleteMachines")
         @ExpectedResponses({ 202 })
@@ -175,7 +184,7 @@ Mono<Response<AgentPoolListResult>> listNext(@PathParam(value = "nextLink", enco
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -206,7 +215,7 @@ public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(St
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.abortLatestOperation(this.client.getEndpoint(), apiVersion,
@@ -219,7 +228,7 @@ public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(St
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -251,7 +260,7 @@ private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(S
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.abortLatestOperation(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -263,7 +272,7 @@ private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(S
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -287,7 +296,7 @@ public PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -313,7 +322,7 @@ private PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -334,7 +343,7 @@ public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resou
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -357,7 +366,7 @@ public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resou
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -378,7 +387,7 @@ public Mono<Void> abortLatestOperationAsync(String resourceGroupName, String res
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -401,7 +410,7 @@ private Mono<Void> abortLatestOperationAsync(String resourceGroupName, String re
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -420,7 +429,7 @@ public void abortLatestOperation(String resourceGroupName, String resourceName,
      * 
      * Aborts the currently running operation on the agent pool. The Agent Pool will be moved to a Canceling state and
      * eventually to a Canceled state when cancellation finishes. If the operation completes before cancellation can
-     * take place, a 409 error code is returned.
+     * take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -464,7 +473,7 @@ private Mono<PagedResponse<AgentPoolInner>> listSinglePageAsync(String resourceG
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -504,7 +513,7 @@ private Mono<PagedResponse<AgentPoolInner>> listSinglePageAsync(String resourceG
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -611,7 +620,7 @@ public Mono<Response<AgentPoolInner>> getWithResponseAsync(String resourceGroupN
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -653,7 +662,7 @@ private Mono<Response<AgentPoolInner>> getWithResponseAsync(String resourceGroup
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -751,7 +760,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -802,7 +811,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1070,7 +1079,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -1115,7 +1124,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -1371,7 +1380,7 @@ public Mono<Response<AgentPoolUpgradeProfileInner>> getUpgradeProfileWithRespons
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getUpgradeProfile(this.client.getEndpoint(), apiVersion,
@@ -1413,7 +1422,7 @@ private Mono<Response<AgentPoolUpgradeProfileInner>> getUpgradeProfileWithRespon
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getUpgradeProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1473,6 +1482,250 @@ public AgentPoolUpgradeProfileInner getUpgradeProfile(String resourceGroupName,
         return getUpgradeProfileWithResponse(resourceGroupName, resourceName, agentPoolName, Context.NONE).getValue();
     }
 
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> completeUpgradeWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (agentPoolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.completeUpgrade(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, agentPoolName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> completeUpgradeWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (agentPoolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.completeUpgrade(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, agentPoolName, accept, context);
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginCompleteUpgradeAsync(String resourceGroupName, String resourceName,
+        String agentPoolName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = completeUpgradeWithResponseAsync(resourceGroupName, resourceName, agentPoolName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginCompleteUpgradeAsync(String resourceGroupName, String resourceName,
+        String agentPoolName, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = completeUpgradeWithResponseAsync(resourceGroupName, resourceName, agentPoolName, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginCompleteUpgrade(String resourceGroupName, String resourceName,
+        String agentPoolName) {
+        return this.beginCompleteUpgradeAsync(resourceGroupName, resourceName, agentPoolName).getSyncPoller();
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginCompleteUpgrade(String resourceGroupName, String resourceName,
+        String agentPoolName, Context context) {
+        return this.beginCompleteUpgradeAsync(resourceGroupName, resourceName, agentPoolName, context).getSyncPoller();
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> completeUpgradeAsync(String resourceGroupName, String resourceName, String agentPoolName) {
+        return beginCompleteUpgradeAsync(resourceGroupName, resourceName, agentPoolName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> completeUpgradeAsync(String resourceGroupName, String resourceName, String agentPoolName,
+        Context context) {
+        return beginCompleteUpgradeAsync(resourceGroupName, resourceName, agentPoolName, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void completeUpgrade(String resourceGroupName, String resourceName, String agentPoolName) {
+        completeUpgradeAsync(resourceGroupName, resourceName, agentPoolName).block();
+    }
+
+    /**
+     * Completes the upgrade of an agent pool.
+     * 
+     * Completes the upgrade operation for the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void completeUpgrade(String resourceGroupName, String resourceName, String agentPoolName, Context context) {
+        completeUpgradeAsync(resourceGroupName, resourceName, agentPoolName, context).block();
+    }
+
     /**
      * Deletes specific machines in an agent pool.
      * 
@@ -1511,7 +1764,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteMachinesWithResponseAsync(String r
         } else {
             machines.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.deleteMachines(this.client.getEndpoint(), apiVersion,
             this.client.getSubscriptionId(), resourceGroupName, resourceName, agentPoolName, machines, accept, context))
@@ -1557,7 +1810,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteMachinesWithResponseAsync(String
         } else {
             machines.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.deleteMachines(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1752,7 +2005,7 @@ public void deleteMachines(String resourceGroupName, String resourceName, String
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getAvailableAgentPoolVersions(this.client.getEndpoint(), apiVersion,
@@ -1793,7 +2046,7 @@ public void deleteMachines(String resourceGroupName, String resourceName, String
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getAvailableAgentPoolVersions(this.client.getEndpoint(), apiVersion,
@@ -1895,7 +2148,7 @@ public Mono<Response<Flux<ByteBuffer>>> upgradeNodeImageVersionWithResponseAsync
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.upgradeNodeImageVersion(this.client.getEndpoint(), apiVersion,
@@ -1940,7 +2193,7 @@ private Mono<Response<Flux<ByteBuffer>>> upgradeNodeImageVersionWithResponseAsyn
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.upgradeNodeImageVersion(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceManagementClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceManagementClientImpl.java
index db7ad4492be9..98cc29cbc0e8 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceManagementClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceManagementClientImpl.java
@@ -10,11 +10,19 @@
 import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.resourcemanager.containerservice.fluent.AgentPoolsClient;
 import com.azure.resourcemanager.containerservice.fluent.ContainerServiceManagementClient;
+import com.azure.resourcemanager.containerservice.fluent.ContainerServiceOperationsClient;
 import com.azure.resourcemanager.containerservice.fluent.ContainerServicesClient;
+import com.azure.resourcemanager.containerservice.fluent.IdentityBindingsClient;
+import com.azure.resourcemanager.containerservice.fluent.JwtAuthenticatorsClient;
+import com.azure.resourcemanager.containerservice.fluent.LoadBalancersClient;
 import com.azure.resourcemanager.containerservice.fluent.MachinesClient;
 import com.azure.resourcemanager.containerservice.fluent.MaintenanceConfigurationsClient;
+import com.azure.resourcemanager.containerservice.fluent.ManagedClusterSnapshotsClient;
 import com.azure.resourcemanager.containerservice.fluent.ManagedClustersClient;
+import com.azure.resourcemanager.containerservice.fluent.ManagedNamespacesClient;
+import com.azure.resourcemanager.containerservice.fluent.MeshMembershipsClient;
 import com.azure.resourcemanager.containerservice.fluent.OpenShiftManagedClustersClient;
+import com.azure.resourcemanager.containerservice.fluent.OperationStatusResultsClient;
 import com.azure.resourcemanager.containerservice.fluent.OperationsClient;
 import com.azure.resourcemanager.containerservice.fluent.PrivateEndpointConnectionsClient;
 import com.azure.resourcemanager.containerservice.fluent.PrivateLinkResourcesClient;
@@ -159,6 +167,20 @@ public ManagedClustersClient getManagedClusters() {
         return this.managedClusters;
     }
 
+    /**
+     * The ContainerServiceOperationsClient object to access its operations.
+     */
+    private final ContainerServiceOperationsClient containerServiceOperations;
+
+    /**
+     * Gets the ContainerServiceOperationsClient object to access its operations.
+     * 
+     * @return the ContainerServiceOperationsClient object.
+     */
+    public ContainerServiceOperationsClient getContainerServiceOperations() {
+        return this.containerServiceOperations;
+    }
+
     /**
      * The MaintenanceConfigurationsClient object to access its operations.
      */
@@ -173,6 +195,20 @@ public MaintenanceConfigurationsClient getMaintenanceConfigurations() {
         return this.maintenanceConfigurations;
     }
 
+    /**
+     * The ManagedNamespacesClient object to access its operations.
+     */
+    private final ManagedNamespacesClient managedNamespaces;
+
+    /**
+     * Gets the ManagedNamespacesClient object to access its operations.
+     * 
+     * @return the ManagedNamespacesClient object.
+     */
+    public ManagedNamespacesClient getManagedNamespaces() {
+        return this.managedNamespaces;
+    }
+
     /**
      * The AgentPoolsClient object to access its operations.
      */
@@ -187,6 +223,20 @@ public AgentPoolsClient getAgentPools() {
         return this.agentPools;
     }
 
+    /**
+     * The MachinesClient object to access its operations.
+     */
+    private final MachinesClient machines;
+
+    /**
+     * Gets the MachinesClient object to access its operations.
+     * 
+     * @return the MachinesClient object.
+     */
+    public MachinesClient getMachines() {
+        return this.machines;
+    }
+
     /**
      * The PrivateEndpointConnectionsClient object to access its operations.
      */
@@ -229,6 +279,20 @@ public ResolvePrivateLinkServiceIdsClient getResolvePrivateLinkServiceIds() {
         return this.resolvePrivateLinkServiceIds;
     }
 
+    /**
+     * The OperationStatusResultsClient object to access its operations.
+     */
+    private final OperationStatusResultsClient operationStatusResults;
+
+    /**
+     * Gets the OperationStatusResultsClient object to access its operations.
+     * 
+     * @return the OperationStatusResultsClient object.
+     */
+    public OperationStatusResultsClient getOperationStatusResults() {
+        return this.operationStatusResults;
+    }
+
     /**
      * The SnapshotsClient object to access its operations.
      */
@@ -244,17 +308,17 @@ public SnapshotsClient getSnapshots() {
     }
 
     /**
-     * The TrustedAccessRoleBindingsClient object to access its operations.
+     * The ManagedClusterSnapshotsClient object to access its operations.
      */
-    private final TrustedAccessRoleBindingsClient trustedAccessRoleBindings;
+    private final ManagedClusterSnapshotsClient managedClusterSnapshots;
 
     /**
-     * Gets the TrustedAccessRoleBindingsClient object to access its operations.
+     * Gets the ManagedClusterSnapshotsClient object to access its operations.
      * 
-     * @return the TrustedAccessRoleBindingsClient object.
+     * @return the ManagedClusterSnapshotsClient object.
      */
-    public TrustedAccessRoleBindingsClient getTrustedAccessRoleBindings() {
-        return this.trustedAccessRoleBindings;
+    public ManagedClusterSnapshotsClient getManagedClusterSnapshots() {
+        return this.managedClusterSnapshots;
     }
 
     /**
@@ -272,17 +336,73 @@ public TrustedAccessRolesClient getTrustedAccessRoles() {
     }
 
     /**
-     * The MachinesClient object to access its operations.
+     * The TrustedAccessRoleBindingsClient object to access its operations.
      */
-    private final MachinesClient machines;
+    private final TrustedAccessRoleBindingsClient trustedAccessRoleBindings;
 
     /**
-     * Gets the MachinesClient object to access its operations.
+     * Gets the TrustedAccessRoleBindingsClient object to access its operations.
      * 
-     * @return the MachinesClient object.
+     * @return the TrustedAccessRoleBindingsClient object.
      */
-    public MachinesClient getMachines() {
-        return this.machines;
+    public TrustedAccessRoleBindingsClient getTrustedAccessRoleBindings() {
+        return this.trustedAccessRoleBindings;
+    }
+
+    /**
+     * The LoadBalancersClient object to access its operations.
+     */
+    private final LoadBalancersClient loadBalancers;
+
+    /**
+     * Gets the LoadBalancersClient object to access its operations.
+     * 
+     * @return the LoadBalancersClient object.
+     */
+    public LoadBalancersClient getLoadBalancers() {
+        return this.loadBalancers;
+    }
+
+    /**
+     * The IdentityBindingsClient object to access its operations.
+     */
+    private final IdentityBindingsClient identityBindings;
+
+    /**
+     * Gets the IdentityBindingsClient object to access its operations.
+     * 
+     * @return the IdentityBindingsClient object.
+     */
+    public IdentityBindingsClient getIdentityBindings() {
+        return this.identityBindings;
+    }
+
+    /**
+     * The JwtAuthenticatorsClient object to access its operations.
+     */
+    private final JwtAuthenticatorsClient jwtAuthenticators;
+
+    /**
+     * Gets the JwtAuthenticatorsClient object to access its operations.
+     * 
+     * @return the JwtAuthenticatorsClient object.
+     */
+    public JwtAuthenticatorsClient getJwtAuthenticators() {
+        return this.jwtAuthenticators;
+    }
+
+    /**
+     * The MeshMembershipsClient object to access its operations.
+     */
+    private final MeshMembershipsClient meshMemberships;
+
+    /**
+     * Gets the MeshMembershipsClient object to access its operations.
+     * 
+     * @return the MeshMembershipsClient object.
+     */
+    public MeshMembershipsClient getMeshMemberships() {
+        return this.meshMemberships;
     }
 
     /**
@@ -308,14 +428,22 @@ public MachinesClient getMachines() {
         this.containerServices = new ContainerServicesClientImpl(this);
         this.operations = new OperationsClientImpl(this);
         this.managedClusters = new ManagedClustersClientImpl(this);
+        this.containerServiceOperations = new ContainerServiceOperationsClientImpl(this);
         this.maintenanceConfigurations = new MaintenanceConfigurationsClientImpl(this);
+        this.managedNamespaces = new ManagedNamespacesClientImpl(this);
         this.agentPools = new AgentPoolsClientImpl(this);
+        this.machines = new MachinesClientImpl(this);
         this.privateEndpointConnections = new PrivateEndpointConnectionsClientImpl(this);
         this.privateLinkResources = new PrivateLinkResourcesClientImpl(this);
         this.resolvePrivateLinkServiceIds = new ResolvePrivateLinkServiceIdsClientImpl(this);
+        this.operationStatusResults = new OperationStatusResultsClientImpl(this);
         this.snapshots = new SnapshotsClientImpl(this);
-        this.trustedAccessRoleBindings = new TrustedAccessRoleBindingsClientImpl(this);
+        this.managedClusterSnapshots = new ManagedClusterSnapshotsClientImpl(this);
         this.trustedAccessRoles = new TrustedAccessRolesClientImpl(this);
-        this.machines = new MachinesClientImpl(this);
+        this.trustedAccessRoleBindings = new TrustedAccessRoleBindingsClientImpl(this);
+        this.loadBalancers = new LoadBalancersClientImpl(this);
+        this.identityBindings = new IdentityBindingsClientImpl(this);
+        this.jwtAuthenticators = new JwtAuthenticatorsClientImpl(this);
+        this.meshMemberships = new MeshMembershipsClientImpl(this);
     }
 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceOperationsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceOperationsClientImpl.java
new file mode 100644
index 000000000000..0c0da3b9992a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ContainerServiceOperationsClientImpl.java
@@ -0,0 +1,293 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.resourcemanager.containerservice.fluent.ContainerServiceOperationsClient;
+import com.azure.resourcemanager.containerservice.fluent.models.NodeImageVersionInner;
+import com.azure.resourcemanager.containerservice.models.NodeImageVersionsListResult;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in ContainerServiceOperationsClient.
+ */
+public final class ContainerServiceOperationsClientImpl implements ContainerServiceOperationsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final ContainerServiceOperationsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ContainerServiceOperationsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    ContainerServiceOperationsClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service = RestProxy.create(ContainerServiceOperationsService.class, client.getHttpPipeline(),
+            client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientContainerServiceOperations to be used
+     * by the proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientContainerServiceOperations")
+    public interface ContainerServiceOperationsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/nodeImageVersions")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NodeImageVersionsListResult>> listNodeImageVersions(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NodeImageVersionsListResult>> listNodeImageVersionsNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NodeImageVersionInner>> listNodeImageVersionsSinglePageAsync(String location) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listNodeImageVersions(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), location, accept, context))
+            .<PagedResponse<NodeImageVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NodeImageVersionInner>> listNodeImageVersionsSinglePageAsync(String location,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listNodeImageVersions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), location,
+                accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<NodeImageVersionInner> listNodeImageVersionsAsync(String location) {
+        return new PagedFlux<>(() -> listNodeImageVersionsSinglePageAsync(location),
+            nextLink -> listNodeImageVersionsNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<NodeImageVersionInner> listNodeImageVersionsAsync(String location, Context context) {
+        return new PagedFlux<>(() -> listNodeImageVersionsSinglePageAsync(location, context),
+            nextLink -> listNodeImageVersionsNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NodeImageVersionInner> listNodeImageVersions(String location) {
+        return new PagedIterable<>(listNodeImageVersionsAsync(location));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Only returns the latest version of each node image. For example there may be an
+     * AKSUbuntu-1804gen2containerd-2024.01.26, but only AKSUbuntu-1804gen2containerd-2024.02.02 is visible in this
+     * list.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NodeImageVersionInner> listNodeImageVersions(String location, Context context) {
+        return new PagedIterable<>(listNodeImageVersionsAsync(location, context));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NodeImageVersionInner>> listNodeImageVersionsNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listNodeImageVersionsNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<NodeImageVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of supported NodeImage versions in the specified subscription.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array NodeImageVersions along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NodeImageVersionInner>> listNodeImageVersionsNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listNodeImageVersionsNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/IdentityBindingsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/IdentityBindingsClientImpl.java
new file mode 100644
index 000000000000..343b8cd55b2c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/IdentityBindingsClientImpl.java
@@ -0,0 +1,947 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.IdentityBindingsClient;
+import com.azure.resourcemanager.containerservice.fluent.models.IdentityBindingInner;
+import com.azure.resourcemanager.containerservice.models.IdentityBindingListResult;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in IdentityBindingsClient.
+ */
+public final class IdentityBindingsClientImpl implements IdentityBindingsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final IdentityBindingsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of IdentityBindingsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    IdentityBindingsClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service
+            = RestProxy.create(IdentityBindingsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientIdentityBindings to be used by the
+     * proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientIdentityBindings")
+    public interface IdentityBindingsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/identityBindings")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<IdentityBindingListResult>> listByManagedCluster(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/identityBindings/{identityBindingName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<IdentityBindingInner>> get(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("identityBindingName") String identityBindingName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/identityBindings/{identityBindingName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("identityBindingName") String identityBindingName,
+            @BodyParam("application/json") IdentityBindingInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/identityBindings/{identityBindingName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("identityBindingName") String identityBindingName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<IdentityBindingListResult>> listByManagedClusterNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<IdentityBindingInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByManagedCluster(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<IdentityBindingInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<IdentityBindingInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listByManagedCluster(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<IdentityBindingInner> listByManagedClusterAsync(String resourceGroupName, String resourceName) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<IdentityBindingInner> listByManagedClusterAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<IdentityBindingInner> listByManagedCluster(String resourceGroupName, String resourceName) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<IdentityBindingInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<IdentityBindingInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (identityBindingName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter identityBindingName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, identityBindingName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<IdentityBindingInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (identityBindingName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter identityBindingName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, identityBindingName, accept, context);
+    }
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<IdentityBindingInner> getAsync(String resourceGroupName, String resourceName,
+        String identityBindingName) {
+        return getWithResponseAsync(resourceGroupName, resourceName, identityBindingName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<IdentityBindingInner> getWithResponse(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context) {
+        return getWithResponseAsync(resourceGroupName, resourceName, identityBindingName, context).block();
+    }
+
+    /**
+     * Gets the specified Identity Binding.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified Identity Binding.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public IdentityBindingInner get(String resourceGroupName, String resourceName, String identityBindingName) {
+        return getWithResponse(resourceGroupName, resourceName, identityBindingName, Context.NONE).getValue();
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String identityBindingName, IdentityBindingInner parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (identityBindingName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter identityBindingName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, identityBindingName, parameters,
+                accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String identityBindingName, IdentityBindingInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (identityBindingName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter identityBindingName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, identityBindingName, parameters, accept, context);
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String identityBindingName, IdentityBindingInner parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, resourceName, identityBindingName, parameters);
+        return this.client.<IdentityBindingInner, IdentityBindingInner>getLroResult(mono, this.client.getHttpPipeline(),
+            IdentityBindingInner.class, IdentityBindingInner.class, this.client.getContext());
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String identityBindingName, IdentityBindingInner parameters,
+        Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, resourceName,
+            identityBindingName, parameters, context);
+        return this.client.<IdentityBindingInner, IdentityBindingInner>getLroResult(mono, this.client.getHttpPipeline(),
+            IdentityBindingInner.class, IdentityBindingInner.class, context);
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String identityBindingName, IdentityBindingInner parameters) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, identityBindingName, parameters)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<IdentityBindingInner>, IdentityBindingInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String identityBindingName, IdentityBindingInner parameters,
+        Context context) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, identityBindingName, parameters, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<IdentityBindingInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, IdentityBindingInner parameters) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, identityBindingName, parameters).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<IdentityBindingInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, IdentityBindingInner parameters, Context context) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, identityBindingName, parameters, context)
+            .last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public IdentityBindingInner createOrUpdate(String resourceGroupName, String resourceName,
+        String identityBindingName, IdentityBindingInner parameters) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, identityBindingName, parameters).block();
+    }
+
+    /**
+     * Creates or updates an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param parameters The identity binding to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the IdentityBinding resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public IdentityBindingInner createOrUpdate(String resourceGroupName, String resourceName,
+        String identityBindingName, IdentityBindingInner parameters, Context context) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, identityBindingName, parameters, context).block();
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (identityBindingName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter identityBindingName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, identityBindingName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (identityBindingName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter identityBindingName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, identityBindingName, accept, context);
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String identityBindingName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, identityBindingName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, identityBindingName, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String identityBindingName) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, identityBindingName).getSyncPoller();
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String identityBindingName, Context context) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, identityBindingName, context).getSyncPoller();
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String identityBindingName) {
+        return beginDeleteAsync(resourceGroupName, resourceName, identityBindingName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String identityBindingName,
+        Context context) {
+        return beginDeleteAsync(resourceGroupName, resourceName, identityBindingName, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String identityBindingName) {
+        deleteAsync(resourceGroupName, resourceName, identityBindingName).block();
+    }
+
+    /**
+     * Deletes an identity binding in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param identityBindingName The name of the identity binding.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String identityBindingName, Context context) {
+        deleteAsync(resourceGroupName, resourceName, identityBindingName, context).block();
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<IdentityBindingInner>> listByManagedClusterNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<IdentityBindingInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of identity bindings in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of identity bindings in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<IdentityBindingInner>> listByManagedClusterNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/JwtAuthenticatorsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/JwtAuthenticatorsClientImpl.java
new file mode 100644
index 000000000000..72fd654b4e2d
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/JwtAuthenticatorsClientImpl.java
@@ -0,0 +1,963 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.JwtAuthenticatorsClient;
+import com.azure.resourcemanager.containerservice.fluent.models.JwtAuthenticatorInner;
+import com.azure.resourcemanager.containerservice.models.JwtAuthenticatorListResult;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in JwtAuthenticatorsClient.
+ */
+public final class JwtAuthenticatorsClientImpl implements JwtAuthenticatorsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final JwtAuthenticatorsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of JwtAuthenticatorsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    JwtAuthenticatorsClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service
+            = RestProxy.create(JwtAuthenticatorsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientJwtAuthenticators to be used by the
+     * proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientJwtAuthenticators")
+    public interface JwtAuthenticatorsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/jwtAuthenticators")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<JwtAuthenticatorListResult>> listByManagedCluster(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/jwtAuthenticators/{jwtAuthenticatorName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<JwtAuthenticatorInner>> get(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("jwtAuthenticatorName") String jwtAuthenticatorName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/jwtAuthenticators/{jwtAuthenticatorName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("jwtAuthenticatorName") String jwtAuthenticatorName,
+            @BodyParam("application/json") JwtAuthenticatorInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/jwtAuthenticators/{jwtAuthenticatorName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("jwtAuthenticatorName") String jwtAuthenticatorName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<JwtAuthenticatorListResult>> listByManagedClusterNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<JwtAuthenticatorInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByManagedCluster(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<JwtAuthenticatorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<JwtAuthenticatorInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listByManagedCluster(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<JwtAuthenticatorInner> listByManagedClusterAsync(String resourceGroupName, String resourceName) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<JwtAuthenticatorInner> listByManagedClusterAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<JwtAuthenticatorInner> listByManagedCluster(String resourceGroupName, String resourceName) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<JwtAuthenticatorInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster along with {@link Response} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<JwtAuthenticatorInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (jwtAuthenticatorName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter jwtAuthenticatorName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, jwtAuthenticatorName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster along with {@link Response} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<JwtAuthenticatorInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (jwtAuthenticatorName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter jwtAuthenticatorName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, jwtAuthenticatorName, accept, context);
+    }
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<JwtAuthenticatorInner> getAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName) {
+        return getWithResponseAsync(resourceGroupName, resourceName, jwtAuthenticatorName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<JwtAuthenticatorInner> getWithResponse(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context) {
+        return getWithResponseAsync(resourceGroupName, resourceName, jwtAuthenticatorName, context).block();
+    }
+
+    /**
+     * Gets the specified JWT authenticator of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified JWT authenticator of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public JwtAuthenticatorInner get(String resourceGroupName, String resourceName, String jwtAuthenticatorName) {
+        return getWithResponse(resourceGroupName, resourceName, jwtAuthenticatorName, Context.NONE).getValue();
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (jwtAuthenticatorName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter jwtAuthenticatorName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, jwtAuthenticatorName, parameters,
+                accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (jwtAuthenticatorName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter jwtAuthenticatorName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, jwtAuthenticatorName, parameters, accept, context);
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters);
+        return this.client.<JwtAuthenticatorInner, JwtAuthenticatorInner>getLroResult(mono,
+            this.client.getHttpPipeline(), JwtAuthenticatorInner.class, JwtAuthenticatorInner.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters,
+        Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, resourceName,
+            jwtAuthenticatorName, parameters, context);
+        return this.client.<JwtAuthenticatorInner, JwtAuthenticatorInner>getLroResult(mono,
+            this.client.getHttpPipeline(), JwtAuthenticatorInner.class, JwtAuthenticatorInner.class, context);
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<JwtAuthenticatorInner>, JwtAuthenticatorInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String jwtAuthenticatorName, JwtAuthenticatorInner parameters,
+        Context context) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<JwtAuthenticatorInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, JwtAuthenticatorInner parameters) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<JwtAuthenticatorInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, JwtAuthenticatorInner parameters, Context context) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters, context)
+            .last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public JwtAuthenticatorInner createOrUpdate(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, JwtAuthenticatorInner parameters) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters).block();
+    }
+
+    /**
+     * Creates or updates JWT authenticator in the managed cluster and updates the managed cluster to apply the
+     * settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param parameters The JWT authenticator to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return configuration for JWT authenticator in the managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public JwtAuthenticatorInner createOrUpdate(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, JwtAuthenticatorInner parameters, Context context) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, jwtAuthenticatorName, parameters, context).block();
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (jwtAuthenticatorName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter jwtAuthenticatorName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                    resourceGroupName, resourceName, jwtAuthenticatorName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (jwtAuthenticatorName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter jwtAuthenticatorName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, jwtAuthenticatorName, accept, context);
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, jwtAuthenticatorName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, jwtAuthenticatorName, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, jwtAuthenticatorName).getSyncPoller();
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String jwtAuthenticatorName, Context context) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, jwtAuthenticatorName, context).getSyncPoller();
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String jwtAuthenticatorName) {
+        return beginDeleteAsync(resourceGroupName, resourceName, jwtAuthenticatorName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String jwtAuthenticatorName,
+        Context context) {
+        return beginDeleteAsync(resourceGroupName, resourceName, jwtAuthenticatorName, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String jwtAuthenticatorName) {
+        deleteAsync(resourceGroupName, resourceName, jwtAuthenticatorName).block();
+    }
+
+    /**
+     * Deletes a JWT authenticator and updates the managed cluster to apply the settings.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param jwtAuthenticatorName The name of the JWT authenticator.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String jwtAuthenticatorName, Context context) {
+        deleteAsync(resourceGroupName, resourceName, jwtAuthenticatorName, context).block();
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<JwtAuthenticatorInner>> listByManagedClusterNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<JwtAuthenticatorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of JWT authenticators in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of JWT authenticators in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<JwtAuthenticatorInner>> listByManagedClusterNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java
index 704826090f6f..454642777e59 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java
@@ -324,6 +324,11 @@ AgentPoolInner getAgentPoolInner() {
         agentPoolInner.withVirtualMachinesProfile(innerModel().virtualMachinesProfile());
         agentPoolInner.withVirtualMachineNodesStatus(innerModel().virtualMachineNodesStatus());
         agentPoolInner.withStatus(innerModel().status());
+
+        // available only in preview api-version
+        agentPoolInner.withNodeImageVersion(innerModel().nodeImageVersion());
+        agentPoolInner.withUpgradeStrategy(innerModel().upgradeStrategy());
+
         return agentPoolInner;
     }
 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/LoadBalancersClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/LoadBalancersClientImpl.java
new file mode 100644
index 000000000000..a7d3d14c8ac9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/LoadBalancersClientImpl.java
@@ -0,0 +1,842 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.LoadBalancersClient;
+import com.azure.resourcemanager.containerservice.fluent.models.LoadBalancerInner;
+import com.azure.resourcemanager.containerservice.models.LoadBalancerListResult;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in LoadBalancersClient.
+ */
+public final class LoadBalancersClientImpl implements LoadBalancersClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final LoadBalancersService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of LoadBalancersClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    LoadBalancersClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service
+            = RestProxy.create(LoadBalancersService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientLoadBalancers to be used by the proxy
+     * service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientLoadBalancers")
+    public interface LoadBalancersService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/loadBalancers")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<LoadBalancerListResult>> listByManagedCluster(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/loadBalancers/{loadBalancerName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<LoadBalancerInner>> get(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("loadBalancerName") String loadBalancerName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/loadBalancers/{loadBalancerName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<LoadBalancerInner>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("loadBalancerName") String loadBalancerName,
+            @BodyParam("application/json") LoadBalancerInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/loadBalancers/{loadBalancerName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("loadBalancerName") String loadBalancerName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<LoadBalancerListResult>> listByManagedClusterNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<LoadBalancerInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByManagedCluster(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<LoadBalancerInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<LoadBalancerInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listByManagedCluster(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<LoadBalancerInner> listByManagedClusterAsync(String resourceGroupName, String resourceName) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<LoadBalancerInner> listByManagedClusterAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<LoadBalancerInner> listByManagedCluster(String resourceGroupName, String resourceName) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<LoadBalancerInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<LoadBalancerInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (loadBalancerName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, loadBalancerName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<LoadBalancerInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (loadBalancerName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, loadBalancerName, accept, context);
+    }
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<LoadBalancerInner> getAsync(String resourceGroupName, String resourceName, String loadBalancerName) {
+        return getWithResponseAsync(resourceGroupName, resourceName, loadBalancerName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<LoadBalancerInner> getWithResponse(String resourceGroupName, String resourceName,
+        String loadBalancerName, Context context) {
+        return getWithResponseAsync(resourceGroupName, resourceName, loadBalancerName, context).block();
+    }
+
+    /**
+     * Gets the specified load balancer.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified load balancer.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public LoadBalancerInner get(String resourceGroupName, String resourceName, String loadBalancerName) {
+        return getWithResponse(resourceGroupName, resourceName, loadBalancerName, Context.NONE).getValue();
+    }
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<LoadBalancerInner>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String loadBalancerName, LoadBalancerInner parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (loadBalancerName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, loadBalancerName, parameters, accept,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<LoadBalancerInner>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String loadBalancerName, LoadBalancerInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (loadBalancerName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, loadBalancerName, parameters, accept, context);
+    }
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<LoadBalancerInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName, LoadBalancerInner parameters) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, resourceName, loadBalancerName, parameters)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<LoadBalancerInner> createOrUpdateWithResponse(String resourceGroupName, String resourceName,
+        String loadBalancerName, LoadBalancerInner parameters, Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, resourceName, loadBalancerName, parameters, context)
+            .block();
+    }
+
+    /**
+     * Creates or updates a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param parameters The load balancer to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the configurations regarding multiple standard load balancers.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public LoadBalancerInner createOrUpdate(String resourceGroupName, String resourceName, String loadBalancerName,
+        LoadBalancerInner parameters) {
+        return createOrUpdateWithResponse(resourceGroupName, resourceName, loadBalancerName, parameters, Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (loadBalancerName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, loadBalancerName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (loadBalancerName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter loadBalancerName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, loadBalancerName, accept, context);
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, loadBalancerName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String loadBalancerName, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, loadBalancerName, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String loadBalancerName) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, loadBalancerName).getSyncPoller();
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String loadBalancerName, Context context) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, loadBalancerName, context).getSyncPoller();
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String loadBalancerName) {
+        return beginDeleteAsync(resourceGroupName, resourceName, loadBalancerName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String loadBalancerName,
+        Context context) {
+        return beginDeleteAsync(resourceGroupName, resourceName, loadBalancerName, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String loadBalancerName) {
+        deleteAsync(resourceGroupName, resourceName, loadBalancerName).block();
+    }
+
+    /**
+     * Deletes a load balancer in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param loadBalancerName The name of the load balancer.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String loadBalancerName, Context context) {
+        deleteAsync(resourceGroupName, resourceName, loadBalancerName, context).block();
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<LoadBalancerInner>> listByManagedClusterNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<LoadBalancerInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of load balancers in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of load balancers in the specified managed cluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<LoadBalancerInner>> listByManagedClusterNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MachinesClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MachinesClientImpl.java
index 0860182b9d1b..290dad2bdbf7 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MachinesClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MachinesClientImpl.java
@@ -4,6 +4,7 @@
 
 package com.azure.resourcemanager.containerservice.implementation;
 
+import com.azure.core.annotation.BodyParam;
 import com.azure.core.annotation.ExpectedResponses;
 import com.azure.core.annotation.Get;
 import com.azure.core.annotation.HeaderParam;
@@ -11,6 +12,7 @@
 import com.azure.core.annotation.Host;
 import com.azure.core.annotation.HostParam;
 import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
 import com.azure.core.annotation.QueryParam;
 import com.azure.core.annotation.ReturnType;
 import com.azure.core.annotation.ServiceInterface;
@@ -23,11 +25,16 @@
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.containerservice.fluent.MachinesClient;
 import com.azure.resourcemanager.containerservice.fluent.models.MachineInner;
 import com.azure.resourcemanager.containerservice.models.MachineListResult;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 /**
@@ -80,6 +87,18 @@ Mono<Response<MachineInner>> get(@HostParam("$host") String endpoint,
             @PathParam("agentPoolName") String agentPoolName, @PathParam("machineName") String machineName,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/machines/{machineName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("agentPoolName") String agentPoolName, @PathParam("machineName") String machineName,
+            @HeaderParam("If-Match") String ifMatch, @HeaderParam("If-None-Match") String ifNoneMatch,
+            @BodyParam("application/json") MachineInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -121,7 +140,7 @@ private Mono<PagedResponse<MachineInner>> listSinglePageAsync(String resourceGro
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -165,7 +184,7 @@ private Mono<PagedResponse<MachineInner>> listSinglePageAsync(String resourceGro
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -251,7 +270,7 @@ public PagedIterable<MachineInner> list(String resourceGroupName, String resourc
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -282,7 +301,7 @@ public Mono<Response<MachineInner>> getWithResponseAsync(String resourceGroupNam
         if (machineName == null) {
             return Mono.error(new IllegalArgumentException("Parameter machineName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -296,7 +315,7 @@ public Mono<Response<MachineInner>> getWithResponseAsync(String resourceGroupNam
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -328,7 +347,7 @@ private Mono<Response<MachineInner>> getWithResponseAsync(String resourceGroupNa
         if (machineName == null) {
             return Mono.error(new IllegalArgumentException("Parameter machineName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -341,7 +360,7 @@ private Mono<Response<MachineInner>> getWithResponseAsync(String resourceGroupNa
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -360,7 +379,7 @@ public Mono<MachineInner> getAsync(String resourceGroupName, String resourceName
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -379,7 +398,7 @@ public Response<MachineInner> getWithResponse(String resourceGroupName, String r
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param agentPoolName The name of the agent pool.
-     * @param machineName host name of the machine.
+     * @param machineName Host name of the machine.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -390,6 +409,362 @@ public MachineInner get(String resourceGroupName, String resourceName, String ag
         return getWithResponse(resourceGroupName, resourceName, agentPoolName, machineName, Context.NONE).getValue();
     }
 
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (agentPoolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
+        }
+        if (machineName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter machineName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, agentPoolName, machineName, ifMatch,
+                ifNoneMatch, parameters, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (agentPoolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
+        }
+        if (machineName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter machineName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, agentPoolName, machineName, ifMatch, ifNoneMatch, parameters, accept,
+            context);
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<MachineInner>, MachineInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch) {
+        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, resourceName,
+            agentPoolName, machineName, parameters, ifMatch, ifNoneMatch);
+        return this.client.<MachineInner, MachineInner>getLroResult(mono, this.client.getHttpPipeline(),
+            MachineInner.class, MachineInner.class, this.client.getContext());
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<MachineInner>, MachineInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters) {
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, resourceName,
+            agentPoolName, machineName, parameters, ifMatch, ifNoneMatch);
+        return this.client.<MachineInner, MachineInner>getLroResult(mono, this.client.getHttpPipeline(),
+            MachineInner.class, MachineInner.class, this.client.getContext());
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<MachineInner>, MachineInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, resourceName,
+            agentPoolName, machineName, parameters, ifMatch, ifNoneMatch, context);
+        return this.client.<MachineInner, MachineInner>getLroResult(mono, this.client.getHttpPipeline(),
+            MachineInner.class, MachineInner.class, context);
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<MachineInner>, MachineInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters) {
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        return this
+            .beginCreateOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters, ifMatch,
+                ifNoneMatch)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of a machine provides detailed information about its configuration and
+     * status.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<MachineInner>, MachineInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceName, String agentPoolName, String machineName, MachineInner parameters, String ifMatch,
+        String ifNoneMatch, Context context) {
+        return this
+            .beginCreateOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters, ifMatch,
+                ifNoneMatch, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<MachineInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters, String ifMatch, String ifNoneMatch) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters,
+            ifMatch, ifNoneMatch).last().flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<MachineInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters) {
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters,
+            ifMatch, ifNoneMatch).last().flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<MachineInner> createOrUpdateAsync(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters, String ifMatch, String ifNoneMatch, Context context) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters,
+            ifMatch, ifNoneMatch, context).last().flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public MachineInner createOrUpdate(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters) {
+        final String ifMatch = null;
+        final String ifNoneMatch = null;
+        return createOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters, ifMatch,
+            ifNoneMatch).block();
+    }
+
+    /**
+     * Creates or updates a machine in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param machineName Host name of the machine.
+     * @param parameters The machine to create or update.
+     * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ifNoneMatch The request should only proceed if no entity matches this string.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a machine provides detailed information about its configuration and status.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public MachineInner createOrUpdate(String resourceGroupName, String resourceName, String agentPoolName,
+        String machineName, MachineInner parameters, String ifMatch, String ifNoneMatch, Context context) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, agentPoolName, machineName, parameters, ifMatch,
+            ifNoneMatch, context).block();
+    }
+
     /**
      * Gets a list of machines in the specified agent pool.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MaintenanceConfigurationsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MaintenanceConfigurationsClientImpl.java
index 03121f2761b8..1474a4f66a28 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MaintenanceConfigurationsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MaintenanceConfigurationsClientImpl.java
@@ -141,7 +141,7 @@ Mono<Response<MaintenanceConfigurationListResult>> listByManagedClusterNext(
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByManagedCluster(this.client.getEndpoint(), apiVersion,
@@ -181,7 +181,7 @@ Mono<Response<MaintenanceConfigurationListResult>> listByManagedClusterNext(
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -296,7 +296,7 @@ public Mono<Response<MaintenanceConfigurationInner>> getWithResponseAsync(String
         if (configName == null) {
             return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -338,7 +338,7 @@ private Mono<Response<MaintenanceConfigurationInner>> getWithResponseAsync(Strin
         if (configName == null) {
             return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -436,7 +436,7 @@ public Mono<Response<MaintenanceConfigurationInner>> createOrUpdateWithResponseA
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
             this.client.getSubscriptionId(), resourceGroupName, resourceName, configName, parameters, accept, context))
@@ -483,7 +483,7 @@ private Mono<Response<MaintenanceConfigurationInner>> createOrUpdateWithResponse
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -582,7 +582,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
         if (configName == null) {
             return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -623,7 +623,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (configName == null) {
             return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClusterSnapshotsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClusterSnapshotsClientImpl.java
new file mode 100644
index 000000000000..cf11efd7cabd
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClusterSnapshotsClientImpl.java
@@ -0,0 +1,1020 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.Patch;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.resourcemanager.containerservice.fluent.ManagedClusterSnapshotsClient;
+import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterSnapshotInner;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterSnapshotListResult;
+import com.azure.resourcemanager.containerservice.models.TagsObject;
+import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsDelete;
+import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsGet;
+import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsListing;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in ManagedClusterSnapshotsClient.
+ */
+public final class ManagedClusterSnapshotsClientImpl implements InnerSupportsGet<ManagedClusterSnapshotInner>,
+    InnerSupportsListing<ManagedClusterSnapshotInner>, InnerSupportsDelete<Void>, ManagedClusterSnapshotsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final ManagedClusterSnapshotsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedClusterSnapshotsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    ManagedClusterSnapshotsClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service = RestProxy.create(ManagedClusterSnapshotsService.class, client.getHttpPipeline(),
+            client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientManagedClusterSnapshots to be used by
+     * the proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientManagedClusterSnapshots")
+    public interface ManagedClusterSnapshotsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/managedclustersnapshots")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotListResult>> list(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclustersnapshots")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotListResult>> listByResourceGroup(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclustersnapshots/{resourceName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotInner>> getByResourceGroup(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclustersnapshots/{resourceName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotInner>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @BodyParam("application/json") ManagedClusterSnapshotInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclustersnapshots/{resourceName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotInner>> updateTags(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @BodyParam("application/json") TagsObject parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclustersnapshots/{resourceName}")
+        @ExpectedResponses({ 200, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Void>> delete(@HostParam("$host") String endpoint, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotListResult>> listNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedClusterSnapshotListResult>> listByResourceGroupNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>> listSinglePageAsync() {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                accept, context))
+            .<PagedResponse<ManagedClusterSnapshotInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>> listSinglePageAsync(Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<ManagedClusterSnapshotInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ManagedClusterSnapshotInner> listAsync(Context context) {
+        return new PagedFlux<>(() -> listSinglePageAsync(context),
+            nextLink -> listNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ManagedClusterSnapshotInner> list() {
+        return new PagedIterable<>(listAsync());
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ManagedClusterSnapshotInner> list(Context context) {
+        return new PagedIterable<>(listAsync(context));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>>
+        listByResourceGroupSinglePageAsync(String resourceGroupName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, accept, context))
+            .<PagedResponse<ManagedClusterSnapshotInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>>
+        listByResourceGroupSinglePageAsync(String resourceGroupName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listByResourceGroup(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<ManagedClusterSnapshotInner> listByResourceGroupAsync(String resourceGroupName) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ManagedClusterSnapshotInner> listByResourceGroupAsync(String resourceGroupName, Context context) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName, context),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ManagedClusterSnapshotInner> listByResourceGroup(String resourceGroupName) {
+        return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ManagedClusterSnapshotInner> listByResourceGroup(String resourceGroupName, Context context) {
+        return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName, context));
+    }
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<ManagedClusterSnapshotInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<ManagedClusterSnapshotInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.getByResourceGroup(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, accept, context);
+    }
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ManagedClusterSnapshotInner> getByResourceGroupAsync(String resourceGroupName, String resourceName) {
+        return getByResourceGroupWithResponseAsync(resourceGroupName, resourceName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<ManagedClusterSnapshotInner> getByResourceGroupWithResponse(String resourceGroupName,
+        String resourceName, Context context) {
+        return getByResourceGroupWithResponseAsync(resourceGroupName, resourceName, context).block();
+    }
+
+    /**
+     * Gets a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedClusterSnapshotInner getByResourceGroup(String resourceGroupName, String resourceName) {
+        return getByResourceGroupWithResponse(resourceGroupName, resourceName, Context.NONE).getValue();
+    }
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<ManagedClusterSnapshotInner>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, ManagedClusterSnapshotInner parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, parameters, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<ManagedClusterSnapshotInner>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, ManagedClusterSnapshotInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, parameters, accept, context);
+    }
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ManagedClusterSnapshotInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        ManagedClusterSnapshotInner parameters) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, resourceName, parameters)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<ManagedClusterSnapshotInner> createOrUpdateWithResponse(String resourceGroupName,
+        String resourceName, ManagedClusterSnapshotInner parameters, Context context) {
+        return createOrUpdateWithResponseAsync(resourceGroupName, resourceName, parameters, context).block();
+    }
+
+    /**
+     * Creates or updates a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The managed cluster snapshot to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedClusterSnapshotInner createOrUpdate(String resourceGroupName, String resourceName,
+        ManagedClusterSnapshotInner parameters) {
+        return createOrUpdateWithResponse(resourceGroupName, resourceName, parameters, Context.NONE).getValue();
+    }
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<ManagedClusterSnapshotInner>> updateTagsWithResponseAsync(String resourceGroupName,
+        String resourceName, TagsObject parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.updateTags(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, parameters, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<ManagedClusterSnapshotInner>> updateTagsWithResponseAsync(String resourceGroupName,
+        String resourceName, TagsObject parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.updateTags(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, parameters, accept, context);
+    }
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ManagedClusterSnapshotInner> updateTagsAsync(String resourceGroupName, String resourceName,
+        TagsObject parameters) {
+        return updateTagsWithResponseAsync(resourceGroupName, resourceName, parameters)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<ManagedClusterSnapshotInner> updateTagsWithResponse(String resourceGroupName, String resourceName,
+        TagsObject parameters, Context context) {
+        return updateTagsWithResponseAsync(resourceGroupName, resourceName, parameters, context).block();
+    }
+
+    /**
+     * Updates tags on a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters Parameters supplied to the Update managed cluster snapshot Tags operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a managed cluster snapshot resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedClusterSnapshotInner updateTags(String resourceGroupName, String resourceName,
+        TagsObject parameters) {
+        return updateTagsWithResponse(resourceGroupName, resourceName, parameters, Context.NONE).getValue();
+    }
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, accept, context);
+    }
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
+        return deleteWithResponseAsync(resourceGroupName, resourceName).flatMap(ignored -> Mono.empty());
+    }
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<Void> deleteWithResponse(String resourceGroupName, String resourceName, Context context) {
+        return deleteWithResponseAsync(resourceGroupName, resourceName, context).block();
+    }
+
+    /**
+     * Deletes a managed cluster snapshot.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName) {
+        deleteWithResponse(resourceGroupName, resourceName, Context.NONE);
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>> listNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<ManagedClusterSnapshotInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of managed cluster snapshots in the specified subscription.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed cluster snapshots in the specified subscription along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>> listNextSinglePageAsync(String nextLink, Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<ManagedClusterSnapshotInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists managed cluster snapshots in the specified subscription and resource group.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response from the List Managed Cluster Snapshots operation along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedClusterSnapshotInner>> listByResourceGroupNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClustersClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClustersClientImpl.java
index 0f86e9a527ff..f8641391458c 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClustersClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedClustersClientImpl.java
@@ -35,6 +35,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.containerservice.fluent.ManagedClustersClient;
 import com.azure.resourcemanager.containerservice.fluent.models.CredentialResultsInner;
+import com.azure.resourcemanager.containerservice.fluent.models.GuardrailsAvailableVersionInner;
 import com.azure.resourcemanager.containerservice.fluent.models.KubernetesVersionListResultInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterAccessProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterInner;
@@ -43,7 +44,9 @@
 import com.azure.resourcemanager.containerservice.fluent.models.MeshUpgradeProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.OutboundEnvironmentEndpointInner;
 import com.azure.resourcemanager.containerservice.fluent.models.RunCommandResultInner;
+import com.azure.resourcemanager.containerservice.fluent.models.SafeguardsAvailableVersionInner;
 import com.azure.resourcemanager.containerservice.models.Format;
+import com.azure.resourcemanager.containerservice.models.GuardrailsAvailableVersionsList;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAadProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterListResult;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterServicePrincipalProfile;
@@ -51,7 +54,9 @@
 import com.azure.resourcemanager.containerservice.models.MeshRevisionProfileList;
 import com.azure.resourcemanager.containerservice.models.MeshUpgradeProfileList;
 import com.azure.resourcemanager.containerservice.models.OutboundEnvironmentEndpointCollection;
+import com.azure.resourcemanager.containerservice.models.RebalanceLoadBalancersRequestBody;
 import com.azure.resourcemanager.containerservice.models.RunCommandRequest;
+import com.azure.resourcemanager.containerservice.models.SafeguardsAvailableVersionsList;
 import com.azure.resourcemanager.containerservice.models.TagsObject;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsDelete;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsGet;
@@ -201,7 +206,9 @@ Mono<Response<Flux<ByteBuffer>>> updateTags(@HostParam("$host") String endpoint,
         Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
-            @HeaderParam("If-Match") String ifMatch, @HeaderParam("Accept") String accept, Context context);
+            @HeaderParam("If-Match") String ifMatch,
+            @QueryParam("ignore-pod-disruption-budget") Boolean ignorePodDisruptionBudget,
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/resetServicePrincipalProfile")
@@ -224,19 +231,19 @@ Mono<Response<Flux<ByteBuffer>>> resetAadProfile(@HostParam("$host") String endp
             Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/rotateClusterCertificates")
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclusters/{resourceName}/abort")
         @ExpectedResponses({ 202, 204 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificates(@HostParam("$host") String endpoint,
+        Mono<Response<Flux<ByteBuffer>>> abortLatestOperation(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
             @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
-        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedclusters/{resourceName}/abort")
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/rotateClusterCertificates")
         @ExpectedResponses({ 202, 204 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Mono<Response<Flux<ByteBuffer>>> abortLatestOperation(@HostParam("$host") String endpoint,
+        Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificates(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
             @HeaderParam("Accept") String accept, Context context);
@@ -297,6 +304,40 @@ Mono<Response<OutboundEnvironmentEndpointCollection>> listOutboundNetworkDepende
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/guardrailsVersions/{version}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<GuardrailsAvailableVersionInner>> getGuardrailsVersions(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @PathParam("version") String version,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/guardrailsVersions")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<GuardrailsAvailableVersionsList>> listGuardrailsVersions(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/safeguardsVersions/{version}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<SafeguardsAvailableVersionInner>> getSafeguardsVersions(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @PathParam("version") String version,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/safeguardsVersions")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<SafeguardsAvailableVersionsList>> listSafeguardsVersions(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.ContainerService/locations/{location}/meshRevisionProfiles")
         @ExpectedResponses({ 200 })
@@ -332,6 +373,16 @@ Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfile(@HostParam("$host"
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
             @PathParam("mode") String mode, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/rebalanceLoadBalancers")
+        @ExpectedResponses({ 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> rebalanceLoadBalancers(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @BodyParam("application/json") RebalanceLoadBalancersRequestBody parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -356,6 +407,22 @@ Mono<Response<OutboundEnvironmentEndpointCollection>> listOutboundNetworkDepende
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<GuardrailsAvailableVersionsList>> listGuardrailsVersionsNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<SafeguardsAvailableVersionsList>> listSafeguardsVersionsNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -399,7 +466,7 @@ public Mono<Response<KubernetesVersionListResultInner>> listKubernetesVersionsWi
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listKubernetesVersions(this.client.getEndpoint(), apiVersion,
@@ -435,7 +502,7 @@ private Mono<Response<KubernetesVersionListResultInner>> listKubernetesVersionsW
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listKubernetesVersions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -513,7 +580,7 @@ private Mono<PagedResponse<ManagedClusterInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -543,7 +610,7 @@ private Mono<PagedResponse<ManagedClusterInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -630,7 +697,7 @@ private Mono<PagedResponse<ManagedClusterInner>> listByResourceGroupSinglePageAs
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), apiVersion,
@@ -666,7 +733,7 @@ private Mono<PagedResponse<ManagedClusterInner>> listByResourceGroupSinglePageAs
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -765,7 +832,7 @@ public PagedIterable<ManagedClusterInner> listByResourceGroup(String resourceGro
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getUpgradeProfile(this.client.getEndpoint(), apiVersion,
@@ -803,7 +870,7 @@ public PagedIterable<ManagedClusterInner> listByResourceGroup(String resourceGro
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getUpgradeProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -897,7 +964,7 @@ public Mono<Response<ManagedClusterAccessProfileInner>> getAccessProfileWithResp
         if (roleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getAccessProfile(this.client.getEndpoint(), apiVersion,
@@ -944,7 +1011,7 @@ private Mono<Response<ManagedClusterAccessProfileInner>> getAccessProfileWithRes
         if (roleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getAccessProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1051,7 +1118,7 @@ public Mono<Response<CredentialResultsInner>> listClusterAdminCredentialsWithRes
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listClusterAdminCredentials(this.client.getEndpoint(), apiVersion,
@@ -1089,7 +1156,7 @@ private Mono<Response<CredentialResultsInner>> listClusterAdminCredentialsWithRe
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listClusterAdminCredentials(this.client.getEndpoint(), apiVersion,
@@ -1182,7 +1249,7 @@ public Mono<Response<CredentialResultsInner>> listClusterUserCredentialsWithResp
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listClusterUserCredentials(this.client.getEndpoint(), apiVersion,
@@ -1223,7 +1290,7 @@ private Mono<Response<CredentialResultsInner>> listClusterUserCredentialsWithRes
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listClusterUserCredentials(this.client.getEndpoint(), apiVersion,
@@ -1317,7 +1384,7 @@ public Mono<Response<CredentialResultsInner>> listClusterMonitoringUserCredentia
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listClusterMonitoringUserCredentials(this.client.getEndpoint(), apiVersion,
@@ -1355,7 +1422,7 @@ private Mono<Response<CredentialResultsInner>> listClusterMonitoringUserCredenti
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listClusterMonitoringUserCredentials(this.client.getEndpoint(), apiVersion,
@@ -1444,7 +1511,7 @@ public Mono<Response<ManagedClusterInner>> getByResourceGroupWithResponseAsync(S
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion,
@@ -1481,7 +1548,7 @@ private Mono<Response<ManagedClusterInner>> getByResourceGroupWithResponseAsync(
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1572,7 +1639,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -1618,7 +1685,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1873,7 +1940,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), apiVersion,
@@ -1917,7 +1984,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -2126,6 +2193,8 @@ public ManagedClusterInner updateTags(String resourceGroupName, String resourceN
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2133,7 +2202,7 @@ public ManagedClusterInner updateTags(String resourceGroupName, String resourceN
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
-        String ifMatch) {
+        String ifMatch, Boolean ignorePodDisruptionBudget) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -2149,11 +2218,12 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
-                this.client.getSubscriptionId(), resourceGroupName, resourceName, ifMatch, accept, context))
+            .withContext(
+                context -> service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                    resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget, accept, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -2163,6 +2233,8 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -2171,7 +2243,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
-        String ifMatch, Context context) {
+        String ifMatch, Boolean ignorePodDisruptionBudget, Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -2187,11 +2259,11 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
-            resourceName, ifMatch, accept, context);
+            resourceName, ifMatch, ignorePodDisruptionBudget, accept, context);
     }
 
     /**
@@ -2200,6 +2272,8 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2207,8 +2281,9 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
-        String ifMatch) {
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, resourceName, ifMatch);
+        String ifMatch, Boolean ignorePodDisruptionBudget) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             this.client.getContext());
     }
@@ -2226,7 +2301,9 @@ public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupN
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName) {
         final String ifMatch = null;
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, resourceName, ifMatch);
+        final Boolean ignorePodDisruptionBudget = null;
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             this.client.getContext());
     }
@@ -2237,6 +2314,8 @@ public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupN
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -2245,10 +2324,10 @@ public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupN
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
-        String ifMatch, Context context) {
+        String ifMatch, Boolean ignorePodDisruptionBudget, Context context) {
         context = this.client.mergeContext(context);
         Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, resourceName, ifMatch, context);
+            = deleteWithResponseAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget, context);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             context);
     }
@@ -2266,7 +2345,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName) {
         final String ifMatch = null;
-        return this.beginDeleteAsync(resourceGroupName, resourceName, ifMatch).getSyncPoller();
+        final Boolean ignorePodDisruptionBudget = null;
+        return this.beginDeleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget)
+            .getSyncPoller();
     }
 
     /**
@@ -2275,6 +2356,8 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -2283,8 +2366,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName, String ifMatch,
-        Context context) {
-        return this.beginDeleteAsync(resourceGroupName, resourceName, ifMatch, context).getSyncPoller();
+        Boolean ignorePodDisruptionBudget, Context context) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget, context)
+            .getSyncPoller();
     }
 
     /**
@@ -2293,14 +2377,17 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String ifMatch) {
-        return beginDeleteAsync(resourceGroupName, resourceName, ifMatch).last()
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String ifMatch,
+        Boolean ignorePodDisruptionBudget) {
+        return beginDeleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
@@ -2317,7 +2404,8 @@ public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
         final String ifMatch = null;
-        return beginDeleteAsync(resourceGroupName, resourceName, ifMatch).last()
+        final Boolean ignorePodDisruptionBudget = null;
+        return beginDeleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
@@ -2327,6 +2415,8 @@ public Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -2334,8 +2424,9 @@ public Mono<Void> deleteAsync(String resourceGroupName, String resourceName) {
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String ifMatch, Context context) {
-        return beginDeleteAsync(resourceGroupName, resourceName, ifMatch, context).last()
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String ifMatch,
+        Boolean ignorePodDisruptionBudget, Context context) {
+        return beginDeleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget, context).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
@@ -2351,7 +2442,8 @@ private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String resourceName) {
         final String ifMatch = null;
-        deleteAsync(resourceGroupName, resourceName, ifMatch).block();
+        final Boolean ignorePodDisruptionBudget = null;
+        deleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget).block();
     }
 
     /**
@@ -2360,14 +2452,17 @@ public void delete(String resourceGroupName, String resourceName) {
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
      * @param ifMatch The request should only proceed if an entity matches this string.
+     * @param ignorePodDisruptionBudget ignore-pod-disruption-budget=true to delete those pods on a node without
+     * considering Pod Disruption Budget.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String resourceName, String ifMatch, Context context) {
-        deleteAsync(resourceGroupName, resourceName, ifMatch, context).block();
+    public void delete(String resourceGroupName, String resourceName, String ifMatch, Boolean ignorePodDisruptionBudget,
+        Context context) {
+        deleteAsync(resourceGroupName, resourceName, ifMatch, ignorePodDisruptionBudget, context).block();
     }
 
     /**
@@ -2406,7 +2501,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetServicePrincipalProfileWithResponse
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.resetServicePrincipalProfile(this.client.getEndpoint(), apiVersion,
@@ -2451,7 +2546,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetServicePrincipalProfileWithRespons
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.resetServicePrincipalProfile(this.client.getEndpoint(), apiVersion,
@@ -2659,7 +2754,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetAadProfileWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.resetAadProfile(this.client.getEndpoint(), apiVersion,
@@ -2705,7 +2800,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetAadProfileWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.resetAadProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -2883,10 +2978,11 @@ public void resetAadProfile(String resourceGroupName, String resourceName, Manag
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -2896,7 +2992,7 @@ public void resetAadProfile(String resourceGroupName, String resourceName, Manag
      * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(String resourceGroupName,
+    public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String resourceGroupName,
         String resourceName) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
@@ -2913,19 +3009,20 @@ public Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsy
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.rotateClusterCertificates(this.client.getEndpoint(), apiVersion,
+            .withContext(context -> service.abortLatestOperation(this.client.getEndpoint(), apiVersion,
                 this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -2936,7 +3033,7 @@ public Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsy
      * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(String resourceGroupName,
+    private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String resourceGroupName,
         String resourceName, Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
@@ -2953,18 +3050,19 @@ private Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAs
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
-        return service.rotateClusterCertificates(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+        return service.abortLatestOperation(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
             resourceGroupName, resourceName, accept, context);
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -2974,19 +3072,19 @@ private Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAs
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String resourceGroupName,
+    public PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourceGroupName,
         String resourceName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = rotateClusterCertificatesWithResponseAsync(resourceGroupName, resourceName);
+        Mono<Response<Flux<ByteBuffer>>> mono = abortLatestOperationWithResponseAsync(resourceGroupName, resourceName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             this.client.getContext());
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -2997,20 +3095,21 @@ public PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(St
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String resourceGroupName,
+    private PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourceGroupName,
         String resourceName, Context context) {
         context = this.client.mergeContext(context);
         Mono<Response<Flux<ByteBuffer>>> mono
-            = rotateClusterCertificatesWithResponseAsync(resourceGroupName, resourceName, context);
+            = abortLatestOperationWithResponseAsync(resourceGroupName, resourceName, context);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             context);
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3020,16 +3119,16 @@ private PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(S
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName,
-        String resourceName) {
-        return this.beginRotateClusterCertificatesAsync(resourceGroupName, resourceName).getSyncPoller();
+    public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName) {
+        return this.beginAbortLatestOperationAsync(resourceGroupName, resourceName).getSyncPoller();
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3040,16 +3139,17 @@ public SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName,
-        String resourceName, Context context) {
-        return this.beginRotateClusterCertificatesAsync(resourceGroupName, resourceName, context).getSyncPoller();
+    public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName,
+        Context context) {
+        return this.beginAbortLatestOperationAsync(resourceGroupName, resourceName, context).getSyncPoller();
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3059,16 +3159,17 @@ public SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, String resourceName) {
-        return beginRotateClusterCertificatesAsync(resourceGroupName, resourceName).last()
+    public Mono<Void> abortLatestOperationAsync(String resourceGroupName, String resourceName) {
+        return beginAbortLatestOperationAsync(resourceGroupName, resourceName).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3079,16 +3180,17 @@ public Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, Strin
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, String resourceName, Context context) {
-        return beginRotateClusterCertificatesAsync(resourceGroupName, resourceName, context).last()
+    private Mono<Void> abortLatestOperationAsync(String resourceGroupName, String resourceName, Context context) {
+        return beginAbortLatestOperationAsync(resourceGroupName, resourceName, context).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3097,15 +3199,16 @@ private Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, Stri
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void rotateClusterCertificates(String resourceGroupName, String resourceName) {
-        rotateClusterCertificatesAsync(resourceGroupName, resourceName).block();
+    public void abortLatestOperation(String resourceGroupName, String resourceName) {
+        abortLatestOperationAsync(resourceGroupName, resourceName).block();
     }
 
     /**
-     * Rotates the certificates of a managed cluster.
+     * Aborts last operation running on managed cluster.
      * 
-     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
-     * rotating managed cluster certificates.
+     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
+     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
+     * cancellation can take place, an error is returned.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3115,16 +3218,15 @@ public void rotateClusterCertificates(String resourceGroupName, String resourceN
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void rotateClusterCertificates(String resourceGroupName, String resourceName, Context context) {
-        rotateClusterCertificatesAsync(resourceGroupName, resourceName, context).block();
+    public void abortLatestOperation(String resourceGroupName, String resourceName, Context context) {
+        abortLatestOperationAsync(resourceGroupName, resourceName, context).block();
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3134,7 +3236,7 @@ public void rotateClusterCertificates(String resourceGroupName, String resourceN
      * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String resourceGroupName,
+    public Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(String resourceGroupName,
         String resourceName) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
@@ -3151,20 +3253,19 @@ public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(St
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.abortLatestOperation(this.client.getEndpoint(), apiVersion,
+            .withContext(context -> service.rotateClusterCertificates(this.client.getEndpoint(), apiVersion,
                 this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3175,7 +3276,7 @@ public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(St
      * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(String resourceGroupName,
+    private Mono<Response<Flux<ByteBuffer>>> rotateClusterCertificatesWithResponseAsync(String resourceGroupName,
         String resourceName, Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
@@ -3192,19 +3293,18 @@ private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(S
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
-        return service.abortLatestOperation(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+        return service.rotateClusterCertificates(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
             resourceGroupName, resourceName, accept, context);
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3214,19 +3314,19 @@ private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(S
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourceGroupName,
+    public PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String resourceGroupName,
         String resourceName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = abortLatestOperationWithResponseAsync(resourceGroupName, resourceName);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = rotateClusterCertificatesWithResponseAsync(resourceGroupName, resourceName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             this.client.getContext());
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3237,21 +3337,20 @@ public PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String resourceGroupName,
+    private PollerFlux<PollResult<Void>, Void> beginRotateClusterCertificatesAsync(String resourceGroupName,
         String resourceName, Context context) {
         context = this.client.mergeContext(context);
         Mono<Response<Flux<ByteBuffer>>> mono
-            = abortLatestOperationWithResponseAsync(resourceGroupName, resourceName, context);
+            = rotateClusterCertificatesWithResponseAsync(resourceGroupName, resourceName, context);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
             context);
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3261,16 +3360,16 @@ private PollerFlux<PollResult<Void>, Void> beginAbortLatestOperationAsync(String
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName) {
-        return this.beginAbortLatestOperationAsync(resourceGroupName, resourceName).getSyncPoller();
+    public SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName,
+        String resourceName) {
+        return this.beginRotateClusterCertificatesAsync(resourceGroupName, resourceName).getSyncPoller();
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3281,17 +3380,16 @@ public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resou
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resourceGroupName, String resourceName,
-        Context context) {
-        return this.beginAbortLatestOperationAsync(resourceGroupName, resourceName, context).getSyncPoller();
+    public SyncPoller<PollResult<Void>, Void> beginRotateClusterCertificates(String resourceGroupName,
+        String resourceName, Context context) {
+        return this.beginRotateClusterCertificatesAsync(resourceGroupName, resourceName, context).getSyncPoller();
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3301,17 +3399,16 @@ public SyncPoller<PollResult<Void>, Void> beginAbortLatestOperation(String resou
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> abortLatestOperationAsync(String resourceGroupName, String resourceName) {
-        return beginAbortLatestOperationAsync(resourceGroupName, resourceName).last()
+    public Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, String resourceName) {
+        return beginRotateClusterCertificatesAsync(resourceGroupName, resourceName).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3322,17 +3419,16 @@ public Mono<Void> abortLatestOperationAsync(String resourceGroupName, String res
      * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> abortLatestOperationAsync(String resourceGroupName, String resourceName, Context context) {
-        return beginAbortLatestOperationAsync(resourceGroupName, resourceName, context).last()
+    private Mono<Void> rotateClusterCertificatesAsync(String resourceGroupName, String resourceName, Context context) {
+        return beginRotateClusterCertificatesAsync(resourceGroupName, resourceName, context).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3341,16 +3437,15 @@ private Mono<Void> abortLatestOperationAsync(String resourceGroupName, String re
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void abortLatestOperation(String resourceGroupName, String resourceName) {
-        abortLatestOperationAsync(resourceGroupName, resourceName).block();
+    public void rotateClusterCertificates(String resourceGroupName, String resourceName) {
+        rotateClusterCertificatesAsync(resourceGroupName, resourceName).block();
     }
 
     /**
-     * Aborts last operation running on managed cluster.
+     * Rotates the certificates of a managed cluster.
      * 
-     * Aborts the currently running operation on the managed cluster. The Managed Cluster will be moved to a Canceling
-     * state and eventually to a Canceled state when cancellation finishes. If the operation completes before
-     * cancellation can take place, a 409 error code is returned.
+     * See [Certificate rotation](https://docs.microsoft.com/azure/aks/certificate-rotation) for more details about
+     * rotating managed cluster certificates.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
@@ -3360,8 +3455,8 @@ public void abortLatestOperation(String resourceGroupName, String resourceName)
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public void abortLatestOperation(String resourceGroupName, String resourceName, Context context) {
-        abortLatestOperationAsync(resourceGroupName, resourceName, context).block();
+    public void rotateClusterCertificates(String resourceGroupName, String resourceName, Context context) {
+        rotateClusterCertificatesAsync(resourceGroupName, resourceName, context).block();
     }
 
     /**
@@ -3392,7 +3487,7 @@ public Mono<Response<Flux<ByteBuffer>>> rotateServiceAccountSigningKeysWithRespo
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.rotateServiceAccountSigningKeys(this.client.getEndpoint(), apiVersion,
@@ -3429,7 +3524,7 @@ private Mono<Response<Flux<ByteBuffer>>> rotateServiceAccountSigningKeysWithResp
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.rotateServiceAccountSigningKeys(this.client.getEndpoint(), apiVersion,
@@ -3604,7 +3699,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGro
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stop(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -3646,7 +3741,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGr
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stop(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -3853,7 +3948,7 @@ public Mono<Response<Flux<ByteBuffer>>> startWithResponseAsync(String resourceGr
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.start(this.client.getEndpoint(), apiVersion,
@@ -3893,7 +3988,7 @@ private Mono<Response<Flux<ByteBuffer>>> startWithResponseAsync(String resourceG
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.start(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -4091,7 +4186,7 @@ public Mono<Response<Flux<ByteBuffer>>> runCommandWithResponseAsync(String resou
         } else {
             requestPayload.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.runCommand(this.client.getEndpoint(), apiVersion,
@@ -4137,7 +4232,7 @@ private Mono<Response<Flux<ByteBuffer>>> runCommandWithResponseAsync(String reso
         } else {
             requestPayload.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.runCommand(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -4351,7 +4446,7 @@ public Mono<ManagedClustersGetCommandResultResponse> getCommandResultWithRespons
         if (commandId == null) {
             return Mono.error(new IllegalArgumentException("Parameter commandId is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getCommandResult(this.client.getEndpoint(), apiVersion,
@@ -4393,7 +4488,7 @@ private Mono<ManagedClustersGetCommandResultResponse> getCommandResultWithRespon
         if (commandId == null) {
             return Mono.error(new IllegalArgumentException("Parameter commandId is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getCommandResult(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -4486,7 +4581,7 @@ public RunCommandResultInner getCommandResult(String resourceGroupName, String r
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listOutboundNetworkDependenciesEndpoints(this.client.getEndpoint(),
@@ -4531,7 +4626,7 @@ public RunCommandResultInner getCommandResult(String resourceGroupName, String r
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -4633,20 +4728,20 @@ public RunCommandResultInner getCommandResult(String resourceGroupName, String r
     }
 
     /**
-     * Lists mesh revision profiles for all meshes in the specified location.
+     * Gets supported Guardrails version in the specified subscription and location.
      * 
-     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains Guardrails version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
+     * @param version Safeguards version.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshRevisionsProfiles along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return available Guardrails Version along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<MeshRevisionProfileInner>> listMeshRevisionProfilesSinglePageAsync(String location) {
+    public Mono<Response<GuardrailsAvailableVersionInner>> getGuardrailsVersionsWithResponseAsync(String location,
+        String version) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -4658,32 +4753,159 @@ private Mono<PagedResponse<MeshRevisionProfileInner>> listMeshRevisionProfilesSi
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        if (version == null) {
+            return Mono.error(new IllegalArgumentException("Parameter version is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.listMeshRevisionProfiles(this.client.getEndpoint(), apiVersion,
+            .withContext(context -> service.getGuardrailsVersions(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), location, version, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<GuardrailsAvailableVersionInner>> getGuardrailsVersionsWithResponseAsync(String location,
+        String version, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (version == null) {
+            return Mono.error(new IllegalArgumentException("Parameter version is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.getGuardrailsVersions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            location, version, accept, context);
+    }
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<GuardrailsAvailableVersionInner> getGuardrailsVersionsAsync(String location, String version) {
+        return getGuardrailsVersionsWithResponseAsync(location, version)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<GuardrailsAvailableVersionInner> getGuardrailsVersionsWithResponse(String location, String version,
+        Context context) {
+        return getGuardrailsVersionsWithResponseAsync(location, version, context).block();
+    }
+
+    /**
+     * Gets supported Guardrails version in the specified subscription and location.
+     * 
+     * Contains Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param version Safeguards version.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available Guardrails Version.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public GuardrailsAvailableVersionInner getGuardrailsVersions(String location, String version) {
+        return getGuardrailsVersionsWithResponse(location, version, Context.NONE).getValue();
+    }
+
+    /**
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
+     * 
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of GuardrailsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<GuardrailsAvailableVersionInner>>
+        listGuardrailsVersionsSinglePageAsync(String location) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listGuardrailsVersions(this.client.getEndpoint(), apiVersion,
                 this.client.getSubscriptionId(), location, accept, context))
-            .<PagedResponse<MeshRevisionProfileInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+            .<PagedResponse<GuardrailsAvailableVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
                 res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
-     * Lists mesh revision profiles for all meshes in the specified location.
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
      * 
-     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshRevisionsProfiles along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return hold values properties, which is array of GuardrailsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<MeshRevisionProfileInner>> listMeshRevisionProfilesSinglePageAsync(String location,
+    private Mono<PagedResponse<GuardrailsAvailableVersionInner>> listGuardrailsVersionsSinglePageAsync(String location,
         Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
@@ -4696,104 +4918,103 @@ private Mono<PagedResponse<MeshRevisionProfileInner>> listMeshRevisionProfilesSi
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
-            .listMeshRevisionProfiles(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), location,
+            .listGuardrailsVersions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), location,
                 accept, context)
             .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
                 res.getValue().value(), res.getValue().nextLink(), null));
     }
 
     /**
-     * Lists mesh revision profiles for all meshes in the specified location.
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
      * 
-     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedFlux}.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<MeshRevisionProfileInner> listMeshRevisionProfilesAsync(String location) {
-        return new PagedFlux<>(() -> listMeshRevisionProfilesSinglePageAsync(location),
-            nextLink -> listMeshRevisionProfilesNextSinglePageAsync(nextLink));
+    public PagedFlux<GuardrailsAvailableVersionInner> listGuardrailsVersionsAsync(String location) {
+        return new PagedFlux<>(() -> listGuardrailsVersionsSinglePageAsync(location),
+            nextLink -> listGuardrailsVersionsNextSinglePageAsync(nextLink));
     }
 
     /**
-     * Lists mesh revision profiles for all meshes in the specified location.
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
      * 
-     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedFlux}.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<MeshRevisionProfileInner> listMeshRevisionProfilesAsync(String location, Context context) {
-        return new PagedFlux<>(() -> listMeshRevisionProfilesSinglePageAsync(location, context),
-            nextLink -> listMeshRevisionProfilesNextSinglePageAsync(nextLink, context));
+    private PagedFlux<GuardrailsAvailableVersionInner> listGuardrailsVersionsAsync(String location, Context context) {
+        return new PagedFlux<>(() -> listGuardrailsVersionsSinglePageAsync(location, context),
+            nextLink -> listGuardrailsVersionsNextSinglePageAsync(nextLink, context));
     }
 
     /**
-     * Lists mesh revision profiles for all meshes in the specified location.
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
      * 
-     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedIterable}.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<MeshRevisionProfileInner> listMeshRevisionProfiles(String location) {
-        return new PagedIterable<>(listMeshRevisionProfilesAsync(location));
+    public PagedIterable<GuardrailsAvailableVersionInner> listGuardrailsVersions(String location) {
+        return new PagedIterable<>(listGuardrailsVersionsAsync(location));
     }
 
     /**
-     * Lists mesh revision profiles for all meshes in the specified location.
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
      * 
-     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains list of Guardrails version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedIterable}.
+     * @return hold values properties, which is array of GuardrailsVersions as paginated response with
+     * {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<MeshRevisionProfileInner> listMeshRevisionProfiles(String location, Context context) {
-        return new PagedIterable<>(listMeshRevisionProfilesAsync(location, context));
+    public PagedIterable<GuardrailsAvailableVersionInner> listGuardrailsVersions(String location, Context context) {
+        return new PagedIterable<>(listGuardrailsVersionsAsync(location, context));
     }
 
     /**
-     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * Gets supported Safeguards version in the specified subscription and location.
      * 
-     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains Safeguards version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
-     * @param mode The mode of the mesh.
+     * @param version Safeguards version.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return mesh revision profile for a mesh along with {@link Response} on successful completion of {@link Mono}.
+     * @return available Safeguards Version along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithResponseAsync(String location,
-        String mode) {
+    public Mono<Response<SafeguardsAvailableVersionInner>> getSafeguardsVersionsWithResponseAsync(String location,
+        String version) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -4805,34 +5026,33 @@ public Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithRespon
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        if (mode == null) {
-            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        if (version == null) {
+            return Mono.error(new IllegalArgumentException("Parameter version is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.getMeshRevisionProfile(this.client.getEndpoint(), apiVersion,
-                this.client.getSubscriptionId(), location, mode, accept, context))
+            .withContext(context -> service.getSafeguardsVersions(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), location, version, accept, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
-     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * Gets supported Safeguards version in the specified subscription and location.
      * 
-     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains Safeguards version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
-     * @param mode The mode of the mesh.
+     * @param version Safeguards version.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return mesh revision profile for a mesh along with {@link Response} on successful completion of {@link Mono}.
+     * @return available Safeguards Version along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithResponseAsync(String location,
-        String mode, Context context) {
+    private Mono<Response<SafeguardsAvailableVersionInner>> getSafeguardsVersionsWithResponseAsync(String location,
+        String version, Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -4844,86 +5064,85 @@ private Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithRespo
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        if (mode == null) {
-            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        if (version == null) {
+            return Mono.error(new IllegalArgumentException("Parameter version is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
-        return service.getMeshRevisionProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
-            location, mode, accept, context);
+        return service.getSafeguardsVersions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            location, version, accept, context);
     }
 
     /**
-     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * Gets supported Safeguards version in the specified subscription and location.
      * 
-     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains Safeguards version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
-     * @param mode The mode of the mesh.
+     * @param version Safeguards version.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return mesh revision profile for a mesh on successful completion of {@link Mono}.
+     * @return available Safeguards Version on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<MeshRevisionProfileInner> getMeshRevisionProfileAsync(String location, String mode) {
-        return getMeshRevisionProfileWithResponseAsync(location, mode).flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    public Mono<SafeguardsAvailableVersionInner> getSafeguardsVersionsAsync(String location, String version) {
+        return getSafeguardsVersionsWithResponseAsync(location, version)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
-     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * Gets supported Safeguards version in the specified subscription and location.
      * 
-     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains Safeguards version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
-     * @param mode The mode of the mesh.
+     * @param version Safeguards version.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return mesh revision profile for a mesh along with {@link Response}.
+     * @return available Safeguards Version along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<MeshRevisionProfileInner> getMeshRevisionProfileWithResponse(String location, String mode,
+    public Response<SafeguardsAvailableVersionInner> getSafeguardsVersionsWithResponse(String location, String version,
         Context context) {
-        return getMeshRevisionProfileWithResponseAsync(location, mode, context).block();
+        return getSafeguardsVersionsWithResponseAsync(location, version, context).block();
     }
 
     /**
-     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * Gets supported Safeguards version in the specified subscription and location.
      * 
-     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
-     * upgrades.
+     * Contains Safeguards version along with its support info and whether it is a default version.
      * 
      * @param location The name of the Azure region.
-     * @param mode The mode of the mesh.
+     * @param version Safeguards version.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return mesh revision profile for a mesh.
+     * @return available Safeguards Version.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public MeshRevisionProfileInner getMeshRevisionProfile(String location, String mode) {
-        return getMeshRevisionProfileWithResponse(location, mode, Context.NONE).getValue();
+    public SafeguardsAvailableVersionInner getSafeguardsVersions(String location, String version) {
+        return getSafeguardsVersionsWithResponse(location, version, Context.NONE).getValue();
     }
 
     /**
-     * Lists available upgrades for all service meshes in a specific cluster.
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
      * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param resourceName The name of the managed cluster resource.
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshUpgradeProfiles along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return hold values properties, which is array of SafeguardsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<MeshUpgradeProfileInner>>
-        listMeshUpgradeProfilesSinglePageAsync(String resourceGroupName, String resourceName) {
+    private Mono<PagedResponse<SafeguardsAvailableVersionInner>>
+        listSafeguardsVersionsSinglePageAsync(String location) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -4932,38 +5151,35 @@ public MeshRevisionProfileInner getMeshRevisionProfile(String location, String m
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (resourceName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.listMeshUpgradeProfiles(this.client.getEndpoint(), apiVersion,
-                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
-            .<PagedResponse<MeshUpgradeProfileInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+            .withContext(context -> service.listSafeguardsVersions(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), location, accept, context))
+            .<PagedResponse<SafeguardsAvailableVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
                 res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
-     * Lists available upgrades for all service meshes in a specific cluster.
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
      * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param resourceName The name of the managed cluster resource.
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshUpgradeProfiles along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return hold values properties, which is array of SafeguardsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<MeshUpgradeProfileInner>>
-        listMeshUpgradeProfilesSinglePageAsync(String resourceGroupName, String resourceName, Context context) {
+    private Mono<PagedResponse<SafeguardsAvailableVersionInner>> listSafeguardsVersionsSinglePageAsync(String location,
+        Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -4972,89 +5188,632 @@ public MeshRevisionProfileInner getMeshRevisionProfile(String location, String m
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (resourceName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
-            .listMeshUpgradeProfiles(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
-                resourceGroupName, resourceName, accept, context)
+            .listSafeguardsVersions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), location,
+                accept, context)
             .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
                 res.getValue().value(), res.getValue().nextLink(), null));
     }
 
     /**
-     * Lists available upgrades for all service meshes in a specific cluster.
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
      * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param resourceName The name of the managed cluster resource.
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedFlux}.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<MeshUpgradeProfileInner> listMeshUpgradeProfilesAsync(String resourceGroupName,
-        String resourceName) {
-        return new PagedFlux<>(() -> listMeshUpgradeProfilesSinglePageAsync(resourceGroupName, resourceName),
-            nextLink -> listMeshUpgradeProfilesNextSinglePageAsync(nextLink));
+    public PagedFlux<SafeguardsAvailableVersionInner> listSafeguardsVersionsAsync(String location) {
+        return new PagedFlux<>(() -> listSafeguardsVersionsSinglePageAsync(location),
+            nextLink -> listSafeguardsVersionsNextSinglePageAsync(nextLink));
     }
 
     /**
-     * Lists available upgrades for all service meshes in a specific cluster.
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
      * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param resourceName The name of the managed cluster resource.
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedFlux}.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<MeshUpgradeProfileInner> listMeshUpgradeProfilesAsync(String resourceGroupName,
-        String resourceName, Context context) {
-        return new PagedFlux<>(() -> listMeshUpgradeProfilesSinglePageAsync(resourceGroupName, resourceName, context),
-            nextLink -> listMeshUpgradeProfilesNextSinglePageAsync(nextLink, context));
+    private PagedFlux<SafeguardsAvailableVersionInner> listSafeguardsVersionsAsync(String location, Context context) {
+        return new PagedFlux<>(() -> listSafeguardsVersionsSinglePageAsync(location, context),
+            nextLink -> listSafeguardsVersionsNextSinglePageAsync(nextLink, context));
     }
 
     /**
-     * Lists available upgrades for all service meshes in a specific cluster.
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
      * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param resourceName The name of the managed cluster resource.
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<SafeguardsAvailableVersionInner> listSafeguardsVersions(String location) {
+        return new PagedIterable<>(listSafeguardsVersionsAsync(location));
+    }
+
+    /**
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
+     * 
+     * Contains list of Safeguards version along with its support info and whether it is a default version.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<SafeguardsAvailableVersionInner> listSafeguardsVersions(String location, Context context) {
+        return new PagedIterable<>(listSafeguardsVersionsAsync(location, context));
+    }
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     * 
+     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshRevisionProfileInner>> listMeshRevisionProfilesSinglePageAsync(String location) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listMeshRevisionProfiles(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), location, accept, context))
+            .<PagedResponse<MeshRevisionProfileInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     * 
+     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshRevisionProfileInner>> listMeshRevisionProfilesSinglePageAsync(String location,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listMeshRevisionProfiles(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), location,
+                accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     * 
+     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<MeshRevisionProfileInner> listMeshRevisionProfilesAsync(String location) {
+        return new PagedFlux<>(() -> listMeshRevisionProfilesSinglePageAsync(location),
+            nextLink -> listMeshRevisionProfilesNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     * 
+     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<MeshRevisionProfileInner> listMeshRevisionProfilesAsync(String location, Context context) {
+        return new PagedFlux<>(() -> listMeshRevisionProfilesSinglePageAsync(location, context),
+            nextLink -> listMeshRevisionProfilesNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     * 
+     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<MeshRevisionProfileInner> listMeshRevisionProfiles(String location) {
+        return new PagedIterable<>(listMeshRevisionProfilesAsync(location));
+    }
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     * 
+     * Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<MeshRevisionProfileInner> listMeshRevisionProfiles(String location, Context context) {
+        return new PagedIterable<>(listMeshRevisionProfilesAsync(location, context));
+    }
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * 
+     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithResponseAsync(String location,
+        String mode) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (mode == null) {
+            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getMeshRevisionProfile(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), location, mode, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * 
+     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param mode The mode of the mesh.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithResponseAsync(String location,
+        String mode, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (mode == null) {
+            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.getMeshRevisionProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            location, mode, accept, context);
+    }
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * 
+     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<MeshRevisionProfileInner> getMeshRevisionProfileAsync(String location, String mode) {
+        return getMeshRevisionProfileWithResponseAsync(location, mode).flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * 
+     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param mode The mode of the mesh.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<MeshRevisionProfileInner> getMeshRevisionProfileWithResponse(String location, String mode,
+        Context context) {
+        return getMeshRevisionProfileWithResponseAsync(location, mode, context).block();
+    }
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     * 
+     * Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     * 
+     * @param location The name of the Azure region.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public MeshRevisionProfileInner getMeshRevisionProfile(String location, String mode) {
+        return getMeshRevisionProfileWithResponse(location, mode, Context.NONE).getValue();
+    }
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshUpgradeProfileInner>>
+        listMeshUpgradeProfilesSinglePageAsync(String resourceGroupName, String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listMeshUpgradeProfiles(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<MeshUpgradeProfileInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshUpgradeProfileInner>>
+        listMeshUpgradeProfilesSinglePageAsync(String resourceGroupName, String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listMeshUpgradeProfiles(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<MeshUpgradeProfileInner> listMeshUpgradeProfilesAsync(String resourceGroupName,
+        String resourceName) {
+        return new PagedFlux<>(() -> listMeshUpgradeProfilesSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listMeshUpgradeProfilesNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<MeshUpgradeProfileInner> listMeshUpgradeProfilesAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        return new PagedFlux<>(() -> listMeshUpgradeProfilesSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listMeshUpgradeProfilesNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(String resourceGroupName,
+        String resourceName) {
+        return new PagedIterable<>(listMeshUpgradeProfilesAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedIterable}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(String resourceGroupName,
-        String resourceName) {
-        return new PagedIterable<>(listMeshUpgradeProfilesAsync(resourceGroupName, resourceName));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listMeshUpgradeProfilesAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster along with {@link Response} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithResponseAsync(String resourceGroupName,
+        String resourceName, String mode) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (mode == null) {
+            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getMeshUpgradeProfile(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, mode, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster along with {@link Response} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithResponseAsync(String resourceGroupName,
+        String resourceName, String mode, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (mode == null) {
+            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.getMeshUpgradeProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, mode, accept, context);
+    }
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<MeshUpgradeProfileInner> getMeshUpgradeProfileAsync(String resourceGroupName, String resourceName,
+        String mode) {
+        return getMeshUpgradeProfileWithResponseAsync(resourceGroupName, resourceName, mode)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
     /**
-     * Lists available upgrades for all service meshes in a specific cluster.
+     * Gets available upgrades for a service mesh in a cluster.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedIterable}.
+     * @return available upgrades for a service mesh in a cluster along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(String resourceGroupName, String resourceName,
-        Context context) {
-        return new PagedIterable<>(listMeshUpgradeProfilesAsync(resourceGroupName, resourceName, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<MeshUpgradeProfileInner> getMeshUpgradeProfileWithResponse(String resourceGroupName,
+        String resourceName, String mode, Context context) {
+        return getMeshUpgradeProfileWithResponseAsync(resourceGroupName, resourceName, mode, context).block();
     }
 
     /**
@@ -5066,12 +5825,28 @@ public PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(String res
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return available upgrades for a service mesh in a cluster along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return available upgrades for a service mesh in a cluster.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithResponseAsync(String resourceGroupName,
-        String resourceName, String mode) {
+    public MeshUpgradeProfileInner getMeshUpgradeProfile(String resourceGroupName, String resourceName, String mode) {
+        return getMeshUpgradeProfileWithResponse(resourceGroupName, resourceName, mode, Context.NONE).getValue();
+    }
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> rebalanceLoadBalancersWithResponseAsync(String resourceGroupName,
+        String resourceName, RebalanceLoadBalancersRequestBody parameters) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -5087,33 +5862,35 @@ public Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithResponse
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        if (mode == null) {
-            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.getMeshUpgradeProfile(this.client.getEndpoint(), apiVersion,
-                this.client.getSubscriptionId(), resourceGroupName, resourceName, mode, accept, context))
+            .withContext(context -> service.rebalanceLoadBalancers(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, parameters, accept, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
-     * Gets available upgrades for a service mesh in a cluster.
+     * Rebalance nodes across specific load balancers.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
-     * @param mode The mode of the mesh.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return available upgrades for a service mesh in a cluster along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return the {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithResponseAsync(String resourceGroupName,
-        String resourceName, String mode, Context context) {
+    private Mono<Response<Flux<ByteBuffer>>> rebalanceLoadBalancersWithResponseAsync(String resourceGroupName,
+        String resourceName, RebalanceLoadBalancersRequestBody parameters, Context context) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -5129,66 +5906,172 @@ private Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithRespons
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        if (mode == null) {
-            return Mono.error(new IllegalArgumentException("Parameter mode is required and cannot be null."));
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
-        return service.getMeshUpgradeProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
-            resourceGroupName, resourceName, mode, accept, context);
+        return service.rebalanceLoadBalancers(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, parameters, accept, context);
     }
 
     /**
-     * Gets available upgrades for a service mesh in a cluster.
+     * Rebalance nodes across specific load balancers.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
-     * @param mode The mode of the mesh.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return available upgrades for a service mesh in a cluster on successful completion of {@link Mono}.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginRebalanceLoadBalancersAsync(String resourceGroupName,
+        String resourceName, RebalanceLoadBalancersRequestBody parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = rebalanceLoadBalancersWithResponseAsync(resourceGroupName, resourceName, parameters);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginRebalanceLoadBalancersAsync(String resourceGroupName,
+        String resourceName, RebalanceLoadBalancersRequestBody parameters, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = rebalanceLoadBalancersWithResponseAsync(resourceGroupName, resourceName, parameters, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginRebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters) {
+        return this.beginRebalanceLoadBalancersAsync(resourceGroupName, resourceName, parameters).getSyncPoller();
+    }
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginRebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters, Context context) {
+        return this.beginRebalanceLoadBalancersAsync(resourceGroupName, resourceName, parameters, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<MeshUpgradeProfileInner> getMeshUpgradeProfileAsync(String resourceGroupName, String resourceName,
-        String mode) {
-        return getMeshUpgradeProfileWithResponseAsync(resourceGroupName, resourceName, mode)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    public Mono<Void> rebalanceLoadBalancersAsync(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters) {
+        return beginRebalanceLoadBalancersAsync(resourceGroupName, resourceName, parameters).last()
+            .flatMap(this.client::getLroFinalResultOrError);
     }
 
     /**
-     * Gets available upgrades for a service mesh in a cluster.
+     * Rebalance nodes across specific load balancers.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
-     * @param mode The mode of the mesh.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return available upgrades for a service mesh in a cluster along with {@link Response}.
+     * @return A {@link Mono} that completes when a successful response is received.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<MeshUpgradeProfileInner> getMeshUpgradeProfileWithResponse(String resourceGroupName,
-        String resourceName, String mode, Context context) {
-        return getMeshUpgradeProfileWithResponseAsync(resourceGroupName, resourceName, mode, context).block();
+    private Mono<Void> rebalanceLoadBalancersAsync(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters, Context context) {
+        return beginRebalanceLoadBalancersAsync(resourceGroupName, resourceName, parameters, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
     }
 
     /**
-     * Gets available upgrades for a service mesh in a cluster.
+     * Rebalance nodes across specific load balancers.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param resourceName The name of the managed cluster resource.
-     * @param mode The mode of the mesh.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return available upgrades for a service mesh in a cluster.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public MeshUpgradeProfileInner getMeshUpgradeProfile(String resourceGroupName, String resourceName, String mode) {
-        return getMeshUpgradeProfileWithResponse(resourceGroupName, resourceName, mode, Context.NONE).getValue();
+    public void rebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters) {
+        rebalanceLoadBalancersAsync(resourceGroupName, resourceName, parameters).block();
+    }
+
+    /**
+     * Rebalance nodes across specific load balancers.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param parameters The names of the load balancers to be rebalanced. If set to empty, all load balancers will be
+     * rebalanced.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void rebalanceLoadBalancers(String resourceGroupName, String resourceName,
+        RebalanceLoadBalancersRequestBody parameters, Context context) {
+        rebalanceLoadBalancersAsync(resourceGroupName, resourceName, parameters, context).block();
     }
 
     /**
@@ -5372,6 +6255,128 @@ private Mono<PagedResponse<ManagedClusterInner>> listByResourceGroupNextSinglePa
                 res.getValue().value(), res.getValue().nextLink(), null));
     }
 
+    /**
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of GuardrailsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<GuardrailsAvailableVersionInner>>
+        listGuardrailsVersionsNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listGuardrailsVersionsNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<GuardrailsAvailableVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of supported Guardrails versions in the specified subscription and location.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of GuardrailsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<GuardrailsAvailableVersionInner>>
+        listGuardrailsVersionsNextSinglePageAsync(String nextLink, Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listGuardrailsVersionsNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<SafeguardsAvailableVersionInner>>
+        listSafeguardsVersionsNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listSafeguardsVersionsNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<SafeguardsAvailableVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of supported Safeguards versions in the specified subscription and location.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return hold values properties, which is array of SafeguardsVersions along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<SafeguardsAvailableVersionInner>>
+        listSafeguardsVersionsNextSinglePageAsync(String nextLink, Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listSafeguardsVersionsNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
     /**
      * Lists mesh revision profiles for all meshes in the specified location.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedNamespacesClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedNamespacesClientImpl.java
new file mode 100644
index 000000000000..1f192eea5913
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ManagedNamespacesClientImpl.java
@@ -0,0 +1,1264 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.Patch;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Post;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.ManagedNamespacesClient;
+import com.azure.resourcemanager.containerservice.fluent.models.CredentialResultsInner;
+import com.azure.resourcemanager.containerservice.fluent.models.ManagedNamespaceInner;
+import com.azure.resourcemanager.containerservice.models.ManagedNamespaceListResult;
+import com.azure.resourcemanager.containerservice.models.TagsObject;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in ManagedNamespacesClient.
+ */
+public final class ManagedNamespacesClientImpl implements ManagedNamespacesClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final ManagedNamespacesService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ManagedNamespacesClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    ManagedNamespacesClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service
+            = RestProxy.create(ManagedNamespacesService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientManagedNamespaces to be used by the
+     * proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientManagedNamespaces")
+    public interface ManagedNamespacesService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/managedNamespaces")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedNamespaceListResult>> listByManagedCluster(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/managedNamespaces/{managedNamespaceName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedNamespaceInner>> get(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("managedNamespaceName") String managedNamespaceName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/managedNamespaces/{managedNamespaceName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("managedNamespaceName") String managedNamespaceName,
+            @BodyParam("application/json") ManagedNamespaceInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/managedNamespaces/{managedNamespaceName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("managedNamespaceName") String managedNamespaceName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/managedNamespaces/{managedNamespaceName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedNamespaceInner>> update(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("managedNamespaceName") String managedNamespaceName,
+            @BodyParam("application/json") TagsObject parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/managedNamespaces/{managedNamespaceName}/listCredential")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<CredentialResultsInner>> listCredential(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("managedNamespaceName") String managedNamespaceName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ManagedNamespaceListResult>> listByManagedClusterNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedNamespaceInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByManagedCluster(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<ManagedNamespaceInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedNamespaceInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listByManagedCluster(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<ManagedNamespaceInner> listByManagedClusterAsync(String resourceGroupName, String resourceName) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ManagedNamespaceInner> listByManagedClusterAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ManagedNamespaceInner> listByManagedCluster(String resourceGroupName, String resourceName) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ManagedNamespaceInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<ManagedNamespaceInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, managedNamespaceName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<ManagedNamespaceInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, managedNamespaceName, accept, context);
+    }
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ManagedNamespaceInner> getAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        return getWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<ManagedNamespaceInner> getWithResponse(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context) {
+        return getWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName, context).block();
+    }
+
+    /**
+     * Gets the specified namespace of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the specified namespace of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedNamespaceInner get(String resourceGroupName, String resourceName, String managedNamespaceName) {
+        return getWithResponse(resourceGroupName, resourceName, managedNamespaceName, Context.NONE).getValue();
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, managedNamespaceName, parameters,
+                accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, managedNamespaceName, parameters, accept, context);
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName, parameters);
+        return this.client.<ManagedNamespaceInner, ManagedNamespaceInner>getLroResult(mono,
+            this.client.getHttpPipeline(), ManagedNamespaceInner.class, ManagedNamespaceInner.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters,
+        Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, resourceName,
+            managedNamespaceName, parameters, context);
+        return this.client.<ManagedNamespaceInner, ManagedNamespaceInner>getLroResult(mono,
+            this.client.getHttpPipeline(), ManagedNamespaceInner.class, ManagedNamespaceInner.class, context);
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, managedNamespaceName, parameters)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ManagedNamespaceInner>, ManagedNamespaceInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String managedNamespaceName, ManagedNamespaceInner parameters,
+        Context context) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, managedNamespaceName, parameters, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ManagedNamespaceInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, ManagedNamespaceInner parameters) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, managedNamespaceName, parameters).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<ManagedNamespaceInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, ManagedNamespaceInner parameters, Context context) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, managedNamespaceName, parameters, context)
+            .last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedNamespaceInner createOrUpdate(String resourceGroupName, String resourceName,
+        String managedNamespaceName, ManagedNamespaceInner parameters) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, managedNamespaceName, parameters).block();
+    }
+
+    /**
+     * Creates or updates a managed namespace in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters The namespace to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedNamespaceInner createOrUpdate(String resourceGroupName, String resourceName,
+        String managedNamespaceName, ManagedNamespaceInner parameters, Context context) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, managedNamespaceName, parameters, context).block();
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                    resourceGroupName, resourceName, managedNamespaceName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, managedNamespaceName, accept, context);
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, managedNamespaceName).getSyncPoller();
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, managedNamespaceName, context).getSyncPoller();
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String managedNamespaceName) {
+        return beginDeleteAsync(resourceGroupName, resourceName, managedNamespaceName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String managedNamespaceName,
+        Context context) {
+        return beginDeleteAsync(resourceGroupName, resourceName, managedNamespaceName, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String managedNamespaceName) {
+        deleteAsync(resourceGroupName, resourceName, managedNamespaceName).block();
+    }
+
+    /**
+     * Deletes a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String managedNamespaceName, Context context) {
+        deleteAsync(resourceGroupName, resourceName, managedNamespaceName, context).block();
+    }
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<ManagedNamespaceInner>> updateWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, TagsObject parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.update(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                    resourceGroupName, resourceName, managedNamespaceName, parameters, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<ManagedNamespaceInner>> updateWithResponseAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, TagsObject parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.update(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, managedNamespaceName, parameters, accept, context);
+    }
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<ManagedNamespaceInner> updateAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName, TagsObject parameters) {
+        return updateWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName, parameters)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<ManagedNamespaceInner> updateWithResponse(String resourceGroupName, String resourceName,
+        String managedNamespaceName, TagsObject parameters, Context context) {
+        return updateWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName, parameters, context)
+            .block();
+    }
+
+    /**
+     * Updates tags on a managed namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param parameters Parameters supplied to the patch namespace operation, we only support patch tags for now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return namespace managed by ARM.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ManagedNamespaceInner update(String resourceGroupName, String resourceName, String managedNamespaceName,
+        TagsObject parameters) {
+        return updateWithResponse(resourceGroupName, resourceName, managedNamespaceName, parameters, Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<CredentialResultsInner>> listCredentialWithResponseAsync(String resourceGroupName,
+        String resourceName, String managedNamespaceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.listCredential(this.client.getEndpoint(), apiVersion,
+            this.client.getSubscriptionId(), resourceGroupName, resourceName, managedNamespaceName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<CredentialResultsInner>> listCredentialWithResponseAsync(String resourceGroupName,
+        String resourceName, String managedNamespaceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (managedNamespaceName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter managedNamespaceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listCredential(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, managedNamespaceName, accept, context);
+    }
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<CredentialResultsInner> listCredentialAsync(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        return listCredentialWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<CredentialResultsInner> listCredentialWithResponse(String resourceGroupName, String resourceName,
+        String managedNamespaceName, Context context) {
+        return listCredentialWithResponseAsync(resourceGroupName, resourceName, managedNamespaceName, context).block();
+    }
+
+    /**
+     * Lists the credentials of a namespace.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param managedNamespaceName The name of the managed namespace.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list credential result response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public CredentialResultsInner listCredential(String resourceGroupName, String resourceName,
+        String managedNamespaceName) {
+        return listCredentialWithResponse(resourceGroupName, resourceName, managedNamespaceName, Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedNamespaceInner>> listByManagedClusterNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<ManagedNamespaceInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of managed namespaces in the specified managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of managed namespaces in the specified managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ManagedNamespaceInner>> listByManagedClusterNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MeshMembershipsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MeshMembershipsClientImpl.java
new file mode 100644
index 000000000000..e2d8fcd3ae77
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/MeshMembershipsClientImpl.java
@@ -0,0 +1,950 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.containerservice.fluent.MeshMembershipsClient;
+import com.azure.resourcemanager.containerservice.fluent.models.MeshMembershipInner;
+import com.azure.resourcemanager.containerservice.models.MeshMembershipsListResult;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in MeshMembershipsClient.
+ */
+public final class MeshMembershipsClientImpl implements MeshMembershipsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final MeshMembershipsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of MeshMembershipsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    MeshMembershipsClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service
+            = RestProxy.create(MeshMembershipsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientMeshMemberships to be used by the
+     * proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientMeshMemberships")
+    public interface MeshMembershipsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/meshMemberships")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<MeshMembershipsListResult>> listByManagedCluster(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/meshMemberships/{meshMembershipName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<MeshMembershipInner>> get(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("meshMembershipName") String meshMembershipName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/meshMemberships/{meshMembershipName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("meshMembershipName") String meshMembershipName,
+            @BodyParam("application/json") MeshMembershipInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/meshMemberships/{meshMembershipName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("meshMembershipName") String meshMembershipName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<MeshMembershipsListResult>> listByManagedClusterNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshMembershipInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByManagedCluster(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<MeshMembershipInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshMembershipInner>> listByManagedClusterSinglePageAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .listByManagedCluster(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<MeshMembershipInner> listByManagedClusterAsync(String resourceGroupName, String resourceName) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<MeshMembershipInner> listByManagedClusterAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedFlux<>(() -> listByManagedClusterSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listByManagedClusterNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<MeshMembershipInner> listByManagedCluster(String resourceGroupName, String resourceName) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<MeshMembershipInner> listByManagedCluster(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listByManagedClusterAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<MeshMembershipInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (meshMembershipName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter meshMembershipName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, meshMembershipName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<MeshMembershipInner>> getWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (meshMembershipName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter meshMembershipName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, meshMembershipName, accept, context);
+    }
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<MeshMembershipInner> getAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName) {
+        return getWithResponseAsync(resourceGroupName, resourceName, meshMembershipName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<MeshMembershipInner> getWithResponse(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context) {
+        return getWithResponseAsync(resourceGroupName, resourceName, meshMembershipName, context).block();
+    }
+
+    /**
+     * Gets the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public MeshMembershipInner get(String resourceGroupName, String resourceName, String meshMembershipName) {
+        return getWithResponse(resourceGroupName, resourceName, meshMembershipName, Context.NONE).getValue();
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String meshMembershipName, MeshMembershipInner parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (meshMembershipName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter meshMembershipName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, meshMembershipName, parameters,
+                accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceName, String meshMembershipName, MeshMembershipInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (meshMembershipName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter meshMembershipName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, meshMembershipName, parameters, accept, context);
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String meshMembershipName, MeshMembershipInner parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, resourceName, meshMembershipName, parameters);
+        return this.client.<MeshMembershipInner, MeshMembershipInner>getLroResult(mono, this.client.getHttpPipeline(),
+            MeshMembershipInner.class, MeshMembershipInner.class, this.client.getContext());
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdateAsync(
+        String resourceGroupName, String resourceName, String meshMembershipName, MeshMembershipInner parameters,
+        Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, resourceName, meshMembershipName, parameters, context);
+        return this.client.<MeshMembershipInner, MeshMembershipInner>getLroResult(mono, this.client.getHttpPipeline(),
+            MeshMembershipInner.class, MeshMembershipInner.class, context);
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String meshMembershipName, MeshMembershipInner parameters) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, meshMembershipName, parameters)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<MeshMembershipInner>, MeshMembershipInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceName, String meshMembershipName, MeshMembershipInner parameters,
+        Context context) {
+        return this.beginCreateOrUpdateAsync(resourceGroupName, resourceName, meshMembershipName, parameters, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<MeshMembershipInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, MeshMembershipInner parameters) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, meshMembershipName, parameters).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<MeshMembershipInner> createOrUpdateAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, MeshMembershipInner parameters, Context context) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceName, meshMembershipName, parameters, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public MeshMembershipInner createOrUpdate(String resourceGroupName, String resourceName, String meshMembershipName,
+        MeshMembershipInner parameters) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, meshMembershipName, parameters).block();
+    }
+
+    /**
+     * Creates or updates the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param parameters The mesh membership to create or update.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh membership of a managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public MeshMembershipInner createOrUpdate(String resourceGroupName, String resourceName, String meshMembershipName,
+        MeshMembershipInner parameters, Context context) {
+        return createOrUpdateAsync(resourceGroupName, resourceName, meshMembershipName, parameters, context).block();
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (meshMembershipName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter meshMembershipName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, meshMembershipName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (meshMembershipName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter meshMembershipName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, meshMembershipName, accept, context);
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, meshMembershipName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, resourceName, meshMembershipName, context);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            context);
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String meshMembershipName) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, meshMembershipName).getSyncPoller();
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceName,
+        String meshMembershipName, Context context) {
+        return this.beginDeleteAsync(resourceGroupName, resourceName, meshMembershipName, context).getSyncPoller();
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String meshMembershipName) {
+        return beginDeleteAsync(resourceGroupName, resourceName, meshMembershipName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceName, String meshMembershipName,
+        Context context) {
+        return beginDeleteAsync(resourceGroupName, resourceName, meshMembershipName, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String meshMembershipName) {
+        deleteAsync(resourceGroupName, resourceName, meshMembershipName).block();
+    }
+
+    /**
+     * Deletes the mesh membership of a managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param meshMembershipName The name of the mesh membership.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceName, String meshMembershipName, Context context) {
+        deleteAsync(resourceGroupName, resourceName, meshMembershipName, context).block();
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshMembershipInner>> listByManagedClusterNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<MeshMembershipInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists mesh memberships in a managed cluster.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the result of a request to list mesh memberships in a managed cluster along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<MeshMembershipInner>> listByManagedClusterNextSinglePageAsync(String nextLink,
+        Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listByManagedClusterNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationStatusResultsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationStatusResultsClientImpl.java
new file mode 100644
index 000000000000..0c897af5d8a2
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationStatusResultsClientImpl.java
@@ -0,0 +1,587 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.implementation;
+
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.resourcemanager.containerservice.fluent.OperationStatusResultsClient;
+import com.azure.resourcemanager.containerservice.fluent.models.OperationStatusResultInner;
+import com.azure.resourcemanager.containerservice.models.OperationStatusResultList;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in OperationStatusResultsClient.
+ */
+public final class OperationStatusResultsClientImpl implements OperationStatusResultsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final OperationStatusResultsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final ContainerServiceManagementClientImpl client;
+
+    /**
+     * Initializes an instance of OperationStatusResultsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    OperationStatusResultsClientImpl(ContainerServiceManagementClientImpl client) {
+        this.service = RestProxy.create(OperationStatusResultsService.class, client.getHttpPipeline(),
+            client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for ContainerServiceManagementClientOperationStatusResults to be used by
+     * the proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "ContainerServiceManagementClientOperationStatusResults")
+    public interface OperationStatusResultsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/operations")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<OperationStatusResultList>> list(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/operations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<OperationStatusResultInner>> get(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("operationId") String operationId, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/operations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<OperationStatusResultInner>> getByAgentPool(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("resourceName") String resourceName,
+            @PathParam("agentPoolName") String agentPoolName, @PathParam("operationId") String operationId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<OperationStatusResultList>> listNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<OperationStatusResultInner>> listSinglePageAsync(String resourceGroupName,
+        String resourceName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, accept, context))
+            .<PagedResponse<OperationStatusResultInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<OperationStatusResultInner>> listSinglePageAsync(String resourceGroupName,
+        String resourceName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+                resourceName, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<OperationStatusResultInner> listAsync(String resourceGroupName, String resourceName) {
+        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, resourceName),
+            nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<OperationStatusResultInner> listAsync(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, resourceName, context),
+            nextLink -> listNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<OperationStatusResultInner> list(String resourceGroupName, String resourceName) {
+        return new PagedIterable<>(listAsync(resourceGroupName, resourceName));
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<OperationStatusResultInner> list(String resourceGroupName, String resourceName,
+        Context context) {
+        return new PagedIterable<>(listAsync(resourceGroupName, resourceName, context));
+    }
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<OperationStatusResultInner>> getWithResponseAsync(String resourceGroupName,
+        String resourceName, String operationId) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+                resourceGroupName, resourceName, operationId, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<OperationStatusResultInner>> getWithResponseAsync(String resourceGroupName,
+        String resourceName, String operationId, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
+            resourceName, operationId, accept, context);
+    }
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<OperationStatusResultInner> getAsync(String resourceGroupName, String resourceName,
+        String operationId) {
+        return getWithResponseAsync(resourceGroupName, resourceName, operationId)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<OperationStatusResultInner> getWithResponse(String resourceGroupName, String resourceName,
+        String operationId, Context context) {
+        return getWithResponseAsync(resourceGroupName, resourceName, operationId, context).block();
+    }
+
+    /**
+     * Get the status of a specific operation in the specified managed cluster.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified managed cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public OperationStatusResultInner get(String resourceGroupName, String resourceName, String operationId) {
+        return getWithResponse(resourceGroupName, resourceName, operationId, Context.NONE).getValue();
+    }
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<OperationStatusResultInner>> getByAgentPoolWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String operationId) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (agentPoolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getByAgentPool(this.client.getEndpoint(), apiVersion,
+                this.client.getSubscriptionId(), resourceGroupName, resourceName, agentPoolName, operationId, accept,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<OperationStatusResultInner>> getByAgentPoolWithResponseAsync(String resourceGroupName,
+        String resourceName, String agentPoolName, String operationId, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (resourceName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
+        }
+        if (agentPoolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String apiVersion = "2025-08-02-preview";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.getByAgentPool(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
+            resourceGroupName, resourceName, agentPoolName, operationId, accept, context);
+    }
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<OperationStatusResultInner> getByAgentPoolAsync(String resourceGroupName, String resourceName,
+        String agentPoolName, String operationId) {
+        return getByAgentPoolWithResponseAsync(resourceGroupName, resourceName, agentPoolName, operationId)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<OperationStatusResultInner> getByAgentPoolWithResponse(String resourceGroupName,
+        String resourceName, String agentPoolName, String operationId, Context context) {
+        return getByAgentPoolWithResponseAsync(resourceGroupName, resourceName, agentPoolName, operationId, context)
+            .block();
+    }
+
+    /**
+     * Get the status of a specific operation in the specified agent pool.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param agentPoolName The name of the agent pool.
+     * @param operationId The ID of an ongoing async operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the status of a specific operation in the specified agent pool.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public OperationStatusResultInner getByAgentPool(String resourceGroupName, String resourceName,
+        String agentPoolName, String operationId) {
+        return getByAgentPoolWithResponse(resourceGroupName, resourceName, agentPoolName, operationId, Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<OperationStatusResultInner>> listNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<OperationStatusResultInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of operations in the specified managedCluster
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of operations in the specified managedCluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<OperationStatusResultInner>> listNextSinglePageAsync(String nextLink, Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationsClientImpl.java
index 7b5ed09bcb50..2e83b03aa24f 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/OperationsClientImpl.java
@@ -82,7 +82,7 @@ private Mono<PagedResponse<OperationValueInner>> listSinglePageAsync() {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.list(this.client.getEndpoint(), apiVersion, accept, context))
             .<PagedResponse<OperationValueInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
@@ -105,7 +105,7 @@ private Mono<PagedResponse<OperationValueInner>> listSinglePageAsync(Context con
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, accept, context)
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateEndpointConnectionsClientImpl.java
index 940c00e82c3c..1671804ee3c2 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -138,7 +138,7 @@ public Mono<Response<PrivateEndpointConnectionListResultInner>> listWithResponse
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -178,7 +178,7 @@ private Mono<Response<PrivateEndpointConnectionListResultInner>> listWithRespons
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -273,7 +273,7 @@ public Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -317,7 +317,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -422,7 +422,7 @@ public Mono<Response<PrivateEndpointConnectionInner>> updateWithResponseAsync(St
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -472,7 +472,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> updateWithResponseAsync(S
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -570,7 +570,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -613,7 +613,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateLinkResourcesClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateLinkResourcesClientImpl.java
index efa082ef813b..279d230e9443 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateLinkResourcesClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/PrivateLinkResourcesClientImpl.java
@@ -97,7 +97,7 @@ public Mono<Response<PrivateLinkResourcesListResultInner>> listWithResponseAsync
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -136,7 +136,7 @@ private Mono<Response<PrivateLinkResourcesListResultInner>> listWithResponseAsyn
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ResolvePrivateLinkServiceIdsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ResolvePrivateLinkServiceIdsClientImpl.java
index 828b2579ba5c..ce3c3e722ba2 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ResolvePrivateLinkServiceIdsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/ResolvePrivateLinkServiceIdsClientImpl.java
@@ -104,7 +104,7 @@ public Mono<Response<PrivateLinkResourceInner>> postWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.post(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -148,7 +148,7 @@ private Mono<Response<PrivateLinkResourceInner>> postWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.post(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/SnapshotsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/SnapshotsClientImpl.java
index 9fcab35748bb..9778b750a27e 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/SnapshotsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/SnapshotsClientImpl.java
@@ -160,7 +160,7 @@ private Mono<PagedResponse<SnapshotInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -190,7 +190,7 @@ private Mono<PagedResponse<SnapshotInner>> listSinglePageAsync(Context context)
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -275,7 +275,7 @@ private Mono<PagedResponse<SnapshotInner>> listByResourceGroupSinglePageAsync(St
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), apiVersion,
@@ -311,7 +311,7 @@ private Mono<PagedResponse<SnapshotInner>> listByResourceGroupSinglePageAsync(St
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -409,7 +409,7 @@ public Mono<Response<SnapshotInner>> getByResourceGroupWithResponseAsync(String
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), apiVersion,
@@ -446,7 +446,7 @@ private Mono<Response<SnapshotInner>> getByResourceGroupWithResponseAsync(String
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -535,7 +535,7 @@ public Mono<Response<SnapshotInner>> createOrUpdateWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -578,7 +578,7 @@ private Mono<Response<SnapshotInner>> createOrUpdateWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -671,7 +671,7 @@ public Mono<Response<SnapshotInner>> updateTagsWithResponseAsync(String resource
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), apiVersion,
@@ -714,7 +714,7 @@ private Mono<Response<SnapshotInner>> updateTagsWithResponseAsync(String resourc
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -799,7 +799,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -836,7 +836,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRoleBindingsClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRoleBindingsClientImpl.java
index ff3024d60d18..b1907771fbe7 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRoleBindingsClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRoleBindingsClientImpl.java
@@ -148,7 +148,7 @@ private Mono<PagedResponse<TrustedAccessRoleBindingInner>> listSinglePageAsync(S
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -188,7 +188,7 @@ private Mono<PagedResponse<TrustedAccessRoleBindingInner>> listSinglePageAsync(S
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -297,7 +297,7 @@ public Mono<Response<TrustedAccessRoleBindingInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter trustedAccessRoleBindingName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -339,7 +339,7 @@ private Mono<Response<TrustedAccessRoleBindingInner>> getWithResponseAsync(Strin
             return Mono.error(
                 new IllegalArgumentException("Parameter trustedAccessRoleBindingName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -441,7 +441,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             trustedAccessRoleBinding.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -493,7 +493,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             trustedAccessRoleBinding.validate();
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -704,7 +704,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(
                 new IllegalArgumentException("Parameter trustedAccessRoleBindingName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -747,7 +747,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter trustedAccessRoleBindingName is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRolesClientImpl.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRolesClientImpl.java
index e322494d85ea..01d41a2d5b05 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRolesClientImpl.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/implementation/TrustedAccessRolesClientImpl.java
@@ -101,7 +101,7 @@ private Mono<PagedResponse<TrustedAccessRoleInner>> listSinglePageAsync(String l
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -134,7 +134,7 @@ private Mono<PagedResponse<TrustedAccessRoleInner>> listSinglePageAsync(String l
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2025-07-01";
+        final String apiVersion = "2025-08-02-preview";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AccelerationMode.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AccelerationMode.java
new file mode 100644
index 000000000000..117724b51d09
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AccelerationMode.java
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Enable advanced network acceleration options. This allows users to configure acceleration using BPF host routing.
+ * This can be enabled only with Cilium dataplane. If not specified, the default value is None (no acceleration). The
+ * acceleration mode can be changed on a pre-existing cluster. See https://aka.ms/acnsperformance for a detailed
+ * explanation.
+ */
+public final class AccelerationMode extends ExpandableStringEnum<AccelerationMode> {
+    /**
+     * Static value BpfVeth for AccelerationMode.
+     */
+    public static final AccelerationMode BPF_VETH = fromString("BpfVeth");
+
+    /**
+     * Static value None for AccelerationMode.
+     */
+    public static final AccelerationMode NONE = fromString("None");
+
+    /**
+     * Creates a new instance of AccelerationMode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AccelerationMode() {
+    }
+
+    /**
+     * Creates or finds a AccelerationMode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AccelerationMode.
+     */
+    public static AccelerationMode fromString(String name) {
+        return fromString(name, AccelerationMode.class);
+    }
+
+    /**
+     * Gets known AccelerationMode values.
+     * 
+     * @return known AccelerationMode values.
+     */
+    public static Collection<AccelerationMode> values() {
+        return values(AccelerationMode.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AddonAutoscaling.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AddonAutoscaling.java
new file mode 100644
index 000000000000..003a808b9fe7
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AddonAutoscaling.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Whether VPA add-on is enabled and configured to scale AKS-managed add-ons.
+ */
+public final class AddonAutoscaling extends ExpandableStringEnum<AddonAutoscaling> {
+    /**
+     * Static value Enabled for AddonAutoscaling.
+     */
+    public static final AddonAutoscaling ENABLED = fromString("Enabled");
+
+    /**
+     * Static value Disabled for AddonAutoscaling.
+     */
+    public static final AddonAutoscaling DISABLED = fromString("Disabled");
+
+    /**
+     * Creates a new instance of AddonAutoscaling value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AddonAutoscaling() {
+    }
+
+    /**
+     * Creates or finds a AddonAutoscaling from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AddonAutoscaling.
+     */
+    public static AddonAutoscaling fromString(String name) {
+        return fromString(name, AddonAutoscaling.class);
+    }
+
+    /**
+     * Gets known AddonAutoscaling values.
+     * 
+     * @return known AddonAutoscaling values.
+     */
+    public static Collection<AddonAutoscaling> values() {
+        return values(AddonAutoscaling.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdoptionPolicy.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdoptionPolicy.java
new file mode 100644
index 000000000000..7a2cb8d39c4e
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdoptionPolicy.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Action if Kubernetes namespace with same name already exists.
+ */
+public final class AdoptionPolicy extends ExpandableStringEnum<AdoptionPolicy> {
+    /**
+     * Static value Never for AdoptionPolicy.
+     */
+    public static final AdoptionPolicy NEVER = fromString("Never");
+
+    /**
+     * Static value IfIdentical for AdoptionPolicy.
+     */
+    public static final AdoptionPolicy IF_IDENTICAL = fromString("IfIdentical");
+
+    /**
+     * Static value Always for AdoptionPolicy.
+     */
+    public static final AdoptionPolicy ALWAYS = fromString("Always");
+
+    /**
+     * Creates a new instance of AdoptionPolicy value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AdoptionPolicy() {
+    }
+
+    /**
+     * Creates or finds a AdoptionPolicy from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AdoptionPolicy.
+     */
+    public static AdoptionPolicy fromString(String name) {
+        return fromString(name, AdoptionPolicy.class);
+    }
+
+    /**
+     * Gets known AdoptionPolicy values.
+     * 
+     * @return known AdoptionPolicy values.
+     */
+    public static Collection<AdoptionPolicy> values() {
+        return values(AdoptionPolicy.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkPolicies.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkPolicies.java
new file mode 100644
index 000000000000..3912695f8b3f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkPolicies.java
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Enable advanced network policies. This allows users to configure Layer 7 network policies (FQDN, HTTP, Kafka).
+ * Policies themselves must be configured via the Cilium Network Policy resources, see
+ * https://docs.cilium.io/en/latest/security/policy/index.html. This can be enabled only on cilium-based clusters. If
+ * not specified, the default value is FQDN if security.enabled is set to true.
+ */
+public final class AdvancedNetworkPolicies extends ExpandableStringEnum<AdvancedNetworkPolicies> {
+    /**
+     * Static value L7 for AdvancedNetworkPolicies.
+     */
+    public static final AdvancedNetworkPolicies L7 = fromString("L7");
+
+    /**
+     * Static value FQDN for AdvancedNetworkPolicies.
+     */
+    public static final AdvancedNetworkPolicies FQDN = fromString("FQDN");
+
+    /**
+     * Static value None for AdvancedNetworkPolicies.
+     */
+    public static final AdvancedNetworkPolicies NONE = fromString("None");
+
+    /**
+     * Creates a new instance of AdvancedNetworkPolicies value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AdvancedNetworkPolicies() {
+    }
+
+    /**
+     * Creates or finds a AdvancedNetworkPolicies from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AdvancedNetworkPolicies.
+     */
+    public static AdvancedNetworkPolicies fromString(String name) {
+        return fromString(name, AdvancedNetworkPolicies.class);
+    }
+
+    /**
+     * Gets known AdvancedNetworkPolicies values.
+     * 
+     * @return known AdvancedNetworkPolicies values.
+     */
+    public static Collection<AdvancedNetworkPolicies> values() {
+        return values(AdvancedNetworkPolicies.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworking.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworking.java
index 6132ead8e9b4..5ec409247047 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworking.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworking.java
@@ -30,10 +30,15 @@ public final class AdvancedNetworking implements JsonSerializable<AdvancedNetwor
     private AdvancedNetworkingObservability observability;
 
     /*
-     * Security profile to enable security features on cilium based cluster.
+     * Security profile to enable security features on cilium-based cluster.
      */
     private AdvancedNetworkingSecurity security;
 
+    /*
+     * Profile to enable performance-enhancing features on clusters that use Azure CNI powered by Cilium.
+     */
+    private AdvancedNetworkingPerformance performance;
+
     /**
      * Creates an instance of AdvancedNetworking class.
      */
@@ -87,7 +92,7 @@ public AdvancedNetworking withObservability(AdvancedNetworkingObservability obse
     }
 
     /**
-     * Get the security property: Security profile to enable security features on cilium based cluster.
+     * Get the security property: Security profile to enable security features on cilium-based cluster.
      * 
      * @return the security value.
      */
@@ -96,7 +101,7 @@ public AdvancedNetworkingSecurity security() {
     }
 
     /**
-     * Set the security property: Security profile to enable security features on cilium based cluster.
+     * Set the security property: Security profile to enable security features on cilium-based cluster.
      * 
      * @param security the security value to set.
      * @return the AdvancedNetworking object itself.
@@ -106,6 +111,28 @@ public AdvancedNetworking withSecurity(AdvancedNetworkingSecurity security) {
         return this;
     }
 
+    /**
+     * Get the performance property: Profile to enable performance-enhancing features on clusters that use Azure CNI
+     * powered by Cilium.
+     * 
+     * @return the performance value.
+     */
+    public AdvancedNetworkingPerformance performance() {
+        return this.performance;
+    }
+
+    /**
+     * Set the performance property: Profile to enable performance-enhancing features on clusters that use Azure CNI
+     * powered by Cilium.
+     * 
+     * @param performance the performance value to set.
+     * @return the AdvancedNetworking object itself.
+     */
+    public AdvancedNetworking withPerformance(AdvancedNetworkingPerformance performance) {
+        this.performance = performance;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -118,6 +145,9 @@ public void validate() {
         if (security() != null) {
             security().validate();
         }
+        if (performance() != null) {
+            performance().validate();
+        }
     }
 
     /**
@@ -129,6 +159,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeBooleanField("enabled", this.enabled);
         jsonWriter.writeJsonField("observability", this.observability);
         jsonWriter.writeJsonField("security", this.security);
+        jsonWriter.writeJsonField("performance", this.performance);
         return jsonWriter.writeEndObject();
     }
 
@@ -153,6 +184,8 @@ public static AdvancedNetworking fromJson(JsonReader jsonReader) throws IOExcept
                     deserializedAdvancedNetworking.observability = AdvancedNetworkingObservability.fromJson(reader);
                 } else if ("security".equals(fieldName)) {
                     deserializedAdvancedNetworking.security = AdvancedNetworkingSecurity.fromJson(reader);
+                } else if ("performance".equals(fieldName)) {
+                    deserializedAdvancedNetworking.performance = AdvancedNetworkingPerformance.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingPerformance.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingPerformance.java
new file mode 100644
index 000000000000..f90a67176e6f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingPerformance.java
@@ -0,0 +1,105 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Profile to enable performance-enhancing features on clusters that use Azure CNI powered by Cilium.
+ */
+@Fluent
+public final class AdvancedNetworkingPerformance implements JsonSerializable<AdvancedNetworkingPerformance> {
+    /*
+     * Enable advanced network acceleration options. This allows users to configure acceleration using BPF host routing.
+     * This can be enabled only with Cilium dataplane. If not specified, the default value is None (no acceleration).
+     * The acceleration mode can be changed on a pre-existing cluster. See https://aka.ms/acnsperformance for a detailed
+     * explanation
+     */
+    private AccelerationMode accelerationMode;
+
+    /**
+     * Creates an instance of AdvancedNetworkingPerformance class.
+     */
+    public AdvancedNetworkingPerformance() {
+    }
+
+    /**
+     * Get the accelerationMode property: Enable advanced network acceleration options. This allows users to configure
+     * acceleration using BPF host routing. This can be enabled only with Cilium dataplane. If not specified, the
+     * default value is None (no acceleration). The acceleration mode can be changed on a pre-existing cluster. See
+     * https://aka.ms/acnsperformance for a detailed explanation.
+     * 
+     * @return the accelerationMode value.
+     */
+    public AccelerationMode accelerationMode() {
+        return this.accelerationMode;
+    }
+
+    /**
+     * Set the accelerationMode property: Enable advanced network acceleration options. This allows users to configure
+     * acceleration using BPF host routing. This can be enabled only with Cilium dataplane. If not specified, the
+     * default value is None (no acceleration). The acceleration mode can be changed on a pre-existing cluster. See
+     * https://aka.ms/acnsperformance for a detailed explanation.
+     * 
+     * @param accelerationMode the accelerationMode value to set.
+     * @return the AdvancedNetworkingPerformance object itself.
+     */
+    public AdvancedNetworkingPerformance withAccelerationMode(AccelerationMode accelerationMode) {
+        this.accelerationMode = accelerationMode;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("accelerationMode",
+            this.accelerationMode == null ? null : this.accelerationMode.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AdvancedNetworkingPerformance from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AdvancedNetworkingPerformance if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AdvancedNetworkingPerformance.
+     */
+    public static AdvancedNetworkingPerformance fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AdvancedNetworkingPerformance deserializedAdvancedNetworkingPerformance
+                = new AdvancedNetworkingPerformance();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("accelerationMode".equals(fieldName)) {
+                    deserializedAdvancedNetworkingPerformance.accelerationMode
+                        = AccelerationMode.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAdvancedNetworkingPerformance;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurity.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurity.java
index 7d14b493eb6c..42fd5406cb01 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurity.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurity.java
@@ -12,16 +12,30 @@
 import java.io.IOException;
 
 /**
- * Security profile to enable security features on cilium based cluster.
+ * Security profile to enable security features on cilium-based cluster.
  */
 @Fluent
 public final class AdvancedNetworkingSecurity implements JsonSerializable<AdvancedNetworkingSecurity> {
     /*
-     * This feature allows user to configure network policy based on DNS (FQDN) names. It can be enabled only on cilium
-     * based clusters. If not specified, the default is false.
+     * Configure Advanced Networking Security features on Cilium clusters. See individual fields for their default
+     * values.
      */
     private Boolean enabled;
 
+    /*
+     * Enable advanced network policies. This allows users to configure Layer 7 network policies (FQDN, HTTP, Kafka).
+     * Policies themselves must be configured via the Cilium Network Policy resources, see
+     * https://docs.cilium.io/en/latest/security/policy/index.html. This can be enabled only on cilium-based clusters.
+     * If not specified, the default value is FQDN if security.enabled is set to true.
+     */
+    private AdvancedNetworkPolicies advancedNetworkPolicies;
+
+    /*
+     * Encryption configuration for Cilium-based clusters. Once enabled all traffic between Cilium managed pods will be
+     * encrypted when it leaves the node boundary.
+     */
+    private AdvancedNetworkingSecurityTransitEncryption transitEncryption;
+
     /**
      * Creates an instance of AdvancedNetworkingSecurity class.
      */
@@ -29,8 +43,8 @@ public AdvancedNetworkingSecurity() {
     }
 
     /**
-     * Get the enabled property: This feature allows user to configure network policy based on DNS (FQDN) names. It can
-     * be enabled only on cilium based clusters. If not specified, the default is false.
+     * Get the enabled property: Configure Advanced Networking Security features on Cilium clusters. See individual
+     * fields for their default values.
      * 
      * @return the enabled value.
      */
@@ -39,8 +53,8 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled property: This feature allows user to configure network policy based on DNS (FQDN) names. It can
-     * be enabled only on cilium based clusters. If not specified, the default is false.
+     * Set the enabled property: Configure Advanced Networking Security features on Cilium clusters. See individual
+     * fields for their default values.
      * 
      * @param enabled the enabled value to set.
      * @return the AdvancedNetworkingSecurity object itself.
@@ -50,12 +64,64 @@ public AdvancedNetworkingSecurity withEnabled(Boolean enabled) {
         return this;
     }
 
+    /**
+     * Get the advancedNetworkPolicies property: Enable advanced network policies. This allows users to configure Layer
+     * 7 network policies (FQDN, HTTP, Kafka). Policies themselves must be configured via the Cilium Network Policy
+     * resources, see https://docs.cilium.io/en/latest/security/policy/index.html. This can be enabled only on
+     * cilium-based clusters. If not specified, the default value is FQDN if security.enabled is set to true.
+     * 
+     * @return the advancedNetworkPolicies value.
+     */
+    public AdvancedNetworkPolicies advancedNetworkPolicies() {
+        return this.advancedNetworkPolicies;
+    }
+
+    /**
+     * Set the advancedNetworkPolicies property: Enable advanced network policies. This allows users to configure Layer
+     * 7 network policies (FQDN, HTTP, Kafka). Policies themselves must be configured via the Cilium Network Policy
+     * resources, see https://docs.cilium.io/en/latest/security/policy/index.html. This can be enabled only on
+     * cilium-based clusters. If not specified, the default value is FQDN if security.enabled is set to true.
+     * 
+     * @param advancedNetworkPolicies the advancedNetworkPolicies value to set.
+     * @return the AdvancedNetworkingSecurity object itself.
+     */
+    public AdvancedNetworkingSecurity withAdvancedNetworkPolicies(AdvancedNetworkPolicies advancedNetworkPolicies) {
+        this.advancedNetworkPolicies = advancedNetworkPolicies;
+        return this;
+    }
+
+    /**
+     * Get the transitEncryption property: Encryption configuration for Cilium-based clusters. Once enabled all traffic
+     * between Cilium managed pods will be encrypted when it leaves the node boundary.
+     * 
+     * @return the transitEncryption value.
+     */
+    public AdvancedNetworkingSecurityTransitEncryption transitEncryption() {
+        return this.transitEncryption;
+    }
+
+    /**
+     * Set the transitEncryption property: Encryption configuration for Cilium-based clusters. Once enabled all traffic
+     * between Cilium managed pods will be encrypted when it leaves the node boundary.
+     * 
+     * @param transitEncryption the transitEncryption value to set.
+     * @return the AdvancedNetworkingSecurity object itself.
+     */
+    public AdvancedNetworkingSecurity
+        withTransitEncryption(AdvancedNetworkingSecurityTransitEncryption transitEncryption) {
+        this.transitEncryption = transitEncryption;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (transitEncryption() != null) {
+            transitEncryption().validate();
+        }
     }
 
     /**
@@ -65,6 +131,9 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeStringField("advancedNetworkPolicies",
+            this.advancedNetworkPolicies == null ? null : this.advancedNetworkPolicies.toString());
+        jsonWriter.writeJsonField("transitEncryption", this.transitEncryption);
         return jsonWriter.writeEndObject();
     }
 
@@ -85,6 +154,12 @@ public static AdvancedNetworkingSecurity fromJson(JsonReader jsonReader) throws
 
                 if ("enabled".equals(fieldName)) {
                     deserializedAdvancedNetworkingSecurity.enabled = reader.getNullable(JsonReader::getBoolean);
+                } else if ("advancedNetworkPolicies".equals(fieldName)) {
+                    deserializedAdvancedNetworkingSecurity.advancedNetworkPolicies
+                        = AdvancedNetworkPolicies.fromString(reader.getString());
+                } else if ("transitEncryption".equals(fieldName)) {
+                    deserializedAdvancedNetworkingSecurity.transitEncryption
+                        = AdvancedNetworkingSecurityTransitEncryption.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurityTransitEncryption.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurityTransitEncryption.java
new file mode 100644
index 000000000000..4698fbbbee15
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AdvancedNetworkingSecurityTransitEncryption.java
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Encryption configuration for Cilium-based clusters. Once enabled all traffic between Cilium managed pods will be
+ * encrypted when it leaves the node boundary.
+ */
+@Fluent
+public final class AdvancedNetworkingSecurityTransitEncryption
+    implements JsonSerializable<AdvancedNetworkingSecurityTransitEncryption> {
+    /*
+     * Configures pod-to-pod encryption. This can be enabled only on Cilium-based clusters. If not specified, the
+     * default value is None.
+     */
+    private TransitEncryptionType type;
+
+    /**
+     * Creates an instance of AdvancedNetworkingSecurityTransitEncryption class.
+     */
+    public AdvancedNetworkingSecurityTransitEncryption() {
+    }
+
+    /**
+     * Get the type property: Configures pod-to-pod encryption. This can be enabled only on Cilium-based clusters. If
+     * not specified, the default value is None.
+     * 
+     * @return the type value.
+     */
+    public TransitEncryptionType type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type property: Configures pod-to-pod encryption. This can be enabled only on Cilium-based clusters. If
+     * not specified, the default value is None.
+     * 
+     * @param type the type value to set.
+     * @return the AdvancedNetworkingSecurityTransitEncryption object itself.
+     */
+    public AdvancedNetworkingSecurityTransitEncryption withType(TransitEncryptionType type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("type", this.type == null ? null : this.type.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AdvancedNetworkingSecurityTransitEncryption from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AdvancedNetworkingSecurityTransitEncryption if the JsonReader was pointing to an instance
+     * of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AdvancedNetworkingSecurityTransitEncryption.
+     */
+    public static AdvancedNetworkingSecurityTransitEncryption fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AdvancedNetworkingSecurityTransitEncryption deserializedAdvancedNetworkingSecurityTransitEncryption
+                = new AdvancedNetworkingSecurityTransitEncryption();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("type".equals(fieldName)) {
+                    deserializedAdvancedNetworkingSecurityTransitEncryption.type
+                        = TransitEncryptionType.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAdvancedNetworkingSecurityTransitEncryption;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolArtifactStreamingProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolArtifactStreamingProfile.java
new file mode 100644
index 000000000000..1032690e0cee
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolArtifactStreamingProfile.java
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The AgentPoolArtifactStreamingProfile model.
+ */
+@Fluent
+public final class AgentPoolArtifactStreamingProfile implements JsonSerializable<AgentPoolArtifactStreamingProfile> {
+    /*
+     * Artifact streaming speeds up the cold-start of containers on a node through on-demand image loading. To use this
+     * feature, container images must also enable artifact streaming on ACR. If not specified, the default is false.
+     */
+    private Boolean enabled;
+
+    /**
+     * Creates an instance of AgentPoolArtifactStreamingProfile class.
+     */
+    public AgentPoolArtifactStreamingProfile() {
+    }
+
+    /**
+     * Get the enabled property: Artifact streaming speeds up the cold-start of containers on a node through on-demand
+     * image loading. To use this feature, container images must also enable artifact streaming on ACR. If not
+     * specified, the default is false.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Artifact streaming speeds up the cold-start of containers on a node through on-demand
+     * image loading. To use this feature, container images must also enable artifact streaming on ACR. If not
+     * specified, the default is false.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the AgentPoolArtifactStreamingProfile object itself.
+     */
+    public AgentPoolArtifactStreamingProfile withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AgentPoolArtifactStreamingProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AgentPoolArtifactStreamingProfile if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AgentPoolArtifactStreamingProfile.
+     */
+    public static AgentPoolArtifactStreamingProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AgentPoolArtifactStreamingProfile deserializedAgentPoolArtifactStreamingProfile
+                = new AgentPoolArtifactStreamingProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedAgentPoolArtifactStreamingProfile.enabled = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAgentPoolArtifactStreamingProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolBlueGreenUpgradeSettings.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolBlueGreenUpgradeSettings.java
new file mode 100644
index 000000000000..51259791e0db
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolBlueGreenUpgradeSettings.java
@@ -0,0 +1,210 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Settings for blue-green upgrade on an agentpool.
+ */
+@Fluent
+public final class AgentPoolBlueGreenUpgradeSettings implements JsonSerializable<AgentPoolBlueGreenUpgradeSettings> {
+    /*
+     * The number or percentage of nodes to drain in batch during blue-green upgrade. Must be a non-zero number. This
+     * can either be set to an integer (e.g. '5') or a percentage (e.g. '50%'). If a percentage is specified, it is the
+     * percentage of the total number of blue nodes of the initial upgrade operation. For percentages, fractional nodes
+     * are rounded up. If not specified, the default is 10%. For more information, including best practices, see:
+     * https://learn.microsoft.com/en-us/azure/aks/upgrade-cluster
+     */
+    private String drainBatchSize;
+
+    /*
+     * The drain timeout for a node, i.e., the amount of time (in minutes) to wait on eviction of pods and graceful
+     * termination per node. This eviction wait time honors waiting on pod disruption budgets. If this time is exceeded,
+     * the upgrade fails. If not specified, the default is 30 minutes.
+     */
+    private Integer drainTimeoutInMinutes;
+
+    /*
+     * The soak duration after draining a batch of nodes, i.e., the amount of time (in minutes) to wait after draining a
+     * batch of nodes before moving on the next batch. If not specified, the default is 15 minutes.
+     */
+    private Integer batchSoakDurationInMinutes;
+
+    /*
+     * The soak duration for a node pool, i.e., the amount of time (in minutes) to wait after all old nodes are drained
+     * before we remove the old nodes. If not specified, the default is 60 minutes. Only applicable for blue-green
+     * upgrade strategy.
+     */
+    private Integer finalSoakDurationInMinutes;
+
+    /**
+     * Creates an instance of AgentPoolBlueGreenUpgradeSettings class.
+     */
+    public AgentPoolBlueGreenUpgradeSettings() {
+    }
+
+    /**
+     * Get the drainBatchSize property: The number or percentage of nodes to drain in batch during blue-green upgrade.
+     * Must be a non-zero number. This can either be set to an integer (e.g. '5') or a percentage (e.g. '50%'). If a
+     * percentage is specified, it is the percentage of the total number of blue nodes of the initial upgrade operation.
+     * For percentages, fractional nodes are rounded up. If not specified, the default is 10%. For more information,
+     * including best practices, see: https://learn.microsoft.com/en-us/azure/aks/upgrade-cluster.
+     * 
+     * @return the drainBatchSize value.
+     */
+    public String drainBatchSize() {
+        return this.drainBatchSize;
+    }
+
+    /**
+     * Set the drainBatchSize property: The number or percentage of nodes to drain in batch during blue-green upgrade.
+     * Must be a non-zero number. This can either be set to an integer (e.g. '5') or a percentage (e.g. '50%'). If a
+     * percentage is specified, it is the percentage of the total number of blue nodes of the initial upgrade operation.
+     * For percentages, fractional nodes are rounded up. If not specified, the default is 10%. For more information,
+     * including best practices, see: https://learn.microsoft.com/en-us/azure/aks/upgrade-cluster.
+     * 
+     * @param drainBatchSize the drainBatchSize value to set.
+     * @return the AgentPoolBlueGreenUpgradeSettings object itself.
+     */
+    public AgentPoolBlueGreenUpgradeSettings withDrainBatchSize(String drainBatchSize) {
+        this.drainBatchSize = drainBatchSize;
+        return this;
+    }
+
+    /**
+     * Get the drainTimeoutInMinutes property: The drain timeout for a node, i.e., the amount of time (in minutes) to
+     * wait on eviction of pods and graceful termination per node. This eviction wait time honors waiting on pod
+     * disruption budgets. If this time is exceeded, the upgrade fails. If not specified, the default is 30 minutes.
+     * 
+     * @return the drainTimeoutInMinutes value.
+     */
+    public Integer drainTimeoutInMinutes() {
+        return this.drainTimeoutInMinutes;
+    }
+
+    /**
+     * Set the drainTimeoutInMinutes property: The drain timeout for a node, i.e., the amount of time (in minutes) to
+     * wait on eviction of pods and graceful termination per node. This eviction wait time honors waiting on pod
+     * disruption budgets. If this time is exceeded, the upgrade fails. If not specified, the default is 30 minutes.
+     * 
+     * @param drainTimeoutInMinutes the drainTimeoutInMinutes value to set.
+     * @return the AgentPoolBlueGreenUpgradeSettings object itself.
+     */
+    public AgentPoolBlueGreenUpgradeSettings withDrainTimeoutInMinutes(Integer drainTimeoutInMinutes) {
+        this.drainTimeoutInMinutes = drainTimeoutInMinutes;
+        return this;
+    }
+
+    /**
+     * Get the batchSoakDurationInMinutes property: The soak duration after draining a batch of nodes, i.e., the amount
+     * of time (in minutes) to wait after draining a batch of nodes before moving on the next batch. If not specified,
+     * the default is 15 minutes.
+     * 
+     * @return the batchSoakDurationInMinutes value.
+     */
+    public Integer batchSoakDurationInMinutes() {
+        return this.batchSoakDurationInMinutes;
+    }
+
+    /**
+     * Set the batchSoakDurationInMinutes property: The soak duration after draining a batch of nodes, i.e., the amount
+     * of time (in minutes) to wait after draining a batch of nodes before moving on the next batch. If not specified,
+     * the default is 15 minutes.
+     * 
+     * @param batchSoakDurationInMinutes the batchSoakDurationInMinutes value to set.
+     * @return the AgentPoolBlueGreenUpgradeSettings object itself.
+     */
+    public AgentPoolBlueGreenUpgradeSettings withBatchSoakDurationInMinutes(Integer batchSoakDurationInMinutes) {
+        this.batchSoakDurationInMinutes = batchSoakDurationInMinutes;
+        return this;
+    }
+
+    /**
+     * Get the finalSoakDurationInMinutes property: The soak duration for a node pool, i.e., the amount of time (in
+     * minutes) to wait after all old nodes are drained before we remove the old nodes. If not specified, the default is
+     * 60 minutes. Only applicable for blue-green upgrade strategy.
+     * 
+     * @return the finalSoakDurationInMinutes value.
+     */
+    public Integer finalSoakDurationInMinutes() {
+        return this.finalSoakDurationInMinutes;
+    }
+
+    /**
+     * Set the finalSoakDurationInMinutes property: The soak duration for a node pool, i.e., the amount of time (in
+     * minutes) to wait after all old nodes are drained before we remove the old nodes. If not specified, the default is
+     * 60 minutes. Only applicable for blue-green upgrade strategy.
+     * 
+     * @param finalSoakDurationInMinutes the finalSoakDurationInMinutes value to set.
+     * @return the AgentPoolBlueGreenUpgradeSettings object itself.
+     */
+    public AgentPoolBlueGreenUpgradeSettings withFinalSoakDurationInMinutes(Integer finalSoakDurationInMinutes) {
+        this.finalSoakDurationInMinutes = finalSoakDurationInMinutes;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("drainBatchSize", this.drainBatchSize);
+        jsonWriter.writeNumberField("drainTimeoutInMinutes", this.drainTimeoutInMinutes);
+        jsonWriter.writeNumberField("batchSoakDurationInMinutes", this.batchSoakDurationInMinutes);
+        jsonWriter.writeNumberField("finalSoakDurationInMinutes", this.finalSoakDurationInMinutes);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AgentPoolBlueGreenUpgradeSettings from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AgentPoolBlueGreenUpgradeSettings if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AgentPoolBlueGreenUpgradeSettings.
+     */
+    public static AgentPoolBlueGreenUpgradeSettings fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AgentPoolBlueGreenUpgradeSettings deserializedAgentPoolBlueGreenUpgradeSettings
+                = new AgentPoolBlueGreenUpgradeSettings();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("drainBatchSize".equals(fieldName)) {
+                    deserializedAgentPoolBlueGreenUpgradeSettings.drainBatchSize = reader.getString();
+                } else if ("drainTimeoutInMinutes".equals(fieldName)) {
+                    deserializedAgentPoolBlueGreenUpgradeSettings.drainTimeoutInMinutes
+                        = reader.getNullable(JsonReader::getInt);
+                } else if ("batchSoakDurationInMinutes".equals(fieldName)) {
+                    deserializedAgentPoolBlueGreenUpgradeSettings.batchSoakDurationInMinutes
+                        = reader.getNullable(JsonReader::getInt);
+                } else if ("finalSoakDurationInMinutes".equals(fieldName)) {
+                    deserializedAgentPoolBlueGreenUpgradeSettings.finalSoakDurationInMinutes
+                        = reader.getNullable(JsonReader::getInt);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAgentPoolBlueGreenUpgradeSettings;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolMode.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolMode.java
index a44247f5ca08..60058561ab80 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolMode.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolMode.java
@@ -28,6 +28,16 @@ public final class AgentPoolMode extends ExpandableStringEnum<AgentPoolMode> {
      */
     public static final AgentPoolMode GATEWAY = fromString("Gateway");
 
+    /**
+     * Static value ManagedSystem for AgentPoolMode.
+     */
+    public static final AgentPoolMode MANAGED_SYSTEM = fromString("ManagedSystem");
+
+    /**
+     * Static value Machines for AgentPoolMode.
+     */
+    public static final AgentPoolMode MACHINES = fromString("Machines");
+
     /**
      * Creates a new instance of AgentPoolMode value.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolRecentlyUsedVersion.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolRecentlyUsedVersion.java
new file mode 100644
index 000000000000..7ee6aef647c1
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolRecentlyUsedVersion.java
@@ -0,0 +1,154 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.CoreUtils;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * A historical version that can be used for rollback operations.
+ */
+@Fluent
+public final class AgentPoolRecentlyUsedVersion implements JsonSerializable<AgentPoolRecentlyUsedVersion> {
+    /*
+     * The Kubernetes version (major.minor.patch) available for rollback.
+     */
+    private String orchestratorVersion;
+
+    /*
+     * The node image version available for rollback.
+     */
+    private String nodeImageVersion;
+
+    /*
+     * The timestamp when this version was last used.
+     */
+    private OffsetDateTime timestamp;
+
+    /**
+     * Creates an instance of AgentPoolRecentlyUsedVersion class.
+     */
+    public AgentPoolRecentlyUsedVersion() {
+    }
+
+    /**
+     * Get the orchestratorVersion property: The Kubernetes version (major.minor.patch) available for rollback.
+     * 
+     * @return the orchestratorVersion value.
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set the orchestratorVersion property: The Kubernetes version (major.minor.patch) available for rollback.
+     * 
+     * @param orchestratorVersion the orchestratorVersion value to set.
+     * @return the AgentPoolRecentlyUsedVersion object itself.
+     */
+    public AgentPoolRecentlyUsedVersion withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+    /**
+     * Get the nodeImageVersion property: The node image version available for rollback.
+     * 
+     * @return the nodeImageVersion value.
+     */
+    public String nodeImageVersion() {
+        return this.nodeImageVersion;
+    }
+
+    /**
+     * Set the nodeImageVersion property: The node image version available for rollback.
+     * 
+     * @param nodeImageVersion the nodeImageVersion value to set.
+     * @return the AgentPoolRecentlyUsedVersion object itself.
+     */
+    public AgentPoolRecentlyUsedVersion withNodeImageVersion(String nodeImageVersion) {
+        this.nodeImageVersion = nodeImageVersion;
+        return this;
+    }
+
+    /**
+     * Get the timestamp property: The timestamp when this version was last used.
+     * 
+     * @return the timestamp value.
+     */
+    public OffsetDateTime timestamp() {
+        return this.timestamp;
+    }
+
+    /**
+     * Set the timestamp property: The timestamp when this version was last used.
+     * 
+     * @param timestamp the timestamp value to set.
+     * @return the AgentPoolRecentlyUsedVersion object itself.
+     */
+    public AgentPoolRecentlyUsedVersion withTimestamp(OffsetDateTime timestamp) {
+        this.timestamp = timestamp;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("orchestratorVersion", this.orchestratorVersion);
+        jsonWriter.writeStringField("nodeImageVersion", this.nodeImageVersion);
+        jsonWriter.writeStringField("timestamp",
+            this.timestamp == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.timestamp));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AgentPoolRecentlyUsedVersion from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AgentPoolRecentlyUsedVersion if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AgentPoolRecentlyUsedVersion.
+     */
+    public static AgentPoolRecentlyUsedVersion fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AgentPoolRecentlyUsedVersion deserializedAgentPoolRecentlyUsedVersion = new AgentPoolRecentlyUsedVersion();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("orchestratorVersion".equals(fieldName)) {
+                    deserializedAgentPoolRecentlyUsedVersion.orchestratorVersion = reader.getString();
+                } else if ("nodeImageVersion".equals(fieldName)) {
+                    deserializedAgentPoolRecentlyUsedVersion.nodeImageVersion = reader.getString();
+                } else if ("timestamp".equals(fieldName)) {
+                    deserializedAgentPoolRecentlyUsedVersion.timestamp = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAgentPoolRecentlyUsedVersion;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSecurityProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSecurityProfile.java
index 0b0b6f2b171c..c4d2b0cfeb13 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSecurityProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSecurityProfile.java
@@ -16,6 +16,11 @@
  */
 @Fluent
 public final class AgentPoolSecurityProfile implements JsonSerializable<AgentPoolSecurityProfile> {
+    /*
+     * SSH access method of an agent pool.
+     */
+    private AgentPoolSshAccess sshAccess;
+
     /*
      * vTPM is a Trusted Launch feature for configuring a dedicated secure vault for keys and measurements held locally
      * on the node. For more details, see aka.ms/aks/trustedlaunch. If not specified, the default is false.
@@ -34,6 +39,26 @@ public final class AgentPoolSecurityProfile implements JsonSerializable<AgentPoo
     public AgentPoolSecurityProfile() {
     }
 
+    /**
+     * Get the sshAccess property: SSH access method of an agent pool.
+     * 
+     * @return the sshAccess value.
+     */
+    public AgentPoolSshAccess sshAccess() {
+        return this.sshAccess;
+    }
+
+    /**
+     * Set the sshAccess property: SSH access method of an agent pool.
+     * 
+     * @param sshAccess the sshAccess value to set.
+     * @return the AgentPoolSecurityProfile object itself.
+     */
+    public AgentPoolSecurityProfile withSshAccess(AgentPoolSshAccess sshAccess) {
+        this.sshAccess = sshAccess;
+        return this;
+    }
+
     /**
      * Get the enableVtpm property: vTPM is a Trusted Launch feature for configuring a dedicated secure vault for keys
      * and measurements held locally on the node. For more details, see aka.ms/aks/trustedlaunch. If not specified, the
@@ -96,6 +121,7 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("sshAccess", this.sshAccess == null ? null : this.sshAccess.toString());
         jsonWriter.writeBooleanField("enableVTPM", this.enableVtpm);
         jsonWriter.writeBooleanField("enableSecureBoot", this.enableSecureBoot);
         return jsonWriter.writeEndObject();
@@ -116,7 +142,9 @@ public static AgentPoolSecurityProfile fromJson(JsonReader jsonReader) throws IO
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
-                if ("enableVTPM".equals(fieldName)) {
+                if ("sshAccess".equals(fieldName)) {
+                    deserializedAgentPoolSecurityProfile.sshAccess = AgentPoolSshAccess.fromString(reader.getString());
+                } else if ("enableVTPM".equals(fieldName)) {
                     deserializedAgentPoolSecurityProfile.enableVtpm = reader.getNullable(JsonReader::getBoolean);
                 } else if ("enableSecureBoot".equals(fieldName)) {
                     deserializedAgentPoolSecurityProfile.enableSecureBoot = reader.getNullable(JsonReader::getBoolean);
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSshAccess.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSshAccess.java
new file mode 100644
index 000000000000..185e09138b60
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolSshAccess.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * SSH access method of an agent pool.
+ */
+public final class AgentPoolSshAccess extends ExpandableStringEnum<AgentPoolSshAccess> {
+    /**
+     * Static value LocalUser for AgentPoolSshAccess.
+     */
+    public static final AgentPoolSshAccess LOCAL_USER = fromString("LocalUser");
+
+    /**
+     * Static value Disabled for AgentPoolSshAccess.
+     */
+    public static final AgentPoolSshAccess DISABLED = fromString("Disabled");
+
+    /**
+     * Static value EntraId for AgentPoolSshAccess.
+     */
+    public static final AgentPoolSshAccess ENTRA_ID = fromString("EntraId");
+
+    /**
+     * Creates a new instance of AgentPoolSshAccess value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AgentPoolSshAccess() {
+    }
+
+    /**
+     * Creates or finds a AgentPoolSshAccess from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AgentPoolSshAccess.
+     */
+    public static AgentPoolSshAccess fromString(String name) {
+        return fromString(name, AgentPoolSshAccess.class);
+    }
+
+    /**
+     * Gets known AgentPoolSshAccess values.
+     * 
+     * @return known AgentPoolSshAccess values.
+     */
+    public static Collection<AgentPoolSshAccess> values() {
+        return values(AgentPoolSshAccess.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeProfilePropertiesUpgradesItem.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeProfilePropertiesUpgradesItem.java
index c3644b0dd650..21dbdb159988 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeProfilePropertiesUpgradesItem.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeProfilePropertiesUpgradesItem.java
@@ -27,6 +27,11 @@ public final class AgentPoolUpgradeProfilePropertiesUpgradesItem
      */
     private Boolean isPreview;
 
+    /*
+     * Whether the Kubernetes version is out of support.
+     */
+    private Boolean isOutOfSupport;
+
     /**
      * Creates an instance of AgentPoolUpgradeProfilePropertiesUpgradesItem class.
      */
@@ -73,6 +78,26 @@ public AgentPoolUpgradeProfilePropertiesUpgradesItem withIsPreview(Boolean isPre
         return this;
     }
 
+    /**
+     * Get the isOutOfSupport property: Whether the Kubernetes version is out of support.
+     * 
+     * @return the isOutOfSupport value.
+     */
+    public Boolean isOutOfSupport() {
+        return this.isOutOfSupport;
+    }
+
+    /**
+     * Set the isOutOfSupport property: Whether the Kubernetes version is out of support.
+     * 
+     * @param isOutOfSupport the isOutOfSupport value to set.
+     * @return the AgentPoolUpgradeProfilePropertiesUpgradesItem object itself.
+     */
+    public AgentPoolUpgradeProfilePropertiesUpgradesItem withIsOutOfSupport(Boolean isOutOfSupport) {
+        this.isOutOfSupport = isOutOfSupport;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -89,6 +114,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("kubernetesVersion", this.kubernetesVersion);
         jsonWriter.writeBooleanField("isPreview", this.isPreview);
+        jsonWriter.writeBooleanField("isOutOfSupport", this.isOutOfSupport);
         return jsonWriter.writeEndObject();
     }
 
@@ -113,6 +139,9 @@ public static AgentPoolUpgradeProfilePropertiesUpgradesItem fromJson(JsonReader
                 } else if ("isPreview".equals(fieldName)) {
                     deserializedAgentPoolUpgradeProfilePropertiesUpgradesItem.isPreview
                         = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isOutOfSupport".equals(fieldName)) {
+                    deserializedAgentPoolUpgradeProfilePropertiesUpgradesItem.isOutOfSupport
+                        = reader.getNullable(JsonReader::getBoolean);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeSettings.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeSettings.java
index 4fe15df7ade6..c9fc0c033246 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeSettings.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPoolUpgradeSettings.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 
 /**
- * Settings for upgrading an agentpool.
+ * Settings for rolling upgrade on an agentpool.
  */
 @Fluent
 public final class AgentPoolUpgradeSettings implements JsonSerializable<AgentPoolUpgradeSettings> {
@@ -25,6 +25,16 @@ public final class AgentPoolUpgradeSettings implements JsonSerializable<AgentPoo
      */
     private String maxSurge;
 
+    /*
+     * This can either be set to an integer (e.g. '5') or a percentage (e.g. '50%'). If a percentage is specified, it is
+     * the percentage of the total agent pool size at the time of the upgrade. For percentages, fractional nodes are
+     * rounded up. If node capacity constraints prevent full surging, AKS would attempt a slower upgrade with fewer
+     * surge nodes. The upgrade will proceed only if the available surge capacity meets or exceeds minSurge. If minSurge
+     * not specified, the default is 50% of the maxSurge, for example, if maxSurge = 10%, the default is 5%, if maxSurge
+     * = 10, the default is 5.
+     */
+    private String minSurge;
+
     /*
      * The maximum number or percentage of nodes that can be simultaneously unavailable during upgrade. This can either
      * be set to an integer (e.g. '1') or a percentage (e.g. '5%'). If a percentage is specified, it is the percentage
@@ -34,6 +44,16 @@ public final class AgentPoolUpgradeSettings implements JsonSerializable<AgentPoo
      */
     private String maxUnavailable;
 
+    /*
+     * The maximum number or percentage of extra nodes that are allowed to be blocked in the agent pool during an
+     * upgrade when undrainable node behavior is Cordon. This can either be set to an integer (e.g. '5') or a percentage
+     * (e.g. '50%'). If a percentage is specified, it is the percentage of the total agent pool size at the time of the
+     * upgrade. For percentages, fractional nodes are rounded up. If not specified, the default is maxSurge. This must
+     * always be greater than or equal to maxSurge. For more information, including best practices, see:
+     * https://learn.microsoft.com/en-us/azure/aks/upgrade-cluster
+     */
+    private String maxBlockedNodes;
+
     /*
      * The drain timeout for a node. The amount of time (in minutes) to wait on eviction of pods and graceful
      * termination per node. This eviction wait time honors waiting on pod disruption budgets. If this time is exceeded,
@@ -88,6 +108,36 @@ public AgentPoolUpgradeSettings withMaxSurge(String maxSurge) {
         return this;
     }
 
+    /**
+     * Get the minSurge property: This can either be set to an integer (e.g. '5') or a percentage (e.g. '50%'). If a
+     * percentage is specified, it is the percentage of the total agent pool size at the time of the upgrade. For
+     * percentages, fractional nodes are rounded up. If node capacity constraints prevent full surging, AKS would
+     * attempt a slower upgrade with fewer surge nodes. The upgrade will proceed only if the available surge capacity
+     * meets or exceeds minSurge. If minSurge not specified, the default is 50% of the maxSurge, for example, if
+     * maxSurge = 10%, the default is 5%, if maxSurge = 10, the default is 5.
+     * 
+     * @return the minSurge value.
+     */
+    public String minSurge() {
+        return this.minSurge;
+    }
+
+    /**
+     * Set the minSurge property: This can either be set to an integer (e.g. '5') or a percentage (e.g. '50%'). If a
+     * percentage is specified, it is the percentage of the total agent pool size at the time of the upgrade. For
+     * percentages, fractional nodes are rounded up. If node capacity constraints prevent full surging, AKS would
+     * attempt a slower upgrade with fewer surge nodes. The upgrade will proceed only if the available surge capacity
+     * meets or exceeds minSurge. If minSurge not specified, the default is 50% of the maxSurge, for example, if
+     * maxSurge = 10%, the default is 5%, if maxSurge = 10, the default is 5.
+     * 
+     * @param minSurge the minSurge value to set.
+     * @return the AgentPoolUpgradeSettings object itself.
+     */
+    public AgentPoolUpgradeSettings withMinSurge(String minSurge) {
+        this.minSurge = minSurge;
+        return this;
+    }
+
     /**
      * Get the maxUnavailable property: The maximum number or percentage of nodes that can be simultaneously unavailable
      * during upgrade. This can either be set to an integer (e.g. '1') or a percentage (e.g. '5%'). If a percentage is
@@ -116,6 +166,36 @@ public AgentPoolUpgradeSettings withMaxUnavailable(String maxUnavailable) {
         return this;
     }
 
+    /**
+     * Get the maxBlockedNodes property: The maximum number or percentage of extra nodes that are allowed to be blocked
+     * in the agent pool during an upgrade when undrainable node behavior is Cordon. This can either be set to an
+     * integer (e.g. '5') or a percentage (e.g. '50%'). If a percentage is specified, it is the percentage of the total
+     * agent pool size at the time of the upgrade. For percentages, fractional nodes are rounded up. If not specified,
+     * the default is maxSurge. This must always be greater than or equal to maxSurge. For more information, including
+     * best practices, see: https://learn.microsoft.com/en-us/azure/aks/upgrade-cluster.
+     * 
+     * @return the maxBlockedNodes value.
+     */
+    public String maxBlockedNodes() {
+        return this.maxBlockedNodes;
+    }
+
+    /**
+     * Set the maxBlockedNodes property: The maximum number or percentage of extra nodes that are allowed to be blocked
+     * in the agent pool during an upgrade when undrainable node behavior is Cordon. This can either be set to an
+     * integer (e.g. '5') or a percentage (e.g. '50%'). If a percentage is specified, it is the percentage of the total
+     * agent pool size at the time of the upgrade. For percentages, fractional nodes are rounded up. If not specified,
+     * the default is maxSurge. This must always be greater than or equal to maxSurge. For more information, including
+     * best practices, see: https://learn.microsoft.com/en-us/azure/aks/upgrade-cluster.
+     * 
+     * @param maxBlockedNodes the maxBlockedNodes value to set.
+     * @return the AgentPoolUpgradeSettings object itself.
+     */
+    public AgentPoolUpgradeSettings withMaxBlockedNodes(String maxBlockedNodes) {
+        this.maxBlockedNodes = maxBlockedNodes;
+        return this;
+    }
+
     /**
      * Get the drainTimeoutInMinutes property: The drain timeout for a node. The amount of time (in minutes) to wait on
      * eviction of pods and graceful termination per node. This eviction wait time honors waiting on pod disruption
@@ -205,7 +285,9 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("maxSurge", this.maxSurge);
+        jsonWriter.writeStringField("minSurge", this.minSurge);
         jsonWriter.writeStringField("maxUnavailable", this.maxUnavailable);
+        jsonWriter.writeStringField("maxBlockedNodes", this.maxBlockedNodes);
         jsonWriter.writeNumberField("drainTimeoutInMinutes", this.drainTimeoutInMinutes);
         jsonWriter.writeNumberField("nodeSoakDurationInMinutes", this.nodeSoakDurationInMinutes);
         jsonWriter.writeStringField("undrainableNodeBehavior",
@@ -230,8 +312,12 @@ public static AgentPoolUpgradeSettings fromJson(JsonReader jsonReader) throws IO
 
                 if ("maxSurge".equals(fieldName)) {
                     deserializedAgentPoolUpgradeSettings.maxSurge = reader.getString();
+                } else if ("minSurge".equals(fieldName)) {
+                    deserializedAgentPoolUpgradeSettings.minSurge = reader.getString();
                 } else if ("maxUnavailable".equals(fieldName)) {
                     deserializedAgentPoolUpgradeSettings.maxUnavailable = reader.getString();
+                } else if ("maxBlockedNodes".equals(fieldName)) {
+                    deserializedAgentPoolUpgradeSettings.maxBlockedNodes = reader.getString();
                 } else if ("drainTimeoutInMinutes".equals(fieldName)) {
                     deserializedAgentPoolUpgradeSettings.drainTimeoutInMinutes = reader.getNullable(JsonReader::getInt);
                 } else if ("nodeSoakDurationInMinutes".equals(fieldName)) {
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AutoScaleProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AutoScaleProfile.java
new file mode 100644
index 000000000000..bb1452b65b68
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AutoScaleProfile.java
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Specifications on auto-scaling.
+ */
+@Fluent
+public final class AutoScaleProfile implements JsonSerializable<AutoScaleProfile> {
+    /*
+     * VM size that AKS will use when creating and scaling e.g. 'Standard_E4s_v3', 'Standard_E16s_v3' or
+     * 'Standard_D16s_v5'.
+     */
+    private String size;
+
+    /*
+     * The minimum number of nodes of the specified sizes.
+     */
+    private Integer minCount;
+
+    /*
+     * The maximum number of nodes of the specified sizes.
+     */
+    private Integer maxCount;
+
+    /**
+     * Creates an instance of AutoScaleProfile class.
+     */
+    public AutoScaleProfile() {
+    }
+
+    /**
+     * Get the size property: VM size that AKS will use when creating and scaling e.g. 'Standard_E4s_v3',
+     * 'Standard_E16s_v3' or 'Standard_D16s_v5'.
+     * 
+     * @return the size value.
+     */
+    public String size() {
+        return this.size;
+    }
+
+    /**
+     * Set the size property: VM size that AKS will use when creating and scaling e.g. 'Standard_E4s_v3',
+     * 'Standard_E16s_v3' or 'Standard_D16s_v5'.
+     * 
+     * @param size the size value to set.
+     * @return the AutoScaleProfile object itself.
+     */
+    public AutoScaleProfile withSize(String size) {
+        this.size = size;
+        return this;
+    }
+
+    /**
+     * Get the minCount property: The minimum number of nodes of the specified sizes.
+     * 
+     * @return the minCount value.
+     */
+    public Integer minCount() {
+        return this.minCount;
+    }
+
+    /**
+     * Set the minCount property: The minimum number of nodes of the specified sizes.
+     * 
+     * @param minCount the minCount value to set.
+     * @return the AutoScaleProfile object itself.
+     */
+    public AutoScaleProfile withMinCount(Integer minCount) {
+        this.minCount = minCount;
+        return this;
+    }
+
+    /**
+     * Get the maxCount property: The maximum number of nodes of the specified sizes.
+     * 
+     * @return the maxCount value.
+     */
+    public Integer maxCount() {
+        return this.maxCount;
+    }
+
+    /**
+     * Set the maxCount property: The maximum number of nodes of the specified sizes.
+     * 
+     * @param maxCount the maxCount value to set.
+     * @return the AutoScaleProfile object itself.
+     */
+    public AutoScaleProfile withMaxCount(Integer maxCount) {
+        this.maxCount = maxCount;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("size", this.size);
+        jsonWriter.writeNumberField("minCount", this.minCount);
+        jsonWriter.writeNumberField("maxCount", this.maxCount);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AutoScaleProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AutoScaleProfile if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AutoScaleProfile.
+     */
+    public static AutoScaleProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AutoScaleProfile deserializedAutoScaleProfile = new AutoScaleProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("size".equals(fieldName)) {
+                    deserializedAutoScaleProfile.size = reader.getString();
+                } else if ("minCount".equals(fieldName)) {
+                    deserializedAutoScaleProfile.minCount = reader.getNullable(JsonReader::getInt);
+                } else if ("maxCount".equals(fieldName)) {
+                    deserializedAutoScaleProfile.maxCount = reader.getNullable(JsonReader::getInt);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAutoScaleProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ClusterServiceLoadBalancerHealthProbeMode.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ClusterServiceLoadBalancerHealthProbeMode.java
new file mode 100644
index 000000000000..876040ab659a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ClusterServiceLoadBalancerHealthProbeMode.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The health probing behavior for External Traffic Policy Cluster services.
+ */
+public final class ClusterServiceLoadBalancerHealthProbeMode
+    extends ExpandableStringEnum<ClusterServiceLoadBalancerHealthProbeMode> {
+    /**
+     * Static value ServiceNodePort for ClusterServiceLoadBalancerHealthProbeMode.
+     */
+    public static final ClusterServiceLoadBalancerHealthProbeMode SERVICE_NODE_PORT = fromString("ServiceNodePort");
+
+    /**
+     * Static value Shared for ClusterServiceLoadBalancerHealthProbeMode.
+     */
+    public static final ClusterServiceLoadBalancerHealthProbeMode SHARED = fromString("Shared");
+
+    /**
+     * Creates a new instance of ClusterServiceLoadBalancerHealthProbeMode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ClusterServiceLoadBalancerHealthProbeMode() {
+    }
+
+    /**
+     * Creates or finds a ClusterServiceLoadBalancerHealthProbeMode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ClusterServiceLoadBalancerHealthProbeMode.
+     */
+    public static ClusterServiceLoadBalancerHealthProbeMode fromString(String name) {
+        return fromString(name, ClusterServiceLoadBalancerHealthProbeMode.class);
+    }
+
+    /**
+     * Gets known ClusterServiceLoadBalancerHealthProbeMode values.
+     * 
+     * @return known ClusterServiceLoadBalancerHealthProbeMode values.
+     */
+    public static Collection<ClusterServiceLoadBalancerHealthProbeMode> values() {
+        return values(ClusterServiceLoadBalancerHealthProbeMode.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Component.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Component.java
new file mode 100644
index 000000000000..377392c379b5
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Component.java
@@ -0,0 +1,156 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The Component model.
+ */
+@Fluent
+public final class Component implements JsonSerializable<Component> {
+    /*
+     * Component name.
+     */
+    private String name;
+
+    /*
+     * Component version.
+     */
+    private String version;
+
+    /*
+     * If upgraded component version contains breaking changes from the current version. To see a detailed description
+     * of what the breaking changes are, visit
+     * https://learn.microsoft.com/azure/aks/supported-kubernetes-versions?tabs=azure-cli#aks-components-breaking-
+     * changes-by-version.
+     */
+    private Boolean hasBreakingChanges;
+
+    /**
+     * Creates an instance of Component class.
+     */
+    public Component() {
+    }
+
+    /**
+     * Get the name property: Component name.
+     * 
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name property: Component name.
+     * 
+     * @param name the name value to set.
+     * @return the Component object itself.
+     */
+    public Component withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the version property: Component version.
+     * 
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: Component version.
+     * 
+     * @param version the version value to set.
+     * @return the Component object itself.
+     */
+    public Component withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the hasBreakingChanges property: If upgraded component version contains breaking changes from the current
+     * version. To see a detailed description of what the breaking changes are, visit
+     * https://learn.microsoft.com/azure/aks/supported-kubernetes-versions?tabs=azure-cli#aks-components-breaking-changes-by-version.
+     * 
+     * @return the hasBreakingChanges value.
+     */
+    public Boolean hasBreakingChanges() {
+        return this.hasBreakingChanges;
+    }
+
+    /**
+     * Set the hasBreakingChanges property: If upgraded component version contains breaking changes from the current
+     * version. To see a detailed description of what the breaking changes are, visit
+     * https://learn.microsoft.com/azure/aks/supported-kubernetes-versions?tabs=azure-cli#aks-components-breaking-changes-by-version.
+     * 
+     * @param hasBreakingChanges the hasBreakingChanges value to set.
+     * @return the Component object itself.
+     */
+    public Component withHasBreakingChanges(Boolean hasBreakingChanges) {
+        this.hasBreakingChanges = hasBreakingChanges;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("name", this.name);
+        jsonWriter.writeStringField("version", this.version);
+        jsonWriter.writeBooleanField("hasBreakingChanges", this.hasBreakingChanges);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of Component from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of Component if the JsonReader was pointing to an instance of it, or null if it was pointing
+     * to JSON null.
+     * @throws IOException If an error occurs while reading the Component.
+     */
+    public static Component fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            Component deserializedComponent = new Component();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("name".equals(fieldName)) {
+                    deserializedComponent.name = reader.getString();
+                } else if ("version".equals(fieldName)) {
+                    deserializedComponent.version = reader.getString();
+                } else if ("hasBreakingChanges".equals(fieldName)) {
+                    deserializedComponent.hasBreakingChanges = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedComponent;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ComponentsByRelease.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ComponentsByRelease.java
new file mode 100644
index 000000000000..2c734e4fc3d2
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ComponentsByRelease.java
@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * components of given Kubernetes version.
+ */
+@Fluent
+public final class ComponentsByRelease implements JsonSerializable<ComponentsByRelease> {
+    /*
+     * The Kubernetes version (major.minor).
+     */
+    private String kubernetesVersion;
+
+    /*
+     * components of current or upgraded Kubernetes version in the cluster.
+     */
+    private List<Component> components;
+
+    /**
+     * Creates an instance of ComponentsByRelease class.
+     */
+    public ComponentsByRelease() {
+    }
+
+    /**
+     * Get the kubernetesVersion property: The Kubernetes version (major.minor).
+     * 
+     * @return the kubernetesVersion value.
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set the kubernetesVersion property: The Kubernetes version (major.minor).
+     * 
+     * @param kubernetesVersion the kubernetesVersion value to set.
+     * @return the ComponentsByRelease object itself.
+     */
+    public ComponentsByRelease withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get the components property: components of current or upgraded Kubernetes version in the cluster.
+     * 
+     * @return the components value.
+     */
+    public List<Component> components() {
+        return this.components;
+    }
+
+    /**
+     * Set the components property: components of current or upgraded Kubernetes version in the cluster.
+     * 
+     * @param components the components value to set.
+     * @return the ComponentsByRelease object itself.
+     */
+    public ComponentsByRelease withComponents(List<Component> components) {
+        this.components = components;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (components() != null) {
+            components().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("kubernetesVersion", this.kubernetesVersion);
+        jsonWriter.writeArrayField("components", this.components, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ComponentsByRelease from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ComponentsByRelease if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ComponentsByRelease.
+     */
+    public static ComponentsByRelease fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ComponentsByRelease deserializedComponentsByRelease = new ComponentsByRelease();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("kubernetesVersion".equals(fieldName)) {
+                    deserializedComponentsByRelease.kubernetesVersion = reader.getString();
+                } else if ("components".equals(fieldName)) {
+                    List<Component> components = reader.readArray(reader1 -> Component.fromJson(reader1));
+                    deserializedComponentsByRelease.components = components;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedComponentsByRelease;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfile.java
index 333f0bcc9ba8..b9b13331df23 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfile.java
@@ -23,7 +23,7 @@ public final class ContainerServiceNetworkProfile implements JsonSerializable<Co
     private NetworkPlugin networkPlugin;
 
     /*
-     * The mode the network plugin should use.
+     * Network plugin mode used for building the Kubernetes network.
      */
     private NetworkPluginMode networkPluginMode;
 
@@ -43,12 +43,6 @@ public final class ContainerServiceNetworkProfile implements JsonSerializable<Co
      */
     private NetworkDataplane networkDataplane;
 
-    /*
-     * Advanced Networking profile for enabling observability and security feature suite on a cluster. For more
-     * information see aka.ms/aksadvancednetworking.
-     */
-    private AdvancedNetworking advancedNetworking;
-
     /*
      * A CIDR notation IP range from which to assign pod IPs when kubenet is used.
      */
@@ -114,6 +108,25 @@ public final class ContainerServiceNetworkProfile implements JsonSerializable<Co
      */
     private List<IpFamily> ipFamilies;
 
+    /*
+     * Defines access to special link local addresses (Azure Instance Metadata Service, aka IMDS) for pods with
+     * hostNetwork=false. if not specified, the default is 'IMDS'.
+     */
+    private PodLinkLocalAccess podLinkLocalAccess;
+
+    /*
+     * Holds configuration customizations for kube-proxy. Any values not defined will use the kube-proxy defaulting
+     * behavior. See https://v<version>.docs.kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy/ where
+     * <version> is represented by a <major version>-<minor version> string. Kubernetes version 1.23 would be '1-23'.
+     */
+    private ContainerServiceNetworkProfileKubeProxyConfig kubeProxyConfig;
+
+    /*
+     * Advanced Networking profile for enabling observability and security feature suite on a cluster. For more
+     * information see aka.ms/aksadvancednetworking.
+     */
+    private AdvancedNetworking advancedNetworking;
+
     /**
      * Creates an instance of ContainerServiceNetworkProfile class.
      */
@@ -141,7 +154,7 @@ public ContainerServiceNetworkProfile withNetworkPlugin(NetworkPlugin networkPlu
     }
 
     /**
-     * Get the networkPluginMode property: The mode the network plugin should use.
+     * Get the networkPluginMode property: Network plugin mode used for building the Kubernetes network.
      * 
      * @return the networkPluginMode value.
      */
@@ -150,7 +163,7 @@ public NetworkPluginMode networkPluginMode() {
     }
 
     /**
-     * Set the networkPluginMode property: The mode the network plugin should use.
+     * Set the networkPluginMode property: Network plugin mode used for building the Kubernetes network.
      * 
      * @param networkPluginMode the networkPluginMode value to set.
      * @return the ContainerServiceNetworkProfile object itself.
@@ -222,28 +235,6 @@ public ContainerServiceNetworkProfile withNetworkDataplane(NetworkDataplane netw
         return this;
     }
 
-    /**
-     * Get the advancedNetworking property: Advanced Networking profile for enabling observability and security feature
-     * suite on a cluster. For more information see aka.ms/aksadvancednetworking.
-     * 
-     * @return the advancedNetworking value.
-     */
-    public AdvancedNetworking advancedNetworking() {
-        return this.advancedNetworking;
-    }
-
-    /**
-     * Set the advancedNetworking property: Advanced Networking profile for enabling observability and security feature
-     * suite on a cluster. For more information see aka.ms/aksadvancednetworking.
-     * 
-     * @param advancedNetworking the advancedNetworking value to set.
-     * @return the ContainerServiceNetworkProfile object itself.
-     */
-    public ContainerServiceNetworkProfile withAdvancedNetworking(AdvancedNetworking advancedNetworking) {
-        this.advancedNetworking = advancedNetworking;
-        return this;
-    }
-
     /**
      * Get the podCidr property: A CIDR notation IP range from which to assign pod IPs when kubenet is used.
      * 
@@ -492,15 +483,85 @@ public ContainerServiceNetworkProfile withIpFamilies(List<IpFamily> ipFamilies)
         return this;
     }
 
+    /**
+     * Get the podLinkLocalAccess property: Defines access to special link local addresses (Azure Instance Metadata
+     * Service, aka IMDS) for pods with hostNetwork=false. if not specified, the default is 'IMDS'.
+     * 
+     * @return the podLinkLocalAccess value.
+     */
+    public PodLinkLocalAccess podLinkLocalAccess() {
+        return this.podLinkLocalAccess;
+    }
+
+    /**
+     * Set the podLinkLocalAccess property: Defines access to special link local addresses (Azure Instance Metadata
+     * Service, aka IMDS) for pods with hostNetwork=false. if not specified, the default is 'IMDS'.
+     * 
+     * @param podLinkLocalAccess the podLinkLocalAccess value to set.
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withPodLinkLocalAccess(PodLinkLocalAccess podLinkLocalAccess) {
+        this.podLinkLocalAccess = podLinkLocalAccess;
+        return this;
+    }
+
+    /**
+     * Get the kubeProxyConfig property: Holds configuration customizations for kube-proxy. Any values not defined will
+     * use the kube-proxy defaulting behavior. See
+     * https://v&lt;version&gt;.docs.kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy/ where
+     * &lt;version&gt; is represented by a &lt;major version&gt;-&lt;minor version&gt; string. Kubernetes version 1.23
+     * would be '1-23'.
+     * 
+     * @return the kubeProxyConfig value.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfig kubeProxyConfig() {
+        return this.kubeProxyConfig;
+    }
+
+    /**
+     * Set the kubeProxyConfig property: Holds configuration customizations for kube-proxy. Any values not defined will
+     * use the kube-proxy defaulting behavior. See
+     * https://v&lt;version&gt;.docs.kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy/ where
+     * &lt;version&gt; is represented by a &lt;major version&gt;-&lt;minor version&gt; string. Kubernetes version 1.23
+     * would be '1-23'.
+     * 
+     * @param kubeProxyConfig the kubeProxyConfig value to set.
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile
+        withKubeProxyConfig(ContainerServiceNetworkProfileKubeProxyConfig kubeProxyConfig) {
+        this.kubeProxyConfig = kubeProxyConfig;
+        return this;
+    }
+
+    /**
+     * Get the advancedNetworking property: Advanced Networking profile for enabling observability and security feature
+     * suite on a cluster. For more information see aka.ms/aksadvancednetworking.
+     * 
+     * @return the advancedNetworking value.
+     */
+    public AdvancedNetworking advancedNetworking() {
+        return this.advancedNetworking;
+    }
+
+    /**
+     * Set the advancedNetworking property: Advanced Networking profile for enabling observability and security feature
+     * suite on a cluster. For more information see aka.ms/aksadvancednetworking.
+     * 
+     * @param advancedNetworking the advancedNetworking value to set.
+     * @return the ContainerServiceNetworkProfile object itself.
+     */
+    public ContainerServiceNetworkProfile withAdvancedNetworking(AdvancedNetworking advancedNetworking) {
+        this.advancedNetworking = advancedNetworking;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
-        if (advancedNetworking() != null) {
-            advancedNetworking().validate();
-        }
         if (loadBalancerProfile() != null) {
             loadBalancerProfile().validate();
         }
@@ -510,6 +571,12 @@ public void validate() {
         if (staticEgressGatewayProfile() != null) {
             staticEgressGatewayProfile().validate();
         }
+        if (kubeProxyConfig() != null) {
+            kubeProxyConfig().validate();
+        }
+        if (advancedNetworking() != null) {
+            advancedNetworking().validate();
+        }
     }
 
     /**
@@ -525,7 +592,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("networkMode", this.networkMode == null ? null : this.networkMode.toString());
         jsonWriter.writeStringField("networkDataplane",
             this.networkDataplane == null ? null : this.networkDataplane.toString());
-        jsonWriter.writeJsonField("advancedNetworking", this.advancedNetworking);
         jsonWriter.writeStringField("podCidr", this.podCidr);
         jsonWriter.writeStringField("serviceCidr", this.serviceCidr);
         jsonWriter.writeStringField("dnsServiceIP", this.dnsServiceIp);
@@ -539,6 +605,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeArrayField("serviceCidrs", this.serviceCidrs, (writer, element) -> writer.writeString(element));
         jsonWriter.writeArrayField("ipFamilies", this.ipFamilies,
             (writer, element) -> writer.writeString(element == null ? null : element.toString()));
+        jsonWriter.writeStringField("podLinkLocalAccess",
+            this.podLinkLocalAccess == null ? null : this.podLinkLocalAccess.toString());
+        jsonWriter.writeJsonField("kubeProxyConfig", this.kubeProxyConfig);
+        jsonWriter.writeJsonField("advancedNetworking", this.advancedNetworking);
         return jsonWriter.writeEndObject();
     }
 
@@ -572,8 +642,6 @@ public static ContainerServiceNetworkProfile fromJson(JsonReader jsonReader) thr
                 } else if ("networkDataplane".equals(fieldName)) {
                     deserializedContainerServiceNetworkProfile.networkDataplane
                         = NetworkDataplane.fromString(reader.getString());
-                } else if ("advancedNetworking".equals(fieldName)) {
-                    deserializedContainerServiceNetworkProfile.advancedNetworking = AdvancedNetworking.fromJson(reader);
                 } else if ("podCidr".equals(fieldName)) {
                     deserializedContainerServiceNetworkProfile.podCidr = reader.getString();
                 } else if ("serviceCidr".equals(fieldName)) {
@@ -604,6 +672,14 @@ public static ContainerServiceNetworkProfile fromJson(JsonReader jsonReader) thr
                 } else if ("ipFamilies".equals(fieldName)) {
                     List<IpFamily> ipFamilies = reader.readArray(reader1 -> IpFamily.fromString(reader1.getString()));
                     deserializedContainerServiceNetworkProfile.ipFamilies = ipFamilies;
+                } else if ("podLinkLocalAccess".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfile.podLinkLocalAccess
+                        = PodLinkLocalAccess.fromString(reader.getString());
+                } else if ("kubeProxyConfig".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfile.kubeProxyConfig
+                        = ContainerServiceNetworkProfileKubeProxyConfig.fromJson(reader);
+                } else if ("advancedNetworking".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfile.advancedNetworking = AdvancedNetworking.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfileKubeProxyConfig.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfileKubeProxyConfig.java
new file mode 100644
index 000000000000..aa38107056b5
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfileKubeProxyConfig.java
@@ -0,0 +1,166 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Holds configuration customizations for kube-proxy. Any values not defined will use the kube-proxy defaulting
+ * behavior. See https://v&lt;version&gt;.docs.kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy/
+ * where &lt;version&gt; is represented by a &lt;major version&gt;-&lt;minor version&gt; string. Kubernetes version 1.23
+ * would be '1-23'.
+ */
+@Fluent
+public final class ContainerServiceNetworkProfileKubeProxyConfig
+    implements JsonSerializable<ContainerServiceNetworkProfileKubeProxyConfig> {
+    /*
+     * Whether to enable on kube-proxy on the cluster (if no 'kubeProxyConfig' exists, kube-proxy is enabled in AKS by
+     * default without these customizations).
+     */
+    private Boolean enabled;
+
+    /*
+     * Specify which proxy mode to use ('IPTABLES' or 'IPVS')
+     */
+    private Mode mode;
+
+    /*
+     * Holds configuration customizations for IPVS. May only be specified if 'mode' is set to 'IPVS'.
+     */
+    private ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig ipvsConfig;
+
+    /**
+     * Creates an instance of ContainerServiceNetworkProfileKubeProxyConfig class.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfig() {
+    }
+
+    /**
+     * Get the enabled property: Whether to enable on kube-proxy on the cluster (if no 'kubeProxyConfig' exists,
+     * kube-proxy is enabled in AKS by default without these customizations).
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Whether to enable on kube-proxy on the cluster (if no 'kubeProxyConfig' exists,
+     * kube-proxy is enabled in AKS by default without these customizations).
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfig withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the mode property: Specify which proxy mode to use ('IPTABLES' or 'IPVS').
+     * 
+     * @return the mode value.
+     */
+    public Mode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Set the mode property: Specify which proxy mode to use ('IPTABLES' or 'IPVS').
+     * 
+     * @param mode the mode value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfig withMode(Mode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Get the ipvsConfig property: Holds configuration customizations for IPVS. May only be specified if 'mode' is set
+     * to 'IPVS'.
+     * 
+     * @return the ipvsConfig value.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig ipvsConfig() {
+        return this.ipvsConfig;
+    }
+
+    /**
+     * Set the ipvsConfig property: Holds configuration customizations for IPVS. May only be specified if 'mode' is set
+     * to 'IPVS'.
+     * 
+     * @param ipvsConfig the ipvsConfig value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfig
+        withIpvsConfig(ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig ipvsConfig) {
+        this.ipvsConfig = ipvsConfig;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (ipvsConfig() != null) {
+            ipvsConfig().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeStringField("mode", this.mode == null ? null : this.mode.toString());
+        jsonWriter.writeJsonField("ipvsConfig", this.ipvsConfig);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ContainerServiceNetworkProfileKubeProxyConfig from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ContainerServiceNetworkProfileKubeProxyConfig if the JsonReader was pointing to an
+     * instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ContainerServiceNetworkProfileKubeProxyConfig.
+     */
+    public static ContainerServiceNetworkProfileKubeProxyConfig fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ContainerServiceNetworkProfileKubeProxyConfig deserializedContainerServiceNetworkProfileKubeProxyConfig
+                = new ContainerServiceNetworkProfileKubeProxyConfig();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfig.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("mode".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfig.mode
+                        = Mode.fromString(reader.getString());
+                } else if ("ipvsConfig".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfig.ipvsConfig
+                        = ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedContainerServiceNetworkProfileKubeProxyConfig;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.java
new file mode 100644
index 000000000000..6a626ffea889
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.java
@@ -0,0 +1,193 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Holds configuration customizations for IPVS. May only be specified if 'mode' is set to 'IPVS'.
+ */
+@Fluent
+public final class ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig
+    implements JsonSerializable<ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig> {
+    /*
+     * IPVS scheduler, for more information please see http://www.linuxvirtualserver.org/docs/scheduling.html.
+     */
+    private IpvsScheduler scheduler;
+
+    /*
+     * The timeout value used for idle IPVS TCP sessions in seconds. Must be a positive integer value.
+     */
+    private Integer tcpTimeoutSeconds;
+
+    /*
+     * The timeout value used for IPVS TCP sessions after receiving a FIN in seconds. Must be a positive integer value.
+     */
+    private Integer tcpFinTimeoutSeconds;
+
+    /*
+     * The timeout value used for IPVS UDP packets in seconds. Must be a positive integer value.
+     */
+    private Integer udpTimeoutSeconds;
+
+    /**
+     * Creates an instance of ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig class.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig() {
+    }
+
+    /**
+     * Get the scheduler property: IPVS scheduler, for more information please see
+     * http://www.linuxvirtualserver.org/docs/scheduling.html.
+     * 
+     * @return the scheduler value.
+     */
+    public IpvsScheduler scheduler() {
+        return this.scheduler;
+    }
+
+    /**
+     * Set the scheduler property: IPVS scheduler, for more information please see
+     * http://www.linuxvirtualserver.org/docs/scheduling.html.
+     * 
+     * @param scheduler the scheduler value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig withScheduler(IpvsScheduler scheduler) {
+        this.scheduler = scheduler;
+        return this;
+    }
+
+    /**
+     * Get the tcpTimeoutSeconds property: The timeout value used for idle IPVS TCP sessions in seconds. Must be a
+     * positive integer value.
+     * 
+     * @return the tcpTimeoutSeconds value.
+     */
+    public Integer tcpTimeoutSeconds() {
+        return this.tcpTimeoutSeconds;
+    }
+
+    /**
+     * Set the tcpTimeoutSeconds property: The timeout value used for idle IPVS TCP sessions in seconds. Must be a
+     * positive integer value.
+     * 
+     * @param tcpTimeoutSeconds the tcpTimeoutSeconds value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig withTcpTimeoutSeconds(Integer tcpTimeoutSeconds) {
+        this.tcpTimeoutSeconds = tcpTimeoutSeconds;
+        return this;
+    }
+
+    /**
+     * Get the tcpFinTimeoutSeconds property: The timeout value used for IPVS TCP sessions after receiving a FIN in
+     * seconds. Must be a positive integer value.
+     * 
+     * @return the tcpFinTimeoutSeconds value.
+     */
+    public Integer tcpFinTimeoutSeconds() {
+        return this.tcpFinTimeoutSeconds;
+    }
+
+    /**
+     * Set the tcpFinTimeoutSeconds property: The timeout value used for IPVS TCP sessions after receiving a FIN in
+     * seconds. Must be a positive integer value.
+     * 
+     * @param tcpFinTimeoutSeconds the tcpFinTimeoutSeconds value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig
+        withTcpFinTimeoutSeconds(Integer tcpFinTimeoutSeconds) {
+        this.tcpFinTimeoutSeconds = tcpFinTimeoutSeconds;
+        return this;
+    }
+
+    /**
+     * Get the udpTimeoutSeconds property: The timeout value used for IPVS UDP packets in seconds. Must be a positive
+     * integer value.
+     * 
+     * @return the udpTimeoutSeconds value.
+     */
+    public Integer udpTimeoutSeconds() {
+        return this.udpTimeoutSeconds;
+    }
+
+    /**
+     * Set the udpTimeoutSeconds property: The timeout value used for IPVS UDP packets in seconds. Must be a positive
+     * integer value.
+     * 
+     * @param udpTimeoutSeconds the udpTimeoutSeconds value to set.
+     * @return the ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig object itself.
+     */
+    public ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig withUdpTimeoutSeconds(Integer udpTimeoutSeconds) {
+        this.udpTimeoutSeconds = udpTimeoutSeconds;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("scheduler", this.scheduler == null ? null : this.scheduler.toString());
+        jsonWriter.writeNumberField("tcpTimeoutSeconds", this.tcpTimeoutSeconds);
+        jsonWriter.writeNumberField("tcpFinTimeoutSeconds", this.tcpFinTimeoutSeconds);
+        jsonWriter.writeNumberField("udpTimeoutSeconds", this.udpTimeoutSeconds);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig if the JsonReader was pointing to
+     * an instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.
+     */
+    public static ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig deserializedContainerServiceNetworkProfileKubeProxyConfigIpvsConfig
+                = new ContainerServiceNetworkProfileKubeProxyConfigIpvsConfig();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("scheduler".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.scheduler
+                        = IpvsScheduler.fromString(reader.getString());
+                } else if ("tcpTimeoutSeconds".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.tcpTimeoutSeconds
+                        = reader.getNullable(JsonReader::getInt);
+                } else if ("tcpFinTimeoutSeconds".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.tcpFinTimeoutSeconds
+                        = reader.getNullable(JsonReader::getInt);
+                } else if ("udpTimeoutSeconds".equals(fieldName)) {
+                    deserializedContainerServiceNetworkProfileKubeProxyConfigIpvsConfig.udpTimeoutSeconds
+                        = reader.getNullable(JsonReader::getInt);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedContainerServiceNetworkProfileKubeProxyConfigIpvsConfig;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DeletePolicy.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DeletePolicy.java
new file mode 100644
index 000000000000..9fc39e8ee0de
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DeletePolicy.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Delete options of a namespace.
+ */
+public final class DeletePolicy extends ExpandableStringEnum<DeletePolicy> {
+    /**
+     * Static value Keep for DeletePolicy.
+     */
+    public static final DeletePolicy KEEP = fromString("Keep");
+
+    /**
+     * Static value Delete for DeletePolicy.
+     */
+    public static final DeletePolicy DELETE = fromString("Delete");
+
+    /**
+     * Creates a new instance of DeletePolicy value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DeletePolicy() {
+    }
+
+    /**
+     * Creates or finds a DeletePolicy from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DeletePolicy.
+     */
+    public static DeletePolicy fromString(String name) {
+        return fromString(name, DeletePolicy.class);
+    }
+
+    /**
+     * Gets known DeletePolicy values.
+     * 
+     * @return known DeletePolicy values.
+     */
+    public static Collection<DeletePolicy> values() {
+        return values(DeletePolicy.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DriftAction.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DriftAction.java
new file mode 100644
index 000000000000..19e1aa682e34
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DriftAction.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The drift action of the machine. Indicates whether a machine has deviated from its expected state due to changes in
+ * managed cluster properties, requiring corrective action.
+ */
+public final class DriftAction extends ExpandableStringEnum<DriftAction> {
+    /**
+     * Static value Synced for DriftAction.
+     */
+    public static final DriftAction SYNCED = fromString("Synced");
+
+    /**
+     * Static value Recreate for DriftAction.
+     */
+    public static final DriftAction RECREATE = fromString("Recreate");
+
+    /**
+     * Creates a new instance of DriftAction value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DriftAction() {
+    }
+
+    /**
+     * Creates or finds a DriftAction from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DriftAction.
+     */
+    public static DriftAction fromString(String name) {
+        return fromString(name, DriftAction.class);
+    }
+
+    /**
+     * Gets known DriftAction values.
+     * 
+     * @return known DriftAction values.
+     */
+    public static Collection<DriftAction> values() {
+        return values(DriftAction.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DriverType.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DriverType.java
new file mode 100644
index 000000000000..0ab2856f2d4c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/DriverType.java
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Specify the type of GPU driver to install when creating Windows agent pools. If not provided, AKS selects the driver
+ * based on system compatibility. This cannot be changed once the AgentPool has been created. This cannot be set on
+ * Linux AgentPools. For Linux AgentPools, the driver is selected based on system compatibility.
+ */
+public final class DriverType extends ExpandableStringEnum<DriverType> {
+    /**
+     * Static value GRID for DriverType.
+     */
+    public static final DriverType GRID = fromString("GRID");
+
+    /**
+     * Static value CUDA for DriverType.
+     */
+    public static final DriverType CUDA = fromString("CUDA");
+
+    /**
+     * Creates a new instance of DriverType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DriverType() {
+    }
+
+    /**
+     * Creates or finds a DriverType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DriverType.
+     */
+    public static DriverType fromString(String name) {
+        return fromString(name, DriverType.class);
+    }
+
+    /**
+     * Gets known DriverType values.
+     * 
+     * @return known DriverType values.
+     */
+    public static Collection<DriverType> values() {
+        return values(DriverType.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GpuProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GpuProfile.java
index 83dd030aabe6..0c2abaef4d28 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GpuProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GpuProfile.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 
 /**
- * GPU settings for the Agent Pool.
+ * The GpuProfile model.
  */
 @Fluent
 public final class GpuProfile implements JsonSerializable<GpuProfile> {
@@ -21,6 +21,13 @@ public final class GpuProfile implements JsonSerializable<GpuProfile> {
      */
     private GpuDriver driver;
 
+    /*
+     * Specify the type of GPU driver to install when creating Windows agent pools. If not provided, AKS selects the
+     * driver based on system compatibility. This cannot be changed once the AgentPool has been created. This cannot be
+     * set on Linux AgentPools. For Linux AgentPools, the driver is selected based on system compatibility.
+     */
+    private DriverType driverType;
+
     /**
      * Creates an instance of GpuProfile class.
      */
@@ -47,6 +54,32 @@ public GpuProfile withDriver(GpuDriver driver) {
         return this;
     }
 
+    /**
+     * Get the driverType property: Specify the type of GPU driver to install when creating Windows agent pools. If not
+     * provided, AKS selects the driver based on system compatibility. This cannot be changed once the AgentPool has
+     * been created. This cannot be set on Linux AgentPools. For Linux AgentPools, the driver is selected based on
+     * system compatibility.
+     * 
+     * @return the driverType value.
+     */
+    public DriverType driverType() {
+        return this.driverType;
+    }
+
+    /**
+     * Set the driverType property: Specify the type of GPU driver to install when creating Windows agent pools. If not
+     * provided, AKS selects the driver based on system compatibility. This cannot be changed once the AgentPool has
+     * been created. This cannot be set on Linux AgentPools. For Linux AgentPools, the driver is selected based on
+     * system compatibility.
+     * 
+     * @param driverType the driverType value to set.
+     * @return the GpuProfile object itself.
+     */
+    public GpuProfile withDriverType(DriverType driverType) {
+        this.driverType = driverType;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -62,6 +95,7 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("driver", this.driver == null ? null : this.driver.toString());
+        jsonWriter.writeStringField("driverType", this.driverType == null ? null : this.driverType.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -82,6 +116,8 @@ public static GpuProfile fromJson(JsonReader jsonReader) throws IOException {
 
                 if ("driver".equals(fieldName)) {
                     deserializedGpuProfile.driver = GpuDriver.fromString(reader.getString());
+                } else if ("driverType".equals(fieldName)) {
+                    deserializedGpuProfile.driverType = DriverType.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsAvailableVersionsList.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsAvailableVersionsList.java
new file mode 100644
index 000000000000..d1aa02d9846b
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsAvailableVersionsList.java
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.GuardrailsAvailableVersionInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Hold values properties, which is array of GuardrailsVersions.
+ */
+@Fluent
+public final class GuardrailsAvailableVersionsList implements JsonSerializable<GuardrailsAvailableVersionsList> {
+    /*
+     * Array of AKS supported Guardrails versions.
+     */
+    private List<GuardrailsAvailableVersionInner> value;
+
+    /*
+     * The URL to get the next Guardrails available version.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of GuardrailsAvailableVersionsList class.
+     */
+    public GuardrailsAvailableVersionsList() {
+    }
+
+    /**
+     * Get the value property: Array of AKS supported Guardrails versions.
+     * 
+     * @return the value value.
+     */
+    public List<GuardrailsAvailableVersionInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: Array of AKS supported Guardrails versions.
+     * 
+     * @param value the value value to set.
+     * @return the GuardrailsAvailableVersionsList object itself.
+     */
+    public GuardrailsAvailableVersionsList withValue(List<GuardrailsAvailableVersionInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next Guardrails available version.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of GuardrailsAvailableVersionsList from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of GuardrailsAvailableVersionsList if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the GuardrailsAvailableVersionsList.
+     */
+    public static GuardrailsAvailableVersionsList fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            GuardrailsAvailableVersionsList deserializedGuardrailsAvailableVersionsList
+                = new GuardrailsAvailableVersionsList();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<GuardrailsAvailableVersionInner> value
+                        = reader.readArray(reader1 -> GuardrailsAvailableVersionInner.fromJson(reader1));
+                    deserializedGuardrailsAvailableVersionsList.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionsList.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedGuardrailsAvailableVersionsList;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsAvailableVersionsProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsAvailableVersionsProperties.java
new file mode 100644
index 000000000000..11df96a784bb
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsAvailableVersionsProperties.java
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Whether the version is default or not and support info.
+ */
+@Immutable
+public final class GuardrailsAvailableVersionsProperties
+    implements JsonSerializable<GuardrailsAvailableVersionsProperties> {
+    /*
+     * The isDefaultVersion property.
+     */
+    private Boolean isDefaultVersion;
+
+    /*
+     * Whether the version is preview or stable.
+     */
+    private GuardrailsSupport support;
+
+    /**
+     * Creates an instance of GuardrailsAvailableVersionsProperties class.
+     */
+    public GuardrailsAvailableVersionsProperties() {
+    }
+
+    /**
+     * Get the isDefaultVersion property: The isDefaultVersion property.
+     * 
+     * @return the isDefaultVersion value.
+     */
+    public Boolean isDefaultVersion() {
+        return this.isDefaultVersion;
+    }
+
+    /**
+     * Get the support property: Whether the version is preview or stable.
+     * 
+     * @return the support value.
+     */
+    public GuardrailsSupport support() {
+        return this.support;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of GuardrailsAvailableVersionsProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of GuardrailsAvailableVersionsProperties if the JsonReader was pointing to an instance of it,
+     * or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the GuardrailsAvailableVersionsProperties.
+     */
+    public static GuardrailsAvailableVersionsProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            GuardrailsAvailableVersionsProperties deserializedGuardrailsAvailableVersionsProperties
+                = new GuardrailsAvailableVersionsProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("isDefaultVersion".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionsProperties.isDefaultVersion
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("support".equals(fieldName)) {
+                    deserializedGuardrailsAvailableVersionsProperties.support
+                        = GuardrailsSupport.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedGuardrailsAvailableVersionsProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsSupport.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsSupport.java
new file mode 100644
index 000000000000..bdd969c4bfc0
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/GuardrailsSupport.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Whether the version is preview or stable.
+ */
+public final class GuardrailsSupport extends ExpandableStringEnum<GuardrailsSupport> {
+    /**
+     * Static value Preview for GuardrailsSupport.
+     */
+    public static final GuardrailsSupport PREVIEW = fromString("Preview");
+
+    /**
+     * Static value Stable for GuardrailsSupport.
+     */
+    public static final GuardrailsSupport STABLE = fromString("Stable");
+
+    /**
+     * Creates a new instance of GuardrailsSupport value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public GuardrailsSupport() {
+    }
+
+    /**
+     * Creates or finds a GuardrailsSupport from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding GuardrailsSupport.
+     */
+    public static GuardrailsSupport fromString(String name) {
+        return fromString(name, GuardrailsSupport.class);
+    }
+
+    /**
+     * Gets known GuardrailsSupport values.
+     * 
+     * @return known GuardrailsSupport values.
+     */
+    public static Collection<GuardrailsSupport> values() {
+        return values(GuardrailsSupport.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingListResult.java
new file mode 100644
index 000000000000..974a7b23f9ad
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingListResult.java
@@ -0,0 +1,136 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.IdentityBindingInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response of a IdentityBinding list operation.
+ */
+@Fluent
+public final class IdentityBindingListResult implements JsonSerializable<IdentityBindingListResult> {
+    /*
+     * The IdentityBinding items on this page
+     */
+    private List<IdentityBindingInner> value;
+
+    /*
+     * The link to the next page of items
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of IdentityBindingListResult class.
+     */
+    public IdentityBindingListResult() {
+    }
+
+    /**
+     * Get the value property: The IdentityBinding items on this page.
+     * 
+     * @return the value value.
+     */
+    public List<IdentityBindingInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The IdentityBinding items on this page.
+     * 
+     * @param value the value value to set.
+     * @return the IdentityBindingListResult object itself.
+     */
+    public IdentityBindingListResult withValue(List<IdentityBindingInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The link to the next page of items.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the nextLink property: The link to the next page of items.
+     * 
+     * @param nextLink the nextLink value to set.
+     * @return the IdentityBindingListResult object itself.
+     */
+    public IdentityBindingListResult withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() == null) {
+            throw LOGGER.atError()
+                .log(
+                    new IllegalArgumentException("Missing required property value in model IdentityBindingListResult"));
+        } else {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(IdentityBindingListResult.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of IdentityBindingListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of IdentityBindingListResult if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the IdentityBindingListResult.
+     */
+    public static IdentityBindingListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            IdentityBindingListResult deserializedIdentityBindingListResult = new IdentityBindingListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<IdentityBindingInner> value
+                        = reader.readArray(reader1 -> IdentityBindingInner.fromJson(reader1));
+                    deserializedIdentityBindingListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedIdentityBindingListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedIdentityBindingListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingManagedIdentityProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingManagedIdentityProfile.java
new file mode 100644
index 000000000000..5171bc2b615f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingManagedIdentityProfile.java
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Managed identity profile for the identity binding.
+ */
+@Fluent
+public final class IdentityBindingManagedIdentityProfile
+    implements JsonSerializable<IdentityBindingManagedIdentityProfile> {
+    /*
+     * The resource ID of the managed identity.
+     */
+    private String resourceId;
+
+    /*
+     * The object ID of the managed identity.
+     */
+    private String objectId;
+
+    /*
+     * The client ID of the managed identity.
+     */
+    private String clientId;
+
+    /*
+     * The tenant ID of the managed identity.
+     */
+    private String tenantId;
+
+    /**
+     * Creates an instance of IdentityBindingManagedIdentityProfile class.
+     */
+    public IdentityBindingManagedIdentityProfile() {
+    }
+
+    /**
+     * Get the resourceId property: The resource ID of the managed identity.
+     * 
+     * @return the resourceId value.
+     */
+    public String resourceId() {
+        return this.resourceId;
+    }
+
+    /**
+     * Set the resourceId property: The resource ID of the managed identity.
+     * 
+     * @param resourceId the resourceId value to set.
+     * @return the IdentityBindingManagedIdentityProfile object itself.
+     */
+    public IdentityBindingManagedIdentityProfile withResourceId(String resourceId) {
+        this.resourceId = resourceId;
+        return this;
+    }
+
+    /**
+     * Get the objectId property: The object ID of the managed identity.
+     * 
+     * @return the objectId value.
+     */
+    public String objectId() {
+        return this.objectId;
+    }
+
+    /**
+     * Get the clientId property: The client ID of the managed identity.
+     * 
+     * @return the clientId value.
+     */
+    public String clientId() {
+        return this.clientId;
+    }
+
+    /**
+     * Get the tenantId property: The tenant ID of the managed identity.
+     * 
+     * @return the tenantId value.
+     */
+    public String tenantId() {
+        return this.tenantId;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (resourceId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property resourceId in model IdentityBindingManagedIdentityProfile"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(IdentityBindingManagedIdentityProfile.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("resourceId", this.resourceId);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of IdentityBindingManagedIdentityProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of IdentityBindingManagedIdentityProfile if the JsonReader was pointing to an instance of it,
+     * or null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the IdentityBindingManagedIdentityProfile.
+     */
+    public static IdentityBindingManagedIdentityProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            IdentityBindingManagedIdentityProfile deserializedIdentityBindingManagedIdentityProfile
+                = new IdentityBindingManagedIdentityProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("resourceId".equals(fieldName)) {
+                    deserializedIdentityBindingManagedIdentityProfile.resourceId = reader.getString();
+                } else if ("objectId".equals(fieldName)) {
+                    deserializedIdentityBindingManagedIdentityProfile.objectId = reader.getString();
+                } else if ("clientId".equals(fieldName)) {
+                    deserializedIdentityBindingManagedIdentityProfile.clientId = reader.getString();
+                } else if ("tenantId".equals(fieldName)) {
+                    deserializedIdentityBindingManagedIdentityProfile.tenantId = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedIdentityBindingManagedIdentityProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingOidcIssuerProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingOidcIssuerProfile.java
new file mode 100644
index 000000000000..12ad4215b8f6
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingOidcIssuerProfile.java
@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * IdentityBinding OIDC issuer profile.
+ */
+@Immutable
+public final class IdentityBindingOidcIssuerProfile implements JsonSerializable<IdentityBindingOidcIssuerProfile> {
+    /*
+     * The OIDC issuer URL of the IdentityBinding.
+     */
+    private String oidcIssuerUrl;
+
+    /**
+     * Creates an instance of IdentityBindingOidcIssuerProfile class.
+     */
+    public IdentityBindingOidcIssuerProfile() {
+    }
+
+    /**
+     * Get the oidcIssuerUrl property: The OIDC issuer URL of the IdentityBinding.
+     * 
+     * @return the oidcIssuerUrl value.
+     */
+    public String oidcIssuerUrl() {
+        return this.oidcIssuerUrl;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of IdentityBindingOidcIssuerProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of IdentityBindingOidcIssuerProfile if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the IdentityBindingOidcIssuerProfile.
+     */
+    public static IdentityBindingOidcIssuerProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            IdentityBindingOidcIssuerProfile deserializedIdentityBindingOidcIssuerProfile
+                = new IdentityBindingOidcIssuerProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("oidcIssuerUrl".equals(fieldName)) {
+                    deserializedIdentityBindingOidcIssuerProfile.oidcIssuerUrl = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedIdentityBindingOidcIssuerProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingProperties.java
new file mode 100644
index 000000000000..e10fa1bce2cc
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingProperties.java
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * IdentityBinding properties.
+ */
+@Fluent
+public final class IdentityBindingProperties implements JsonSerializable<IdentityBindingProperties> {
+    /*
+     * Managed identity profile for the identity binding.
+     */
+    private IdentityBindingManagedIdentityProfile managedIdentity;
+
+    /*
+     * The OIDC issuer URL of the IdentityBinding.
+     */
+    private IdentityBindingOidcIssuerProfile oidcIssuer;
+
+    /*
+     * The status of the last operation.
+     */
+    private IdentityBindingProvisioningState provisioningState;
+
+    /**
+     * Creates an instance of IdentityBindingProperties class.
+     */
+    public IdentityBindingProperties() {
+    }
+
+    /**
+     * Get the managedIdentity property: Managed identity profile for the identity binding.
+     * 
+     * @return the managedIdentity value.
+     */
+    public IdentityBindingManagedIdentityProfile managedIdentity() {
+        return this.managedIdentity;
+    }
+
+    /**
+     * Set the managedIdentity property: Managed identity profile for the identity binding.
+     * 
+     * @param managedIdentity the managedIdentity value to set.
+     * @return the IdentityBindingProperties object itself.
+     */
+    public IdentityBindingProperties withManagedIdentity(IdentityBindingManagedIdentityProfile managedIdentity) {
+        this.managedIdentity = managedIdentity;
+        return this;
+    }
+
+    /**
+     * Get the oidcIssuer property: The OIDC issuer URL of the IdentityBinding.
+     * 
+     * @return the oidcIssuer value.
+     */
+    public IdentityBindingOidcIssuerProfile oidcIssuer() {
+        return this.oidcIssuer;
+    }
+
+    /**
+     * Get the provisioningState property: The status of the last operation.
+     * 
+     * @return the provisioningState value.
+     */
+    public IdentityBindingProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (managedIdentity() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property managedIdentity in model IdentityBindingProperties"));
+        } else {
+            managedIdentity().validate();
+        }
+        if (oidcIssuer() != null) {
+            oidcIssuer().validate();
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(IdentityBindingProperties.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("managedIdentity", this.managedIdentity);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of IdentityBindingProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of IdentityBindingProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the IdentityBindingProperties.
+     */
+    public static IdentityBindingProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            IdentityBindingProperties deserializedIdentityBindingProperties = new IdentityBindingProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("managedIdentity".equals(fieldName)) {
+                    deserializedIdentityBindingProperties.managedIdentity
+                        = IdentityBindingManagedIdentityProfile.fromJson(reader);
+                } else if ("oidcIssuer".equals(fieldName)) {
+                    deserializedIdentityBindingProperties.oidcIssuer
+                        = IdentityBindingOidcIssuerProfile.fromJson(reader);
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedIdentityBindingProperties.provisioningState
+                        = IdentityBindingProvisioningState.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedIdentityBindingProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingProvisioningState.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingProvisioningState.java
new file mode 100644
index 000000000000..5f5494ac523c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IdentityBindingProvisioningState.java
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The provisioning state of the last accepted operation.
+ */
+public final class IdentityBindingProvisioningState extends ExpandableStringEnum<IdentityBindingProvisioningState> {
+    /**
+     * Static value Succeeded for IdentityBindingProvisioningState.
+     */
+    public static final IdentityBindingProvisioningState SUCCEEDED = fromString("Succeeded");
+
+    /**
+     * Static value Failed for IdentityBindingProvisioningState.
+     */
+    public static final IdentityBindingProvisioningState FAILED = fromString("Failed");
+
+    /**
+     * Static value Canceled for IdentityBindingProvisioningState.
+     */
+    public static final IdentityBindingProvisioningState CANCELED = fromString("Canceled");
+
+    /**
+     * Static value Creating for IdentityBindingProvisioningState.
+     */
+    public static final IdentityBindingProvisioningState CREATING = fromString("Creating");
+
+    /**
+     * Static value Updating for IdentityBindingProvisioningState.
+     */
+    public static final IdentityBindingProvisioningState UPDATING = fromString("Updating");
+
+    /**
+     * Static value Deleting for IdentityBindingProvisioningState.
+     */
+    public static final IdentityBindingProvisioningState DELETING = fromString("Deleting");
+
+    /**
+     * Creates a new instance of IdentityBindingProvisioningState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public IdentityBindingProvisioningState() {
+    }
+
+    /**
+     * Creates or finds a IdentityBindingProvisioningState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding IdentityBindingProvisioningState.
+     */
+    public static IdentityBindingProvisioningState fromString(String name) {
+        return fromString(name, IdentityBindingProvisioningState.class);
+    }
+
+    /**
+     * Gets known IdentityBindingProvisioningState values.
+     * 
+     * @return known IdentityBindingProvisioningState values.
+     */
+    public static Collection<IdentityBindingProvisioningState> values() {
+        return values(IdentityBindingProvisioningState.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/InfrastructureEncryption.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/InfrastructureEncryption.java
new file mode 100644
index 000000000000..c92e56b6341e
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/InfrastructureEncryption.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Whether to enable encryption at rest of Kubernetes resource objects using service-managed keys. More information on
+ * this can be found under https://aka.ms/aks/kubernetesResourceObjectEncryption.
+ */
+public final class InfrastructureEncryption extends ExpandableStringEnum<InfrastructureEncryption> {
+    /**
+     * Static value Enabled for InfrastructureEncryption.
+     */
+    public static final InfrastructureEncryption ENABLED = fromString("Enabled");
+
+    /**
+     * Static value Disabled for InfrastructureEncryption.
+     */
+    public static final InfrastructureEncryption DISABLED = fromString("Disabled");
+
+    /**
+     * Creates a new instance of InfrastructureEncryption value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public InfrastructureEncryption() {
+    }
+
+    /**
+     * Creates or finds a InfrastructureEncryption from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding InfrastructureEncryption.
+     */
+    public static InfrastructureEncryption fromString(String name) {
+        return fromString(name, InfrastructureEncryption.class);
+    }
+
+    /**
+     * Gets known InfrastructureEncryption values.
+     * 
+     * @return known InfrastructureEncryption values.
+     */
+    public static Collection<InfrastructureEncryption> values() {
+        return values(InfrastructureEncryption.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpFamily.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpFamily.java
index 60e8215db582..e780c371e177 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpFamily.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpFamily.java
@@ -8,7 +8,7 @@
 import java.util.Collection;
 
 /**
- * The IP version to use for cluster networking and IP assignment.
+ * To determine if address belongs IPv4 or IPv6 family.
  */
 public final class IpFamily extends ExpandableStringEnum<IpFamily> {
     /**
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpvsScheduler.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpvsScheduler.java
new file mode 100644
index 000000000000..34ecb3f572ba
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IpvsScheduler.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * IPVS scheduler, for more information please see http://www.linuxvirtualserver.org/docs/scheduling.html.
+ */
+public final class IpvsScheduler extends ExpandableStringEnum<IpvsScheduler> {
+    /**
+     * Static value RoundRobin for IpvsScheduler.
+     */
+    public static final IpvsScheduler ROUND_ROBIN = fromString("RoundRobin");
+
+    /**
+     * Static value LeastConnection for IpvsScheduler.
+     */
+    public static final IpvsScheduler LEAST_CONNECTION = fromString("LeastConnection");
+
+    /**
+     * Creates a new instance of IpvsScheduler value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public IpvsScheduler() {
+    }
+
+    /**
+     * Creates or finds a IpvsScheduler from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding IpvsScheduler.
+     */
+    public static IpvsScheduler fromString(String name) {
+        return fromString(name, IpvsScheduler.class);
+    }
+
+    /**
+     * Gets known IpvsScheduler values.
+     * 
+     * @return known IpvsScheduler values.
+     */
+    public static Collection<IpvsScheduler> values() {
+        return values(IpvsScheduler.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioComponents.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioComponents.java
index 0dc7eb7ddb66..d43de4400145 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioComponents.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioComponents.java
@@ -27,6 +27,11 @@ public final class IstioComponents implements JsonSerializable<IstioComponents>
      */
     private List<IstioEgressGateway> egressGateways;
 
+    /*
+     * Mode of traffic redirection.
+     */
+    private ProxyRedirectionMechanism proxyRedirectionMechanism;
+
     /**
      * Creates an instance of IstioComponents class.
      */
@@ -73,6 +78,26 @@ public IstioComponents withEgressGateways(List<IstioEgressGateway> egressGateway
         return this;
     }
 
+    /**
+     * Get the proxyRedirectionMechanism property: Mode of traffic redirection.
+     * 
+     * @return the proxyRedirectionMechanism value.
+     */
+    public ProxyRedirectionMechanism proxyRedirectionMechanism() {
+        return this.proxyRedirectionMechanism;
+    }
+
+    /**
+     * Set the proxyRedirectionMechanism property: Mode of traffic redirection.
+     * 
+     * @param proxyRedirectionMechanism the proxyRedirectionMechanism value to set.
+     * @return the IstioComponents object itself.
+     */
+    public IstioComponents withProxyRedirectionMechanism(ProxyRedirectionMechanism proxyRedirectionMechanism) {
+        this.proxyRedirectionMechanism = proxyRedirectionMechanism;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -97,6 +122,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             (writer, element) -> writer.writeJson(element));
         jsonWriter.writeArrayField("egressGateways", this.egressGateways,
             (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("proxyRedirectionMechanism",
+            this.proxyRedirectionMechanism == null ? null : this.proxyRedirectionMechanism.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -123,6 +150,9 @@ public static IstioComponents fromJson(JsonReader jsonReader) throws IOException
                     List<IstioEgressGateway> egressGateways
                         = reader.readArray(reader1 -> IstioEgressGateway.fromJson(reader1));
                     deserializedIstioComponents.egressGateways = egressGateways;
+                } else if ("proxyRedirectionMechanism".equals(fieldName)) {
+                    deserializedIstioComponents.proxyRedirectionMechanism
+                        = ProxyRedirectionMechanism.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioEgressGateway.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioEgressGateway.java
index f0a0ae4ea50d..42ebfbe64cf4 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioEgressGateway.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/IstioEgressGateway.java
@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.containerservice.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
@@ -21,6 +22,24 @@ public final class IstioEgressGateway implements JsonSerializable<IstioEgressGat
      */
     private boolean enabled;
 
+    /*
+     * Name of the Istio add-on egress gateway.
+     */
+    private String name;
+
+    /*
+     * Namespace that the Istio add-on egress gateway should be deployed in. If unspecified, the default is
+     * aks-istio-egress.
+     */
+    private String namespace;
+
+    /*
+     * Name of the gateway configuration custom resource for the Istio add-on egress gateway. Must be specified when
+     * enabling the Istio egress gateway. Must be deployed in the same namespace that the Istio egress gateway will be
+     * deployed in.
+     */
+    private String gatewayConfigurationName;
+
     /**
      * Creates an instance of IstioEgressGateway class.
      */
@@ -47,14 +66,86 @@ public IstioEgressGateway withEnabled(boolean enabled) {
         return this;
     }
 
+    /**
+     * Get the name property: Name of the Istio add-on egress gateway.
+     * 
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name property: Name of the Istio add-on egress gateway.
+     * 
+     * @param name the name value to set.
+     * @return the IstioEgressGateway object itself.
+     */
+    public IstioEgressGateway withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get the namespace property: Namespace that the Istio add-on egress gateway should be deployed in. If unspecified,
+     * the default is aks-istio-egress.
+     * 
+     * @return the namespace value.
+     */
+    public String namespace() {
+        return this.namespace;
+    }
+
+    /**
+     * Set the namespace property: Namespace that the Istio add-on egress gateway should be deployed in. If unspecified,
+     * the default is aks-istio-egress.
+     * 
+     * @param namespace the namespace value to set.
+     * @return the IstioEgressGateway object itself.
+     */
+    public IstioEgressGateway withNamespace(String namespace) {
+        this.namespace = namespace;
+        return this;
+    }
+
+    /**
+     * Get the gatewayConfigurationName property: Name of the gateway configuration custom resource for the Istio add-on
+     * egress gateway. Must be specified when enabling the Istio egress gateway. Must be deployed in the same namespace
+     * that the Istio egress gateway will be deployed in.
+     * 
+     * @return the gatewayConfigurationName value.
+     */
+    public String gatewayConfigurationName() {
+        return this.gatewayConfigurationName;
+    }
+
+    /**
+     * Set the gatewayConfigurationName property: Name of the gateway configuration custom resource for the Istio add-on
+     * egress gateway. Must be specified when enabling the Istio egress gateway. Must be deployed in the same namespace
+     * that the Istio egress gateway will be deployed in.
+     * 
+     * @param gatewayConfigurationName the gatewayConfigurationName value to set.
+     * @return the IstioEgressGateway object itself.
+     */
+    public IstioEgressGateway withGatewayConfigurationName(String gatewayConfigurationName) {
+        this.gatewayConfigurationName = gatewayConfigurationName;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (name() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Missing required property name in model IstioEgressGateway"));
+        }
     }
 
+    private static final ClientLogger LOGGER = new ClientLogger(IstioEgressGateway.class);
+
     /**
      * {@inheritDoc}
      */
@@ -62,6 +153,9 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeStringField("name", this.name);
+        jsonWriter.writeStringField("namespace", this.namespace);
+        jsonWriter.writeStringField("gatewayConfigurationName", this.gatewayConfigurationName);
         return jsonWriter.writeEndObject();
     }
 
@@ -83,6 +177,12 @@ public static IstioEgressGateway fromJson(JsonReader jsonReader) throws IOExcept
 
                 if ("enabled".equals(fieldName)) {
                     deserializedIstioEgressGateway.enabled = reader.getBoolean();
+                } else if ("name".equals(fieldName)) {
+                    deserializedIstioEgressGateway.name = reader.getString();
+                } else if ("namespace".equals(fieldName)) {
+                    deserializedIstioEgressGateway.namespace = reader.getString();
+                } else if ("gatewayConfigurationName".equals(fieldName)) {
+                    deserializedIstioEgressGateway.gatewayConfigurationName = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorClaimMappingExpression.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorClaimMappingExpression.java
new file mode 100644
index 000000000000..e4d10995f864
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorClaimMappingExpression.java
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The claim mapping expression for JWTAuthenticator.
+ */
+@Fluent
+public final class JwtAuthenticatorClaimMappingExpression
+    implements JsonSerializable<JwtAuthenticatorClaimMappingExpression> {
+    /*
+     * The CEL expression used to access token claims.
+     */
+    private String expression;
+
+    /**
+     * Creates an instance of JwtAuthenticatorClaimMappingExpression class.
+     */
+    public JwtAuthenticatorClaimMappingExpression() {
+    }
+
+    /**
+     * Get the expression property: The CEL expression used to access token claims.
+     * 
+     * @return the expression value.
+     */
+    public String expression() {
+        return this.expression;
+    }
+
+    /**
+     * Set the expression property: The CEL expression used to access token claims.
+     * 
+     * @param expression the expression value to set.
+     * @return the JwtAuthenticatorClaimMappingExpression object itself.
+     */
+    public JwtAuthenticatorClaimMappingExpression withExpression(String expression) {
+        this.expression = expression;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (expression() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property expression in model JwtAuthenticatorClaimMappingExpression"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorClaimMappingExpression.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("expression", this.expression);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorClaimMappingExpression from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorClaimMappingExpression if the JsonReader was pointing to an instance of
+     * it, or null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorClaimMappingExpression.
+     */
+    public static JwtAuthenticatorClaimMappingExpression fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorClaimMappingExpression deserializedJwtAuthenticatorClaimMappingExpression
+                = new JwtAuthenticatorClaimMappingExpression();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("expression".equals(fieldName)) {
+                    deserializedJwtAuthenticatorClaimMappingExpression.expression = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorClaimMappingExpression;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorClaimMappings.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorClaimMappings.java
new file mode 100644
index 000000000000..b1239568bd8c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorClaimMappings.java
@@ -0,0 +1,213 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The claim mappings for JWTAuthenticator.
+ */
+@Fluent
+public final class JwtAuthenticatorClaimMappings implements JsonSerializable<JwtAuthenticatorClaimMappings> {
+    /*
+     * The expression to extract username attribute from the token claims.
+     */
+    private JwtAuthenticatorClaimMappingExpression username;
+
+    /*
+     * The expression to extract groups attribute from the token claims. When not provided, no groups are extracted from
+     * the token claims.
+     */
+    private JwtAuthenticatorClaimMappingExpression groups;
+
+    /*
+     * The expression to extract uid attribute from the token claims. When not provided, no uid is extracted from the
+     * token claims.
+     */
+    private JwtAuthenticatorClaimMappingExpression uid;
+
+    /*
+     * The expression to extract extra attribute from the token claims. When not provided, no extra attributes are
+     * extracted from the token claims.
+     */
+    private List<JwtAuthenticatorExtraClaimMappingExpression> extra;
+
+    /**
+     * Creates an instance of JwtAuthenticatorClaimMappings class.
+     */
+    public JwtAuthenticatorClaimMappings() {
+    }
+
+    /**
+     * Get the username property: The expression to extract username attribute from the token claims.
+     * 
+     * @return the username value.
+     */
+    public JwtAuthenticatorClaimMappingExpression username() {
+        return this.username;
+    }
+
+    /**
+     * Set the username property: The expression to extract username attribute from the token claims.
+     * 
+     * @param username the username value to set.
+     * @return the JwtAuthenticatorClaimMappings object itself.
+     */
+    public JwtAuthenticatorClaimMappings withUsername(JwtAuthenticatorClaimMappingExpression username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Get the groups property: The expression to extract groups attribute from the token claims. When not provided, no
+     * groups are extracted from the token claims.
+     * 
+     * @return the groups value.
+     */
+    public JwtAuthenticatorClaimMappingExpression groups() {
+        return this.groups;
+    }
+
+    /**
+     * Set the groups property: The expression to extract groups attribute from the token claims. When not provided, no
+     * groups are extracted from the token claims.
+     * 
+     * @param groups the groups value to set.
+     * @return the JwtAuthenticatorClaimMappings object itself.
+     */
+    public JwtAuthenticatorClaimMappings withGroups(JwtAuthenticatorClaimMappingExpression groups) {
+        this.groups = groups;
+        return this;
+    }
+
+    /**
+     * Get the uid property: The expression to extract uid attribute from the token claims. When not provided, no uid is
+     * extracted from the token claims.
+     * 
+     * @return the uid value.
+     */
+    public JwtAuthenticatorClaimMappingExpression uid() {
+        return this.uid;
+    }
+
+    /**
+     * Set the uid property: The expression to extract uid attribute from the token claims. When not provided, no uid is
+     * extracted from the token claims.
+     * 
+     * @param uid the uid value to set.
+     * @return the JwtAuthenticatorClaimMappings object itself.
+     */
+    public JwtAuthenticatorClaimMappings withUid(JwtAuthenticatorClaimMappingExpression uid) {
+        this.uid = uid;
+        return this;
+    }
+
+    /**
+     * Get the extra property: The expression to extract extra attribute from the token claims. When not provided, no
+     * extra attributes are extracted from the token claims.
+     * 
+     * @return the extra value.
+     */
+    public List<JwtAuthenticatorExtraClaimMappingExpression> extra() {
+        return this.extra;
+    }
+
+    /**
+     * Set the extra property: The expression to extract extra attribute from the token claims. When not provided, no
+     * extra attributes are extracted from the token claims.
+     * 
+     * @param extra the extra value to set.
+     * @return the JwtAuthenticatorClaimMappings object itself.
+     */
+    public JwtAuthenticatorClaimMappings withExtra(List<JwtAuthenticatorExtraClaimMappingExpression> extra) {
+        this.extra = extra;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (username() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property username in model JwtAuthenticatorClaimMappings"));
+        } else {
+            username().validate();
+        }
+        if (groups() != null) {
+            groups().validate();
+        }
+        if (uid() != null) {
+            uid().validate();
+        }
+        if (extra() != null) {
+            extra().forEach(e -> e.validate());
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorClaimMappings.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("username", this.username);
+        jsonWriter.writeJsonField("groups", this.groups);
+        jsonWriter.writeJsonField("uid", this.uid);
+        jsonWriter.writeArrayField("extra", this.extra, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorClaimMappings from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorClaimMappings if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorClaimMappings.
+     */
+    public static JwtAuthenticatorClaimMappings fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorClaimMappings deserializedJwtAuthenticatorClaimMappings
+                = new JwtAuthenticatorClaimMappings();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("username".equals(fieldName)) {
+                    deserializedJwtAuthenticatorClaimMappings.username
+                        = JwtAuthenticatorClaimMappingExpression.fromJson(reader);
+                } else if ("groups".equals(fieldName)) {
+                    deserializedJwtAuthenticatorClaimMappings.groups
+                        = JwtAuthenticatorClaimMappingExpression.fromJson(reader);
+                } else if ("uid".equals(fieldName)) {
+                    deserializedJwtAuthenticatorClaimMappings.uid
+                        = JwtAuthenticatorClaimMappingExpression.fromJson(reader);
+                } else if ("extra".equals(fieldName)) {
+                    List<JwtAuthenticatorExtraClaimMappingExpression> extra
+                        = reader.readArray(reader1 -> JwtAuthenticatorExtraClaimMappingExpression.fromJson(reader1));
+                    deserializedJwtAuthenticatorClaimMappings.extra = extra;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorClaimMappings;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorExtraClaimMappingExpression.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorExtraClaimMappingExpression.java
new file mode 100644
index 000000000000..bdccfe69d44b
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorExtraClaimMappingExpression.java
@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The extra claim mapping expression for JWTAuthenticator.
+ */
+@Fluent
+public final class JwtAuthenticatorExtraClaimMappingExpression
+    implements JsonSerializable<JwtAuthenticatorExtraClaimMappingExpression> {
+    /*
+     * The key of the extra attribute.
+     */
+    private String key;
+
+    /*
+     * The CEL expression used to extract the value of the extra attribute.
+     */
+    private String valueExpression;
+
+    /**
+     * Creates an instance of JwtAuthenticatorExtraClaimMappingExpression class.
+     */
+    public JwtAuthenticatorExtraClaimMappingExpression() {
+    }
+
+    /**
+     * Get the key property: The key of the extra attribute.
+     * 
+     * @return the key value.
+     */
+    public String key() {
+        return this.key;
+    }
+
+    /**
+     * Set the key property: The key of the extra attribute.
+     * 
+     * @param key the key value to set.
+     * @return the JwtAuthenticatorExtraClaimMappingExpression object itself.
+     */
+    public JwtAuthenticatorExtraClaimMappingExpression withKey(String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     * Get the valueExpression property: The CEL expression used to extract the value of the extra attribute.
+     * 
+     * @return the valueExpression value.
+     */
+    public String valueExpression() {
+        return this.valueExpression;
+    }
+
+    /**
+     * Set the valueExpression property: The CEL expression used to extract the value of the extra attribute.
+     * 
+     * @param valueExpression the valueExpression value to set.
+     * @return the JwtAuthenticatorExtraClaimMappingExpression object itself.
+     */
+    public JwtAuthenticatorExtraClaimMappingExpression withValueExpression(String valueExpression) {
+        this.valueExpression = valueExpression;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (key() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property key in model JwtAuthenticatorExtraClaimMappingExpression"));
+        }
+        if (valueExpression() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property valueExpression in model JwtAuthenticatorExtraClaimMappingExpression"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorExtraClaimMappingExpression.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("key", this.key);
+        jsonWriter.writeStringField("valueExpression", this.valueExpression);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorExtraClaimMappingExpression from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorExtraClaimMappingExpression if the JsonReader was pointing to an instance
+     * of it, or null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorExtraClaimMappingExpression.
+     */
+    public static JwtAuthenticatorExtraClaimMappingExpression fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorExtraClaimMappingExpression deserializedJwtAuthenticatorExtraClaimMappingExpression
+                = new JwtAuthenticatorExtraClaimMappingExpression();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("key".equals(fieldName)) {
+                    deserializedJwtAuthenticatorExtraClaimMappingExpression.key = reader.getString();
+                } else if ("valueExpression".equals(fieldName)) {
+                    deserializedJwtAuthenticatorExtraClaimMappingExpression.valueExpression = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorExtraClaimMappingExpression;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorIssuer.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorIssuer.java
new file mode 100644
index 000000000000..eb38b0dd43e9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorIssuer.java
@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The OIDC issuer details for JWTAuthenticator.
+ */
+@Fluent
+public final class JwtAuthenticatorIssuer implements JsonSerializable<JwtAuthenticatorIssuer> {
+    /*
+     * The issuer URL. The URL must begin with the scheme https and cannot contain a query string or fragment. This must
+     * match the "iss" claim in the presented JWT, and the issuer returned from discovery.
+     */
+    private String url;
+
+    /*
+     * The set of acceptable audiences the JWT must be issued to. At least one is required. When multiple is set,
+     * AudienceMatchPolicy is used in API Server configuration.
+     */
+    private List<String> audiences;
+
+    /**
+     * Creates an instance of JwtAuthenticatorIssuer class.
+     */
+    public JwtAuthenticatorIssuer() {
+    }
+
+    /**
+     * Get the url property: The issuer URL. The URL must begin with the scheme https and cannot contain a query string
+     * or fragment. This must match the "iss" claim in the presented JWT, and the issuer returned from discovery.
+     * 
+     * @return the url value.
+     */
+    public String url() {
+        return this.url;
+    }
+
+    /**
+     * Set the url property: The issuer URL. The URL must begin with the scheme https and cannot contain a query string
+     * or fragment. This must match the "iss" claim in the presented JWT, and the issuer returned from discovery.
+     * 
+     * @param url the url value to set.
+     * @return the JwtAuthenticatorIssuer object itself.
+     */
+    public JwtAuthenticatorIssuer withUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * Get the audiences property: The set of acceptable audiences the JWT must be issued to. At least one is required.
+     * When multiple is set, AudienceMatchPolicy is used in API Server configuration.
+     * 
+     * @return the audiences value.
+     */
+    public List<String> audiences() {
+        return this.audiences;
+    }
+
+    /**
+     * Set the audiences property: The set of acceptable audiences the JWT must be issued to. At least one is required.
+     * When multiple is set, AudienceMatchPolicy is used in API Server configuration.
+     * 
+     * @param audiences the audiences value to set.
+     * @return the JwtAuthenticatorIssuer object itself.
+     */
+    public JwtAuthenticatorIssuer withAudiences(List<String> audiences) {
+        this.audiences = audiences;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (url() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Missing required property url in model JwtAuthenticatorIssuer"));
+        }
+        if (audiences() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property audiences in model JwtAuthenticatorIssuer"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorIssuer.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("url", this.url);
+        jsonWriter.writeArrayField("audiences", this.audiences, (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorIssuer from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorIssuer if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorIssuer.
+     */
+    public static JwtAuthenticatorIssuer fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorIssuer deserializedJwtAuthenticatorIssuer = new JwtAuthenticatorIssuer();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("url".equals(fieldName)) {
+                    deserializedJwtAuthenticatorIssuer.url = reader.getString();
+                } else if ("audiences".equals(fieldName)) {
+                    List<String> audiences = reader.readArray(reader1 -> reader1.getString());
+                    deserializedJwtAuthenticatorIssuer.audiences = audiences;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorIssuer;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorListResult.java
new file mode 100644
index 000000000000..2a5077ab9566
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorListResult.java
@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.JwtAuthenticatorInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response from the List JWT authenticator operation.
+ */
+@Fluent
+public final class JwtAuthenticatorListResult implements JsonSerializable<JwtAuthenticatorListResult> {
+    /*
+     * The list of JWT authenticators.
+     */
+    private List<JwtAuthenticatorInner> value;
+
+    /*
+     * The URL to get the next set of JWT authenticator results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of JwtAuthenticatorListResult class.
+     */
+    public JwtAuthenticatorListResult() {
+    }
+
+    /**
+     * Get the value property: The list of JWT authenticators.
+     * 
+     * @return the value value.
+     */
+    public List<JwtAuthenticatorInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The list of JWT authenticators.
+     * 
+     * @param value the value value to set.
+     * @return the JwtAuthenticatorListResult object itself.
+     */
+    public JwtAuthenticatorListResult withValue(List<JwtAuthenticatorInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next set of JWT authenticator results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property value in model JwtAuthenticatorListResult"));
+        } else {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorListResult.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorListResult if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorListResult.
+     */
+    public static JwtAuthenticatorListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorListResult deserializedJwtAuthenticatorListResult = new JwtAuthenticatorListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<JwtAuthenticatorInner> value
+                        = reader.readArray(reader1 -> JwtAuthenticatorInner.fromJson(reader1));
+                    deserializedJwtAuthenticatorListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedJwtAuthenticatorListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorProperties.java
new file mode 100644
index 000000000000..7d36f2acf2c4
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorProperties.java
@@ -0,0 +1,238 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The properties of JWTAuthenticator. For details on how to configure the properties of a JWT authenticator, please
+ * refer to the Kubernetes documentation:
+ * https://kubernetes.io/docs/reference/access-authn-authz/authentication/#using-authentication-configuration. Please
+ * note that not all fields available in the Kubernetes documentation are supported by AKS. For troubleshooting, please
+ * see https://aka.ms/aks-external-issuers-docs.
+ */
+@Fluent
+public final class JwtAuthenticatorProperties implements JsonSerializable<JwtAuthenticatorProperties> {
+    /*
+     * The current provisioning state of the JWT authenticator.
+     */
+    private JwtAuthenticatorProvisioningState provisioningState;
+
+    /*
+     * The JWT OIDC issuer details.
+     */
+    private JwtAuthenticatorIssuer issuer;
+
+    /*
+     * The rules that are applied to validate token claims to authenticate users. All the expressions must evaluate to
+     * true for validation to succeed.
+     */
+    private List<JwtAuthenticatorValidationRule> claimValidationRules;
+
+    /*
+     * The mappings that define how user attributes are extracted from the token claims.
+     */
+    private JwtAuthenticatorClaimMappings claimMappings;
+
+    /*
+     * The rules that are applied to the mapped user before completing authentication. All the expressions must evaluate
+     * to true for validation to succeed.
+     */
+    private List<JwtAuthenticatorValidationRule> userValidationRules;
+
+    /**
+     * Creates an instance of JwtAuthenticatorProperties class.
+     */
+    public JwtAuthenticatorProperties() {
+    }
+
+    /**
+     * Get the provisioningState property: The current provisioning state of the JWT authenticator.
+     * 
+     * @return the provisioningState value.
+     */
+    public JwtAuthenticatorProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the issuer property: The JWT OIDC issuer details.
+     * 
+     * @return the issuer value.
+     */
+    public JwtAuthenticatorIssuer issuer() {
+        return this.issuer;
+    }
+
+    /**
+     * Set the issuer property: The JWT OIDC issuer details.
+     * 
+     * @param issuer the issuer value to set.
+     * @return the JwtAuthenticatorProperties object itself.
+     */
+    public JwtAuthenticatorProperties withIssuer(JwtAuthenticatorIssuer issuer) {
+        this.issuer = issuer;
+        return this;
+    }
+
+    /**
+     * Get the claimValidationRules property: The rules that are applied to validate token claims to authenticate users.
+     * All the expressions must evaluate to true for validation to succeed.
+     * 
+     * @return the claimValidationRules value.
+     */
+    public List<JwtAuthenticatorValidationRule> claimValidationRules() {
+        return this.claimValidationRules;
+    }
+
+    /**
+     * Set the claimValidationRules property: The rules that are applied to validate token claims to authenticate users.
+     * All the expressions must evaluate to true for validation to succeed.
+     * 
+     * @param claimValidationRules the claimValidationRules value to set.
+     * @return the JwtAuthenticatorProperties object itself.
+     */
+    public JwtAuthenticatorProperties
+        withClaimValidationRules(List<JwtAuthenticatorValidationRule> claimValidationRules) {
+        this.claimValidationRules = claimValidationRules;
+        return this;
+    }
+
+    /**
+     * Get the claimMappings property: The mappings that define how user attributes are extracted from the token claims.
+     * 
+     * @return the claimMappings value.
+     */
+    public JwtAuthenticatorClaimMappings claimMappings() {
+        return this.claimMappings;
+    }
+
+    /**
+     * Set the claimMappings property: The mappings that define how user attributes are extracted from the token claims.
+     * 
+     * @param claimMappings the claimMappings value to set.
+     * @return the JwtAuthenticatorProperties object itself.
+     */
+    public JwtAuthenticatorProperties withClaimMappings(JwtAuthenticatorClaimMappings claimMappings) {
+        this.claimMappings = claimMappings;
+        return this;
+    }
+
+    /**
+     * Get the userValidationRules property: The rules that are applied to the mapped user before completing
+     * authentication. All the expressions must evaluate to true for validation to succeed.
+     * 
+     * @return the userValidationRules value.
+     */
+    public List<JwtAuthenticatorValidationRule> userValidationRules() {
+        return this.userValidationRules;
+    }
+
+    /**
+     * Set the userValidationRules property: The rules that are applied to the mapped user before completing
+     * authentication. All the expressions must evaluate to true for validation to succeed.
+     * 
+     * @param userValidationRules the userValidationRules value to set.
+     * @return the JwtAuthenticatorProperties object itself.
+     */
+    public JwtAuthenticatorProperties
+        withUserValidationRules(List<JwtAuthenticatorValidationRule> userValidationRules) {
+        this.userValidationRules = userValidationRules;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (issuer() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property issuer in model JwtAuthenticatorProperties"));
+        } else {
+            issuer().validate();
+        }
+        if (claimValidationRules() != null) {
+            claimValidationRules().forEach(e -> e.validate());
+        }
+        if (claimMappings() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property claimMappings in model JwtAuthenticatorProperties"));
+        } else {
+            claimMappings().validate();
+        }
+        if (userValidationRules() != null) {
+            userValidationRules().forEach(e -> e.validate());
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorProperties.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("issuer", this.issuer);
+        jsonWriter.writeJsonField("claimMappings", this.claimMappings);
+        jsonWriter.writeArrayField("claimValidationRules", this.claimValidationRules,
+            (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeArrayField("userValidationRules", this.userValidationRules,
+            (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorProperties.
+     */
+    public static JwtAuthenticatorProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorProperties deserializedJwtAuthenticatorProperties = new JwtAuthenticatorProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("issuer".equals(fieldName)) {
+                    deserializedJwtAuthenticatorProperties.issuer = JwtAuthenticatorIssuer.fromJson(reader);
+                } else if ("claimMappings".equals(fieldName)) {
+                    deserializedJwtAuthenticatorProperties.claimMappings
+                        = JwtAuthenticatorClaimMappings.fromJson(reader);
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedJwtAuthenticatorProperties.provisioningState
+                        = JwtAuthenticatorProvisioningState.fromString(reader.getString());
+                } else if ("claimValidationRules".equals(fieldName)) {
+                    List<JwtAuthenticatorValidationRule> claimValidationRules
+                        = reader.readArray(reader1 -> JwtAuthenticatorValidationRule.fromJson(reader1));
+                    deserializedJwtAuthenticatorProperties.claimValidationRules = claimValidationRules;
+                } else if ("userValidationRules".equals(fieldName)) {
+                    List<JwtAuthenticatorValidationRule> userValidationRules
+                        = reader.readArray(reader1 -> JwtAuthenticatorValidationRule.fromJson(reader1));
+                    deserializedJwtAuthenticatorProperties.userValidationRules = userValidationRules;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorProvisioningState.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorProvisioningState.java
new file mode 100644
index 000000000000..fa06b1956c99
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorProvisioningState.java
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The provisioning state of the last accepted operation.
+ */
+public final class JwtAuthenticatorProvisioningState extends ExpandableStringEnum<JwtAuthenticatorProvisioningState> {
+    /**
+     * Static value Succeeded for JwtAuthenticatorProvisioningState.
+     */
+    public static final JwtAuthenticatorProvisioningState SUCCEEDED = fromString("Succeeded");
+
+    /**
+     * Static value Failed for JwtAuthenticatorProvisioningState.
+     */
+    public static final JwtAuthenticatorProvisioningState FAILED = fromString("Failed");
+
+    /**
+     * Static value Canceled for JwtAuthenticatorProvisioningState.
+     */
+    public static final JwtAuthenticatorProvisioningState CANCELED = fromString("Canceled");
+
+    /**
+     * Static value Creating for JwtAuthenticatorProvisioningState.
+     */
+    public static final JwtAuthenticatorProvisioningState CREATING = fromString("Creating");
+
+    /**
+     * Static value Updating for JwtAuthenticatorProvisioningState.
+     */
+    public static final JwtAuthenticatorProvisioningState UPDATING = fromString("Updating");
+
+    /**
+     * Static value Deleting for JwtAuthenticatorProvisioningState.
+     */
+    public static final JwtAuthenticatorProvisioningState DELETING = fromString("Deleting");
+
+    /**
+     * Creates a new instance of JwtAuthenticatorProvisioningState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public JwtAuthenticatorProvisioningState() {
+    }
+
+    /**
+     * Creates or finds a JwtAuthenticatorProvisioningState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding JwtAuthenticatorProvisioningState.
+     */
+    public static JwtAuthenticatorProvisioningState fromString(String name) {
+        return fromString(name, JwtAuthenticatorProvisioningState.class);
+    }
+
+    /**
+     * Gets known JwtAuthenticatorProvisioningState values.
+     * 
+     * @return known JwtAuthenticatorProvisioningState values.
+     */
+    public static Collection<JwtAuthenticatorProvisioningState> values() {
+        return values(JwtAuthenticatorProvisioningState.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorValidationRule.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorValidationRule.java
new file mode 100644
index 000000000000..c470baf052ee
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/JwtAuthenticatorValidationRule.java
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The validation rule for JWTAuthenticator.
+ */
+@Fluent
+public final class JwtAuthenticatorValidationRule implements JsonSerializable<JwtAuthenticatorValidationRule> {
+    /*
+     * The CEL expression used to validate the claim or attribute.
+     */
+    private String expression;
+
+    /*
+     * The validation error message.
+     */
+    private String message;
+
+    /**
+     * Creates an instance of JwtAuthenticatorValidationRule class.
+     */
+    public JwtAuthenticatorValidationRule() {
+    }
+
+    /**
+     * Get the expression property: The CEL expression used to validate the claim or attribute.
+     * 
+     * @return the expression value.
+     */
+    public String expression() {
+        return this.expression;
+    }
+
+    /**
+     * Set the expression property: The CEL expression used to validate the claim or attribute.
+     * 
+     * @param expression the expression value to set.
+     * @return the JwtAuthenticatorValidationRule object itself.
+     */
+    public JwtAuthenticatorValidationRule withExpression(String expression) {
+        this.expression = expression;
+        return this;
+    }
+
+    /**
+     * Get the message property: The validation error message.
+     * 
+     * @return the message value.
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set the message property: The validation error message.
+     * 
+     * @param message the message value to set.
+     * @return the JwtAuthenticatorValidationRule object itself.
+     */
+    public JwtAuthenticatorValidationRule withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (expression() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property expression in model JwtAuthenticatorValidationRule"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(JwtAuthenticatorValidationRule.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("expression", this.expression);
+        jsonWriter.writeStringField("message", this.message);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of JwtAuthenticatorValidationRule from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of JwtAuthenticatorValidationRule if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the JwtAuthenticatorValidationRule.
+     */
+    public static JwtAuthenticatorValidationRule fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            JwtAuthenticatorValidationRule deserializedJwtAuthenticatorValidationRule
+                = new JwtAuthenticatorValidationRule();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("expression".equals(fieldName)) {
+                    deserializedJwtAuthenticatorValidationRule.expression = reader.getString();
+                } else if ("message".equals(fieldName)) {
+                    deserializedJwtAuthenticatorValidationRule.message = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedJwtAuthenticatorValidationRule;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubeletConfig.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubeletConfig.java
index a14c1ea5937b..c06b22dd47ea 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubeletConfig.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubeletConfig.java
@@ -81,6 +81,12 @@ public final class KubeletConfig implements JsonSerializable<KubeletConfig> {
      */
     private Integer podMaxPids;
 
+    /*
+     * Specifies the default seccomp profile applied to all workloads. If not specified, 'Unconfined' will be used by
+     * default.
+     */
+    private SeccompDefault seccompDefault;
+
     /**
      * Creates an instance of KubeletConfig class.
      */
@@ -331,6 +337,28 @@ public KubeletConfig withPodMaxPids(Integer podMaxPids) {
         return this;
     }
 
+    /**
+     * Get the seccompDefault property: Specifies the default seccomp profile applied to all workloads. If not
+     * specified, 'Unconfined' will be used by default.
+     * 
+     * @return the seccompDefault value.
+     */
+    public SeccompDefault seccompDefault() {
+        return this.seccompDefault;
+    }
+
+    /**
+     * Set the seccompDefault property: Specifies the default seccomp profile applied to all workloads. If not
+     * specified, 'Unconfined' will be used by default.
+     * 
+     * @param seccompDefault the seccompDefault value to set.
+     * @return the KubeletConfig object itself.
+     */
+    public KubeletConfig withSeccompDefault(SeccompDefault seccompDefault) {
+        this.seccompDefault = seccompDefault;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -357,6 +385,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeNumberField("containerLogMaxSizeMB", this.containerLogMaxSizeMB);
         jsonWriter.writeNumberField("containerLogMaxFiles", this.containerLogMaxFiles);
         jsonWriter.writeNumberField("podMaxPids", this.podMaxPids);
+        jsonWriter.writeStringField("seccompDefault",
+            this.seccompDefault == null ? null : this.seccompDefault.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -398,6 +428,8 @@ public static KubeletConfig fromJson(JsonReader jsonReader) throws IOException {
                     deserializedKubeletConfig.containerLogMaxFiles = reader.getNullable(JsonReader::getInt);
                 } else if ("podMaxPids".equals(fieldName)) {
                     deserializedKubeletConfig.podMaxPids = reader.getNullable(JsonReader::getInt);
+                } else if ("seccompDefault".equals(fieldName)) {
+                    deserializedKubeletConfig.seccompDefault = SeccompDefault.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesResourceObjectEncryptionProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesResourceObjectEncryptionProfile.java
new file mode 100644
index 000000000000..32f5ad6a3c47
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesResourceObjectEncryptionProfile.java
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Encryption at rest of Kubernetes resource objects using service-managed keys. More information on this can be found
+ * under https://aka.ms/aks/kubernetesResourceObjectEncryption.
+ */
+@Fluent
+public final class KubernetesResourceObjectEncryptionProfile
+    implements JsonSerializable<KubernetesResourceObjectEncryptionProfile> {
+    /*
+     * Whether to enable encryption at rest of Kubernetes resource objects using service-managed keys. More information
+     * on this can be found under https://aka.ms/aks/kubernetesResourceObjectEncryption.
+     */
+    private InfrastructureEncryption infrastructureEncryption;
+
+    /**
+     * Creates an instance of KubernetesResourceObjectEncryptionProfile class.
+     */
+    public KubernetesResourceObjectEncryptionProfile() {
+    }
+
+    /**
+     * Get the infrastructureEncryption property: Whether to enable encryption at rest of Kubernetes resource objects
+     * using service-managed keys. More information on this can be found under
+     * https://aka.ms/aks/kubernetesResourceObjectEncryption.
+     * 
+     * @return the infrastructureEncryption value.
+     */
+    public InfrastructureEncryption infrastructureEncryption() {
+        return this.infrastructureEncryption;
+    }
+
+    /**
+     * Set the infrastructureEncryption property: Whether to enable encryption at rest of Kubernetes resource objects
+     * using service-managed keys. More information on this can be found under
+     * https://aka.ms/aks/kubernetesResourceObjectEncryption.
+     * 
+     * @param infrastructureEncryption the infrastructureEncryption value to set.
+     * @return the KubernetesResourceObjectEncryptionProfile object itself.
+     */
+    public KubernetesResourceObjectEncryptionProfile
+        withInfrastructureEncryption(InfrastructureEncryption infrastructureEncryption) {
+        this.infrastructureEncryption = infrastructureEncryption;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("infrastructureEncryption",
+            this.infrastructureEncryption == null ? null : this.infrastructureEncryption.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of KubernetesResourceObjectEncryptionProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of KubernetesResourceObjectEncryptionProfile if the JsonReader was pointing to an instance of
+     * it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the KubernetesResourceObjectEncryptionProfile.
+     */
+    public static KubernetesResourceObjectEncryptionProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            KubernetesResourceObjectEncryptionProfile deserializedKubernetesResourceObjectEncryptionProfile
+                = new KubernetesResourceObjectEncryptionProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("infrastructureEncryption".equals(fieldName)) {
+                    deserializedKubernetesResourceObjectEncryptionProfile.infrastructureEncryption
+                        = InfrastructureEncryption.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedKubernetesResourceObjectEncryptionProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LabelSelector.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LabelSelector.java
new file mode 100644
index 000000000000..687fc5c092d1
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LabelSelector.java
@@ -0,0 +1,138 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed.
+ * An empty label selector matches all objects. A null label selector matches no objects.
+ */
+@Fluent
+public final class LabelSelector implements JsonSerializable<LabelSelector> {
+    /*
+     * matchLabels is an array of {key=value} pairs. A single {key=value} in the matchLabels map is equivalent to an
+     * element of matchExpressions, whose key field is `key`, the operator is `In`, and the values array contains only
+     * `value`. The requirements are ANDed.
+     */
+    private List<String> matchLabels;
+
+    /*
+     * matchExpressions is a list of label selector requirements. The requirements are ANDed.
+     */
+    private List<LabelSelectorRequirement> matchExpressions;
+
+    /**
+     * Creates an instance of LabelSelector class.
+     */
+    public LabelSelector() {
+    }
+
+    /**
+     * Get the matchLabels property: matchLabels is an array of {key=value} pairs. A single {key=value} in the
+     * matchLabels map is equivalent to an element of matchExpressions, whose key field is `key`, the operator is `In`,
+     * and the values array contains only `value`. The requirements are ANDed.
+     * 
+     * @return the matchLabels value.
+     */
+    public List<String> matchLabels() {
+        return this.matchLabels;
+    }
+
+    /**
+     * Set the matchLabels property: matchLabels is an array of {key=value} pairs. A single {key=value} in the
+     * matchLabels map is equivalent to an element of matchExpressions, whose key field is `key`, the operator is `In`,
+     * and the values array contains only `value`. The requirements are ANDed.
+     * 
+     * @param matchLabels the matchLabels value to set.
+     * @return the LabelSelector object itself.
+     */
+    public LabelSelector withMatchLabels(List<String> matchLabels) {
+        this.matchLabels = matchLabels;
+        return this;
+    }
+
+    /**
+     * Get the matchExpressions property: matchExpressions is a list of label selector requirements. The requirements
+     * are ANDed.
+     * 
+     * @return the matchExpressions value.
+     */
+    public List<LabelSelectorRequirement> matchExpressions() {
+        return this.matchExpressions;
+    }
+
+    /**
+     * Set the matchExpressions property: matchExpressions is a list of label selector requirements. The requirements
+     * are ANDed.
+     * 
+     * @param matchExpressions the matchExpressions value to set.
+     * @return the LabelSelector object itself.
+     */
+    public LabelSelector withMatchExpressions(List<LabelSelectorRequirement> matchExpressions) {
+        this.matchExpressions = matchExpressions;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (matchExpressions() != null) {
+            matchExpressions().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("matchLabels", this.matchLabels, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeArrayField("matchExpressions", this.matchExpressions,
+            (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LabelSelector from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LabelSelector if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the LabelSelector.
+     */
+    public static LabelSelector fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LabelSelector deserializedLabelSelector = new LabelSelector();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("matchLabels".equals(fieldName)) {
+                    List<String> matchLabels = reader.readArray(reader1 -> reader1.getString());
+                    deserializedLabelSelector.matchLabels = matchLabels;
+                } else if ("matchExpressions".equals(fieldName)) {
+                    List<LabelSelectorRequirement> matchExpressions
+                        = reader.readArray(reader1 -> LabelSelectorRequirement.fromJson(reader1));
+                    deserializedLabelSelector.matchExpressions = matchExpressions;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLabelSelector;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LabelSelectorRequirement.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LabelSelectorRequirement.java
new file mode 100644
index 000000000000..02ccd0525bdb
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LabelSelectorRequirement.java
@@ -0,0 +1,154 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * A label selector requirement is a selector that contains values, a key, and an operator that relates the key and
+ * values.
+ */
+@Fluent
+public final class LabelSelectorRequirement implements JsonSerializable<LabelSelectorRequirement> {
+    /*
+     * key is the label key that the selector applies to.
+     */
+    private String key;
+
+    /*
+     * operator represents a key's relationship to a set of values. Valid operators are In and NotIn
+     */
+    private Operator operator;
+
+    /*
+     * values is an array of string values, the values array must be non-empty.
+     */
+    private List<String> values;
+
+    /**
+     * Creates an instance of LabelSelectorRequirement class.
+     */
+    public LabelSelectorRequirement() {
+    }
+
+    /**
+     * Get the key property: key is the label key that the selector applies to.
+     * 
+     * @return the key value.
+     */
+    public String key() {
+        return this.key;
+    }
+
+    /**
+     * Set the key property: key is the label key that the selector applies to.
+     * 
+     * @param key the key value to set.
+     * @return the LabelSelectorRequirement object itself.
+     */
+    public LabelSelectorRequirement withKey(String key) {
+        this.key = key;
+        return this;
+    }
+
+    /**
+     * Get the operator property: operator represents a key's relationship to a set of values. Valid operators are In
+     * and NotIn.
+     * 
+     * @return the operator value.
+     */
+    public Operator operator() {
+        return this.operator;
+    }
+
+    /**
+     * Set the operator property: operator represents a key's relationship to a set of values. Valid operators are In
+     * and NotIn.
+     * 
+     * @param operator the operator value to set.
+     * @return the LabelSelectorRequirement object itself.
+     */
+    public LabelSelectorRequirement withOperator(Operator operator) {
+        this.operator = operator;
+        return this;
+    }
+
+    /**
+     * Get the values property: values is an array of string values, the values array must be non-empty.
+     * 
+     * @return the values value.
+     */
+    public List<String> values() {
+        return this.values;
+    }
+
+    /**
+     * Set the values property: values is an array of string values, the values array must be non-empty.
+     * 
+     * @param values the values value to set.
+     * @return the LabelSelectorRequirement object itself.
+     */
+    public LabelSelectorRequirement withValues(List<String> values) {
+        this.values = values;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("key", this.key);
+        jsonWriter.writeStringField("operator", this.operator == null ? null : this.operator.toString());
+        jsonWriter.writeArrayField("values", this.values, (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LabelSelectorRequirement from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LabelSelectorRequirement if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the LabelSelectorRequirement.
+     */
+    public static LabelSelectorRequirement fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LabelSelectorRequirement deserializedLabelSelectorRequirement = new LabelSelectorRequirement();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("key".equals(fieldName)) {
+                    deserializedLabelSelectorRequirement.key = reader.getString();
+                } else if ("operator".equals(fieldName)) {
+                    deserializedLabelSelectorRequirement.operator = Operator.fromString(reader.getString());
+                } else if ("values".equals(fieldName)) {
+                    List<String> values = reader.readArray(reader1 -> reader1.getString());
+                    deserializedLabelSelectorRequirement.values = values;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLabelSelectorRequirement;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LoadBalancerListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LoadBalancerListResult.java
new file mode 100644
index 000000000000..6314fdcd178a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LoadBalancerListResult.java
@@ -0,0 +1,115 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.LoadBalancerInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response from the List Load Balancers operation.
+ */
+@Fluent
+public final class LoadBalancerListResult implements JsonSerializable<LoadBalancerListResult> {
+    /*
+     * The list of Load Balancers.
+     */
+    private List<LoadBalancerInner> value;
+
+    /*
+     * The URL to get the next set of load balancer results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of LoadBalancerListResult class.
+     */
+    public LoadBalancerListResult() {
+    }
+
+    /**
+     * Get the value property: The list of Load Balancers.
+     * 
+     * @return the value value.
+     */
+    public List<LoadBalancerInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The list of Load Balancers.
+     * 
+     * @param value the value value to set.
+     * @return the LoadBalancerListResult object itself.
+     */
+    public LoadBalancerListResult withValue(List<LoadBalancerInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next set of load balancer results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LoadBalancerListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LoadBalancerListResult if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the LoadBalancerListResult.
+     */
+    public static LoadBalancerListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LoadBalancerListResult deserializedLoadBalancerListResult = new LoadBalancerListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<LoadBalancerInner> value = reader.readArray(reader1 -> LoadBalancerInner.fromJson(reader1));
+                    deserializedLoadBalancerListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedLoadBalancerListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLoadBalancerListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsForwardDestination.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsForwardDestination.java
new file mode 100644
index 000000000000..39c9a39b739f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsForwardDestination.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Destination server for DNS queries to be forwarded from localDNS.
+ */
+public final class LocalDnsForwardDestination extends ExpandableStringEnum<LocalDnsForwardDestination> {
+    /**
+     * Static value ClusterCoreDNS for LocalDnsForwardDestination.
+     */
+    public static final LocalDnsForwardDestination CLUSTER_CORE_DNS = fromString("ClusterCoreDNS");
+
+    /**
+     * Static value VnetDNS for LocalDnsForwardDestination.
+     */
+    public static final LocalDnsForwardDestination VNET_DNS = fromString("VnetDNS");
+
+    /**
+     * Creates a new instance of LocalDnsForwardDestination value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsForwardDestination() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsForwardDestination from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsForwardDestination.
+     */
+    public static LocalDnsForwardDestination fromString(String name) {
+        return fromString(name, LocalDnsForwardDestination.class);
+    }
+
+    /**
+     * Gets known LocalDnsForwardDestination values.
+     * 
+     * @return known LocalDnsForwardDestination values.
+     */
+    public static Collection<LocalDnsForwardDestination> values() {
+        return values(LocalDnsForwardDestination.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsForwardPolicy.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsForwardPolicy.java
new file mode 100644
index 000000000000..3fd4ced49ccc
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsForwardPolicy.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Forward policy for selecting upstream DNS server. See [forward plugin](https://coredns.io/plugins/forward) for more
+ * information.
+ */
+public final class LocalDnsForwardPolicy extends ExpandableStringEnum<LocalDnsForwardPolicy> {
+    /**
+     * Static value Sequential for LocalDnsForwardPolicy.
+     */
+    public static final LocalDnsForwardPolicy SEQUENTIAL = fromString("Sequential");
+
+    /**
+     * Static value RoundRobin for LocalDnsForwardPolicy.
+     */
+    public static final LocalDnsForwardPolicy ROUND_ROBIN = fromString("RoundRobin");
+
+    /**
+     * Static value Random for LocalDnsForwardPolicy.
+     */
+    public static final LocalDnsForwardPolicy RANDOM = fromString("Random");
+
+    /**
+     * Creates a new instance of LocalDnsForwardPolicy value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsForwardPolicy() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsForwardPolicy from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsForwardPolicy.
+     */
+    public static LocalDnsForwardPolicy fromString(String name) {
+        return fromString(name, LocalDnsForwardPolicy.class);
+    }
+
+    /**
+     * Gets known LocalDnsForwardPolicy values.
+     * 
+     * @return known LocalDnsForwardPolicy values.
+     */
+    public static Collection<LocalDnsForwardPolicy> values() {
+        return values(LocalDnsForwardPolicy.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsMode.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsMode.java
new file mode 100644
index 000000000000..0d9ae3ad031b
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsMode.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Mode of enablement for localDNS.
+ */
+public final class LocalDnsMode extends ExpandableStringEnum<LocalDnsMode> {
+    /**
+     * Static value Preferred for LocalDnsMode.
+     */
+    public static final LocalDnsMode PREFERRED = fromString("Preferred");
+
+    /**
+     * Static value Required for LocalDnsMode.
+     */
+    public static final LocalDnsMode REQUIRED = fromString("Required");
+
+    /**
+     * Static value Disabled for LocalDnsMode.
+     */
+    public static final LocalDnsMode DISABLED = fromString("Disabled");
+
+    /**
+     * Creates a new instance of LocalDnsMode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsMode() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsMode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsMode.
+     */
+    public static LocalDnsMode fromString(String name) {
+        return fromString(name, LocalDnsMode.class);
+    }
+
+    /**
+     * Gets known LocalDnsMode values.
+     * 
+     * @return known LocalDnsMode values.
+     */
+    public static Collection<LocalDnsMode> values() {
+        return values(LocalDnsMode.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsOverride.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsOverride.java
new file mode 100644
index 000000000000..7bd4f379f4ef
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsOverride.java
@@ -0,0 +1,305 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Overrides for localDNS profile.
+ */
+@Fluent
+public final class LocalDnsOverride implements JsonSerializable<LocalDnsOverride> {
+    /*
+     * Log level for DNS queries in localDNS.
+     */
+    private LocalDnsQueryLogging queryLogging;
+
+    /*
+     * Enforce TCP or prefer UDP protocol for connections from localDNS to upstream DNS server.
+     */
+    private LocalDnsProtocol protocol;
+
+    /*
+     * Destination server for DNS queries to be forwarded from localDNS.
+     */
+    private LocalDnsForwardDestination forwardDestination;
+
+    /*
+     * Forward policy for selecting upstream DNS server. See [forward plugin](https://coredns.io/plugins/forward) for
+     * more information.
+     */
+    private LocalDnsForwardPolicy forwardPolicy;
+
+    /*
+     * Maximum number of concurrent queries. See [forward plugin](https://coredns.io/plugins/forward) for more
+     * information.
+     */
+    private Integer maxConcurrent;
+
+    /*
+     * Cache max TTL in seconds. See [cache plugin](https://coredns.io/plugins/cache) for more information.
+     */
+    private Integer cacheDurationInSeconds;
+
+    /*
+     * Serve stale duration in seconds. See [cache plugin](https://coredns.io/plugins/cache) for more information.
+     */
+    private Integer serveStaleDurationInSeconds;
+
+    /*
+     * Policy for serving stale data. See [cache plugin](https://coredns.io/plugins/cache) for more information.
+     */
+    private LocalDnsServeStale serveStale;
+
+    /**
+     * Creates an instance of LocalDnsOverride class.
+     */
+    public LocalDnsOverride() {
+    }
+
+    /**
+     * Get the queryLogging property: Log level for DNS queries in localDNS.
+     * 
+     * @return the queryLogging value.
+     */
+    public LocalDnsQueryLogging queryLogging() {
+        return this.queryLogging;
+    }
+
+    /**
+     * Set the queryLogging property: Log level for DNS queries in localDNS.
+     * 
+     * @param queryLogging the queryLogging value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withQueryLogging(LocalDnsQueryLogging queryLogging) {
+        this.queryLogging = queryLogging;
+        return this;
+    }
+
+    /**
+     * Get the protocol property: Enforce TCP or prefer UDP protocol for connections from localDNS to upstream DNS
+     * server.
+     * 
+     * @return the protocol value.
+     */
+    public LocalDnsProtocol protocol() {
+        return this.protocol;
+    }
+
+    /**
+     * Set the protocol property: Enforce TCP or prefer UDP protocol for connections from localDNS to upstream DNS
+     * server.
+     * 
+     * @param protocol the protocol value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withProtocol(LocalDnsProtocol protocol) {
+        this.protocol = protocol;
+        return this;
+    }
+
+    /**
+     * Get the forwardDestination property: Destination server for DNS queries to be forwarded from localDNS.
+     * 
+     * @return the forwardDestination value.
+     */
+    public LocalDnsForwardDestination forwardDestination() {
+        return this.forwardDestination;
+    }
+
+    /**
+     * Set the forwardDestination property: Destination server for DNS queries to be forwarded from localDNS.
+     * 
+     * @param forwardDestination the forwardDestination value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withForwardDestination(LocalDnsForwardDestination forwardDestination) {
+        this.forwardDestination = forwardDestination;
+        return this;
+    }
+
+    /**
+     * Get the forwardPolicy property: Forward policy for selecting upstream DNS server. See [forward
+     * plugin](https://coredns.io/plugins/forward) for more information.
+     * 
+     * @return the forwardPolicy value.
+     */
+    public LocalDnsForwardPolicy forwardPolicy() {
+        return this.forwardPolicy;
+    }
+
+    /**
+     * Set the forwardPolicy property: Forward policy for selecting upstream DNS server. See [forward
+     * plugin](https://coredns.io/plugins/forward) for more information.
+     * 
+     * @param forwardPolicy the forwardPolicy value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withForwardPolicy(LocalDnsForwardPolicy forwardPolicy) {
+        this.forwardPolicy = forwardPolicy;
+        return this;
+    }
+
+    /**
+     * Get the maxConcurrent property: Maximum number of concurrent queries. See [forward
+     * plugin](https://coredns.io/plugins/forward) for more information.
+     * 
+     * @return the maxConcurrent value.
+     */
+    public Integer maxConcurrent() {
+        return this.maxConcurrent;
+    }
+
+    /**
+     * Set the maxConcurrent property: Maximum number of concurrent queries. See [forward
+     * plugin](https://coredns.io/plugins/forward) for more information.
+     * 
+     * @param maxConcurrent the maxConcurrent value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withMaxConcurrent(Integer maxConcurrent) {
+        this.maxConcurrent = maxConcurrent;
+        return this;
+    }
+
+    /**
+     * Get the cacheDurationInSeconds property: Cache max TTL in seconds. See [cache
+     * plugin](https://coredns.io/plugins/cache) for more information.
+     * 
+     * @return the cacheDurationInSeconds value.
+     */
+    public Integer cacheDurationInSeconds() {
+        return this.cacheDurationInSeconds;
+    }
+
+    /**
+     * Set the cacheDurationInSeconds property: Cache max TTL in seconds. See [cache
+     * plugin](https://coredns.io/plugins/cache) for more information.
+     * 
+     * @param cacheDurationInSeconds the cacheDurationInSeconds value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withCacheDurationInSeconds(Integer cacheDurationInSeconds) {
+        this.cacheDurationInSeconds = cacheDurationInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the serveStaleDurationInSeconds property: Serve stale duration in seconds. See [cache
+     * plugin](https://coredns.io/plugins/cache) for more information.
+     * 
+     * @return the serveStaleDurationInSeconds value.
+     */
+    public Integer serveStaleDurationInSeconds() {
+        return this.serveStaleDurationInSeconds;
+    }
+
+    /**
+     * Set the serveStaleDurationInSeconds property: Serve stale duration in seconds. See [cache
+     * plugin](https://coredns.io/plugins/cache) for more information.
+     * 
+     * @param serveStaleDurationInSeconds the serveStaleDurationInSeconds value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withServeStaleDurationInSeconds(Integer serveStaleDurationInSeconds) {
+        this.serveStaleDurationInSeconds = serveStaleDurationInSeconds;
+        return this;
+    }
+
+    /**
+     * Get the serveStale property: Policy for serving stale data. See [cache plugin](https://coredns.io/plugins/cache)
+     * for more information.
+     * 
+     * @return the serveStale value.
+     */
+    public LocalDnsServeStale serveStale() {
+        return this.serveStale;
+    }
+
+    /**
+     * Set the serveStale property: Policy for serving stale data. See [cache plugin](https://coredns.io/plugins/cache)
+     * for more information.
+     * 
+     * @param serveStale the serveStale value to set.
+     * @return the LocalDnsOverride object itself.
+     */
+    public LocalDnsOverride withServeStale(LocalDnsServeStale serveStale) {
+        this.serveStale = serveStale;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("queryLogging", this.queryLogging == null ? null : this.queryLogging.toString());
+        jsonWriter.writeStringField("protocol", this.protocol == null ? null : this.protocol.toString());
+        jsonWriter.writeStringField("forwardDestination",
+            this.forwardDestination == null ? null : this.forwardDestination.toString());
+        jsonWriter.writeStringField("forwardPolicy", this.forwardPolicy == null ? null : this.forwardPolicy.toString());
+        jsonWriter.writeNumberField("maxConcurrent", this.maxConcurrent);
+        jsonWriter.writeNumberField("cacheDurationInSeconds", this.cacheDurationInSeconds);
+        jsonWriter.writeNumberField("serveStaleDurationInSeconds", this.serveStaleDurationInSeconds);
+        jsonWriter.writeStringField("serveStale", this.serveStale == null ? null : this.serveStale.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LocalDnsOverride from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LocalDnsOverride if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the LocalDnsOverride.
+     */
+    public static LocalDnsOverride fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LocalDnsOverride deserializedLocalDnsOverride = new LocalDnsOverride();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("queryLogging".equals(fieldName)) {
+                    deserializedLocalDnsOverride.queryLogging = LocalDnsQueryLogging.fromString(reader.getString());
+                } else if ("protocol".equals(fieldName)) {
+                    deserializedLocalDnsOverride.protocol = LocalDnsProtocol.fromString(reader.getString());
+                } else if ("forwardDestination".equals(fieldName)) {
+                    deserializedLocalDnsOverride.forwardDestination
+                        = LocalDnsForwardDestination.fromString(reader.getString());
+                } else if ("forwardPolicy".equals(fieldName)) {
+                    deserializedLocalDnsOverride.forwardPolicy = LocalDnsForwardPolicy.fromString(reader.getString());
+                } else if ("maxConcurrent".equals(fieldName)) {
+                    deserializedLocalDnsOverride.maxConcurrent = reader.getNullable(JsonReader::getInt);
+                } else if ("cacheDurationInSeconds".equals(fieldName)) {
+                    deserializedLocalDnsOverride.cacheDurationInSeconds = reader.getNullable(JsonReader::getInt);
+                } else if ("serveStaleDurationInSeconds".equals(fieldName)) {
+                    deserializedLocalDnsOverride.serveStaleDurationInSeconds = reader.getNullable(JsonReader::getInt);
+                } else if ("serveStale".equals(fieldName)) {
+                    deserializedLocalDnsOverride.serveStale = LocalDnsServeStale.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLocalDnsOverride;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsProfile.java
new file mode 100644
index 000000000000..cbbd0d7cb0bf
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsProfile.java
@@ -0,0 +1,192 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Configures the per-node local DNS, with VnetDNS and KubeDNS overrides. LocalDNS helps improve performance and
+ * reliability of DNS resolution in an AKS cluster. For more details see aka.ms/aks/localdns.
+ */
+@Fluent
+public final class LocalDnsProfile implements JsonSerializable<LocalDnsProfile> {
+    /*
+     * Mode of enablement for localDNS.
+     */
+    private LocalDnsMode mode;
+
+    /*
+     * System-generated state of localDNS.
+     */
+    private LocalDnsState state;
+
+    /*
+     * VnetDNS overrides apply to DNS traffic from pods with dnsPolicy:default or kubelet (referred to as VnetDNS
+     * traffic).
+     */
+    private Map<String, LocalDnsOverride> vnetDnsOverrides;
+
+    /*
+     * KubeDNS overrides apply to DNS traffic from pods with dnsPolicy:ClusterFirst (referred to as KubeDNS traffic).
+     */
+    private Map<String, LocalDnsOverride> kubeDnsOverrides;
+
+    /**
+     * Creates an instance of LocalDnsProfile class.
+     */
+    public LocalDnsProfile() {
+    }
+
+    /**
+     * Get the mode property: Mode of enablement for localDNS.
+     * 
+     * @return the mode value.
+     */
+    public LocalDnsMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Set the mode property: Mode of enablement for localDNS.
+     * 
+     * @param mode the mode value to set.
+     * @return the LocalDnsProfile object itself.
+     */
+    public LocalDnsProfile withMode(LocalDnsMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Get the state property: System-generated state of localDNS.
+     * 
+     * @return the state value.
+     */
+    public LocalDnsState state() {
+        return this.state;
+    }
+
+    /**
+     * Get the vnetDnsOverrides property: VnetDNS overrides apply to DNS traffic from pods with dnsPolicy:default or
+     * kubelet (referred to as VnetDNS traffic).
+     * 
+     * @return the vnetDnsOverrides value.
+     */
+    public Map<String, LocalDnsOverride> vnetDnsOverrides() {
+        return this.vnetDnsOverrides;
+    }
+
+    /**
+     * Set the vnetDnsOverrides property: VnetDNS overrides apply to DNS traffic from pods with dnsPolicy:default or
+     * kubelet (referred to as VnetDNS traffic).
+     * 
+     * @param vnetDnsOverrides the vnetDnsOverrides value to set.
+     * @return the LocalDnsProfile object itself.
+     */
+    public LocalDnsProfile withVnetDnsOverrides(Map<String, LocalDnsOverride> vnetDnsOverrides) {
+        this.vnetDnsOverrides = vnetDnsOverrides;
+        return this;
+    }
+
+    /**
+     * Get the kubeDnsOverrides property: KubeDNS overrides apply to DNS traffic from pods with dnsPolicy:ClusterFirst
+     * (referred to as KubeDNS traffic).
+     * 
+     * @return the kubeDnsOverrides value.
+     */
+    public Map<String, LocalDnsOverride> kubeDnsOverrides() {
+        return this.kubeDnsOverrides;
+    }
+
+    /**
+     * Set the kubeDnsOverrides property: KubeDNS overrides apply to DNS traffic from pods with dnsPolicy:ClusterFirst
+     * (referred to as KubeDNS traffic).
+     * 
+     * @param kubeDnsOverrides the kubeDnsOverrides value to set.
+     * @return the LocalDnsProfile object itself.
+     */
+    public LocalDnsProfile withKubeDnsOverrides(Map<String, LocalDnsOverride> kubeDnsOverrides) {
+        this.kubeDnsOverrides = kubeDnsOverrides;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (vnetDnsOverrides() != null) {
+            vnetDnsOverrides().values().forEach(e -> {
+                if (e != null) {
+                    e.validate();
+                }
+            });
+        }
+        if (kubeDnsOverrides() != null) {
+            kubeDnsOverrides().values().forEach(e -> {
+                if (e != null) {
+                    e.validate();
+                }
+            });
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("mode", this.mode == null ? null : this.mode.toString());
+        jsonWriter.writeMapField("vnetDNSOverrides", this.vnetDnsOverrides,
+            (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeMapField("kubeDNSOverrides", this.kubeDnsOverrides,
+            (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LocalDnsProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LocalDnsProfile if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the LocalDnsProfile.
+     */
+    public static LocalDnsProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LocalDnsProfile deserializedLocalDnsProfile = new LocalDnsProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("mode".equals(fieldName)) {
+                    deserializedLocalDnsProfile.mode = LocalDnsMode.fromString(reader.getString());
+                } else if ("state".equals(fieldName)) {
+                    deserializedLocalDnsProfile.state = LocalDnsState.fromString(reader.getString());
+                } else if ("vnetDNSOverrides".equals(fieldName)) {
+                    Map<String, LocalDnsOverride> vnetDnsOverrides
+                        = reader.readMap(reader1 -> LocalDnsOverride.fromJson(reader1));
+                    deserializedLocalDnsProfile.vnetDnsOverrides = vnetDnsOverrides;
+                } else if ("kubeDNSOverrides".equals(fieldName)) {
+                    Map<String, LocalDnsOverride> kubeDnsOverrides
+                        = reader.readMap(reader1 -> LocalDnsOverride.fromJson(reader1));
+                    deserializedLocalDnsProfile.kubeDnsOverrides = kubeDnsOverrides;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLocalDnsProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsProtocol.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsProtocol.java
new file mode 100644
index 000000000000..4ff3a5e7194c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsProtocol.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Enforce TCP or prefer UDP protocol for connections from localDNS to upstream DNS server.
+ */
+public final class LocalDnsProtocol extends ExpandableStringEnum<LocalDnsProtocol> {
+    /**
+     * Static value PreferUDP for LocalDnsProtocol.
+     */
+    public static final LocalDnsProtocol PREFER_UDP = fromString("PreferUDP");
+
+    /**
+     * Static value ForceTCP for LocalDnsProtocol.
+     */
+    public static final LocalDnsProtocol FORCE_TCP = fromString("ForceTCP");
+
+    /**
+     * Creates a new instance of LocalDnsProtocol value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsProtocol() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsProtocol from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsProtocol.
+     */
+    public static LocalDnsProtocol fromString(String name) {
+        return fromString(name, LocalDnsProtocol.class);
+    }
+
+    /**
+     * Gets known LocalDnsProtocol values.
+     * 
+     * @return known LocalDnsProtocol values.
+     */
+    public static Collection<LocalDnsProtocol> values() {
+        return values(LocalDnsProtocol.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsQueryLogging.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsQueryLogging.java
new file mode 100644
index 000000000000..4c27d9badbe9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsQueryLogging.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Log level for DNS queries in localDNS.
+ */
+public final class LocalDnsQueryLogging extends ExpandableStringEnum<LocalDnsQueryLogging> {
+    /**
+     * Static value Error for LocalDnsQueryLogging.
+     */
+    public static final LocalDnsQueryLogging ERROR = fromString("Error");
+
+    /**
+     * Static value Log for LocalDnsQueryLogging.
+     */
+    public static final LocalDnsQueryLogging LOG = fromString("Log");
+
+    /**
+     * Creates a new instance of LocalDnsQueryLogging value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsQueryLogging() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsQueryLogging from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsQueryLogging.
+     */
+    public static LocalDnsQueryLogging fromString(String name) {
+        return fromString(name, LocalDnsQueryLogging.class);
+    }
+
+    /**
+     * Gets known LocalDnsQueryLogging values.
+     * 
+     * @return known LocalDnsQueryLogging values.
+     */
+    public static Collection<LocalDnsQueryLogging> values() {
+        return values(LocalDnsQueryLogging.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsServeStale.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsServeStale.java
new file mode 100644
index 000000000000..ea1184a977f0
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsServeStale.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Policy for serving stale data. See [cache plugin](https://coredns.io/plugins/cache) for more information.
+ */
+public final class LocalDnsServeStale extends ExpandableStringEnum<LocalDnsServeStale> {
+    /**
+     * Static value Verify for LocalDnsServeStale.
+     */
+    public static final LocalDnsServeStale VERIFY = fromString("Verify");
+
+    /**
+     * Static value Immediate for LocalDnsServeStale.
+     */
+    public static final LocalDnsServeStale IMMEDIATE = fromString("Immediate");
+
+    /**
+     * Static value Disable for LocalDnsServeStale.
+     */
+    public static final LocalDnsServeStale DISABLE = fromString("Disable");
+
+    /**
+     * Creates a new instance of LocalDnsServeStale value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsServeStale() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsServeStale from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsServeStale.
+     */
+    public static LocalDnsServeStale fromString(String name) {
+        return fromString(name, LocalDnsServeStale.class);
+    }
+
+    /**
+     * Gets known LocalDnsServeStale values.
+     * 
+     * @return known LocalDnsServeStale values.
+     */
+    public static Collection<LocalDnsServeStale> values() {
+        return values(LocalDnsServeStale.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsState.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsState.java
new file mode 100644
index 000000000000..93b21851689e
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/LocalDnsState.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * System-generated state of localDNS.
+ */
+public final class LocalDnsState extends ExpandableStringEnum<LocalDnsState> {
+    /**
+     * Static value Enabled for LocalDnsState.
+     */
+    public static final LocalDnsState ENABLED = fromString("Enabled");
+
+    /**
+     * Static value Disabled for LocalDnsState.
+     */
+    public static final LocalDnsState DISABLED = fromString("Disabled");
+
+    /**
+     * Creates a new instance of LocalDnsState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LocalDnsState() {
+    }
+
+    /**
+     * Creates or finds a LocalDnsState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LocalDnsState.
+     */
+    public static LocalDnsState fromString(String name) {
+        return fromString(name, LocalDnsState.class);
+    }
+
+    /**
+     * Gets known LocalDnsState values.
+     * 
+     * @return known LocalDnsState values.
+     */
+    public static Collection<LocalDnsState> values() {
+        return values(LocalDnsState.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineHardwareProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineHardwareProfile.java
new file mode 100644
index 000000000000..5f2ac475ad1a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineHardwareProfile.java
@@ -0,0 +1,162 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The hardware and GPU settings of the machine.
+ */
+@Fluent
+public final class MachineHardwareProfile implements JsonSerializable<MachineHardwareProfile> {
+    /*
+     * The size of the VM. VM size availability varies by region. If a node contains insufficient compute resources
+     * (memory, cpu, etc) pods might fail to run correctly. For more details on restricted VM sizes, see:
+     * https://docs.microsoft.com/azure/aks/quotas-skus-regions
+     */
+    private String vmSize;
+
+    /*
+     * GPUInstanceProfile to be used to specify GPU MIG instance profile for supported GPU VM SKU.
+     */
+    private GpuInstanceProfile gpuInstanceProfile;
+
+    /*
+     * The GPU settings of the machine.
+     */
+    private GpuProfile gpuProfile;
+
+    /**
+     * Creates an instance of MachineHardwareProfile class.
+     */
+    public MachineHardwareProfile() {
+    }
+
+    /**
+     * Get the vmSize property: The size of the VM. VM size availability varies by region. If a node contains
+     * insufficient compute resources (memory, cpu, etc) pods might fail to run correctly. For more details on
+     * restricted VM sizes, see: https://docs.microsoft.com/azure/aks/quotas-skus-regions.
+     * 
+     * @return the vmSize value.
+     */
+    public String vmSize() {
+        return this.vmSize;
+    }
+
+    /**
+     * Set the vmSize property: The size of the VM. VM size availability varies by region. If a node contains
+     * insufficient compute resources (memory, cpu, etc) pods might fail to run correctly. For more details on
+     * restricted VM sizes, see: https://docs.microsoft.com/azure/aks/quotas-skus-regions.
+     * 
+     * @param vmSize the vmSize value to set.
+     * @return the MachineHardwareProfile object itself.
+     */
+    public MachineHardwareProfile withVmSize(String vmSize) {
+        this.vmSize = vmSize;
+        return this;
+    }
+
+    /**
+     * Get the gpuInstanceProfile property: GPUInstanceProfile to be used to specify GPU MIG instance profile for
+     * supported GPU VM SKU.
+     * 
+     * @return the gpuInstanceProfile value.
+     */
+    public GpuInstanceProfile gpuInstanceProfile() {
+        return this.gpuInstanceProfile;
+    }
+
+    /**
+     * Set the gpuInstanceProfile property: GPUInstanceProfile to be used to specify GPU MIG instance profile for
+     * supported GPU VM SKU.
+     * 
+     * @param gpuInstanceProfile the gpuInstanceProfile value to set.
+     * @return the MachineHardwareProfile object itself.
+     */
+    public MachineHardwareProfile withGpuInstanceProfile(GpuInstanceProfile gpuInstanceProfile) {
+        this.gpuInstanceProfile = gpuInstanceProfile;
+        return this;
+    }
+
+    /**
+     * Get the gpuProfile property: The GPU settings of the machine.
+     * 
+     * @return the gpuProfile value.
+     */
+    public GpuProfile gpuProfile() {
+        return this.gpuProfile;
+    }
+
+    /**
+     * Set the gpuProfile property: The GPU settings of the machine.
+     * 
+     * @param gpuProfile the gpuProfile value to set.
+     * @return the MachineHardwareProfile object itself.
+     */
+    public MachineHardwareProfile withGpuProfile(GpuProfile gpuProfile) {
+        this.gpuProfile = gpuProfile;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (gpuProfile() != null) {
+            gpuProfile().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("vmSize", this.vmSize);
+        jsonWriter.writeStringField("gpuInstanceProfile",
+            this.gpuInstanceProfile == null ? null : this.gpuInstanceProfile.toString());
+        jsonWriter.writeJsonField("gpuProfile", this.gpuProfile);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MachineHardwareProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MachineHardwareProfile if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the MachineHardwareProfile.
+     */
+    public static MachineHardwareProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MachineHardwareProfile deserializedMachineHardwareProfile = new MachineHardwareProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("vmSize".equals(fieldName)) {
+                    deserializedMachineHardwareProfile.vmSize = reader.getString();
+                } else if ("gpuInstanceProfile".equals(fieldName)) {
+                    deserializedMachineHardwareProfile.gpuInstanceProfile
+                        = GpuInstanceProfile.fromString(reader.getString());
+                } else if ("gpuProfile".equals(fieldName)) {
+                    deserializedMachineHardwareProfile.gpuProfile = GpuProfile.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMachineHardwareProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineKubernetesProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineKubernetesProfile.java
new file mode 100644
index 000000000000..77af2b6e776f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineKubernetesProfile.java
@@ -0,0 +1,390 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The Kubernetes configurations used by the machine.
+ */
+@Fluent
+public final class MachineKubernetesProfile implements JsonSerializable<MachineKubernetesProfile> {
+    /*
+     * The node labels on the machine.
+     */
+    private Map<String, String> nodeLabels;
+
+    /*
+     * The version of Kubernetes specified by the user. Both patch version <major.minor.patch> and <major.minor> are
+     * supported. When <major.minor> is specified, the latest supported patch version is chosen automatically.
+     */
+    private String orchestratorVersion;
+
+    /*
+     * The version of Kubernetes running on the machine. If orchestratorVersion was a fully specified version
+     * <major.minor.patch>, this field will be exactly equal to it. If orchestratorVersion was <major.minor>, this field
+     * will contain the full <major.minor.patch> version being used.
+     */
+    private String currentOrchestratorVersion;
+
+    /*
+     * Determines the placement of emptyDir volumes, container runtime data root, and Kubelet ephemeral storage.
+     */
+    private KubeletDiskType kubeletDiskType;
+
+    /*
+     * The Kubelet configuration on the machine.
+     */
+    private KubeletConfig kubeletConfig;
+
+    /*
+     * Taints added on the node during creation that will not be reconciled by AKS. These taints will not be reconciled
+     * by AKS and can be removed with a kubectl call. These taints allow for required configuration to run before the
+     * node is ready to accept workloads, for example 'key1=value1:NoSchedule' that then can be removed with `kubectl
+     * taint nodes node1 key1=value1:NoSchedule-`
+     */
+    private List<String> nodeInitializationTaints;
+
+    /*
+     * The taints added to new node during machine create. For example, key=value:NoSchedule.
+     */
+    private List<String> nodeTaints;
+
+    /*
+     * The maximum number of pods that can run on a node.
+     */
+    private Integer maxPods;
+
+    /*
+     * The node name in the Kubernetes cluster.
+     */
+    private String nodeName;
+
+    /*
+     * Determines the type of workload a node can run.
+     */
+    private WorkloadRuntime workloadRuntime;
+
+    /*
+     * Configuration for using artifact streaming on AKS.
+     */
+    private AgentPoolArtifactStreamingProfile artifactStreamingProfile;
+
+    /**
+     * Creates an instance of MachineKubernetesProfile class.
+     */
+    public MachineKubernetesProfile() {
+    }
+
+    /**
+     * Get the nodeLabels property: The node labels on the machine.
+     * 
+     * @return the nodeLabels value.
+     */
+    public Map<String, String> nodeLabels() {
+        return this.nodeLabels;
+    }
+
+    /**
+     * Set the nodeLabels property: The node labels on the machine.
+     * 
+     * @param nodeLabels the nodeLabels value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withNodeLabels(Map<String, String> nodeLabels) {
+        this.nodeLabels = nodeLabels;
+        return this;
+    }
+
+    /**
+     * Get the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; and &lt;major.minor&gt; are supported. When &lt;major.minor&gt; is specified, the
+     * latest supported patch version is chosen automatically.
+     * 
+     * @return the orchestratorVersion value.
+     */
+    public String orchestratorVersion() {
+        return this.orchestratorVersion;
+    }
+
+    /**
+     * Set the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; and &lt;major.minor&gt; are supported. When &lt;major.minor&gt; is specified, the
+     * latest supported patch version is chosen automatically.
+     * 
+     * @param orchestratorVersion the orchestratorVersion value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withOrchestratorVersion(String orchestratorVersion) {
+        this.orchestratorVersion = orchestratorVersion;
+        return this;
+    }
+
+    /**
+     * Get the currentOrchestratorVersion property: The version of Kubernetes running on the machine. If
+     * orchestratorVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * version being used.
+     * 
+     * @return the currentOrchestratorVersion value.
+     */
+    public String currentOrchestratorVersion() {
+        return this.currentOrchestratorVersion;
+    }
+
+    /**
+     * Get the kubeletDiskType property: Determines the placement of emptyDir volumes, container runtime data root, and
+     * Kubelet ephemeral storage.
+     * 
+     * @return the kubeletDiskType value.
+     */
+    public KubeletDiskType kubeletDiskType() {
+        return this.kubeletDiskType;
+    }
+
+    /**
+     * Set the kubeletDiskType property: Determines the placement of emptyDir volumes, container runtime data root, and
+     * Kubelet ephemeral storage.
+     * 
+     * @param kubeletDiskType the kubeletDiskType value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withKubeletDiskType(KubeletDiskType kubeletDiskType) {
+        this.kubeletDiskType = kubeletDiskType;
+        return this;
+    }
+
+    /**
+     * Get the kubeletConfig property: The Kubelet configuration on the machine.
+     * 
+     * @return the kubeletConfig value.
+     */
+    public KubeletConfig kubeletConfig() {
+        return this.kubeletConfig;
+    }
+
+    /**
+     * Set the kubeletConfig property: The Kubelet configuration on the machine.
+     * 
+     * @param kubeletConfig the kubeletConfig value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withKubeletConfig(KubeletConfig kubeletConfig) {
+        this.kubeletConfig = kubeletConfig;
+        return this;
+    }
+
+    /**
+     * Get the nodeInitializationTaints property: Taints added on the node during creation that will not be reconciled
+     * by AKS. These taints will not be reconciled by AKS and can be removed with a kubectl call. These taints allow for
+     * required configuration to run before the node is ready to accept workloads, for example 'key1=value1:NoSchedule'
+     * that then can be removed with `kubectl taint nodes node1 key1=value1:NoSchedule-`.
+     * 
+     * @return the nodeInitializationTaints value.
+     */
+    public List<String> nodeInitializationTaints() {
+        return this.nodeInitializationTaints;
+    }
+
+    /**
+     * Set the nodeInitializationTaints property: Taints added on the node during creation that will not be reconciled
+     * by AKS. These taints will not be reconciled by AKS and can be removed with a kubectl call. These taints allow for
+     * required configuration to run before the node is ready to accept workloads, for example 'key1=value1:NoSchedule'
+     * that then can be removed with `kubectl taint nodes node1 key1=value1:NoSchedule-`.
+     * 
+     * @param nodeInitializationTaints the nodeInitializationTaints value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withNodeInitializationTaints(List<String> nodeInitializationTaints) {
+        this.nodeInitializationTaints = nodeInitializationTaints;
+        return this;
+    }
+
+    /**
+     * Get the nodeTaints property: The taints added to new node during machine create. For example,
+     * key=value:NoSchedule.
+     * 
+     * @return the nodeTaints value.
+     */
+    public List<String> nodeTaints() {
+        return this.nodeTaints;
+    }
+
+    /**
+     * Set the nodeTaints property: The taints added to new node during machine create. For example,
+     * key=value:NoSchedule.
+     * 
+     * @param nodeTaints the nodeTaints value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withNodeTaints(List<String> nodeTaints) {
+        this.nodeTaints = nodeTaints;
+        return this;
+    }
+
+    /**
+     * Get the maxPods property: The maximum number of pods that can run on a node.
+     * 
+     * @return the maxPods value.
+     */
+    public Integer maxPods() {
+        return this.maxPods;
+    }
+
+    /**
+     * Set the maxPods property: The maximum number of pods that can run on a node.
+     * 
+     * @param maxPods the maxPods value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withMaxPods(Integer maxPods) {
+        this.maxPods = maxPods;
+        return this;
+    }
+
+    /**
+     * Get the nodeName property: The node name in the Kubernetes cluster.
+     * 
+     * @return the nodeName value.
+     */
+    public String nodeName() {
+        return this.nodeName;
+    }
+
+    /**
+     * Get the workloadRuntime property: Determines the type of workload a node can run.
+     * 
+     * @return the workloadRuntime value.
+     */
+    public WorkloadRuntime workloadRuntime() {
+        return this.workloadRuntime;
+    }
+
+    /**
+     * Set the workloadRuntime property: Determines the type of workload a node can run.
+     * 
+     * @param workloadRuntime the workloadRuntime value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile withWorkloadRuntime(WorkloadRuntime workloadRuntime) {
+        this.workloadRuntime = workloadRuntime;
+        return this;
+    }
+
+    /**
+     * Get the artifactStreamingProfile property: Configuration for using artifact streaming on AKS.
+     * 
+     * @return the artifactStreamingProfile value.
+     */
+    public AgentPoolArtifactStreamingProfile artifactStreamingProfile() {
+        return this.artifactStreamingProfile;
+    }
+
+    /**
+     * Set the artifactStreamingProfile property: Configuration for using artifact streaming on AKS.
+     * 
+     * @param artifactStreamingProfile the artifactStreamingProfile value to set.
+     * @return the MachineKubernetesProfile object itself.
+     */
+    public MachineKubernetesProfile
+        withArtifactStreamingProfile(AgentPoolArtifactStreamingProfile artifactStreamingProfile) {
+        this.artifactStreamingProfile = artifactStreamingProfile;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (kubeletConfig() != null) {
+            kubeletConfig().validate();
+        }
+        if (artifactStreamingProfile() != null) {
+            artifactStreamingProfile().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeMapField("nodeLabels", this.nodeLabels, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeStringField("orchestratorVersion", this.orchestratorVersion);
+        jsonWriter.writeStringField("kubeletDiskType",
+            this.kubeletDiskType == null ? null : this.kubeletDiskType.toString());
+        jsonWriter.writeJsonField("kubeletConfig", this.kubeletConfig);
+        jsonWriter.writeArrayField("nodeInitializationTaints", this.nodeInitializationTaints,
+            (writer, element) -> writer.writeString(element));
+        jsonWriter.writeArrayField("nodeTaints", this.nodeTaints, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeNumberField("maxPods", this.maxPods);
+        jsonWriter.writeStringField("workloadRuntime",
+            this.workloadRuntime == null ? null : this.workloadRuntime.toString());
+        jsonWriter.writeJsonField("artifactStreamingProfile", this.artifactStreamingProfile);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MachineKubernetesProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MachineKubernetesProfile if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the MachineKubernetesProfile.
+     */
+    public static MachineKubernetesProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MachineKubernetesProfile deserializedMachineKubernetesProfile = new MachineKubernetesProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("nodeLabels".equals(fieldName)) {
+                    Map<String, String> nodeLabels = reader.readMap(reader1 -> reader1.getString());
+                    deserializedMachineKubernetesProfile.nodeLabels = nodeLabels;
+                } else if ("orchestratorVersion".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.orchestratorVersion = reader.getString();
+                } else if ("currentOrchestratorVersion".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.currentOrchestratorVersion = reader.getString();
+                } else if ("kubeletDiskType".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.kubeletDiskType
+                        = KubeletDiskType.fromString(reader.getString());
+                } else if ("kubeletConfig".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.kubeletConfig = KubeletConfig.fromJson(reader);
+                } else if ("nodeInitializationTaints".equals(fieldName)) {
+                    List<String> nodeInitializationTaints = reader.readArray(reader1 -> reader1.getString());
+                    deserializedMachineKubernetesProfile.nodeInitializationTaints = nodeInitializationTaints;
+                } else if ("nodeTaints".equals(fieldName)) {
+                    List<String> nodeTaints = reader.readArray(reader1 -> reader1.getString());
+                    deserializedMachineKubernetesProfile.nodeTaints = nodeTaints;
+                } else if ("maxPods".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.maxPods = reader.getNullable(JsonReader::getInt);
+                } else if ("nodeName".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.nodeName = reader.getString();
+                } else if ("workloadRuntime".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.workloadRuntime
+                        = WorkloadRuntime.fromString(reader.getString());
+                } else if ("artifactStreamingProfile".equals(fieldName)) {
+                    deserializedMachineKubernetesProfile.artifactStreamingProfile
+                        = AgentPoolArtifactStreamingProfile.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMachineKubernetesProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineListResult.java
index b81e97eb41a2..6425faad04a1 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineListResult.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineListResult.java
@@ -19,14 +19,14 @@
 @Fluent
 public final class MachineListResult implements JsonSerializable<MachineListResult> {
     /*
-     * The URL to get the next set of machine results.
+     * The list of Machines in cluster.
      */
-    private String nextLink;
+    private List<MachineInner> value;
 
     /*
-     * The list of Machines in cluster.
+     * The URL to get the next set of machine results.
      */
-    private List<MachineInner> value;
+    private String nextLink;
 
     /**
      * Creates an instance of MachineListResult class.
@@ -34,15 +34,6 @@ public final class MachineListResult implements JsonSerializable<MachineListResu
     public MachineListResult() {
     }
 
-    /**
-     * Get the nextLink property: The URL to get the next set of machine results.
-     * 
-     * @return the nextLink value.
-     */
-    public String nextLink() {
-        return this.nextLink;
-    }
-
     /**
      * Get the value property: The list of Machines in cluster.
      * 
@@ -63,6 +54,15 @@ public MachineListResult withValue(List<MachineInner> value) {
         return this;
     }
 
+    /**
+     * Get the nextLink property: The URL to get the next set of machine results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -99,11 +99,11 @@ public static MachineListResult fromJson(JsonReader jsonReader) throws IOExcepti
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
-                if ("nextLink".equals(fieldName)) {
-                    deserializedMachineListResult.nextLink = reader.getString();
-                } else if ("value".equals(fieldName)) {
+                if ("value".equals(fieldName)) {
                     List<MachineInner> value = reader.readArray(reader1 -> MachineInner.fromJson(reader1));
                     deserializedMachineListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedMachineListResult.nextLink = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineNetworkProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineNetworkProperties.java
index 5a3c9f305386..0997fe247d0a 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineNetworkProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineNetworkProperties.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.containerservice.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
@@ -13,15 +13,51 @@
 import java.util.List;
 
 /**
- * network properties of the machine.
+ * The network properties of the machine.
  */
-@Immutable
+@Fluent
 public final class MachineNetworkProperties implements JsonSerializable<MachineNetworkProperties> {
     /*
      * IPv4, IPv6 addresses of the machine
      */
     private List<MachineIpAddress> ipAddresses;
 
+    /*
+     * The ID of the subnet which node and optionally pods will join on startup. If this is not specified, a VNET and
+     * subnet will be generated and used. If no podSubnetID is specified, this applies to nodes and pods, otherwise it
+     * applies to just nodes. This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{
+     * virtualNetworkName}/subnets/{subnetName}
+     */
+    private String vnetSubnetId;
+
+    /*
+     * The ID of the subnet which pods will join when launched. If omitted, pod IPs are statically assigned on the node
+     * subnet (see vnetSubnetID for more details). This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{
+     * virtualNetworkName}/subnets/{subnetName}
+     */
+    private String podSubnetId;
+
+    /*
+     * Whether the machine is allocated its own public IP. Some scenarios may require the machine to receive their own
+     * dedicated public IP addresses. A common scenario is for gaming workloads, where a console needs to make a direct
+     * connection to a cloud virtual machine to minimize hops. The default is false.
+     */
+    private Boolean enableNodePublicIp;
+
+    /*
+     * The public IP prefix ID which VM node should use IPs from. This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{
+     * publicIPPrefixName}
+     */
+    private String nodePublicIpPrefixId;
+
+    /*
+     * IPTags of instance-level public IPs.
+     */
+    private List<IpTag> nodePublicIpTags;
+
     /**
      * Creates an instance of MachineNetworkProperties class.
      */
@@ -37,6 +73,126 @@ public List<MachineIpAddress> ipAddresses() {
         return this.ipAddresses;
     }
 
+    /**
+     * Get the vnetSubnetId property: The ID of the subnet which node and optionally pods will join on startup. If this
+     * is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified, this applies to
+     * nodes and pods, otherwise it applies to just nodes. This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}.
+     * 
+     * @return the vnetSubnetId value.
+     */
+    public String vnetSubnetId() {
+        return this.vnetSubnetId;
+    }
+
+    /**
+     * Set the vnetSubnetId property: The ID of the subnet which node and optionally pods will join on startup. If this
+     * is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified, this applies to
+     * nodes and pods, otherwise it applies to just nodes. This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}.
+     * 
+     * @param vnetSubnetId the vnetSubnetId value to set.
+     * @return the MachineNetworkProperties object itself.
+     */
+    public MachineNetworkProperties withVnetSubnetId(String vnetSubnetId) {
+        this.vnetSubnetId = vnetSubnetId;
+        return this;
+    }
+
+    /**
+     * Get the podSubnetId property: The ID of the subnet which pods will join when launched. If omitted, pod IPs are
+     * statically assigned on the node subnet (see vnetSubnetID for more details). This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}.
+     * 
+     * @return the podSubnetId value.
+     */
+    public String podSubnetId() {
+        return this.podSubnetId;
+    }
+
+    /**
+     * Set the podSubnetId property: The ID of the subnet which pods will join when launched. If omitted, pod IPs are
+     * statically assigned on the node subnet (see vnetSubnetID for more details). This is of the form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}.
+     * 
+     * @param podSubnetId the podSubnetId value to set.
+     * @return the MachineNetworkProperties object itself.
+     */
+    public MachineNetworkProperties withPodSubnetId(String podSubnetId) {
+        this.podSubnetId = podSubnetId;
+        return this;
+    }
+
+    /**
+     * Get the enableNodePublicIp property: Whether the machine is allocated its own public IP. Some scenarios may
+     * require the machine to receive their own dedicated public IP addresses. A common scenario is for gaming
+     * workloads, where a console needs to make a direct connection to a cloud virtual machine to minimize hops. The
+     * default is false.
+     * 
+     * @return the enableNodePublicIp value.
+     */
+    public Boolean enableNodePublicIp() {
+        return this.enableNodePublicIp;
+    }
+
+    /**
+     * Set the enableNodePublicIp property: Whether the machine is allocated its own public IP. Some scenarios may
+     * require the machine to receive their own dedicated public IP addresses. A common scenario is for gaming
+     * workloads, where a console needs to make a direct connection to a cloud virtual machine to minimize hops. The
+     * default is false.
+     * 
+     * @param enableNodePublicIp the enableNodePublicIp value to set.
+     * @return the MachineNetworkProperties object itself.
+     */
+    public MachineNetworkProperties withEnableNodePublicIp(Boolean enableNodePublicIp) {
+        this.enableNodePublicIp = enableNodePublicIp;
+        return this;
+    }
+
+    /**
+     * Get the nodePublicIpPrefixId property: The public IP prefix ID which VM node should use IPs from. This is of the
+     * form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}.
+     * 
+     * @return the nodePublicIpPrefixId value.
+     */
+    public String nodePublicIpPrefixId() {
+        return this.nodePublicIpPrefixId;
+    }
+
+    /**
+     * Set the nodePublicIpPrefixId property: The public IP prefix ID which VM node should use IPs from. This is of the
+     * form:
+     * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}.
+     * 
+     * @param nodePublicIpPrefixId the nodePublicIpPrefixId value to set.
+     * @return the MachineNetworkProperties object itself.
+     */
+    public MachineNetworkProperties withNodePublicIpPrefixId(String nodePublicIpPrefixId) {
+        this.nodePublicIpPrefixId = nodePublicIpPrefixId;
+        return this;
+    }
+
+    /**
+     * Get the nodePublicIpTags property: IPTags of instance-level public IPs.
+     * 
+     * @return the nodePublicIpTags value.
+     */
+    public List<IpTag> nodePublicIpTags() {
+        return this.nodePublicIpTags;
+    }
+
+    /**
+     * Set the nodePublicIpTags property: IPTags of instance-level public IPs.
+     * 
+     * @param nodePublicIpTags the nodePublicIpTags value to set.
+     * @return the MachineNetworkProperties object itself.
+     */
+    public MachineNetworkProperties withNodePublicIpTags(List<IpTag> nodePublicIpTags) {
+        this.nodePublicIpTags = nodePublicIpTags;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -46,6 +202,9 @@ public void validate() {
         if (ipAddresses() != null) {
             ipAddresses().forEach(e -> e.validate());
         }
+        if (nodePublicIpTags() != null) {
+            nodePublicIpTags().forEach(e -> e.validate());
+        }
     }
 
     /**
@@ -54,6 +213,12 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("vnetSubnetID", this.vnetSubnetId);
+        jsonWriter.writeStringField("podSubnetID", this.podSubnetId);
+        jsonWriter.writeBooleanField("enableNodePublicIP", this.enableNodePublicIp);
+        jsonWriter.writeStringField("nodePublicIPPrefixID", this.nodePublicIpPrefixId);
+        jsonWriter.writeArrayField("nodePublicIPTags", this.nodePublicIpTags,
+            (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -76,6 +241,18 @@ public static MachineNetworkProperties fromJson(JsonReader jsonReader) throws IO
                     List<MachineIpAddress> ipAddresses
                         = reader.readArray(reader1 -> MachineIpAddress.fromJson(reader1));
                     deserializedMachineNetworkProperties.ipAddresses = ipAddresses;
+                } else if ("vnetSubnetID".equals(fieldName)) {
+                    deserializedMachineNetworkProperties.vnetSubnetId = reader.getString();
+                } else if ("podSubnetID".equals(fieldName)) {
+                    deserializedMachineNetworkProperties.podSubnetId = reader.getString();
+                } else if ("enableNodePublicIP".equals(fieldName)) {
+                    deserializedMachineNetworkProperties.enableNodePublicIp
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("nodePublicIPPrefixID".equals(fieldName)) {
+                    deserializedMachineNetworkProperties.nodePublicIpPrefixId = reader.getString();
+                } else if ("nodePublicIPTags".equals(fieldName)) {
+                    List<IpTag> nodePublicIpTags = reader.readArray(reader1 -> IpTag.fromJson(reader1));
+                    deserializedMachineNetworkProperties.nodePublicIpTags = nodePublicIpTags;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineOSProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineOSProfile.java
new file mode 100644
index 000000000000..57d9a30b45a9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineOSProfile.java
@@ -0,0 +1,285 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The operating system and disk used by the machine.
+ */
+@Fluent
+public final class MachineOSProfile implements JsonSerializable<MachineOSProfile> {
+    /*
+     * OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux.
+     */
+    private OSType osType;
+
+    /*
+     * Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if OSType=Linux or
+     * Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after Windows2019 is
+     * deprecated.
+     */
+    private OSSku osSku;
+
+    /*
+     * OS Disk Size in GB to be used to specify the disk size for every machine in the master/agent pool. If you specify
+     * 0, it will apply the default osDisk size according to the vmSize specified.
+     */
+    private Integer osDiskSizeGB;
+
+    /*
+     * The OS disk type to be used for machines in the agent pool. The default is 'Ephemeral' if the VM supports it and
+     * has a cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not be changed
+     * after creation. For more information see [Ephemeral
+     * OS](https://docs.microsoft.com/azure/aks/cluster-configuration#ephemeral-os).
+     */
+    private OSDiskType osDiskType;
+
+    /*
+     * Whether to use a FIPS-enabled OS.
+     */
+    private Boolean enableFips;
+
+    /*
+     * The Linux machine's specific profile.
+     */
+    private MachineOSProfileLinuxProfile linuxProfile;
+
+    /*
+     * The Windows machine's specific profile.
+     */
+    private AgentPoolWindowsProfile windowsProfile;
+
+    /**
+     * Creates an instance of MachineOSProfile class.
+     */
+    public MachineOSProfile() {
+    }
+
+    /**
+     * Get the osType property: OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux.
+     * 
+     * @return the osType value.
+     */
+    public OSType osType() {
+        return this.osType;
+    }
+
+    /**
+     * Set the osType property: OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux.
+     * 
+     * @param osType the osType value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withOsType(OSType osType) {
+        this.osType = osType;
+        return this;
+    }
+
+    /**
+     * Get the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
+     * 
+     * @return the osSku value.
+     */
+    public OSSku osSku() {
+        return this.osSku;
+    }
+
+    /**
+     * Set the osSku property: Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if
+     * OSType=Linux or Windows2019 if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after
+     * Windows2019 is deprecated.
+     * 
+     * @param osSku the osSku value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withOsSku(OSSku osSku) {
+        this.osSku = osSku;
+        return this;
+    }
+
+    /**
+     * Get the osDiskSizeGB property: OS Disk Size in GB to be used to specify the disk size for every machine in the
+     * master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     * 
+     * @return the osDiskSizeGB value.
+     */
+    public Integer osDiskSizeGB() {
+        return this.osDiskSizeGB;
+    }
+
+    /**
+     * Set the osDiskSizeGB property: OS Disk Size in GB to be used to specify the disk size for every machine in the
+     * master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified.
+     * 
+     * @param osDiskSizeGB the osDiskSizeGB value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withOsDiskSizeGB(Integer osDiskSizeGB) {
+        this.osDiskSizeGB = osDiskSizeGB;
+        return this;
+    }
+
+    /**
+     * Get the osDiskType property: The OS disk type to be used for machines in the agent pool. The default is
+     * 'Ephemeral' if the VM supports it and has a cache disk larger than the requested OSDiskSizeGB. Otherwise,
+     * defaults to 'Managed'. May not be changed after creation. For more information see [Ephemeral
+     * OS](https://docs.microsoft.com/azure/aks/cluster-configuration#ephemeral-os).
+     * 
+     * @return the osDiskType value.
+     */
+    public OSDiskType osDiskType() {
+        return this.osDiskType;
+    }
+
+    /**
+     * Set the osDiskType property: The OS disk type to be used for machines in the agent pool. The default is
+     * 'Ephemeral' if the VM supports it and has a cache disk larger than the requested OSDiskSizeGB. Otherwise,
+     * defaults to 'Managed'. May not be changed after creation. For more information see [Ephemeral
+     * OS](https://docs.microsoft.com/azure/aks/cluster-configuration#ephemeral-os).
+     * 
+     * @param osDiskType the osDiskType value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withOsDiskType(OSDiskType osDiskType) {
+        this.osDiskType = osDiskType;
+        return this;
+    }
+
+    /**
+     * Get the enableFips property: Whether to use a FIPS-enabled OS.
+     * 
+     * @return the enableFips value.
+     */
+    public Boolean enableFips() {
+        return this.enableFips;
+    }
+
+    /**
+     * Set the enableFips property: Whether to use a FIPS-enabled OS.
+     * 
+     * @param enableFips the enableFips value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withEnableFips(Boolean enableFips) {
+        this.enableFips = enableFips;
+        return this;
+    }
+
+    /**
+     * Get the linuxProfile property: The Linux machine's specific profile.
+     * 
+     * @return the linuxProfile value.
+     */
+    public MachineOSProfileLinuxProfile linuxProfile() {
+        return this.linuxProfile;
+    }
+
+    /**
+     * Set the linuxProfile property: The Linux machine's specific profile.
+     * 
+     * @param linuxProfile the linuxProfile value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withLinuxProfile(MachineOSProfileLinuxProfile linuxProfile) {
+        this.linuxProfile = linuxProfile;
+        return this;
+    }
+
+    /**
+     * Get the windowsProfile property: The Windows machine's specific profile.
+     * 
+     * @return the windowsProfile value.
+     */
+    public AgentPoolWindowsProfile windowsProfile() {
+        return this.windowsProfile;
+    }
+
+    /**
+     * Set the windowsProfile property: The Windows machine's specific profile.
+     * 
+     * @param windowsProfile the windowsProfile value to set.
+     * @return the MachineOSProfile object itself.
+     */
+    public MachineOSProfile withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
+        this.windowsProfile = windowsProfile;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (linuxProfile() != null) {
+            linuxProfile().validate();
+        }
+        if (windowsProfile() != null) {
+            windowsProfile().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("osType", this.osType == null ? null : this.osType.toString());
+        jsonWriter.writeStringField("osSKU", this.osSku == null ? null : this.osSku.toString());
+        jsonWriter.writeNumberField("osDiskSizeGB", this.osDiskSizeGB);
+        jsonWriter.writeStringField("osDiskType", this.osDiskType == null ? null : this.osDiskType.toString());
+        jsonWriter.writeBooleanField("enableFIPS", this.enableFips);
+        jsonWriter.writeJsonField("linuxProfile", this.linuxProfile);
+        jsonWriter.writeJsonField("windowsProfile", this.windowsProfile);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MachineOSProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MachineOSProfile if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the MachineOSProfile.
+     */
+    public static MachineOSProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MachineOSProfile deserializedMachineOSProfile = new MachineOSProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("osType".equals(fieldName)) {
+                    deserializedMachineOSProfile.osType = OSType.fromString(reader.getString());
+                } else if ("osSKU".equals(fieldName)) {
+                    deserializedMachineOSProfile.osSku = OSSku.fromString(reader.getString());
+                } else if ("osDiskSizeGB".equals(fieldName)) {
+                    deserializedMachineOSProfile.osDiskSizeGB = reader.getNullable(JsonReader::getInt);
+                } else if ("osDiskType".equals(fieldName)) {
+                    deserializedMachineOSProfile.osDiskType = OSDiskType.fromString(reader.getString());
+                } else if ("enableFIPS".equals(fieldName)) {
+                    deserializedMachineOSProfile.enableFips = reader.getNullable(JsonReader::getBoolean);
+                } else if ("linuxProfile".equals(fieldName)) {
+                    deserializedMachineOSProfile.linuxProfile = MachineOSProfileLinuxProfile.fromJson(reader);
+                } else if ("windowsProfile".equals(fieldName)) {
+                    deserializedMachineOSProfile.windowsProfile = AgentPoolWindowsProfile.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMachineOSProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineOSProfileLinuxProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineOSProfileLinuxProfile.java
new file mode 100644
index 000000000000..ef7ad45400b8
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineOSProfileLinuxProfile.java
@@ -0,0 +1,132 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The Linux machine's specific profile.
+ */
+@Fluent
+public final class MachineOSProfileLinuxProfile implements JsonSerializable<MachineOSProfileLinuxProfile> {
+    /*
+     * The OS configuration of Linux machine.
+     */
+    private LinuxOSConfig linuxOSConfig;
+
+    /*
+     * Message of the day for Linux nodes, base64-encoded. A base64-encoded string which will be written to /etc/motd
+     * after decoding. This allows customization of the message of the day for Linux nodes. It must not be specified for
+     * Windows nodes. It must be a static string (i.e., will be printed raw and not be executed as a script).
+     */
+    private String messageOfTheDay;
+
+    /**
+     * Creates an instance of MachineOSProfileLinuxProfile class.
+     */
+    public MachineOSProfileLinuxProfile() {
+    }
+
+    /**
+     * Get the linuxOSConfig property: The OS configuration of Linux machine.
+     * 
+     * @return the linuxOSConfig value.
+     */
+    public LinuxOSConfig linuxOSConfig() {
+        return this.linuxOSConfig;
+    }
+
+    /**
+     * Set the linuxOSConfig property: The OS configuration of Linux machine.
+     * 
+     * @param linuxOSConfig the linuxOSConfig value to set.
+     * @return the MachineOSProfileLinuxProfile object itself.
+     */
+    public MachineOSProfileLinuxProfile withLinuxOSConfig(LinuxOSConfig linuxOSConfig) {
+        this.linuxOSConfig = linuxOSConfig;
+        return this;
+    }
+
+    /**
+     * Get the messageOfTheDay property: Message of the day for Linux nodes, base64-encoded. A base64-encoded string
+     * which will be written to /etc/motd after decoding. This allows customization of the message of the day for Linux
+     * nodes. It must not be specified for Windows nodes. It must be a static string (i.e., will be printed raw and not
+     * be executed as a script).
+     * 
+     * @return the messageOfTheDay value.
+     */
+    public String messageOfTheDay() {
+        return this.messageOfTheDay;
+    }
+
+    /**
+     * Set the messageOfTheDay property: Message of the day for Linux nodes, base64-encoded. A base64-encoded string
+     * which will be written to /etc/motd after decoding. This allows customization of the message of the day for Linux
+     * nodes. It must not be specified for Windows nodes. It must be a static string (i.e., will be printed raw and not
+     * be executed as a script).
+     * 
+     * @param messageOfTheDay the messageOfTheDay value to set.
+     * @return the MachineOSProfileLinuxProfile object itself.
+     */
+    public MachineOSProfileLinuxProfile withMessageOfTheDay(String messageOfTheDay) {
+        this.messageOfTheDay = messageOfTheDay;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (linuxOSConfig() != null) {
+            linuxOSConfig().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("linuxOSConfig", this.linuxOSConfig);
+        jsonWriter.writeStringField("messageOfTheDay", this.messageOfTheDay);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MachineOSProfileLinuxProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MachineOSProfileLinuxProfile if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the MachineOSProfileLinuxProfile.
+     */
+    public static MachineOSProfileLinuxProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MachineOSProfileLinuxProfile deserializedMachineOSProfileLinuxProfile = new MachineOSProfileLinuxProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("linuxOSConfig".equals(fieldName)) {
+                    deserializedMachineOSProfileLinuxProfile.linuxOSConfig = LinuxOSConfig.fromJson(reader);
+                } else if ("messageOfTheDay".equals(fieldName)) {
+                    deserializedMachineOSProfileLinuxProfile.messageOfTheDay = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMachineOSProfileLinuxProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineProperties.java
index 2f167587df26..2fa217d81c35 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineProperties.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineProperties.java
@@ -4,28 +4,86 @@
 
 package com.azure.resourcemanager.containerservice.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * The properties of the machine.
  */
-@Immutable
+@Fluent
 public final class MachineProperties implements JsonSerializable<MachineProperties> {
     /*
-     * network properties of the machine
+     * The network properties of the machine
      */
     private MachineNetworkProperties network;
 
     /*
-     * Azure resource id of the machine. It can be used to GET underlying VM Instance
+     * Arm resource id of the machine. It can be used to GET underlying VM Instance
      */
     private String resourceId;
 
+    /*
+     * The hardware and GPU settings of the machine.
+     */
+    private MachineHardwareProfile hardware;
+
+    /*
+     * The operating system and disk used by the machine.
+     */
+    private MachineOSProfile operatingSystem;
+
+    /*
+     * The Kubernetes configurations used by the machine.
+     */
+    private MachineKubernetesProfile kubernetes;
+
+    /*
+     * Machine only allows 'System' and 'User' mode.
+     */
+    private AgentPoolMode mode;
+
+    /*
+     * The security settings of the machine.
+     */
+    private AgentPoolSecurityProfile security;
+
+    /*
+     * The priority for the machine. If not specified, the default is 'Regular'.
+     */
+    private ScaleSetPriority priority;
+
+    /*
+     * The version of node image.
+     */
+    private String nodeImageVersion;
+
+    /*
+     * The current deployment or provisioning state.
+     */
+    private String provisioningState;
+
+    /*
+     * The tags to be persisted on the machine.
+     */
+    private Map<String, String> tags;
+
+    /*
+     * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
+     * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
+     * optimistic concurrency per the normal eTag convention.
+     */
+    private String etag;
+
+    /*
+     * Contains read-only information about the machine.
+     */
+    private MachineStatus status;
+
     /**
      * Creates an instance of MachineProperties class.
      */
@@ -33,7 +91,7 @@ public MachineProperties() {
     }
 
     /**
-     * Get the network property: network properties of the machine.
+     * Get the network property: The network properties of the machine.
      * 
      * @return the network value.
      */
@@ -42,7 +100,18 @@ public MachineNetworkProperties network() {
     }
 
     /**
-     * Get the resourceId property: Azure resource id of the machine. It can be used to GET underlying VM Instance.
+     * Set the network property: The network properties of the machine.
+     * 
+     * @param network the network value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withNetwork(MachineNetworkProperties network) {
+        this.network = network;
+        return this;
+    }
+
+    /**
+     * Get the resourceId property: Arm resource id of the machine. It can be used to GET underlying VM Instance.
      * 
      * @return the resourceId value.
      */
@@ -50,6 +119,184 @@ public String resourceId() {
         return this.resourceId;
     }
 
+    /**
+     * Get the hardware property: The hardware and GPU settings of the machine.
+     * 
+     * @return the hardware value.
+     */
+    public MachineHardwareProfile hardware() {
+        return this.hardware;
+    }
+
+    /**
+     * Set the hardware property: The hardware and GPU settings of the machine.
+     * 
+     * @param hardware the hardware value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withHardware(MachineHardwareProfile hardware) {
+        this.hardware = hardware;
+        return this;
+    }
+
+    /**
+     * Get the operatingSystem property: The operating system and disk used by the machine.
+     * 
+     * @return the operatingSystem value.
+     */
+    public MachineOSProfile operatingSystem() {
+        return this.operatingSystem;
+    }
+
+    /**
+     * Set the operatingSystem property: The operating system and disk used by the machine.
+     * 
+     * @param operatingSystem the operatingSystem value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withOperatingSystem(MachineOSProfile operatingSystem) {
+        this.operatingSystem = operatingSystem;
+        return this;
+    }
+
+    /**
+     * Get the kubernetes property: The Kubernetes configurations used by the machine.
+     * 
+     * @return the kubernetes value.
+     */
+    public MachineKubernetesProfile kubernetes() {
+        return this.kubernetes;
+    }
+
+    /**
+     * Set the kubernetes property: The Kubernetes configurations used by the machine.
+     * 
+     * @param kubernetes the kubernetes value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withKubernetes(MachineKubernetesProfile kubernetes) {
+        this.kubernetes = kubernetes;
+        return this;
+    }
+
+    /**
+     * Get the mode property: Machine only allows 'System' and 'User' mode.
+     * 
+     * @return the mode value.
+     */
+    public AgentPoolMode mode() {
+        return this.mode;
+    }
+
+    /**
+     * Set the mode property: Machine only allows 'System' and 'User' mode.
+     * 
+     * @param mode the mode value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withMode(AgentPoolMode mode) {
+        this.mode = mode;
+        return this;
+    }
+
+    /**
+     * Get the security property: The security settings of the machine.
+     * 
+     * @return the security value.
+     */
+    public AgentPoolSecurityProfile security() {
+        return this.security;
+    }
+
+    /**
+     * Set the security property: The security settings of the machine.
+     * 
+     * @param security the security value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withSecurity(AgentPoolSecurityProfile security) {
+        this.security = security;
+        return this;
+    }
+
+    /**
+     * Get the priority property: The priority for the machine. If not specified, the default is 'Regular'.
+     * 
+     * @return the priority value.
+     */
+    public ScaleSetPriority priority() {
+        return this.priority;
+    }
+
+    /**
+     * Set the priority property: The priority for the machine. If not specified, the default is 'Regular'.
+     * 
+     * @param priority the priority value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withPriority(ScaleSetPriority priority) {
+        this.priority = priority;
+        return this;
+    }
+
+    /**
+     * Get the nodeImageVersion property: The version of node image.
+     * 
+     * @return the nodeImageVersion value.
+     */
+    public String nodeImageVersion() {
+        return this.nodeImageVersion;
+    }
+
+    /**
+     * Get the provisioningState property: The current deployment or provisioning state.
+     * 
+     * @return the provisioningState value.
+     */
+    public String provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the tags property: The tags to be persisted on the machine.
+     * 
+     * @return the tags value.
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: The tags to be persisted on the machine.
+     * 
+     * @param tags the tags value to set.
+     * @return the MachineProperties object itself.
+     */
+    public MachineProperties withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
+     * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
+     * 
+     * @return the etag value.
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+    /**
+     * Get the status property: Contains read-only information about the machine.
+     * 
+     * @return the status value.
+     */
+    public MachineStatus status() {
+        return this.status;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -59,6 +306,21 @@ public void validate() {
         if (network() != null) {
             network().validate();
         }
+        if (hardware() != null) {
+            hardware().validate();
+        }
+        if (operatingSystem() != null) {
+            operatingSystem().validate();
+        }
+        if (kubernetes() != null) {
+            kubernetes().validate();
+        }
+        if (security() != null) {
+            security().validate();
+        }
+        if (status() != null) {
+            status().validate();
+        }
     }
 
     /**
@@ -67,6 +329,14 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("network", this.network);
+        jsonWriter.writeJsonField("hardware", this.hardware);
+        jsonWriter.writeJsonField("operatingSystem", this.operatingSystem);
+        jsonWriter.writeJsonField("kubernetes", this.kubernetes);
+        jsonWriter.writeStringField("mode", this.mode == null ? null : this.mode.toString());
+        jsonWriter.writeJsonField("security", this.security);
+        jsonWriter.writeStringField("priority", this.priority == null ? null : this.priority.toString());
+        jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -89,6 +359,29 @@ public static MachineProperties fromJson(JsonReader jsonReader) throws IOExcepti
                     deserializedMachineProperties.network = MachineNetworkProperties.fromJson(reader);
                 } else if ("resourceId".equals(fieldName)) {
                     deserializedMachineProperties.resourceId = reader.getString();
+                } else if ("hardware".equals(fieldName)) {
+                    deserializedMachineProperties.hardware = MachineHardwareProfile.fromJson(reader);
+                } else if ("operatingSystem".equals(fieldName)) {
+                    deserializedMachineProperties.operatingSystem = MachineOSProfile.fromJson(reader);
+                } else if ("kubernetes".equals(fieldName)) {
+                    deserializedMachineProperties.kubernetes = MachineKubernetesProfile.fromJson(reader);
+                } else if ("mode".equals(fieldName)) {
+                    deserializedMachineProperties.mode = AgentPoolMode.fromString(reader.getString());
+                } else if ("security".equals(fieldName)) {
+                    deserializedMachineProperties.security = AgentPoolSecurityProfile.fromJson(reader);
+                } else if ("priority".equals(fieldName)) {
+                    deserializedMachineProperties.priority = ScaleSetPriority.fromString(reader.getString());
+                } else if ("nodeImageVersion".equals(fieldName)) {
+                    deserializedMachineProperties.nodeImageVersion = reader.getString();
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedMachineProperties.provisioningState = reader.getString();
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedMachineProperties.tags = tags;
+                } else if ("eTag".equals(fieldName)) {
+                    deserializedMachineProperties.etag = reader.getString();
+                } else if ("status".equals(fieldName)) {
+                    deserializedMachineProperties.status = MachineStatus.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineStatus.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineStatus.java
new file mode 100644
index 000000000000..5f0bfabe70fa
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MachineStatus.java
@@ -0,0 +1,155 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.management.exception.ManagementError;
+import com.azure.core.util.CoreUtils;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+
+/**
+ * Contains read-only information about the machine.
+ */
+@Immutable
+public final class MachineStatus implements JsonSerializable<MachineStatus> {
+    /*
+     * The error details information of the machine. Preserves the detailed info of failure. If there was no error, this
+     * field is omitted.
+     */
+    private ManagementError provisioningError;
+
+    /*
+     * Specifies the time at which the machine was created.
+     */
+    private OffsetDateTime creationTimestamp;
+
+    /*
+     * The drift action of the machine. Indicates whether a machine has deviated from its expected state due to changes
+     * in managed cluster properties, requiring corrective action.
+     */
+    private DriftAction driftAction;
+
+    /*
+     * Reason for machine drift. Provides detailed information on why the machine has drifted. This field is omitted if
+     * the machine is up to date.
+     */
+    private String driftReason;
+
+    /*
+     * Virtual machine state. Indicates the current state of the underlying virtual machine.
+     */
+    private VmState vmState;
+
+    /**
+     * Creates an instance of MachineStatus class.
+     */
+    public MachineStatus() {
+    }
+
+    /**
+     * Get the provisioningError property: The error details information of the machine. Preserves the detailed info of
+     * failure. If there was no error, this field is omitted.
+     * 
+     * @return the provisioningError value.
+     */
+    public ManagementError provisioningError() {
+        return this.provisioningError;
+    }
+
+    /**
+     * Get the creationTimestamp property: Specifies the time at which the machine was created.
+     * 
+     * @return the creationTimestamp value.
+     */
+    public OffsetDateTime creationTimestamp() {
+        return this.creationTimestamp;
+    }
+
+    /**
+     * Get the driftAction property: The drift action of the machine. Indicates whether a machine has deviated from its
+     * expected state due to changes in managed cluster properties, requiring corrective action.
+     * 
+     * @return the driftAction value.
+     */
+    public DriftAction driftAction() {
+        return this.driftAction;
+    }
+
+    /**
+     * Get the driftReason property: Reason for machine drift. Provides detailed information on why the machine has
+     * drifted. This field is omitted if the machine is up to date.
+     * 
+     * @return the driftReason value.
+     */
+    public String driftReason() {
+        return this.driftReason;
+    }
+
+    /**
+     * Get the vmState property: Virtual machine state. Indicates the current state of the underlying virtual machine.
+     * 
+     * @return the vmState value.
+     */
+    public VmState vmState() {
+        return this.vmState;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MachineStatus from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MachineStatus if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the MachineStatus.
+     */
+    public static MachineStatus fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MachineStatus deserializedMachineStatus = new MachineStatus();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("provisioningError".equals(fieldName)) {
+                    deserializedMachineStatus.provisioningError = ManagementError.fromJson(reader);
+                } else if ("creationTimestamp".equals(fieldName)) {
+                    deserializedMachineStatus.creationTimestamp = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("driftAction".equals(fieldName)) {
+                    deserializedMachineStatus.driftAction = DriftAction.fromString(reader.getString());
+                } else if ("driftReason".equals(fieldName)) {
+                    deserializedMachineStatus.driftReason = reader.getString();
+                } else if ("vmState".equals(fieldName)) {
+                    deserializedMachineStatus.vmState = VmState.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMachineStatus;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAgentPoolProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAgentPoolProfile.java
index c58922190d1e..55c754ef20ea 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAgentPoolProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAgentPoolProfile.java
@@ -31,13 +31,8 @@ public final class ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoo
     private String provisioningState;
 
     /*
-     * The version of node image
-     */
-    private String nodeImageVersion;
-
-    /*
-     * The version of Kubernetes the Agent Pool is running. If orchestratorVersion is a fully specified version
-     * <major.minor.patch>, this field will be exactly equal to it. If orchestratorVersion is <major.minor>, this field
+     * The version of Kubernetes running on the Agent Pool. If orchestratorVersion was a fully specified version
+     * <major.minor.patch>, this field will be exactly equal to it. If orchestratorVersion was <major.minor>, this field
      * will contain the full <major.minor.patch> version being used.
      */
     private String currentOrchestratorVersion;
@@ -45,7 +40,7 @@ public final class ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoo
     /*
      * Unique read-only string used to implement optimistic concurrency. The eTag value will change when the resource is
      * updated. Specify an if-match or if-none-match header with the eTag value for a subsequent request to enable
-     * optimistic concurrency per the normal etag convention.
+     * optimistic concurrency per the normal eTag convention.
      */
     private String etag;
 
@@ -88,19 +83,9 @@ public String provisioningState() {
     }
 
     /**
-     * Get the nodeImageVersion property: The version of node image.
-     * 
-     * @return the nodeImageVersion value.
-     */
-    @Override
-    public String nodeImageVersion() {
-        return this.nodeImageVersion;
-    }
-
-    /**
-     * Get the currentOrchestratorVersion property: The version of Kubernetes the Agent Pool is running. If
-     * orchestratorVersion is a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
-     * it. If orchestratorVersion is &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * Get the currentOrchestratorVersion property: The version of Kubernetes running on the Agent Pool. If
+     * orchestratorVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
      * version being used.
      * 
      * @return the currentOrchestratorVersion value.
@@ -113,7 +98,7 @@ public String currentOrchestratorVersion() {
     /**
      * Get the etag property: Unique read-only string used to implement optimistic concurrency. The eTag value will
      * change when the resource is updated. Specify an if-match or if-none-match header with the eTag value for a
-     * subsequent request to enable optimistic concurrency per the normal etag convention.
+     * subsequent request to enable optimistic concurrency per the normal eTag convention.
      * 
      * @return the etag value.
      */
@@ -302,6 +287,24 @@ public ManagedClusterAgentPoolProfile withOrchestratorVersion(String orchestrato
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile withNodeImageVersion(String nodeImageVersion) {
+        super.withNodeImageVersion(nodeImageVersion);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile withUpgradeStrategy(UpgradeStrategy upgradeStrategy) {
+        super.withUpgradeStrategy(upgradeStrategy);
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -311,6 +314,16 @@ public ManagedClusterAgentPoolProfile withUpgradeSettings(AgentPoolUpgradeSettin
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile
+        withUpgradeSettingsBlueGreen(AgentPoolBlueGreenUpgradeSettings upgradeSettingsBlueGreen) {
+        super.withUpgradeSettingsBlueGreen(upgradeSettingsBlueGreen);
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -401,6 +414,15 @@ public ManagedClusterAgentPoolProfile withNodeTaints(List<String> nodeTaints) {
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile withNodeInitializationTaints(List<String> nodeInitializationTaints) {
+        super.withNodeInitializationTaints(nodeInitializationTaints);
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -495,8 +517,8 @@ public ManagedClusterAgentPoolProfile withHostGroupId(String hostGroupId) {
      * {@inheritDoc}
      */
     @Override
-    public ManagedClusterAgentPoolProfile withNetworkProfile(AgentPoolNetworkProfile networkProfile) {
-        super.withNetworkProfile(networkProfile);
+    public ManagedClusterAgentPoolProfile withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
+        super.withWindowsProfile(windowsProfile);
         return this;
     }
 
@@ -504,8 +526,8 @@ public ManagedClusterAgentPoolProfile withNetworkProfile(AgentPoolNetworkProfile
      * {@inheritDoc}
      */
     @Override
-    public ManagedClusterAgentPoolProfile withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
-        super.withWindowsProfile(windowsProfile);
+    public ManagedClusterAgentPoolProfile withNetworkProfile(AgentPoolNetworkProfile networkProfile) {
+        super.withNetworkProfile(networkProfile);
         return this;
     }
 
@@ -531,8 +553,9 @@ public ManagedClusterAgentPoolProfile withGpuProfile(GpuProfile gpuProfile) {
      * {@inheritDoc}
      */
     @Override
-    public ManagedClusterAgentPoolProfile withGatewayProfile(AgentPoolGatewayProfile gatewayProfile) {
-        super.withGatewayProfile(gatewayProfile);
+    public ManagedClusterAgentPoolProfile
+        withArtifactStreamingProfile(AgentPoolArtifactStreamingProfile artifactStreamingProfile) {
+        super.withArtifactStreamingProfile(artifactStreamingProfile);
         return this;
     }
 
@@ -555,6 +578,15 @@ public ManagedClusterAgentPoolProfile withVirtualMachinesProfile(VirtualMachines
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile withGatewayProfile(AgentPoolGatewayProfile gatewayProfile) {
+        super.withGatewayProfile(gatewayProfile);
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -564,6 +596,25 @@ public ManagedClusterAgentPoolProfile withStatus(AgentPoolStatus status) {
         return this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile withLocalDnsProfile(LocalDnsProfile localDnsProfile) {
+        super.withLocalDnsProfile(localDnsProfile);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ManagedClusterAgentPoolProfile
+        withNodeCustomizationProfile(NodeCustomizationProfile nodeCustomizationProfile) {
+        super.withNodeCustomizationProfile(nodeCustomizationProfile);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -579,6 +630,9 @@ public void validate() {
         if (upgradeSettings() != null) {
             upgradeSettings().validate();
         }
+        if (upgradeSettingsBlueGreen() != null) {
+            upgradeSettingsBlueGreen().validate();
+        }
         if (powerState() != null) {
             powerState().validate();
         }
@@ -591,20 +645,20 @@ public void validate() {
         if (creationData() != null) {
             creationData().validate();
         }
-        if (networkProfile() != null) {
-            networkProfile().validate();
-        }
         if (windowsProfile() != null) {
             windowsProfile().validate();
         }
+        if (networkProfile() != null) {
+            networkProfile().validate();
+        }
         if (securityProfile() != null) {
             securityProfile().validate();
         }
         if (gpuProfile() != null) {
             gpuProfile().validate();
         }
-        if (gatewayProfile() != null) {
-            gatewayProfile().validate();
+        if (artifactStreamingProfile() != null) {
+            artifactStreamingProfile().validate();
         }
         if (virtualMachinesProfile() != null) {
             virtualMachinesProfile().validate();
@@ -612,9 +666,18 @@ public void validate() {
         if (virtualMachineNodesStatus() != null) {
             virtualMachineNodesStatus().forEach(e -> e.validate());
         }
+        if (gatewayProfile() != null) {
+            gatewayProfile().validate();
+        }
         if (status() != null) {
             status().validate();
         }
+        if (localDnsProfile() != null) {
+            localDnsProfile().validate();
+        }
+        if (nodeCustomizationProfile() != null) {
+            nodeCustomizationProfile().validate();
+        }
     }
 
     private static final ClientLogger LOGGER = new ClientLogger(ManagedClusterAgentPoolProfile.class);
@@ -646,7 +709,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("type", type() == null ? null : type().toString());
         jsonWriter.writeStringField("mode", mode() == null ? null : mode().toString());
         jsonWriter.writeStringField("orchestratorVersion", orchestratorVersion());
+        jsonWriter.writeStringField("nodeImageVersion", nodeImageVersion());
+        jsonWriter.writeStringField("upgradeStrategy", upgradeStrategy() == null ? null : upgradeStrategy().toString());
         jsonWriter.writeJsonField("upgradeSettings", upgradeSettings());
+        jsonWriter.writeJsonField("upgradeSettingsBlueGreen", upgradeSettingsBlueGreen());
         jsonWriter.writeJsonField("powerState", powerState());
         jsonWriter.writeArrayField("availabilityZones", availabilityZones(),
             (writer, element) -> writer.writeString(element));
@@ -660,6 +726,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
         jsonWriter.writeMapField("nodeLabels", nodeLabels(), (writer, element) -> writer.writeString(element));
         jsonWriter.writeArrayField("nodeTaints", nodeTaints(), (writer, element) -> writer.writeString(element));
+        jsonWriter.writeArrayField("nodeInitializationTaints", nodeInitializationTaints(),
+            (writer, element) -> writer.writeString(element));
         jsonWriter.writeStringField("proximityPlacementGroupID", proximityPlacementGroupId());
         jsonWriter.writeJsonField("kubeletConfig", kubeletConfig());
         jsonWriter.writeJsonField("linuxOSConfig", linuxOSConfig());
@@ -671,15 +739,18 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeJsonField("creationData", creationData());
         jsonWriter.writeStringField("capacityReservationGroupID", capacityReservationGroupId());
         jsonWriter.writeStringField("hostGroupID", hostGroupId());
-        jsonWriter.writeJsonField("networkProfile", networkProfile());
         jsonWriter.writeJsonField("windowsProfile", windowsProfile());
+        jsonWriter.writeJsonField("networkProfile", networkProfile());
         jsonWriter.writeJsonField("securityProfile", securityProfile());
         jsonWriter.writeJsonField("gpuProfile", gpuProfile());
-        jsonWriter.writeJsonField("gatewayProfile", gatewayProfile());
+        jsonWriter.writeJsonField("artifactStreamingProfile", artifactStreamingProfile());
         jsonWriter.writeJsonField("virtualMachinesProfile", virtualMachinesProfile());
         jsonWriter.writeArrayField("virtualMachineNodesStatus", virtualMachineNodesStatus(),
             (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeJsonField("gatewayProfile", gatewayProfile());
         jsonWriter.writeJsonField("status", status());
+        jsonWriter.writeJsonField("localDNSProfile", localDnsProfile());
+        jsonWriter.writeJsonField("nodeCustomizationProfile", nodeCustomizationProfile());
         jsonWriter.writeStringField("name", this.name);
         return jsonWriter.writeEndObject();
     }
@@ -752,10 +823,16 @@ public static ManagedClusterAgentPoolProfile fromJson(JsonReader jsonReader) thr
                 } else if ("currentOrchestratorVersion".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.currentOrchestratorVersion = reader.getString();
                 } else if ("nodeImageVersion".equals(fieldName)) {
-                    deserializedManagedClusterAgentPoolProfile.nodeImageVersion = reader.getString();
+                    deserializedManagedClusterAgentPoolProfile.withNodeImageVersion(reader.getString());
+                } else if ("upgradeStrategy".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfile
+                        .withUpgradeStrategy(UpgradeStrategy.fromString(reader.getString()));
                 } else if ("upgradeSettings".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile
                         .withUpgradeSettings(AgentPoolUpgradeSettings.fromJson(reader));
+                } else if ("upgradeSettingsBlueGreen".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfile
+                        .withUpgradeSettingsBlueGreen(AgentPoolBlueGreenUpgradeSettings.fromJson(reader));
                 } else if ("provisioningState".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.provisioningState = reader.getString();
                 } else if ("powerState".equals(fieldName)) {
@@ -786,6 +863,9 @@ public static ManagedClusterAgentPoolProfile fromJson(JsonReader jsonReader) thr
                 } else if ("nodeTaints".equals(fieldName)) {
                     List<String> nodeTaints = reader.readArray(reader1 -> reader1.getString());
                     deserializedManagedClusterAgentPoolProfile.withNodeTaints(nodeTaints);
+                } else if ("nodeInitializationTaints".equals(fieldName)) {
+                    List<String> nodeInitializationTaints = reader.readArray(reader1 -> reader1.getString());
+                    deserializedManagedClusterAgentPoolProfile.withNodeInitializationTaints(nodeInitializationTaints);
                 } else if ("proximityPlacementGroupID".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.withProximityPlacementGroupId(reader.getString());
                 } else if ("kubeletConfig".equals(fieldName)) {
@@ -810,20 +890,20 @@ public static ManagedClusterAgentPoolProfile fromJson(JsonReader jsonReader) thr
                     deserializedManagedClusterAgentPoolProfile.withCapacityReservationGroupId(reader.getString());
                 } else if ("hostGroupID".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.withHostGroupId(reader.getString());
-                } else if ("networkProfile".equals(fieldName)) {
-                    deserializedManagedClusterAgentPoolProfile
-                        .withNetworkProfile(AgentPoolNetworkProfile.fromJson(reader));
                 } else if ("windowsProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile
                         .withWindowsProfile(AgentPoolWindowsProfile.fromJson(reader));
+                } else if ("networkProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfile
+                        .withNetworkProfile(AgentPoolNetworkProfile.fromJson(reader));
                 } else if ("securityProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile
                         .withSecurityProfile(AgentPoolSecurityProfile.fromJson(reader));
                 } else if ("gpuProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.withGpuProfile(GpuProfile.fromJson(reader));
-                } else if ("gatewayProfile".equals(fieldName)) {
+                } else if ("artifactStreamingProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile
-                        .withGatewayProfile(AgentPoolGatewayProfile.fromJson(reader));
+                        .withArtifactStreamingProfile(AgentPoolArtifactStreamingProfile.fromJson(reader));
                 } else if ("virtualMachinesProfile".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile
                         .withVirtualMachinesProfile(VirtualMachinesProfile.fromJson(reader));
@@ -831,8 +911,16 @@ public static ManagedClusterAgentPoolProfile fromJson(JsonReader jsonReader) thr
                     List<VirtualMachineNodes> virtualMachineNodesStatus
                         = reader.readArray(reader1 -> VirtualMachineNodes.fromJson(reader1));
                     deserializedManagedClusterAgentPoolProfile.withVirtualMachineNodesStatus(virtualMachineNodesStatus);
+                } else if ("gatewayProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfile
+                        .withGatewayProfile(AgentPoolGatewayProfile.fromJson(reader));
                 } else if ("status".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.withStatus(AgentPoolStatus.fromJson(reader));
+                } else if ("localDNSProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfile.withLocalDnsProfile(LocalDnsProfile.fromJson(reader));
+                } else if ("nodeCustomizationProfile".equals(fieldName)) {
+                    deserializedManagedClusterAgentPoolProfile
+                        .withNodeCustomizationProfile(NodeCustomizationProfile.fromJson(reader));
                 } else if ("name".equals(fieldName)) {
                     deserializedManagedClusterAgentPoolProfile.name = reader.getString();
                 } else {
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterApiServerAccessProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterApiServerAccessProfile.java
index b1ba9d300a4e..d069c9903b07 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterApiServerAccessProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterApiServerAccessProfile.java
@@ -50,14 +50,13 @@ public final class ManagedClusterApiServerAccessProfile
     private Boolean disableRunCommand;
 
     /*
-     * Whether to enable apiserver vnet integration for the cluster or not. See aka.ms/AksVnetIntegration for more
-     * details.
+     * Whether to enable apiserver vnet integration for the cluster or not.
      */
     private Boolean enableVnetIntegration;
 
     /*
-     * The subnet to be used when apiserver vnet integration is enabled. It is required when creating a new cluster with
-     * BYO Vnet, or when updating an existing cluster to enable apiserver vnet integration.
+     * The subnet to be used when apiserver vnet integration is enabled. It is required when: 1. creating a new cluster
+     * with BYO Vnet; 2. updating an existing cluster to enable apiserver vnet integration.
      */
     private String subnetId;
 
@@ -185,8 +184,7 @@ public ManagedClusterApiServerAccessProfile withDisableRunCommand(Boolean disabl
     }
 
     /**
-     * Get the enableVnetIntegration property: Whether to enable apiserver vnet integration for the cluster or not. See
-     * aka.ms/AksVnetIntegration for more details.
+     * Get the enableVnetIntegration property: Whether to enable apiserver vnet integration for the cluster or not.
      * 
      * @return the enableVnetIntegration value.
      */
@@ -195,8 +193,7 @@ public Boolean enableVnetIntegration() {
     }
 
     /**
-     * Set the enableVnetIntegration property: Whether to enable apiserver vnet integration for the cluster or not. See
-     * aka.ms/AksVnetIntegration for more details.
+     * Set the enableVnetIntegration property: Whether to enable apiserver vnet integration for the cluster or not.
      * 
      * @param enableVnetIntegration the enableVnetIntegration value to set.
      * @return the ManagedClusterApiServerAccessProfile object itself.
@@ -207,8 +204,8 @@ public ManagedClusterApiServerAccessProfile withEnableVnetIntegration(Boolean en
     }
 
     /**
-     * Get the subnetId property: The subnet to be used when apiserver vnet integration is enabled. It is required when
-     * creating a new cluster with BYO Vnet, or when updating an existing cluster to enable apiserver vnet integration.
+     * Get the subnetId property: The subnet to be used when apiserver vnet integration is enabled. It is required when:
+     * 1. creating a new cluster with BYO Vnet; 2. updating an existing cluster to enable apiserver vnet integration.
      * 
      * @return the subnetId value.
      */
@@ -217,8 +214,8 @@ public String subnetId() {
     }
 
     /**
-     * Set the subnetId property: The subnet to be used when apiserver vnet integration is enabled. It is required when
-     * creating a new cluster with BYO Vnet, or when updating an existing cluster to enable apiserver vnet integration.
+     * Set the subnetId property: The subnet to be used when apiserver vnet integration is enabled. It is required when:
+     * 1. creating a new cluster with BYO Vnet; 2. updating an existing cluster to enable apiserver vnet integration.
      * 
      * @param subnetId the subnetId value to set.
      * @return the ManagedClusterApiServerAccessProfile object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAutoUpgradeProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAutoUpgradeProfile.java
index cf6a236cb42e..d7546883b228 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAutoUpgradeProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAutoUpgradeProfile.java
@@ -23,7 +23,8 @@ public final class ManagedClusterAutoUpgradeProfile implements JsonSerializable<
     private UpgradeChannel upgradeChannel;
 
     /*
-     * Node OS Upgrade Channel. Manner in which the OS on your nodes is updated. The default is NodeImage.
+     * Manner in which the OS on your nodes is updated. The default is Unmanaged, but may change to either NodeImage or
+     * SecurityPatch at GA.
      */
     private NodeOSUpgradeChannel nodeOSUpgradeChannel;
 
@@ -58,8 +59,8 @@ public ManagedClusterAutoUpgradeProfile withUpgradeChannel(UpgradeChannel upgrad
     }
 
     /**
-     * Get the nodeOSUpgradeChannel property: Node OS Upgrade Channel. Manner in which the OS on your nodes is updated.
-     * The default is NodeImage.
+     * Get the nodeOSUpgradeChannel property: Manner in which the OS on your nodes is updated. The default is Unmanaged,
+     * but may change to either NodeImage or SecurityPatch at GA.
      * 
      * @return the nodeOSUpgradeChannel value.
      */
@@ -68,8 +69,8 @@ public NodeOSUpgradeChannel nodeOSUpgradeChannel() {
     }
 
     /**
-     * Set the nodeOSUpgradeChannel property: Node OS Upgrade Channel. Manner in which the OS on your nodes is updated.
-     * The default is NodeImage.
+     * Set the nodeOSUpgradeChannel property: Manner in which the OS on your nodes is updated. The default is Unmanaged,
+     * but may change to either NodeImage or SecurityPatch at GA.
      * 
      * @param nodeOSUpgradeChannel the nodeOSUpgradeChannel value to set.
      * @return the ManagedClusterAutoUpgradeProfile object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfile.java
index 929046a73d98..43d1c487b0df 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfile.java
@@ -12,17 +12,28 @@
 import java.io.IOException;
 
 /**
- * Azure Monitor addon profiles for monitoring the managed cluster.
+ * Prometheus addon profile for the container service cluster.
  */
 @Fluent
 public final class ManagedClusterAzureMonitorProfile implements JsonSerializable<ManagedClusterAzureMonitorProfile> {
     /*
-     * Metrics profile for the Azure Monitor managed service for Prometheus addon. Collect out-of-the-box Kubernetes
-     * infrastructure metrics to send to an Azure Monitor Workspace and configure additional scraping for custom
-     * targets. See aka.ms/AzureManagedPrometheus for an overview.
+     * Metrics profile for the prometheus service addon
      */
     private ManagedClusterAzureMonitorProfileMetrics metrics;
 
+    /*
+     * Azure Monitor Container Insights Profile for Kubernetes Events, Inventory and Container stdout & stderr logs etc.
+     * See aka.ms/AzureMonitorContainerInsights for an overview.
+     */
+    private ManagedClusterAzureMonitorProfileContainerInsights containerInsights;
+
+    /*
+     * Application Monitoring Profile for Kubernetes Application Container. Collects application logs, metrics and
+     * traces through auto-instrumentation of the application using Azure Monitor OpenTelemetry based SDKs. See
+     * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     */
+    private ManagedClusterAzureMonitorProfileAppMonitoring appMonitoring;
+
     /**
      * Creates an instance of ManagedClusterAzureMonitorProfile class.
      */
@@ -30,9 +41,7 @@ public ManagedClusterAzureMonitorProfile() {
     }
 
     /**
-     * Get the metrics property: Metrics profile for the Azure Monitor managed service for Prometheus addon. Collect
-     * out-of-the-box Kubernetes infrastructure metrics to send to an Azure Monitor Workspace and configure additional
-     * scraping for custom targets. See aka.ms/AzureManagedPrometheus for an overview.
+     * Get the metrics property: Metrics profile for the prometheus service addon.
      * 
      * @return the metrics value.
      */
@@ -41,9 +50,7 @@ public ManagedClusterAzureMonitorProfileMetrics metrics() {
     }
 
     /**
-     * Set the metrics property: Metrics profile for the Azure Monitor managed service for Prometheus addon. Collect
-     * out-of-the-box Kubernetes infrastructure metrics to send to an Azure Monitor Workspace and configure additional
-     * scraping for custom targets. See aka.ms/AzureManagedPrometheus for an overview.
+     * Set the metrics property: Metrics profile for the prometheus service addon.
      * 
      * @param metrics the metrics value to set.
      * @return the ManagedClusterAzureMonitorProfile object itself.
@@ -53,6 +60,54 @@ public ManagedClusterAzureMonitorProfile withMetrics(ManagedClusterAzureMonitorP
         return this;
     }
 
+    /**
+     * Get the containerInsights property: Azure Monitor Container Insights Profile for Kubernetes Events, Inventory and
+     * Container stdout &amp; stderr logs etc. See aka.ms/AzureMonitorContainerInsights for an overview.
+     * 
+     * @return the containerInsights value.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights containerInsights() {
+        return this.containerInsights;
+    }
+
+    /**
+     * Set the containerInsights property: Azure Monitor Container Insights Profile for Kubernetes Events, Inventory and
+     * Container stdout &amp; stderr logs etc. See aka.ms/AzureMonitorContainerInsights for an overview.
+     * 
+     * @param containerInsights the containerInsights value to set.
+     * @return the ManagedClusterAzureMonitorProfile object itself.
+     */
+    public ManagedClusterAzureMonitorProfile
+        withContainerInsights(ManagedClusterAzureMonitorProfileContainerInsights containerInsights) {
+        this.containerInsights = containerInsights;
+        return this;
+    }
+
+    /**
+     * Get the appMonitoring property: Application Monitoring Profile for Kubernetes Application Container. Collects
+     * application logs, metrics and traces through auto-instrumentation of the application using Azure Monitor
+     * OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @return the appMonitoring value.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoring appMonitoring() {
+        return this.appMonitoring;
+    }
+
+    /**
+     * Set the appMonitoring property: Application Monitoring Profile for Kubernetes Application Container. Collects
+     * application logs, metrics and traces through auto-instrumentation of the application using Azure Monitor
+     * OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @param appMonitoring the appMonitoring value to set.
+     * @return the ManagedClusterAzureMonitorProfile object itself.
+     */
+    public ManagedClusterAzureMonitorProfile
+        withAppMonitoring(ManagedClusterAzureMonitorProfileAppMonitoring appMonitoring) {
+        this.appMonitoring = appMonitoring;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -62,6 +117,12 @@ public void validate() {
         if (metrics() != null) {
             metrics().validate();
         }
+        if (containerInsights() != null) {
+            containerInsights().validate();
+        }
+        if (appMonitoring() != null) {
+            appMonitoring().validate();
+        }
     }
 
     /**
@@ -71,6 +132,8 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeJsonField("metrics", this.metrics);
+        jsonWriter.writeJsonField("containerInsights", this.containerInsights);
+        jsonWriter.writeJsonField("appMonitoring", this.appMonitoring);
         return jsonWriter.writeEndObject();
     }
 
@@ -93,6 +156,12 @@ public static ManagedClusterAzureMonitorProfile fromJson(JsonReader jsonReader)
                 if ("metrics".equals(fieldName)) {
                     deserializedManagedClusterAzureMonitorProfile.metrics
                         = ManagedClusterAzureMonitorProfileMetrics.fromJson(reader);
+                } else if ("containerInsights".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfile.containerInsights
+                        = ManagedClusterAzureMonitorProfileContainerInsights.fromJson(reader);
+                } else if ("appMonitoring".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfile.appMonitoring
+                        = ManagedClusterAzureMonitorProfileAppMonitoring.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoring.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoring.java
new file mode 100644
index 000000000000..2d0b6ad861c8
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoring.java
@@ -0,0 +1,186 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Application Monitoring Profile for Kubernetes Application Container. Collects application logs, metrics and traces
+ * through auto-instrumentation of the application using Azure Monitor OpenTelemetry based SDKs. See
+ * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+ */
+@Fluent
+public final class ManagedClusterAzureMonitorProfileAppMonitoring
+    implements JsonSerializable<ManagedClusterAzureMonitorProfileAppMonitoring> {
+    /*
+     * Application Monitoring Auto Instrumentation for Kubernetes Application Container. Deploys web hook to
+     * auto-instrument Azure Monitor OpenTelemetry based SDKs to collect OpenTelemetry metrics, logs and traces of the
+     * application. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     */
+    private ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation autoInstrumentation;
+
+    /*
+     * Application Monitoring Open Telemetry Metrics Profile for Kubernetes Application Container Metrics. Collects
+     * OpenTelemetry metrics of the application using Azure Monitor OpenTelemetry based SDKs. See
+     * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     */
+    private ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics openTelemetryMetrics;
+
+    /*
+     * Application Monitoring Open Telemetry Metrics Profile for Kubernetes Application Container Logs and Traces.
+     * Collects OpenTelemetry logs and traces of the application using Azure Monitor OpenTelemetry based SDKs. See
+     * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     */
+    private ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs openTelemetryLogs;
+
+    /**
+     * Creates an instance of ManagedClusterAzureMonitorProfileAppMonitoring class.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoring() {
+    }
+
+    /**
+     * Get the autoInstrumentation property: Application Monitoring Auto Instrumentation for Kubernetes Application
+     * Container. Deploys web hook to auto-instrument Azure Monitor OpenTelemetry based SDKs to collect OpenTelemetry
+     * metrics, logs and traces of the application. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @return the autoInstrumentation value.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation autoInstrumentation() {
+        return this.autoInstrumentation;
+    }
+
+    /**
+     * Set the autoInstrumentation property: Application Monitoring Auto Instrumentation for Kubernetes Application
+     * Container. Deploys web hook to auto-instrument Azure Monitor OpenTelemetry based SDKs to collect OpenTelemetry
+     * metrics, logs and traces of the application. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @param autoInstrumentation the autoInstrumentation value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoring object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoring
+        withAutoInstrumentation(ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation autoInstrumentation) {
+        this.autoInstrumentation = autoInstrumentation;
+        return this;
+    }
+
+    /**
+     * Get the openTelemetryMetrics property: Application Monitoring Open Telemetry Metrics Profile for Kubernetes
+     * Application Container Metrics. Collects OpenTelemetry metrics of the application using Azure Monitor
+     * OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @return the openTelemetryMetrics value.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics openTelemetryMetrics() {
+        return this.openTelemetryMetrics;
+    }
+
+    /**
+     * Set the openTelemetryMetrics property: Application Monitoring Open Telemetry Metrics Profile for Kubernetes
+     * Application Container Metrics. Collects OpenTelemetry metrics of the application using Azure Monitor
+     * OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @param openTelemetryMetrics the openTelemetryMetrics value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoring object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoring withOpenTelemetryMetrics(
+        ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics openTelemetryMetrics) {
+        this.openTelemetryMetrics = openTelemetryMetrics;
+        return this;
+    }
+
+    /**
+     * Get the openTelemetryLogs property: Application Monitoring Open Telemetry Metrics Profile for Kubernetes
+     * Application Container Logs and Traces. Collects OpenTelemetry logs and traces of the application using Azure
+     * Monitor OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @return the openTelemetryLogs value.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs openTelemetryLogs() {
+        return this.openTelemetryLogs;
+    }
+
+    /**
+     * Set the openTelemetryLogs property: Application Monitoring Open Telemetry Metrics Profile for Kubernetes
+     * Application Container Logs and Traces. Collects OpenTelemetry logs and traces of the application using Azure
+     * Monitor OpenTelemetry based SDKs. See aka.ms/AzureMonitorApplicationMonitoring for an overview.
+     * 
+     * @param openTelemetryLogs the openTelemetryLogs value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoring object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoring
+        withOpenTelemetryLogs(ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs openTelemetryLogs) {
+        this.openTelemetryLogs = openTelemetryLogs;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (autoInstrumentation() != null) {
+            autoInstrumentation().validate();
+        }
+        if (openTelemetryMetrics() != null) {
+            openTelemetryMetrics().validate();
+        }
+        if (openTelemetryLogs() != null) {
+            openTelemetryLogs().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("autoInstrumentation", this.autoInstrumentation);
+        jsonWriter.writeJsonField("openTelemetryMetrics", this.openTelemetryMetrics);
+        jsonWriter.writeJsonField("openTelemetryLogs", this.openTelemetryLogs);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterAzureMonitorProfileAppMonitoring from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterAzureMonitorProfileAppMonitoring if the JsonReader was pointing to an
+     * instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterAzureMonitorProfileAppMonitoring.
+     */
+    public static ManagedClusterAzureMonitorProfileAppMonitoring fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterAzureMonitorProfileAppMonitoring deserializedManagedClusterAzureMonitorProfileAppMonitoring
+                = new ManagedClusterAzureMonitorProfileAppMonitoring();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("autoInstrumentation".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoring.autoInstrumentation
+                        = ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation.fromJson(reader);
+                } else if ("openTelemetryMetrics".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoring.openTelemetryMetrics
+                        = ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.fromJson(reader);
+                } else if ("openTelemetryLogs".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoring.openTelemetryLogs
+                        = ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterAzureMonitorProfileAppMonitoring;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation.java
new file mode 100644
index 000000000000..cc7353d304d3
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation.java
@@ -0,0 +1,100 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Application Monitoring Auto Instrumentation for Kubernetes Application Container. Deploys web hook to auto-instrument
+ * Azure Monitor OpenTelemetry based SDKs to collect OpenTelemetry metrics, logs and traces of the application. See
+ * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+ */
+@Fluent
+public final class ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation
+    implements JsonSerializable<ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation> {
+    /*
+     * Indicates if Application Monitoring Auto Instrumentation is enabled or not.
+     */
+    private Boolean enabled;
+
+    /**
+     * Creates an instance of ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation class.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation() {
+    }
+
+    /**
+     * Get the enabled property: Indicates if Application Monitoring Auto Instrumentation is enabled or not.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Indicates if Application Monitoring Auto Instrumentation is enabled or not.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation if the JsonReader was
+     * pointing to an instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the
+     * ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation.
+     */
+    public static ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation deserializedManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation
+                = new ManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterAzureMonitorProfileAppMonitoringAutoInstrumentation;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.java
new file mode 100644
index 000000000000..fedaf77910f4
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.java
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Application Monitoring Open Telemetry Metrics Profile for Kubernetes Application Container Logs and Traces. Collects
+ * OpenTelemetry logs and traces of the application using Azure Monitor OpenTelemetry based SDKs. See
+ * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+ */
+@Fluent
+public final class ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs
+    implements JsonSerializable<ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs> {
+    /*
+     * Indicates if Application Monitoring Open Telemetry Logs and traces is enabled or not.
+     */
+    private Boolean enabled;
+
+    /*
+     * The Open Telemetry host port for Open Telemetry logs and traces. If not specified, the default port is 28331.
+     */
+    private Long port;
+
+    /**
+     * Creates an instance of ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs class.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs() {
+    }
+
+    /**
+     * Get the enabled property: Indicates if Application Monitoring Open Telemetry Logs and traces is enabled or not.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Indicates if Application Monitoring Open Telemetry Logs and traces is enabled or not.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the port property: The Open Telemetry host port for Open Telemetry logs and traces. If not specified, the
+     * default port is 28331.
+     * 
+     * @return the port value.
+     */
+    public Long port() {
+        return this.port;
+    }
+
+    /**
+     * Set the port property: The Open Telemetry host port for Open Telemetry logs and traces. If not specified, the
+     * default port is 28331.
+     * 
+     * @param port the port value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs withPort(Long port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeNumberField("port", this.port);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs if the JsonReader was
+     * pointing to an instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the
+     * ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.
+     */
+    public static ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs
+                = new ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("port".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs.port
+                        = reader.getNullable(JsonReader::getLong);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryLogs;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.java
new file mode 100644
index 000000000000..8c942507ff7d
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.java
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Application Monitoring Open Telemetry Metrics Profile for Kubernetes Application Container Metrics. Collects
+ * OpenTelemetry metrics of the application using Azure Monitor OpenTelemetry based SDKs. See
+ * aka.ms/AzureMonitorApplicationMonitoring for an overview.
+ */
+@Fluent
+public final class ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics
+    implements JsonSerializable<ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics> {
+    /*
+     * Indicates if Application Monitoring Open Telemetry Metrics is enabled or not.
+     */
+    private Boolean enabled;
+
+    /*
+     * The Open Telemetry host port for Open Telemetry metrics. If not specified, the default port is 28333.
+     */
+    private Long port;
+
+    /**
+     * Creates an instance of ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics class.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics() {
+    }
+
+    /**
+     * Get the enabled property: Indicates if Application Monitoring Open Telemetry Metrics is enabled or not.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Indicates if Application Monitoring Open Telemetry Metrics is enabled or not.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the port property: The Open Telemetry host port for Open Telemetry metrics. If not specified, the default
+     * port is 28333.
+     * 
+     * @return the port value.
+     */
+    public Long port() {
+        return this.port;
+    }
+
+    /**
+     * Set the port property: The Open Telemetry host port for Open Telemetry metrics. If not specified, the default
+     * port is 28333.
+     * 
+     * @param port the port value to set.
+     * @return the ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics object itself.
+     */
+    public ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics withPort(Long port) {
+        this.port = port;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeNumberField("port", this.port);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics if the JsonReader was
+     * pointing to an instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the
+     * ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.
+     */
+    public static ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics
+                = new ManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("port".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics.port
+                        = reader.getNullable(JsonReader::getLong);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterAzureMonitorProfileAppMonitoringOpenTelemetryMetrics;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileContainerInsights.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileContainerInsights.java
new file mode 100644
index 000000000000..66c81f746a55
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileContainerInsights.java
@@ -0,0 +1,229 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Azure Monitor Container Insights Profile for Kubernetes Events, Inventory and Container stdout &amp; stderr logs etc.
+ * See aka.ms/AzureMonitorContainerInsights for an overview.
+ */
+@Fluent
+public final class ManagedClusterAzureMonitorProfileContainerInsights
+    implements JsonSerializable<ManagedClusterAzureMonitorProfileContainerInsights> {
+    /*
+     * Indicates if Azure Monitor Container Insights Logs Addon is enabled or not.
+     */
+    private Boolean enabled;
+
+    /*
+     * Fully Qualified ARM Resource Id of Azure Log Analytics Workspace for storing Azure Monitor Container Insights
+     * Logs.
+     */
+    private String logAnalyticsWorkspaceResourceId;
+
+    /*
+     * The syslog host port. If not specified, the default port is 28330.
+     */
+    private Long syslogPort;
+
+    /*
+     * Indicates whether custom metrics collection has to be disabled or not. If not specified the default is false. No
+     * custom metrics will be emitted if this field is false but the container insights enabled field is false
+     */
+    private Boolean disableCustomMetrics;
+
+    /*
+     * Indicates whether prometheus metrics scraping is disabled or not. If not specified the default is false. No
+     * prometheus metrics will be emitted if this field is false but the container insights enabled field is false
+     */
+    private Boolean disablePrometheusMetricsScraping;
+
+    /**
+     * Creates an instance of ManagedClusterAzureMonitorProfileContainerInsights class.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights() {
+    }
+
+    /**
+     * Get the enabled property: Indicates if Azure Monitor Container Insights Logs Addon is enabled or not.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Indicates if Azure Monitor Container Insights Logs Addon is enabled or not.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterAzureMonitorProfileContainerInsights object itself.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the logAnalyticsWorkspaceResourceId property: Fully Qualified ARM Resource Id of Azure Log Analytics
+     * Workspace for storing Azure Monitor Container Insights Logs.
+     * 
+     * @return the logAnalyticsWorkspaceResourceId value.
+     */
+    public String logAnalyticsWorkspaceResourceId() {
+        return this.logAnalyticsWorkspaceResourceId;
+    }
+
+    /**
+     * Set the logAnalyticsWorkspaceResourceId property: Fully Qualified ARM Resource Id of Azure Log Analytics
+     * Workspace for storing Azure Monitor Container Insights Logs.
+     * 
+     * @param logAnalyticsWorkspaceResourceId the logAnalyticsWorkspaceResourceId value to set.
+     * @return the ManagedClusterAzureMonitorProfileContainerInsights object itself.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights
+        withLogAnalyticsWorkspaceResourceId(String logAnalyticsWorkspaceResourceId) {
+        this.logAnalyticsWorkspaceResourceId = logAnalyticsWorkspaceResourceId;
+        return this;
+    }
+
+    /**
+     * Get the syslogPort property: The syslog host port. If not specified, the default port is 28330.
+     * 
+     * @return the syslogPort value.
+     */
+    public Long syslogPort() {
+        return this.syslogPort;
+    }
+
+    /**
+     * Set the syslogPort property: The syslog host port. If not specified, the default port is 28330.
+     * 
+     * @param syslogPort the syslogPort value to set.
+     * @return the ManagedClusterAzureMonitorProfileContainerInsights object itself.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights withSyslogPort(Long syslogPort) {
+        this.syslogPort = syslogPort;
+        return this;
+    }
+
+    /**
+     * Get the disableCustomMetrics property: Indicates whether custom metrics collection has to be disabled or not. If
+     * not specified the default is false. No custom metrics will be emitted if this field is false but the container
+     * insights enabled field is false.
+     * 
+     * @return the disableCustomMetrics value.
+     */
+    public Boolean disableCustomMetrics() {
+        return this.disableCustomMetrics;
+    }
+
+    /**
+     * Set the disableCustomMetrics property: Indicates whether custom metrics collection has to be disabled or not. If
+     * not specified the default is false. No custom metrics will be emitted if this field is false but the container
+     * insights enabled field is false.
+     * 
+     * @param disableCustomMetrics the disableCustomMetrics value to set.
+     * @return the ManagedClusterAzureMonitorProfileContainerInsights object itself.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights withDisableCustomMetrics(Boolean disableCustomMetrics) {
+        this.disableCustomMetrics = disableCustomMetrics;
+        return this;
+    }
+
+    /**
+     * Get the disablePrometheusMetricsScraping property: Indicates whether prometheus metrics scraping is disabled or
+     * not. If not specified the default is false. No prometheus metrics will be emitted if this field is false but the
+     * container insights enabled field is false.
+     * 
+     * @return the disablePrometheusMetricsScraping value.
+     */
+    public Boolean disablePrometheusMetricsScraping() {
+        return this.disablePrometheusMetricsScraping;
+    }
+
+    /**
+     * Set the disablePrometheusMetricsScraping property: Indicates whether prometheus metrics scraping is disabled or
+     * not. If not specified the default is false. No prometheus metrics will be emitted if this field is false but the
+     * container insights enabled field is false.
+     * 
+     * @param disablePrometheusMetricsScraping the disablePrometheusMetricsScraping value to set.
+     * @return the ManagedClusterAzureMonitorProfileContainerInsights object itself.
+     */
+    public ManagedClusterAzureMonitorProfileContainerInsights
+        withDisablePrometheusMetricsScraping(Boolean disablePrometheusMetricsScraping) {
+        this.disablePrometheusMetricsScraping = disablePrometheusMetricsScraping;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeStringField("logAnalyticsWorkspaceResourceId", this.logAnalyticsWorkspaceResourceId);
+        jsonWriter.writeNumberField("syslogPort", this.syslogPort);
+        jsonWriter.writeBooleanField("disableCustomMetrics", this.disableCustomMetrics);
+        jsonWriter.writeBooleanField("disablePrometheusMetricsScraping", this.disablePrometheusMetricsScraping);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterAzureMonitorProfileContainerInsights from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterAzureMonitorProfileContainerInsights if the JsonReader was pointing to an
+     * instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterAzureMonitorProfileContainerInsights.
+     */
+    public static ManagedClusterAzureMonitorProfileContainerInsights fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterAzureMonitorProfileContainerInsights deserializedManagedClusterAzureMonitorProfileContainerInsights
+                = new ManagedClusterAzureMonitorProfileContainerInsights();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileContainerInsights.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("logAnalyticsWorkspaceResourceId".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileContainerInsights.logAnalyticsWorkspaceResourceId
+                        = reader.getString();
+                } else if ("syslogPort".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileContainerInsights.syslogPort
+                        = reader.getNullable(JsonReader::getLong);
+                } else if ("disableCustomMetrics".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileContainerInsights.disableCustomMetrics
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("disablePrometheusMetricsScraping".equals(fieldName)) {
+                    deserializedManagedClusterAzureMonitorProfileContainerInsights.disablePrometheusMetricsScraping
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterAzureMonitorProfileContainerInsights;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileKubeStateMetrics.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileKubeStateMetrics.java
index c6fd51a2703f..4112892296bf 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileKubeStateMetrics.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileKubeStateMetrics.java
@@ -12,24 +12,18 @@
 import java.io.IOException;
 
 /**
- * Kube State Metrics profile for the Azure Managed Prometheus addon. These optional settings are for the
- * kube-state-metrics pod that is deployed with the addon. See aka.ms/AzureManagedPrometheus-optional-parameters for
- * details.
+ * Kube State Metrics for prometheus addon profile for the container service cluster.
  */
 @Fluent
 public final class ManagedClusterAzureMonitorProfileKubeStateMetrics
     implements JsonSerializable<ManagedClusterAzureMonitorProfileKubeStateMetrics> {
     /*
-     * Comma-separated list of additional Kubernetes label keys that will be used in the resource's labels metric
-     * (Example: 'namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...'). By default the metric contains only
-     * resource name and namespace labels.
+     * Comma-separated list of Kubernetes annotations keys that will be used in the resource's labels metric.
      */
     private String metricLabelsAllowlist;
 
     /*
-     * Comma-separated list of Kubernetes annotation keys that will be used in the resource's labels metric (Example:
-     * 'namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...'). By default the metric contains only
-     * resource name and namespace labels.
+     * Comma-separated list of additional Kubernetes label keys that will be used in the resource's labels metric.
      */
     private String metricAnnotationsAllowList;
 
@@ -40,9 +34,8 @@ public ManagedClusterAzureMonitorProfileKubeStateMetrics() {
     }
 
     /**
-     * Get the metricLabelsAllowlist property: Comma-separated list of additional Kubernetes label keys that will be
-     * used in the resource's labels metric (Example: 'namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...'). By
-     * default the metric contains only resource name and namespace labels.
+     * Get the metricLabelsAllowlist property: Comma-separated list of Kubernetes annotations keys that will be used in
+     * the resource's labels metric.
      * 
      * @return the metricLabelsAllowlist value.
      */
@@ -51,9 +44,8 @@ public String metricLabelsAllowlist() {
     }
 
     /**
-     * Set the metricLabelsAllowlist property: Comma-separated list of additional Kubernetes label keys that will be
-     * used in the resource's labels metric (Example: 'namespaces=[k8s-label-1,k8s-label-n,...],pods=[app],...'). By
-     * default the metric contains only resource name and namespace labels.
+     * Set the metricLabelsAllowlist property: Comma-separated list of Kubernetes annotations keys that will be used in
+     * the resource's labels metric.
      * 
      * @param metricLabelsAllowlist the metricLabelsAllowlist value to set.
      * @return the ManagedClusterAzureMonitorProfileKubeStateMetrics object itself.
@@ -64,9 +56,8 @@ public ManagedClusterAzureMonitorProfileKubeStateMetrics withMetricLabelsAllowli
     }
 
     /**
-     * Get the metricAnnotationsAllowList property: Comma-separated list of Kubernetes annotation keys that will be used
-     * in the resource's labels metric (Example: 'namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...').
-     * By default the metric contains only resource name and namespace labels.
+     * Get the metricAnnotationsAllowList property: Comma-separated list of additional Kubernetes label keys that will
+     * be used in the resource's labels metric.
      * 
      * @return the metricAnnotationsAllowList value.
      */
@@ -75,9 +66,8 @@ public String metricAnnotationsAllowList() {
     }
 
     /**
-     * Set the metricAnnotationsAllowList property: Comma-separated list of Kubernetes annotation keys that will be used
-     * in the resource's labels metric (Example: 'namespaces=[kubernetes.io/team,...],pods=[kubernetes.io/team],...').
-     * By default the metric contains only resource name and namespace labels.
+     * Set the metricAnnotationsAllowList property: Comma-separated list of additional Kubernetes label keys that will
+     * be used in the resource's labels metric.
      * 
      * @param metricAnnotationsAllowList the metricAnnotationsAllowList value to set.
      * @return the ManagedClusterAzureMonitorProfileKubeStateMetrics object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileMetrics.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileMetrics.java
index c429294b7ad5..1192651a08dc 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileMetrics.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterAzureMonitorProfileMetrics.java
@@ -12,23 +12,18 @@
 import java.io.IOException;
 
 /**
- * Metrics profile for the Azure Monitor managed service for Prometheus addon. Collect out-of-the-box Kubernetes
- * infrastructure metrics to send to an Azure Monitor Workspace and configure additional scraping for custom targets.
- * See aka.ms/AzureManagedPrometheus for an overview.
+ * Metrics profile for the prometheus service addon.
  */
 @Fluent
 public final class ManagedClusterAzureMonitorProfileMetrics
     implements JsonSerializable<ManagedClusterAzureMonitorProfileMetrics> {
     /*
-     * Whether to enable or disable the Azure Managed Prometheus addon for Prometheus monitoring. See
-     * aka.ms/AzureManagedPrometheus-aks-enable for details on enabling and disabling.
+     * Whether to enable the Prometheus collector
      */
     private boolean enabled;
 
     /*
-     * Kube State Metrics profile for the Azure Managed Prometheus addon. These optional settings are for the
-     * kube-state-metrics pod that is deployed with the addon. See aka.ms/AzureManagedPrometheus-optional-parameters for
-     * details.
+     * Kube State Metrics for prometheus addon profile for the container service cluster
      */
     private ManagedClusterAzureMonitorProfileKubeStateMetrics kubeStateMetrics;
 
@@ -39,8 +34,7 @@ public ManagedClusterAzureMonitorProfileMetrics() {
     }
 
     /**
-     * Get the enabled property: Whether to enable or disable the Azure Managed Prometheus addon for Prometheus
-     * monitoring. See aka.ms/AzureManagedPrometheus-aks-enable for details on enabling and disabling.
+     * Get the enabled property: Whether to enable the Prometheus collector.
      * 
      * @return the enabled value.
      */
@@ -49,8 +43,7 @@ public boolean enabled() {
     }
 
     /**
-     * Set the enabled property: Whether to enable or disable the Azure Managed Prometheus addon for Prometheus
-     * monitoring. See aka.ms/AzureManagedPrometheus-aks-enable for details on enabling and disabling.
+     * Set the enabled property: Whether to enable the Prometheus collector.
      * 
      * @param enabled the enabled value to set.
      * @return the ManagedClusterAzureMonitorProfileMetrics object itself.
@@ -61,9 +54,8 @@ public ManagedClusterAzureMonitorProfileMetrics withEnabled(boolean enabled) {
     }
 
     /**
-     * Get the kubeStateMetrics property: Kube State Metrics profile for the Azure Managed Prometheus addon. These
-     * optional settings are for the kube-state-metrics pod that is deployed with the addon. See
-     * aka.ms/AzureManagedPrometheus-optional-parameters for details.
+     * Get the kubeStateMetrics property: Kube State Metrics for prometheus addon profile for the container service
+     * cluster.
      * 
      * @return the kubeStateMetrics value.
      */
@@ -72,9 +64,8 @@ public ManagedClusterAzureMonitorProfileKubeStateMetrics kubeStateMetrics() {
     }
 
     /**
-     * Set the kubeStateMetrics property: Kube State Metrics profile for the Azure Managed Prometheus addon. These
-     * optional settings are for the kube-state-metrics pod that is deployed with the addon. See
-     * aka.ms/AzureManagedPrometheus-optional-parameters for details.
+     * Set the kubeStateMetrics property: Kube State Metrics for prometheus addon profile for the container service
+     * cluster.
      * 
      * @param kubeStateMetrics the kubeStateMetrics value to set.
      * @return the ManagedClusterAzureMonitorProfileMetrics object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHostedSystemProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHostedSystemProfile.java
new file mode 100644
index 000000000000..10238c97d81f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHostedSystemProfile.java
@@ -0,0 +1,94 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Settings for hosted system addons.
+ */
+@Fluent
+public final class ManagedClusterHostedSystemProfile implements JsonSerializable<ManagedClusterHostedSystemProfile> {
+    /*
+     * Whether to enable hosted system addons for the cluster.
+     */
+    private Boolean enabled;
+
+    /**
+     * Creates an instance of ManagedClusterHostedSystemProfile class.
+     */
+    public ManagedClusterHostedSystemProfile() {
+    }
+
+    /**
+     * Get the enabled property: Whether to enable hosted system addons for the cluster.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Whether to enable hosted system addons for the cluster.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterHostedSystemProfile object itself.
+     */
+    public ManagedClusterHostedSystemProfile withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterHostedSystemProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterHostedSystemProfile if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterHostedSystemProfile.
+     */
+    public static ManagedClusterHostedSystemProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterHostedSystemProfile deserializedManagedClusterHostedSystemProfile
+                = new ManagedClusterHostedSystemProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterHostedSystemProfile.enabled = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterHostedSystemProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHttpProxyConfig.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHttpProxyConfig.java
index 24bb81b69756..92ebe06e2255 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHttpProxyConfig.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterHttpProxyConfig.java
@@ -32,11 +32,23 @@ public final class ManagedClusterHttpProxyConfig implements JsonSerializable<Man
      */
     private List<String> noProxy;
 
+    /*
+     * A read-only list of all endpoints for which traffic should not be sent to the proxy. This list is a superset of
+     * noProxy and values injected by AKS.
+     */
+    private List<String> effectiveNoProxy;
+
     /*
      * Alternative CA cert to use for connecting to proxy servers.
      */
     private String trustedCa;
 
+    /*
+     * Whether to enable HTTP proxy. When disabled, the specified proxy configuration will be not be set on pods and
+     * nodes.
+     */
+    private Boolean enabled;
+
     /**
      * Creates an instance of ManagedClusterHttpProxyConfig class.
      */
@@ -103,6 +115,16 @@ public ManagedClusterHttpProxyConfig withNoProxy(List<String> noProxy) {
         return this;
     }
 
+    /**
+     * Get the effectiveNoProxy property: A read-only list of all endpoints for which traffic should not be sent to the
+     * proxy. This list is a superset of noProxy and values injected by AKS.
+     * 
+     * @return the effectiveNoProxy value.
+     */
+    public List<String> effectiveNoProxy() {
+        return this.effectiveNoProxy;
+    }
+
     /**
      * Get the trustedCa property: Alternative CA cert to use for connecting to proxy servers.
      * 
@@ -123,6 +145,28 @@ public ManagedClusterHttpProxyConfig withTrustedCa(String trustedCa) {
         return this;
     }
 
+    /**
+     * Get the enabled property: Whether to enable HTTP proxy. When disabled, the specified proxy configuration will be
+     * not be set on pods and nodes.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Whether to enable HTTP proxy. When disabled, the specified proxy configuration will be
+     * not be set on pods and nodes.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterHttpProxyConfig object itself.
+     */
+    public ManagedClusterHttpProxyConfig withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -141,6 +185,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("httpsProxy", this.httpsProxy);
         jsonWriter.writeArrayField("noProxy", this.noProxy, (writer, element) -> writer.writeString(element));
         jsonWriter.writeStringField("trustedCa", this.trustedCa);
+        jsonWriter.writeBooleanField("enabled", this.enabled);
         return jsonWriter.writeEndObject();
     }
 
@@ -167,8 +212,13 @@ public static ManagedClusterHttpProxyConfig fromJson(JsonReader jsonReader) thro
                 } else if ("noProxy".equals(fieldName)) {
                     List<String> noProxy = reader.readArray(reader1 -> reader1.getString());
                     deserializedManagedClusterHttpProxyConfig.noProxy = noProxy;
+                } else if ("effectiveNoProxy".equals(fieldName)) {
+                    List<String> effectiveNoProxy = reader.readArray(reader1 -> reader1.getString());
+                    deserializedManagedClusterHttpProxyConfig.effectiveNoProxy = effectiveNoProxy;
                 } else if ("trustedCa".equals(fieldName)) {
                     deserializedManagedClusterHttpProxyConfig.trustedCa = reader.getString();
+                } else if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterHttpProxyConfig.enabled = reader.getNullable(JsonReader::getBoolean);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfile.java
index ce50126d08fe..fae594d3bb04 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfile.java
@@ -17,8 +17,12 @@
 @Fluent
 public final class ManagedClusterIngressProfile implements JsonSerializable<ManagedClusterIngressProfile> {
     /*
-     * App Routing settings for the ingress profile. You can find an overview and onboarding guide for this feature at
-     * https://learn.microsoft.com/en-us/azure/aks/app-routing?tabs=default%2Cdeploy-app-default.
+     * Settings for the managed Gateway API installation
+     */
+    private ManagedClusterIngressProfileGatewayConfiguration gatewayApi;
+
+    /*
+     * Web App Routing settings for the ingress profile.
      */
     private ManagedClusterIngressProfileWebAppRouting webAppRouting;
 
@@ -29,9 +33,27 @@ public ManagedClusterIngressProfile() {
     }
 
     /**
-     * Get the webAppRouting property: App Routing settings for the ingress profile. You can find an overview and
-     * onboarding guide for this feature at
-     * https://learn.microsoft.com/en-us/azure/aks/app-routing?tabs=default%2Cdeploy-app-default.
+     * Get the gatewayApi property: Settings for the managed Gateway API installation.
+     * 
+     * @return the gatewayApi value.
+     */
+    public ManagedClusterIngressProfileGatewayConfiguration gatewayApi() {
+        return this.gatewayApi;
+    }
+
+    /**
+     * Set the gatewayApi property: Settings for the managed Gateway API installation.
+     * 
+     * @param gatewayApi the gatewayApi value to set.
+     * @return the ManagedClusterIngressProfile object itself.
+     */
+    public ManagedClusterIngressProfile withGatewayApi(ManagedClusterIngressProfileGatewayConfiguration gatewayApi) {
+        this.gatewayApi = gatewayApi;
+        return this;
+    }
+
+    /**
+     * Get the webAppRouting property: Web App Routing settings for the ingress profile.
      * 
      * @return the webAppRouting value.
      */
@@ -40,9 +62,7 @@ public ManagedClusterIngressProfileWebAppRouting webAppRouting() {
     }
 
     /**
-     * Set the webAppRouting property: App Routing settings for the ingress profile. You can find an overview and
-     * onboarding guide for this feature at
-     * https://learn.microsoft.com/en-us/azure/aks/app-routing?tabs=default%2Cdeploy-app-default.
+     * Set the webAppRouting property: Web App Routing settings for the ingress profile.
      * 
      * @param webAppRouting the webAppRouting value to set.
      * @return the ManagedClusterIngressProfile object itself.
@@ -58,6 +78,9 @@ public ManagedClusterIngressProfile withWebAppRouting(ManagedClusterIngressProfi
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (gatewayApi() != null) {
+            gatewayApi().validate();
+        }
         if (webAppRouting() != null) {
             webAppRouting().validate();
         }
@@ -69,6 +92,7 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("gatewayAPI", this.gatewayApi);
         jsonWriter.writeJsonField("webAppRouting", this.webAppRouting);
         return jsonWriter.writeEndObject();
     }
@@ -88,7 +112,10 @@ public static ManagedClusterIngressProfile fromJson(JsonReader jsonReader) throw
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
-                if ("webAppRouting".equals(fieldName)) {
+                if ("gatewayAPI".equals(fieldName)) {
+                    deserializedManagedClusterIngressProfile.gatewayApi
+                        = ManagedClusterIngressProfileGatewayConfiguration.fromJson(reader);
+                } else if ("webAppRouting".equals(fieldName)) {
                     deserializedManagedClusterIngressProfile.webAppRouting
                         = ManagedClusterIngressProfileWebAppRouting.fromJson(reader);
                 } else {
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileGatewayConfiguration.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileGatewayConfiguration.java
new file mode 100644
index 000000000000..d76887801802
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileGatewayConfiguration.java
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The ManagedClusterIngressProfileGatewayConfiguration model.
+ */
+@Fluent
+public final class ManagedClusterIngressProfileGatewayConfiguration
+    implements JsonSerializable<ManagedClusterIngressProfileGatewayConfiguration> {
+    /*
+     * Configuration for the managed Gateway API installation. If not specified, the default is 'Disabled'. See
+     * https://aka.ms/k8s-gateway-api for more details.
+     */
+    private ManagedGatewayType installation;
+
+    /**
+     * Creates an instance of ManagedClusterIngressProfileGatewayConfiguration class.
+     */
+    public ManagedClusterIngressProfileGatewayConfiguration() {
+    }
+
+    /**
+     * Get the installation property: Configuration for the managed Gateway API installation. If not specified, the
+     * default is 'Disabled'. See https://aka.ms/k8s-gateway-api for more details.
+     * 
+     * @return the installation value.
+     */
+    public ManagedGatewayType installation() {
+        return this.installation;
+    }
+
+    /**
+     * Set the installation property: Configuration for the managed Gateway API installation. If not specified, the
+     * default is 'Disabled'. See https://aka.ms/k8s-gateway-api for more details.
+     * 
+     * @param installation the installation value to set.
+     * @return the ManagedClusterIngressProfileGatewayConfiguration object itself.
+     */
+    public ManagedClusterIngressProfileGatewayConfiguration withInstallation(ManagedGatewayType installation) {
+        this.installation = installation;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("installation", this.installation == null ? null : this.installation.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterIngressProfileGatewayConfiguration from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterIngressProfileGatewayConfiguration if the JsonReader was pointing to an
+     * instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterIngressProfileGatewayConfiguration.
+     */
+    public static ManagedClusterIngressProfileGatewayConfiguration fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterIngressProfileGatewayConfiguration deserializedManagedClusterIngressProfileGatewayConfiguration
+                = new ManagedClusterIngressProfileGatewayConfiguration();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("installation".equals(fieldName)) {
+                    deserializedManagedClusterIngressProfileGatewayConfiguration.installation
+                        = ManagedGatewayType.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterIngressProfileGatewayConfiguration;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileWebAppRouting.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileWebAppRouting.java
index 7c7ac44b3702..b675b3cc4cf5 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileWebAppRouting.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterIngressProfileWebAppRouting.java
@@ -13,20 +13,20 @@
 import java.util.List;
 
 /**
- * Application Routing add-on settings for the ingress profile.
+ * Web App Routing settings for the ingress profile.
  */
 @Fluent
 public final class ManagedClusterIngressProfileWebAppRouting
     implements JsonSerializable<ManagedClusterIngressProfileWebAppRouting> {
     /*
-     * Whether to enable the Application Routing add-on.
+     * Whether to enable Web App Routing.
      */
     private Boolean enabled;
 
     /*
-     * Resource IDs of the DNS zones to be associated with the Application Routing add-on. Used only when Application
-     * Routing add-on is enabled. Public and private DNS zones can be in different resource groups, but all public DNS
-     * zones must be in the same resource group and all private DNS zones must be in the same resource group.
+     * Resource IDs of the DNS zones to be associated with the Web App Routing add-on. Used only when Web App Routing is
+     * enabled. Public and private DNS zones can be in different resource groups, but all public DNS zones must be in
+     * the same resource group and all private DNS zones must be in the same resource group.
      */
     private List<String> dnsZoneResourceIds;
 
@@ -37,8 +37,8 @@ public final class ManagedClusterIngressProfileWebAppRouting
     private ManagedClusterIngressProfileNginx nginx;
 
     /*
-     * Managed identity of the Application Routing add-on. This is the identity that should be granted permissions, for
-     * example, to manage the associated Azure DNS resource and get certificates from Azure Key Vault. See [this
+     * Managed identity of the Web Application Routing add-on. This is the identity that should be granted permissions,
+     * for example, to manage the associated Azure DNS resource and get certificates from Azure Key Vault. See [this
      * overview of the add-on](https://learn.microsoft.com/en-us/azure/aks/web-app-routing?tabs=with-osm) for more
      * instructions.
      */
@@ -51,7 +51,7 @@ public ManagedClusterIngressProfileWebAppRouting() {
     }
 
     /**
-     * Get the enabled property: Whether to enable the Application Routing add-on.
+     * Get the enabled property: Whether to enable Web App Routing.
      * 
      * @return the enabled value.
      */
@@ -60,7 +60,7 @@ public Boolean enabled() {
     }
 
     /**
-     * Set the enabled property: Whether to enable the Application Routing add-on.
+     * Set the enabled property: Whether to enable Web App Routing.
      * 
      * @param enabled the enabled value to set.
      * @return the ManagedClusterIngressProfileWebAppRouting object itself.
@@ -71,10 +71,10 @@ public ManagedClusterIngressProfileWebAppRouting withEnabled(Boolean enabled) {
     }
 
     /**
-     * Get the dnsZoneResourceIds property: Resource IDs of the DNS zones to be associated with the Application Routing
-     * add-on. Used only when Application Routing add-on is enabled. Public and private DNS zones can be in different
-     * resource groups, but all public DNS zones must be in the same resource group and all private DNS zones must be in
-     * the same resource group.
+     * Get the dnsZoneResourceIds property: Resource IDs of the DNS zones to be associated with the Web App Routing
+     * add-on. Used only when Web App Routing is enabled. Public and private DNS zones can be in different resource
+     * groups, but all public DNS zones must be in the same resource group and all private DNS zones must be in the same
+     * resource group.
      * 
      * @return the dnsZoneResourceIds value.
      */
@@ -83,10 +83,10 @@ public List<String> dnsZoneResourceIds() {
     }
 
     /**
-     * Set the dnsZoneResourceIds property: Resource IDs of the DNS zones to be associated with the Application Routing
-     * add-on. Used only when Application Routing add-on is enabled. Public and private DNS zones can be in different
-     * resource groups, but all public DNS zones must be in the same resource group and all private DNS zones must be in
-     * the same resource group.
+     * Set the dnsZoneResourceIds property: Resource IDs of the DNS zones to be associated with the Web App Routing
+     * add-on. Used only when Web App Routing is enabled. Public and private DNS zones can be in different resource
+     * groups, but all public DNS zones must be in the same resource group and all private DNS zones must be in the same
+     * resource group.
      * 
      * @param dnsZoneResourceIds the dnsZoneResourceIds value to set.
      * @return the ManagedClusterIngressProfileWebAppRouting object itself.
@@ -119,9 +119,9 @@ public ManagedClusterIngressProfileWebAppRouting withNginx(ManagedClusterIngress
     }
 
     /**
-     * Get the identity property: Managed identity of the Application Routing add-on. This is the identity that should
-     * be granted permissions, for example, to manage the associated Azure DNS resource and get certificates from Azure
-     * Key Vault. See [this overview of the
+     * Get the identity property: Managed identity of the Web Application Routing add-on. This is the identity that
+     * should be granted permissions, for example, to manage the associated Azure DNS resource and get certificates from
+     * Azure Key Vault. See [this overview of the
      * add-on](https://learn.microsoft.com/en-us/azure/aks/web-app-routing?tabs=with-osm) for more instructions.
      * 
      * @return the identity value.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterLoadBalancerProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterLoadBalancerProfile.java
index b01a7427e97b..baf286e7877c 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterLoadBalancerProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterLoadBalancerProfile.java
@@ -59,6 +59,11 @@ public final class ManagedClusterLoadBalancerProfile implements JsonSerializable
      */
     private BackendPoolType backendPoolType;
 
+    /*
+     * The health probing behavior for External Traffic Policy Cluster services.
+     */
+    private ClusterServiceLoadBalancerHealthProbeMode clusterServiceLoadBalancerHealthProbeMode;
+
     /**
      * Creates an instance of ManagedClusterLoadBalancerProfile class.
      */
@@ -223,6 +228,29 @@ public ManagedClusterLoadBalancerProfile withBackendPoolType(BackendPoolType bac
         return this;
     }
 
+    /**
+     * Get the clusterServiceLoadBalancerHealthProbeMode property: The health probing behavior for External Traffic
+     * Policy Cluster services.
+     * 
+     * @return the clusterServiceLoadBalancerHealthProbeMode value.
+     */
+    public ClusterServiceLoadBalancerHealthProbeMode clusterServiceLoadBalancerHealthProbeMode() {
+        return this.clusterServiceLoadBalancerHealthProbeMode;
+    }
+
+    /**
+     * Set the clusterServiceLoadBalancerHealthProbeMode property: The health probing behavior for External Traffic
+     * Policy Cluster services.
+     * 
+     * @param clusterServiceLoadBalancerHealthProbeMode the clusterServiceLoadBalancerHealthProbeMode value to set.
+     * @return the ManagedClusterLoadBalancerProfile object itself.
+     */
+    public ManagedClusterLoadBalancerProfile withClusterServiceLoadBalancerHealthProbeMode(
+        ClusterServiceLoadBalancerHealthProbeMode clusterServiceLoadBalancerHealthProbeMode) {
+        this.clusterServiceLoadBalancerHealthProbeMode = clusterServiceLoadBalancerHealthProbeMode;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -257,6 +285,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeBooleanField("enableMultipleStandardLoadBalancers", this.enableMultipleStandardLoadBalancers);
         jsonWriter.writeStringField("backendPoolType",
             this.backendPoolType == null ? null : this.backendPoolType.toString());
+        jsonWriter.writeStringField("clusterServiceLoadBalancerHealthProbeMode",
+            this.clusterServiceLoadBalancerHealthProbeMode == null
+                ? null
+                : this.clusterServiceLoadBalancerHealthProbeMode.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -301,6 +333,9 @@ public static ManagedClusterLoadBalancerProfile fromJson(JsonReader jsonReader)
                 } else if ("backendPoolType".equals(fieldName)) {
                     deserializedManagedClusterLoadBalancerProfile.backendPoolType
                         = BackendPoolType.fromString(reader.getString());
+                } else if ("clusterServiceLoadBalancerHealthProbeMode".equals(fieldName)) {
+                    deserializedManagedClusterLoadBalancerProfile.clusterServiceLoadBalancerHealthProbeMode
+                        = ClusterServiceLoadBalancerHealthProbeMode.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterNodeResourceGroupProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterNodeResourceGroupProfile.java
index e3485eccdee3..f2f87355b2c3 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterNodeResourceGroupProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterNodeResourceGroupProfile.java
@@ -18,8 +18,7 @@
 public final class ManagedClusterNodeResourceGroupProfile
     implements JsonSerializable<ManagedClusterNodeResourceGroupProfile> {
     /*
-     * The restriction level applied to the cluster's node resource group. If not specified, the default is
-     * 'Unrestricted'
+     * The restriction level applied to the cluster's node resource group
      */
     private RestrictionLevel restrictionLevel;
 
@@ -30,8 +29,7 @@ public ManagedClusterNodeResourceGroupProfile() {
     }
 
     /**
-     * Get the restrictionLevel property: The restriction level applied to the cluster's node resource group. If not
-     * specified, the default is 'Unrestricted'.
+     * Get the restrictionLevel property: The restriction level applied to the cluster's node resource group.
      * 
      * @return the restrictionLevel value.
      */
@@ -40,8 +38,7 @@ public RestrictionLevel restrictionLevel() {
     }
 
     /**
-     * Set the restrictionLevel property: The restriction level applied to the cluster's node resource group. If not
-     * specified, the default is 'Unrestricted'.
+     * Set the restrictionLevel property: The restriction level applied to the cluster's node resource group.
      * 
      * @param restrictionLevel the restrictionLevel value to set.
      * @return the ManagedClusterNodeResourceGroupProfile object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfile.java
index 433b50af7fe1..eae4c357b603 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfile.java
@@ -38,6 +38,11 @@ public final class ManagedClusterPoolUpgradeProfile implements JsonSerializable<
      */
     private List<ManagedClusterPoolUpgradeProfileUpgradesItem> upgrades;
 
+    /*
+     * List of components grouped by kubernetes major.minor version.
+     */
+    private List<ComponentsByRelease> componentsByReleases;
+
     /**
      * Creates an instance of ManagedClusterPoolUpgradeProfile class.
      */
@@ -124,6 +129,26 @@ public ManagedClusterPoolUpgradeProfile withUpgrades(List<ManagedClusterPoolUpgr
         return this;
     }
 
+    /**
+     * Get the componentsByReleases property: List of components grouped by kubernetes major.minor version.
+     * 
+     * @return the componentsByReleases value.
+     */
+    public List<ComponentsByRelease> componentsByReleases() {
+        return this.componentsByReleases;
+    }
+
+    /**
+     * Set the componentsByReleases property: List of components grouped by kubernetes major.minor version.
+     * 
+     * @param componentsByReleases the componentsByReleases value to set.
+     * @return the ManagedClusterPoolUpgradeProfile object itself.
+     */
+    public ManagedClusterPoolUpgradeProfile withComponentsByReleases(List<ComponentsByRelease> componentsByReleases) {
+        this.componentsByReleases = componentsByReleases;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -143,6 +168,9 @@ public void validate() {
         if (upgrades() != null) {
             upgrades().forEach(e -> e.validate());
         }
+        if (componentsByReleases() != null) {
+            componentsByReleases().forEach(e -> e.validate());
+        }
     }
 
     private static final ClientLogger LOGGER = new ClientLogger(ManagedClusterPoolUpgradeProfile.class);
@@ -157,6 +185,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("osType", this.osType == null ? null : this.osType.toString());
         jsonWriter.writeStringField("name", this.name);
         jsonWriter.writeArrayField("upgrades", this.upgrades, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeArrayField("componentsByReleases", this.componentsByReleases,
+            (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -187,6 +217,10 @@ public static ManagedClusterPoolUpgradeProfile fromJson(JsonReader jsonReader) t
                     List<ManagedClusterPoolUpgradeProfileUpgradesItem> upgrades
                         = reader.readArray(reader1 -> ManagedClusterPoolUpgradeProfileUpgradesItem.fromJson(reader1));
                     deserializedManagedClusterPoolUpgradeProfile.upgrades = upgrades;
+                } else if ("componentsByReleases".equals(fieldName)) {
+                    List<ComponentsByRelease> componentsByReleases
+                        = reader.readArray(reader1 -> ComponentsByRelease.fromJson(reader1));
+                    deserializedManagedClusterPoolUpgradeProfile.componentsByReleases = componentsByReleases;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfileUpgradesItem.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfileUpgradesItem.java
index 57acd9ecdb9e..4d37910b753d 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfileUpgradesItem.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPoolUpgradeProfileUpgradesItem.java
@@ -27,6 +27,11 @@ public final class ManagedClusterPoolUpgradeProfileUpgradesItem
      */
     private Boolean isPreview;
 
+    /*
+     * Whether the Kubernetes version is out of support.
+     */
+    private Boolean isOutOfSupport;
+
     /**
      * Creates an instance of ManagedClusterPoolUpgradeProfileUpgradesItem class.
      */
@@ -73,6 +78,26 @@ public ManagedClusterPoolUpgradeProfileUpgradesItem withIsPreview(Boolean isPrev
         return this;
     }
 
+    /**
+     * Get the isOutOfSupport property: Whether the Kubernetes version is out of support.
+     * 
+     * @return the isOutOfSupport value.
+     */
+    public Boolean isOutOfSupport() {
+        return this.isOutOfSupport;
+    }
+
+    /**
+     * Set the isOutOfSupport property: Whether the Kubernetes version is out of support.
+     * 
+     * @param isOutOfSupport the isOutOfSupport value to set.
+     * @return the ManagedClusterPoolUpgradeProfileUpgradesItem object itself.
+     */
+    public ManagedClusterPoolUpgradeProfileUpgradesItem withIsOutOfSupport(Boolean isOutOfSupport) {
+        this.isOutOfSupport = isOutOfSupport;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -89,6 +114,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("kubernetesVersion", this.kubernetesVersion);
         jsonWriter.writeBooleanField("isPreview", this.isPreview);
+        jsonWriter.writeBooleanField("isOutOfSupport", this.isOutOfSupport);
         return jsonWriter.writeEndObject();
     }
 
@@ -113,6 +139,9 @@ public static ManagedClusterPoolUpgradeProfileUpgradesItem fromJson(JsonReader j
                 } else if ("isPreview".equals(fieldName)) {
                     deserializedManagedClusterPoolUpgradeProfileUpgradesItem.isPreview
                         = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isOutOfSupport".equals(fieldName)) {
+                    deserializedManagedClusterPoolUpgradeProfileUpgradesItem.isOutOfSupport
+                        = reader.getNullable(JsonReader::getBoolean);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesAutoScalerProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesAutoScalerProfile.java
index b4e194a1ef21..a5efa904d57b 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesAutoScalerProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesAutoScalerProfile.java
@@ -45,9 +45,8 @@ public final class ManagedClusterPropertiesAutoScalerProfile
     private Boolean ignoreDaemonsetsUtilization;
 
     /*
-     * The expander to use when scaling up. If not specified, the default is 'random'. See
-     * [expanders](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-expanders)
-     * for more information.
+     * Type of node group expander to be used in scale up. Set to be deprecated, please use 'expanders' flag in the
+     * future. Available values are: 'least-waste', 'most-pods', 'priority', 'random'.
      */
     private Expander expander;
 
@@ -251,9 +250,8 @@ public Boolean ignoreDaemonsetsUtilization() {
     }
 
     /**
-     * Get the expander property: The expander to use when scaling up. If not specified, the default is 'random'. See
-     * [expanders](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-expanders)
-     * for more information.
+     * Get the expander property: Type of node group expander to be used in scale up. Set to be deprecated, please use
+     * 'expanders' flag in the future. Available values are: 'least-waste', 'most-pods', 'priority', 'random'.
      * 
      * @return the expander value.
      */
@@ -262,9 +260,8 @@ public Expander expander() {
     }
 
     /**
-     * Set the expander property: The expander to use when scaling up. If not specified, the default is 'random'. See
-     * [expanders](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/FAQ.md#what-are-expanders)
-     * for more information.
+     * Set the expander property: Type of node group expander to be used in scale up. Set to be deprecated, please use
+     * 'expanders' flag in the future. Available values are: 'least-waste', 'most-pods', 'priority', 'random'.
      * 
      * @param expander the expander value to set.
      * @return the ManagedClusterPropertiesAutoScalerProfile object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesForSnapshot.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesForSnapshot.java
new file mode 100644
index 000000000000..f9398bd28eb3
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterPropertiesForSnapshot.java
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * managed cluster properties for snapshot, these properties are read only.
+ */
+@Fluent
+public final class ManagedClusterPropertiesForSnapshot
+    implements JsonSerializable<ManagedClusterPropertiesForSnapshot> {
+    /*
+     * The current kubernetes version.
+     */
+    private String kubernetesVersion;
+
+    /*
+     * The current managed cluster sku.
+     */
+    private ManagedClusterSku sku;
+
+    /*
+     * Whether the cluster has enabled Kubernetes Role-Based Access Control or not.
+     */
+    private Boolean enableRbac;
+
+    /*
+     * The current network profile.
+     */
+    private NetworkProfileForSnapshot networkProfile;
+
+    /**
+     * Creates an instance of ManagedClusterPropertiesForSnapshot class.
+     */
+    public ManagedClusterPropertiesForSnapshot() {
+    }
+
+    /**
+     * Get the kubernetesVersion property: The current kubernetes version.
+     * 
+     * @return the kubernetesVersion value.
+     */
+    public String kubernetesVersion() {
+        return this.kubernetesVersion;
+    }
+
+    /**
+     * Set the kubernetesVersion property: The current kubernetes version.
+     * 
+     * @param kubernetesVersion the kubernetesVersion value to set.
+     * @return the ManagedClusterPropertiesForSnapshot object itself.
+     */
+    public ManagedClusterPropertiesForSnapshot withKubernetesVersion(String kubernetesVersion) {
+        this.kubernetesVersion = kubernetesVersion;
+        return this;
+    }
+
+    /**
+     * Get the sku property: The current managed cluster sku.
+     * 
+     * @return the sku value.
+     */
+    public ManagedClusterSku sku() {
+        return this.sku;
+    }
+
+    /**
+     * Set the sku property: The current managed cluster sku.
+     * 
+     * @param sku the sku value to set.
+     * @return the ManagedClusterPropertiesForSnapshot object itself.
+     */
+    public ManagedClusterPropertiesForSnapshot withSku(ManagedClusterSku sku) {
+        this.sku = sku;
+        return this;
+    }
+
+    /**
+     * Get the enableRbac property: Whether the cluster has enabled Kubernetes Role-Based Access Control or not.
+     * 
+     * @return the enableRbac value.
+     */
+    public Boolean enableRbac() {
+        return this.enableRbac;
+    }
+
+    /**
+     * Set the enableRbac property: Whether the cluster has enabled Kubernetes Role-Based Access Control or not.
+     * 
+     * @param enableRbac the enableRbac value to set.
+     * @return the ManagedClusterPropertiesForSnapshot object itself.
+     */
+    public ManagedClusterPropertiesForSnapshot withEnableRbac(Boolean enableRbac) {
+        this.enableRbac = enableRbac;
+        return this;
+    }
+
+    /**
+     * Get the networkProfile property: The current network profile.
+     * 
+     * @return the networkProfile value.
+     */
+    public NetworkProfileForSnapshot networkProfile() {
+        return this.networkProfile;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (sku() != null) {
+            sku().validate();
+        }
+        if (networkProfile() != null) {
+            networkProfile().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("kubernetesVersion", this.kubernetesVersion);
+        jsonWriter.writeJsonField("sku", this.sku);
+        jsonWriter.writeBooleanField("enableRbac", this.enableRbac);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterPropertiesForSnapshot from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterPropertiesForSnapshot if the JsonReader was pointing to an instance of it,
+     * or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterPropertiesForSnapshot.
+     */
+    public static ManagedClusterPropertiesForSnapshot fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterPropertiesForSnapshot deserializedManagedClusterPropertiesForSnapshot
+                = new ManagedClusterPropertiesForSnapshot();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("kubernetesVersion".equals(fieldName)) {
+                    deserializedManagedClusterPropertiesForSnapshot.kubernetesVersion = reader.getString();
+                } else if ("sku".equals(fieldName)) {
+                    deserializedManagedClusterPropertiesForSnapshot.sku = ManagedClusterSku.fromJson(reader);
+                } else if ("enableRbac".equals(fieldName)) {
+                    deserializedManagedClusterPropertiesForSnapshot.enableRbac
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("networkProfile".equals(fieldName)) {
+                    deserializedManagedClusterPropertiesForSnapshot.networkProfile
+                        = NetworkProfileForSnapshot.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterPropertiesForSnapshot;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfile.java
index 014323f743dc..ab06dd7b7009 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfile.java
@@ -28,6 +28,12 @@ public final class ManagedClusterSecurityProfile implements JsonSerializable<Man
      */
     private AzureKeyVaultKms azureKeyVaultKms;
 
+    /*
+     * Encryption at rest of Kubernetes resource objects. More information on this can be found under
+     * https://aka.ms/aks/kubernetesResourceObjectEncryption
+     */
+    private KubernetesResourceObjectEncryptionProfile kubernetesResourceObjectEncryptionProfile;
+
     /*
      * Workload identity settings for the security profile. Workload identity enables Kubernetes applications to access
      * Azure cloud resources securely with Azure AD. See https://aka.ms/aks/wi for more details.
@@ -39,6 +45,20 @@ public final class ManagedClusterSecurityProfile implements JsonSerializable<Man
      */
     private ManagedClusterSecurityProfileImageCleaner imageCleaner;
 
+    /*
+     * Image integrity is a feature that works with Azure Policy to verify image integrity by signature. This will not
+     * have any effect unless Azure Policy is applied to enforce image signatures. See
+     * https://aka.ms/aks/image-integrity for how to use this feature via policy.
+     */
+    private ManagedClusterSecurityProfileImageIntegrity imageIntegrity;
+
+    /*
+     * [Node
+     * Restriction](https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#noderestriction)
+     * settings for the security profile.
+     */
+    private ManagedClusterSecurityProfileNodeRestriction nodeRestriction;
+
     /*
      * A list of up to 10 base64 encoded CAs that will be added to the trust store on all nodes in the cluster. For more
      * information see [Custom CA Trust
@@ -94,6 +114,29 @@ public ManagedClusterSecurityProfile withAzureKeyVaultKms(AzureKeyVaultKms azure
         return this;
     }
 
+    /**
+     * Get the kubernetesResourceObjectEncryptionProfile property: Encryption at rest of Kubernetes resource objects.
+     * More information on this can be found under https://aka.ms/aks/kubernetesResourceObjectEncryption.
+     * 
+     * @return the kubernetesResourceObjectEncryptionProfile value.
+     */
+    public KubernetesResourceObjectEncryptionProfile kubernetesResourceObjectEncryptionProfile() {
+        return this.kubernetesResourceObjectEncryptionProfile;
+    }
+
+    /**
+     * Set the kubernetesResourceObjectEncryptionProfile property: Encryption at rest of Kubernetes resource objects.
+     * More information on this can be found under https://aka.ms/aks/kubernetesResourceObjectEncryption.
+     * 
+     * @param kubernetesResourceObjectEncryptionProfile the kubernetesResourceObjectEncryptionProfile value to set.
+     * @return the ManagedClusterSecurityProfile object itself.
+     */
+    public ManagedClusterSecurityProfile withKubernetesResourceObjectEncryptionProfile(
+        KubernetesResourceObjectEncryptionProfile kubernetesResourceObjectEncryptionProfile) {
+        this.kubernetesResourceObjectEncryptionProfile = kubernetesResourceObjectEncryptionProfile;
+        return this;
+    }
+
     /**
      * Get the workloadIdentity property: Workload identity settings for the security profile. Workload identity enables
      * Kubernetes applications to access Azure cloud resources securely with Azure AD. See https://aka.ms/aks/wi for
@@ -139,6 +182,56 @@ public ManagedClusterSecurityProfile withImageCleaner(ManagedClusterSecurityProf
         return this;
     }
 
+    /**
+     * Get the imageIntegrity property: Image integrity is a feature that works with Azure Policy to verify image
+     * integrity by signature. This will not have any effect unless Azure Policy is applied to enforce image signatures.
+     * See https://aka.ms/aks/image-integrity for how to use this feature via policy.
+     * 
+     * @return the imageIntegrity value.
+     */
+    public ManagedClusterSecurityProfileImageIntegrity imageIntegrity() {
+        return this.imageIntegrity;
+    }
+
+    /**
+     * Set the imageIntegrity property: Image integrity is a feature that works with Azure Policy to verify image
+     * integrity by signature. This will not have any effect unless Azure Policy is applied to enforce image signatures.
+     * See https://aka.ms/aks/image-integrity for how to use this feature via policy.
+     * 
+     * @param imageIntegrity the imageIntegrity value to set.
+     * @return the ManagedClusterSecurityProfile object itself.
+     */
+    public ManagedClusterSecurityProfile
+        withImageIntegrity(ManagedClusterSecurityProfileImageIntegrity imageIntegrity) {
+        this.imageIntegrity = imageIntegrity;
+        return this;
+    }
+
+    /**
+     * Get the nodeRestriction property: [Node
+     * Restriction](https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#noderestriction)
+     * settings for the security profile.
+     * 
+     * @return the nodeRestriction value.
+     */
+    public ManagedClusterSecurityProfileNodeRestriction nodeRestriction() {
+        return this.nodeRestriction;
+    }
+
+    /**
+     * Set the nodeRestriction property: [Node
+     * Restriction](https://kubernetes.io/docs/reference/access-authn-authz/admission-controllers/#noderestriction)
+     * settings for the security profile.
+     * 
+     * @param nodeRestriction the nodeRestriction value to set.
+     * @return the ManagedClusterSecurityProfile object itself.
+     */
+    public ManagedClusterSecurityProfile
+        withNodeRestriction(ManagedClusterSecurityProfileNodeRestriction nodeRestriction) {
+        this.nodeRestriction = nodeRestriction;
+        return this;
+    }
+
     /**
      * Get the customCATrustCertificates property: A list of up to 10 base64 encoded CAs that will be added to the trust
      * store on all nodes in the cluster. For more information see [Custom CA Trust
@@ -175,12 +268,21 @@ public void validate() {
         if (azureKeyVaultKms() != null) {
             azureKeyVaultKms().validate();
         }
+        if (kubernetesResourceObjectEncryptionProfile() != null) {
+            kubernetesResourceObjectEncryptionProfile().validate();
+        }
         if (workloadIdentity() != null) {
             workloadIdentity().validate();
         }
         if (imageCleaner() != null) {
             imageCleaner().validate();
         }
+        if (imageIntegrity() != null) {
+            imageIntegrity().validate();
+        }
+        if (nodeRestriction() != null) {
+            nodeRestriction().validate();
+        }
     }
 
     /**
@@ -191,8 +293,12 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeJsonField("defender", this.defender);
         jsonWriter.writeJsonField("azureKeyVaultKms", this.azureKeyVaultKms);
+        jsonWriter.writeJsonField("kubernetesResourceObjectEncryptionProfile",
+            this.kubernetesResourceObjectEncryptionProfile);
         jsonWriter.writeJsonField("workloadIdentity", this.workloadIdentity);
         jsonWriter.writeJsonField("imageCleaner", this.imageCleaner);
+        jsonWriter.writeJsonField("imageIntegrity", this.imageIntegrity);
+        jsonWriter.writeJsonField("nodeRestriction", this.nodeRestriction);
         jsonWriter.writeArrayField("customCATrustCertificates", this.customCATrustCertificates,
             (writer, element) -> writer.writeBinary(element));
         return jsonWriter.writeEndObject();
@@ -219,12 +325,21 @@ public static ManagedClusterSecurityProfile fromJson(JsonReader jsonReader) thro
                         = ManagedClusterSecurityProfileDefender.fromJson(reader);
                 } else if ("azureKeyVaultKms".equals(fieldName)) {
                     deserializedManagedClusterSecurityProfile.azureKeyVaultKms = AzureKeyVaultKms.fromJson(reader);
+                } else if ("kubernetesResourceObjectEncryptionProfile".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfile.kubernetesResourceObjectEncryptionProfile
+                        = KubernetesResourceObjectEncryptionProfile.fromJson(reader);
                 } else if ("workloadIdentity".equals(fieldName)) {
                     deserializedManagedClusterSecurityProfile.workloadIdentity
                         = ManagedClusterSecurityProfileWorkloadIdentity.fromJson(reader);
                 } else if ("imageCleaner".equals(fieldName)) {
                     deserializedManagedClusterSecurityProfile.imageCleaner
                         = ManagedClusterSecurityProfileImageCleaner.fromJson(reader);
+                } else if ("imageIntegrity".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfile.imageIntegrity
+                        = ManagedClusterSecurityProfileImageIntegrity.fromJson(reader);
+                } else if ("nodeRestriction".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfile.nodeRestriction
+                        = ManagedClusterSecurityProfileNodeRestriction.fromJson(reader);
                 } else if ("customCATrustCertificates".equals(fieldName)) {
                     List<byte[]> customCATrustCertificates = reader.readArray(reader1 -> reader1.getBinary());
                     deserializedManagedClusterSecurityProfile.customCATrustCertificates = customCATrustCertificates;
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefender.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefender.java
index 78e8613b9bdb..ad3b2f80545c 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefender.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefender.java
@@ -29,6 +29,13 @@ public final class ManagedClusterSecurityProfileDefender
      */
     private ManagedClusterSecurityProfileDefenderSecurityMonitoring securityMonitoring;
 
+    /*
+     * Microsoft Defender settings for security gating, validates container images eligibility for deployment based on
+     * Defender for Containers security findings. Using Admission Controller, it either audits or prevents the
+     * deployment of images that do not meet security standards.
+     */
+    private ManagedClusterSecurityProfileDefenderSecurityGating securityGating;
+
     /**
      * Creates an instance of ManagedClusterSecurityProfileDefender class.
      */
@@ -83,6 +90,31 @@ public ManagedClusterSecurityProfileDefenderSecurityMonitoring securityMonitorin
         return this;
     }
 
+    /**
+     * Get the securityGating property: Microsoft Defender settings for security gating, validates container images
+     * eligibility for deployment based on Defender for Containers security findings. Using Admission Controller, it
+     * either audits or prevents the deployment of images that do not meet security standards.
+     * 
+     * @return the securityGating value.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGating securityGating() {
+        return this.securityGating;
+    }
+
+    /**
+     * Set the securityGating property: Microsoft Defender settings for security gating, validates container images
+     * eligibility for deployment based on Defender for Containers security findings. Using Admission Controller, it
+     * either audits or prevents the deployment of images that do not meet security standards.
+     * 
+     * @param securityGating the securityGating value to set.
+     * @return the ManagedClusterSecurityProfileDefender object itself.
+     */
+    public ManagedClusterSecurityProfileDefender
+        withSecurityGating(ManagedClusterSecurityProfileDefenderSecurityGating securityGating) {
+        this.securityGating = securityGating;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -92,6 +124,9 @@ public void validate() {
         if (securityMonitoring() != null) {
             securityMonitoring().validate();
         }
+        if (securityGating() != null) {
+            securityGating().validate();
+        }
     }
 
     /**
@@ -102,6 +137,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("logAnalyticsWorkspaceResourceId", this.logAnalyticsWorkspaceResourceId);
         jsonWriter.writeJsonField("securityMonitoring", this.securityMonitoring);
+        jsonWriter.writeJsonField("securityGating", this.securityGating);
         return jsonWriter.writeEndObject();
     }
 
@@ -127,6 +163,9 @@ public static ManagedClusterSecurityProfileDefender fromJson(JsonReader jsonRead
                 } else if ("securityMonitoring".equals(fieldName)) {
                     deserializedManagedClusterSecurityProfileDefender.securityMonitoring
                         = ManagedClusterSecurityProfileDefenderSecurityMonitoring.fromJson(reader);
+                } else if ("securityGating".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileDefender.securityGating
+                        = ManagedClusterSecurityProfileDefenderSecurityGating.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefenderSecurityGating.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefenderSecurityGating.java
new file mode 100644
index 000000000000..92847ad182fb
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefenderSecurityGating.java
@@ -0,0 +1,184 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Microsoft Defender settings for security gating, validates container images eligibility for deployment based on
+ * Defender for Containers security findings. Using Admission Controller, it either audits or prevents the deployment of
+ * images that do not meet security standards.
+ */
+@Fluent
+public final class ManagedClusterSecurityProfileDefenderSecurityGating
+    implements JsonSerializable<ManagedClusterSecurityProfileDefenderSecurityGating> {
+    /*
+     * Whether to enable Defender security gating. When enabled, the gating feature will scan container images and audit
+     * or block the deployment of images that do not meet security standards according to the configured security rules.
+     */
+    private Boolean enabled;
+
+    /*
+     * List of identities that the admission controller will make use of in order to pull security artifacts from the
+     * registry. These are the same identities used by the cluster to pull container images. Each identity provided
+     * should have federated identity credential attached to it.
+     */
+    private List<ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem> identities;
+
+    /*
+     * In use only while registry access granted by secret rather than managed identity. Set whether to grant the
+     * Defender gating agent access to the cluster's secrets for pulling images from registries. If secret access is
+     * denied and the registry requires pull secrets, the add-on will not perform any image validation. Default value is
+     * false.
+     */
+    private Boolean allowSecretAccess;
+
+    /**
+     * Creates an instance of ManagedClusterSecurityProfileDefenderSecurityGating class.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGating() {
+    }
+
+    /**
+     * Get the enabled property: Whether to enable Defender security gating. When enabled, the gating feature will scan
+     * container images and audit or block the deployment of images that do not meet security standards according to the
+     * configured security rules.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Whether to enable Defender security gating. When enabled, the gating feature will scan
+     * container images and audit or block the deployment of images that do not meet security standards according to the
+     * configured security rules.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterSecurityProfileDefenderSecurityGating object itself.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGating withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Get the identities property: List of identities that the admission controller will make use of in order to pull
+     * security artifacts from the registry. These are the same identities used by the cluster to pull container images.
+     * Each identity provided should have federated identity credential attached to it.
+     * 
+     * @return the identities value.
+     */
+    public List<ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem> identities() {
+        return this.identities;
+    }
+
+    /**
+     * Set the identities property: List of identities that the admission controller will make use of in order to pull
+     * security artifacts from the registry. These are the same identities used by the cluster to pull container images.
+     * Each identity provided should have federated identity credential attached to it.
+     * 
+     * @param identities the identities value to set.
+     * @return the ManagedClusterSecurityProfileDefenderSecurityGating object itself.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGating
+        withIdentities(List<ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem> identities) {
+        this.identities = identities;
+        return this;
+    }
+
+    /**
+     * Get the allowSecretAccess property: In use only while registry access granted by secret rather than managed
+     * identity. Set whether to grant the Defender gating agent access to the cluster's secrets for pulling images from
+     * registries. If secret access is denied and the registry requires pull secrets, the add-on will not perform any
+     * image validation. Default value is false.
+     * 
+     * @return the allowSecretAccess value.
+     */
+    public Boolean allowSecretAccess() {
+        return this.allowSecretAccess;
+    }
+
+    /**
+     * Set the allowSecretAccess property: In use only while registry access granted by secret rather than managed
+     * identity. Set whether to grant the Defender gating agent access to the cluster's secrets for pulling images from
+     * registries. If secret access is denied and the registry requires pull secrets, the add-on will not perform any
+     * image validation. Default value is false.
+     * 
+     * @param allowSecretAccess the allowSecretAccess value to set.
+     * @return the ManagedClusterSecurityProfileDefenderSecurityGating object itself.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGating withAllowSecretAccess(Boolean allowSecretAccess) {
+        this.allowSecretAccess = allowSecretAccess;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (identities() != null) {
+            identities().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeArrayField("identities", this.identities, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeBooleanField("allowSecretAccess", this.allowSecretAccess);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSecurityProfileDefenderSecurityGating from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSecurityProfileDefenderSecurityGating if the JsonReader was pointing to an
+     * instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterSecurityProfileDefenderSecurityGating.
+     */
+    public static ManagedClusterSecurityProfileDefenderSecurityGating fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSecurityProfileDefenderSecurityGating deserializedManagedClusterSecurityProfileDefenderSecurityGating
+                = new ManagedClusterSecurityProfileDefenderSecurityGating();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileDefenderSecurityGating.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("identities".equals(fieldName)) {
+                    List<ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem> identities
+                        = reader.readArray(reader1 -> ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem
+                            .fromJson(reader1));
+                    deserializedManagedClusterSecurityProfileDefenderSecurityGating.identities = identities;
+                } else if ("allowSecretAccess".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileDefenderSecurityGating.allowSecretAccess
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSecurityProfileDefenderSecurityGating;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem.java
new file mode 100644
index 000000000000..1029c3faa92c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem.java
@@ -0,0 +1,135 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem model.
+ */
+@Fluent
+public final class ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem
+    implements JsonSerializable<ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem> {
+    /*
+     * The container registry for which the identity will be used; the identity specified here should have a federated
+     * identity credential attached to it.
+     */
+    private String azureContainerRegistry;
+
+    /*
+     * The identity object used to access the registry
+     */
+    private UserAssignedIdentity identity;
+
+    /**
+     * Creates an instance of ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem class.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem() {
+    }
+
+    /**
+     * Get the azureContainerRegistry property: The container registry for which the identity will be used; the identity
+     * specified here should have a federated identity credential attached to it.
+     * 
+     * @return the azureContainerRegistry value.
+     */
+    public String azureContainerRegistry() {
+        return this.azureContainerRegistry;
+    }
+
+    /**
+     * Set the azureContainerRegistry property: The container registry for which the identity will be used; the identity
+     * specified here should have a federated identity credential attached to it.
+     * 
+     * @param azureContainerRegistry the azureContainerRegistry value to set.
+     * @return the ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem object itself.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem
+        withAzureContainerRegistry(String azureContainerRegistry) {
+        this.azureContainerRegistry = azureContainerRegistry;
+        return this;
+    }
+
+    /**
+     * Get the identity property: The identity object used to access the registry.
+     * 
+     * @return the identity value.
+     */
+    public UserAssignedIdentity identity() {
+        return this.identity;
+    }
+
+    /**
+     * Set the identity property: The identity object used to access the registry.
+     * 
+     * @param identity the identity value to set.
+     * @return the ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem object itself.
+     */
+    public ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem
+        withIdentity(UserAssignedIdentity identity) {
+        this.identity = identity;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (identity() != null) {
+            identity().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("azureContainerRegistry", this.azureContainerRegistry);
+        jsonWriter.writeJsonField("identity", this.identity);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem if the JsonReader was
+     * pointing to an instance of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the
+     * ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem.
+     */
+    public static ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem deserializedManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem
+                = new ManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("azureContainerRegistry".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem.azureContainerRegistry
+                        = reader.getString();
+                } else if ("identity".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem.identity
+                        = UserAssignedIdentity.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSecurityProfileDefenderSecurityGatingIdentitiesItem;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileImageIntegrity.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileImageIntegrity.java
new file mode 100644
index 000000000000..65ce8f74d785
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileImageIntegrity.java
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Image integrity related settings for the security profile.
+ */
+@Fluent
+public final class ManagedClusterSecurityProfileImageIntegrity
+    implements JsonSerializable<ManagedClusterSecurityProfileImageIntegrity> {
+    /*
+     * Whether to enable image integrity. The default value is false.
+     */
+    private Boolean enabled;
+
+    /**
+     * Creates an instance of ManagedClusterSecurityProfileImageIntegrity class.
+     */
+    public ManagedClusterSecurityProfileImageIntegrity() {
+    }
+
+    /**
+     * Get the enabled property: Whether to enable image integrity. The default value is false.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Whether to enable image integrity. The default value is false.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterSecurityProfileImageIntegrity object itself.
+     */
+    public ManagedClusterSecurityProfileImageIntegrity withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSecurityProfileImageIntegrity from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSecurityProfileImageIntegrity if the JsonReader was pointing to an instance
+     * of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterSecurityProfileImageIntegrity.
+     */
+    public static ManagedClusterSecurityProfileImageIntegrity fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSecurityProfileImageIntegrity deserializedManagedClusterSecurityProfileImageIntegrity
+                = new ManagedClusterSecurityProfileImageIntegrity();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileImageIntegrity.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSecurityProfileImageIntegrity;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileNodeRestriction.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileNodeRestriction.java
new file mode 100644
index 000000000000..ae296c00861b
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSecurityProfileNodeRestriction.java
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Node Restriction settings for the security profile.
+ */
+@Fluent
+public final class ManagedClusterSecurityProfileNodeRestriction
+    implements JsonSerializable<ManagedClusterSecurityProfileNodeRestriction> {
+    /*
+     * Whether to enable Node Restriction
+     */
+    private Boolean enabled;
+
+    /**
+     * Creates an instance of ManagedClusterSecurityProfileNodeRestriction class.
+     */
+    public ManagedClusterSecurityProfileNodeRestriction() {
+    }
+
+    /**
+     * Get the enabled property: Whether to enable Node Restriction.
+     * 
+     * @return the enabled value.
+     */
+    public Boolean enabled() {
+        return this.enabled;
+    }
+
+    /**
+     * Set the enabled property: Whether to enable Node Restriction.
+     * 
+     * @param enabled the enabled value to set.
+     * @return the ManagedClusterSecurityProfileNodeRestriction object itself.
+     */
+    public ManagedClusterSecurityProfileNodeRestriction withEnabled(Boolean enabled) {
+        this.enabled = enabled;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeBooleanField("enabled", this.enabled);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSecurityProfileNodeRestriction from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSecurityProfileNodeRestriction if the JsonReader was pointing to an instance
+     * of it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterSecurityProfileNodeRestriction.
+     */
+    public static ManagedClusterSecurityProfileNodeRestriction fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSecurityProfileNodeRestriction deserializedManagedClusterSecurityProfileNodeRestriction
+                = new ManagedClusterSecurityProfileNodeRestriction();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("enabled".equals(fieldName)) {
+                    deserializedManagedClusterSecurityProfileNodeRestriction.enabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSecurityProfileNodeRestriction;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSnapshotListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSnapshotListResult.java
new file mode 100644
index 000000000000..c424e9052a9e
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterSnapshotListResult.java
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterSnapshotInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response from the List Managed Cluster Snapshots operation.
+ */
+@Fluent
+public final class ManagedClusterSnapshotListResult implements JsonSerializable<ManagedClusterSnapshotListResult> {
+    /*
+     * The list of managed cluster snapshots.
+     */
+    private List<ManagedClusterSnapshotInner> value;
+
+    /*
+     * The URL to get the next set of managed cluster snapshot results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of ManagedClusterSnapshotListResult class.
+     */
+    public ManagedClusterSnapshotListResult() {
+    }
+
+    /**
+     * Get the value property: The list of managed cluster snapshots.
+     * 
+     * @return the value value.
+     */
+    public List<ManagedClusterSnapshotInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The list of managed cluster snapshots.
+     * 
+     * @param value the value value to set.
+     * @return the ManagedClusterSnapshotListResult object itself.
+     */
+    public ManagedClusterSnapshotListResult withValue(List<ManagedClusterSnapshotInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next set of managed cluster snapshot results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedClusterSnapshotListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedClusterSnapshotListResult if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedClusterSnapshotListResult.
+     */
+    public static ManagedClusterSnapshotListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedClusterSnapshotListResult deserializedManagedClusterSnapshotListResult
+                = new ManagedClusterSnapshotListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<ManagedClusterSnapshotInner> value
+                        = reader.readArray(reader1 -> ManagedClusterSnapshotInner.fromJson(reader1));
+                    deserializedManagedClusterSnapshotListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedManagedClusterSnapshotListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedClusterSnapshotListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterStorageProfileDiskCsiDriver.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterStorageProfileDiskCsiDriver.java
index 7a94fabab0c8..ccb43c95014c 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterStorageProfileDiskCsiDriver.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterStorageProfileDiskCsiDriver.java
@@ -22,6 +22,11 @@ public final class ManagedClusterStorageProfileDiskCsiDriver
      */
     private Boolean enabled;
 
+    /*
+     * The version of AzureDisk CSI Driver. The default value is v1.
+     */
+    private String version;
+
     /**
      * Creates an instance of ManagedClusterStorageProfileDiskCsiDriver class.
      */
@@ -48,6 +53,26 @@ public ManagedClusterStorageProfileDiskCsiDriver withEnabled(Boolean enabled) {
         return this;
     }
 
+    /**
+     * Get the version property: The version of AzureDisk CSI Driver. The default value is v1.
+     * 
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The version of AzureDisk CSI Driver. The default value is v1.
+     * 
+     * @param version the version value to set.
+     * @return the ManagedClusterStorageProfileDiskCsiDriver object itself.
+     */
+    public ManagedClusterStorageProfileDiskCsiDriver withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -63,6 +88,7 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeStringField("version", this.version);
         return jsonWriter.writeEndObject();
     }
 
@@ -85,6 +111,8 @@ public static ManagedClusterStorageProfileDiskCsiDriver fromJson(JsonReader json
                 if ("enabled".equals(fieldName)) {
                     deserializedManagedClusterStorageProfileDiskCsiDriver.enabled
                         = reader.getNullable(JsonReader::getBoolean);
+                } else if ("version".equals(fieldName)) {
+                    deserializedManagedClusterStorageProfileDiskCsiDriver.version = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfile.java
index c8824d320110..b1d3f03a048c 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfile.java
@@ -23,7 +23,7 @@ public final class ManagedClusterWorkloadAutoScalerProfile
     private ManagedClusterWorkloadAutoScalerProfileKeda keda;
 
     /*
-     * VPA (Vertical Pod Autoscaler) settings for the workload auto-scaler profile.
+     * The verticalPodAutoscaler property.
      */
     private ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler verticalPodAutoscaler;
 
@@ -54,8 +54,7 @@ public ManagedClusterWorkloadAutoScalerProfile withKeda(ManagedClusterWorkloadAu
     }
 
     /**
-     * Get the verticalPodAutoscaler property: VPA (Vertical Pod Autoscaler) settings for the workload auto-scaler
-     * profile.
+     * Get the verticalPodAutoscaler property: The verticalPodAutoscaler property.
      * 
      * @return the verticalPodAutoscaler value.
      */
@@ -64,8 +63,7 @@ public ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler verticalPodA
     }
 
     /**
-     * Set the verticalPodAutoscaler property: VPA (Vertical Pod Autoscaler) settings for the workload auto-scaler
-     * profile.
+     * Set the verticalPodAutoscaler property: The verticalPodAutoscaler property.
      * 
      * @param verticalPodAutoscaler the verticalPodAutoscaler value to set.
      * @return the ManagedClusterWorkloadAutoScalerProfile object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler.java
index 391810a872f1..01c22f2e3d84 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler.java
@@ -12,16 +12,21 @@
 import java.io.IOException;
 
 /**
- * VPA (Vertical Pod Autoscaler) settings for the workload auto-scaler profile.
+ * The ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler model.
  */
 @Fluent
 public final class ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler
     implements JsonSerializable<ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler> {
     /*
-     * Whether to enable VPA. Default value is false.
+     * Whether to enable VPA add-on in cluster. Default value is false.
      */
     private boolean enabled;
 
+    /*
+     * Whether VPA add-on is enabled and configured to scale AKS-managed add-ons.
+     */
+    private AddonAutoscaling addonAutoscaling;
+
     /**
      * Creates an instance of ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler class.
      */
@@ -29,7 +34,7 @@ public ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler() {
     }
 
     /**
-     * Get the enabled property: Whether to enable VPA. Default value is false.
+     * Get the enabled property: Whether to enable VPA add-on in cluster. Default value is false.
      * 
      * @return the enabled value.
      */
@@ -38,7 +43,7 @@ public boolean enabled() {
     }
 
     /**
-     * Set the enabled property: Whether to enable VPA. Default value is false.
+     * Set the enabled property: Whether to enable VPA add-on in cluster. Default value is false.
      * 
      * @param enabled the enabled value to set.
      * @return the ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler object itself.
@@ -48,6 +53,27 @@ public ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler withEnabled(
         return this;
     }
 
+    /**
+     * Get the addonAutoscaling property: Whether VPA add-on is enabled and configured to scale AKS-managed add-ons.
+     * 
+     * @return the addonAutoscaling value.
+     */
+    public AddonAutoscaling addonAutoscaling() {
+        return this.addonAutoscaling;
+    }
+
+    /**
+     * Set the addonAutoscaling property: Whether VPA add-on is enabled and configured to scale AKS-managed add-ons.
+     * 
+     * @param addonAutoscaling the addonAutoscaling value to set.
+     * @return the ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler object itself.
+     */
+    public ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler
+        withAddonAutoscaling(AddonAutoscaling addonAutoscaling) {
+        this.addonAutoscaling = addonAutoscaling;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -63,6 +89,8 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeBooleanField("enabled", this.enabled);
+        jsonWriter.writeStringField("addonAutoscaling",
+            this.addonAutoscaling == null ? null : this.addonAutoscaling.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -88,6 +116,9 @@ public static ManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler fromJ
                 if ("enabled".equals(fieldName)) {
                     deserializedManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler.enabled
                         = reader.getBoolean();
+                } else if ("addonAutoscaling".equals(fieldName)) {
+                    deserializedManagedClusterWorkloadAutoScalerProfileVerticalPodAutoscaler.addonAutoscaling
+                        = AddonAutoscaling.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedGatewayType.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedGatewayType.java
new file mode 100644
index 000000000000..f12707fc5b6b
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedGatewayType.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Configuration for the managed Gateway API installation. If not specified, the default is 'Disabled'. See
+ * https://aka.ms/k8s-gateway-api for more details.
+ */
+public final class ManagedGatewayType extends ExpandableStringEnum<ManagedGatewayType> {
+    /**
+     * Static value Disabled for ManagedGatewayType.
+     */
+    public static final ManagedGatewayType DISABLED = fromString("Disabled");
+
+    /**
+     * Static value Standard for ManagedGatewayType.
+     */
+    public static final ManagedGatewayType STANDARD = fromString("Standard");
+
+    /**
+     * Creates a new instance of ManagedGatewayType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ManagedGatewayType() {
+    }
+
+    /**
+     * Creates or finds a ManagedGatewayType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ManagedGatewayType.
+     */
+    public static ManagedGatewayType fromString(String name) {
+        return fromString(name, ManagedGatewayType.class);
+    }
+
+    /**
+     * Gets known ManagedGatewayType values.
+     * 
+     * @return known ManagedGatewayType values.
+     */
+    public static Collection<ManagedGatewayType> values() {
+        return values(ManagedGatewayType.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedNamespaceListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedNamespaceListResult.java
new file mode 100644
index 000000000000..f1bbb2e4cfff
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ManagedNamespaceListResult.java
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.ManagedNamespaceInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The result of a request to list managed namespaces in a managed cluster.
+ */
+@Fluent
+public final class ManagedNamespaceListResult implements JsonSerializable<ManagedNamespaceListResult> {
+    /*
+     * The list of managed namespaces.
+     */
+    private List<ManagedNamespaceInner> value;
+
+    /*
+     * The URI to fetch the next page of results, if any.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of ManagedNamespaceListResult class.
+     */
+    public ManagedNamespaceListResult() {
+    }
+
+    /**
+     * Get the value property: The list of managed namespaces.
+     * 
+     * @return the value value.
+     */
+    public List<ManagedNamespaceInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The list of managed namespaces.
+     * 
+     * @param value the value value to set.
+     * @return the ManagedNamespaceListResult object itself.
+     */
+    public ManagedNamespaceListResult withValue(List<ManagedNamespaceInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URI to fetch the next page of results, if any.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the nextLink property: The URI to fetch the next page of results, if any.
+     * 
+     * @param nextLink the nextLink value to set.
+     * @return the ManagedNamespaceListResult object itself.
+     */
+    public ManagedNamespaceListResult withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ManagedNamespaceListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ManagedNamespaceListResult if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ManagedNamespaceListResult.
+     */
+    public static ManagedNamespaceListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ManagedNamespaceListResult deserializedManagedNamespaceListResult = new ManagedNamespaceListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<ManagedNamespaceInner> value
+                        = reader.readArray(reader1 -> ManagedNamespaceInner.fromJson(reader1));
+                    deserializedManagedNamespaceListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedManagedNamespaceListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedManagedNamespaceListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipProperties.java
new file mode 100644
index 000000000000..dc08ab89ace1
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipProperties.java
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Mesh membership properties of a managed cluster.
+ */
+@Fluent
+public final class MeshMembershipProperties implements JsonSerializable<MeshMembershipProperties> {
+    /*
+     * The current provisioning state of the Mesh Membership.
+     */
+    private MeshMembershipProvisioningState provisioningState;
+
+    /*
+     * The ARM resource id for the managed mesh member. This is of the form:
+     * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppLink/applinks/{
+     * appLinkName}/appLinkMembers/{appLinkMemberName}'. Visit https://aka.ms/applink for more information.
+     */
+    private String managedMeshId;
+
+    /**
+     * Creates an instance of MeshMembershipProperties class.
+     */
+    public MeshMembershipProperties() {
+    }
+
+    /**
+     * Get the provisioningState property: The current provisioning state of the Mesh Membership.
+     * 
+     * @return the provisioningState value.
+     */
+    public MeshMembershipProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the managedMeshId property: The ARM resource id for the managed mesh member. This is of the form:
+     * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppLink/applinks/{appLinkName}/appLinkMembers/{appLinkMemberName}'.
+     * Visit https://aka.ms/applink for more information.
+     * 
+     * @return the managedMeshId value.
+     */
+    public String managedMeshId() {
+        return this.managedMeshId;
+    }
+
+    /**
+     * Set the managedMeshId property: The ARM resource id for the managed mesh member. This is of the form:
+     * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AppLink/applinks/{appLinkName}/appLinkMembers/{appLinkMemberName}'.
+     * Visit https://aka.ms/applink for more information.
+     * 
+     * @param managedMeshId the managedMeshId value to set.
+     * @return the MeshMembershipProperties object itself.
+     */
+    public MeshMembershipProperties withManagedMeshId(String managedMeshId) {
+        this.managedMeshId = managedMeshId;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (managedMeshId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property managedMeshId in model MeshMembershipProperties"));
+        }
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(MeshMembershipProperties.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("managedMeshID", this.managedMeshId);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MeshMembershipProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MeshMembershipProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the MeshMembershipProperties.
+     */
+    public static MeshMembershipProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MeshMembershipProperties deserializedMeshMembershipProperties = new MeshMembershipProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("managedMeshID".equals(fieldName)) {
+                    deserializedMeshMembershipProperties.managedMeshId = reader.getString();
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedMeshMembershipProperties.provisioningState
+                        = MeshMembershipProvisioningState.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMeshMembershipProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipProvisioningState.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipProvisioningState.java
new file mode 100644
index 000000000000..ab03b199aed9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipProvisioningState.java
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The provisioning state of the last accepted operation.
+ */
+public final class MeshMembershipProvisioningState extends ExpandableStringEnum<MeshMembershipProvisioningState> {
+    /**
+     * Static value Canceled for MeshMembershipProvisioningState.
+     */
+    public static final MeshMembershipProvisioningState CANCELED = fromString("Canceled");
+
+    /**
+     * Static value Creating for MeshMembershipProvisioningState.
+     */
+    public static final MeshMembershipProvisioningState CREATING = fromString("Creating");
+
+    /**
+     * Static value Deleting for MeshMembershipProvisioningState.
+     */
+    public static final MeshMembershipProvisioningState DELETING = fromString("Deleting");
+
+    /**
+     * Static value Failed for MeshMembershipProvisioningState.
+     */
+    public static final MeshMembershipProvisioningState FAILED = fromString("Failed");
+
+    /**
+     * Static value Succeeded for MeshMembershipProvisioningState.
+     */
+    public static final MeshMembershipProvisioningState SUCCEEDED = fromString("Succeeded");
+
+    /**
+     * Static value Updating for MeshMembershipProvisioningState.
+     */
+    public static final MeshMembershipProvisioningState UPDATING = fromString("Updating");
+
+    /**
+     * Creates a new instance of MeshMembershipProvisioningState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public MeshMembershipProvisioningState() {
+    }
+
+    /**
+     * Creates or finds a MeshMembershipProvisioningState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding MeshMembershipProvisioningState.
+     */
+    public static MeshMembershipProvisioningState fromString(String name) {
+        return fromString(name, MeshMembershipProvisioningState.class);
+    }
+
+    /**
+     * Gets known MeshMembershipProvisioningState values.
+     * 
+     * @return known MeshMembershipProvisioningState values.
+     */
+    public static Collection<MeshMembershipProvisioningState> values() {
+        return values(MeshMembershipProvisioningState.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipsListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipsListResult.java
new file mode 100644
index 000000000000..8702c4098ab1
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/MeshMembershipsListResult.java
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.MeshMembershipInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The result of a request to list mesh memberships in a managed cluster.
+ */
+@Fluent
+public final class MeshMembershipsListResult implements JsonSerializable<MeshMembershipsListResult> {
+    /*
+     * The list of mesh memberships.
+     */
+    private List<MeshMembershipInner> value;
+
+    /*
+     * The URL to get the next set of mesh membership results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of MeshMembershipsListResult class.
+     */
+    public MeshMembershipsListResult() {
+    }
+
+    /**
+     * Get the value property: The list of mesh memberships.
+     * 
+     * @return the value value.
+     */
+    public List<MeshMembershipInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: The list of mesh memberships.
+     * 
+     * @param value the value value to set.
+     * @return the MeshMembershipsListResult object itself.
+     */
+    public MeshMembershipsListResult withValue(List<MeshMembershipInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next set of mesh membership results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of MeshMembershipsListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of MeshMembershipsListResult if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the MeshMembershipsListResult.
+     */
+    public static MeshMembershipsListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            MeshMembershipsListResult deserializedMeshMembershipsListResult = new MeshMembershipsListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<MeshMembershipInner> value
+                        = reader.readArray(reader1 -> MeshMembershipInner.fromJson(reader1));
+                    deserializedMeshMembershipsListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedMeshMembershipsListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedMeshMembershipsListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Mode.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Mode.java
new file mode 100644
index 000000000000..48a0540e997c
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Mode.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Specify which proxy mode to use ('IPTABLES' or 'IPVS').
+ */
+public final class Mode extends ExpandableStringEnum<Mode> {
+    /**
+     * Static value IPTABLES for Mode.
+     */
+    public static final Mode IPTABLES = fromString("IPTABLES");
+
+    /**
+     * Static value IPVS for Mode.
+     */
+    public static final Mode IPVS = fromString("IPVS");
+
+    /**
+     * Creates a new instance of Mode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public Mode() {
+    }
+
+    /**
+     * Creates or finds a Mode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding Mode.
+     */
+    public static Mode fromString(String name) {
+        return fromString(name, Mode.class);
+    }
+
+    /**
+     * Gets known Mode values.
+     * 
+     * @return known Mode values.
+     */
+    public static Collection<Mode> values() {
+        return values(Mode.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NamespaceProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NamespaceProperties.java
new file mode 100644
index 000000000000..653a3e21df0a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NamespaceProperties.java
@@ -0,0 +1,288 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Properties of a namespace managed by ARM.
+ */
+@Fluent
+public final class NamespaceProperties implements JsonSerializable<NamespaceProperties> {
+    /*
+     * The current provisioning state of the namespace.
+     */
+    private NamespaceProvisioningState provisioningState;
+
+    /*
+     * The labels of managed namespace.
+     */
+    private Map<String, String> labels;
+
+    /*
+     * The annotations of managed namespace.
+     */
+    private Map<String, String> annotations;
+
+    /*
+     * The special FQDN used by the Azure Portal to access the Managed Cluster. This FQDN is for use only by the Azure
+     * Portal and should not be used by other clients. The Azure Portal requires certain Cross-Origin Resource Sharing
+     * (CORS) headers to be sent in some responses, which Kubernetes APIServer doesn't handle by default. This special
+     * FQDN supports CORS, allowing the Azure Portal to function properly.
+     */
+    private String portalFqdn;
+
+    /*
+     * The default resource quota enforced upon the namespace. Customers can have other Kubernetes resource quota
+     * objects under the namespace. All the resource quotas will be enforced.
+     */
+    private ResourceQuota defaultResourceQuota;
+
+    /*
+     * The default network policy enforced upon the namespace. Customers can have other Kubernetes network policy
+     * objects under the namespace. All the network policies will be enforced.
+     */
+    private NetworkPolicies defaultNetworkPolicy;
+
+    /*
+     * Action if Kubernetes namespace with same name already exists.
+     */
+    private AdoptionPolicy adoptionPolicy;
+
+    /*
+     * Delete options of a namespace.
+     */
+    private DeletePolicy deletePolicy;
+
+    /**
+     * Creates an instance of NamespaceProperties class.
+     */
+    public NamespaceProperties() {
+    }
+
+    /**
+     * Get the provisioningState property: The current provisioning state of the namespace.
+     * 
+     * @return the provisioningState value.
+     */
+    public NamespaceProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the labels property: The labels of managed namespace.
+     * 
+     * @return the labels value.
+     */
+    public Map<String, String> labels() {
+        return this.labels;
+    }
+
+    /**
+     * Set the labels property: The labels of managed namespace.
+     * 
+     * @param labels the labels value to set.
+     * @return the NamespaceProperties object itself.
+     */
+    public NamespaceProperties withLabels(Map<String, String> labels) {
+        this.labels = labels;
+        return this;
+    }
+
+    /**
+     * Get the annotations property: The annotations of managed namespace.
+     * 
+     * @return the annotations value.
+     */
+    public Map<String, String> annotations() {
+        return this.annotations;
+    }
+
+    /**
+     * Set the annotations property: The annotations of managed namespace.
+     * 
+     * @param annotations the annotations value to set.
+     * @return the NamespaceProperties object itself.
+     */
+    public NamespaceProperties withAnnotations(Map<String, String> annotations) {
+        this.annotations = annotations;
+        return this;
+    }
+
+    /**
+     * Get the portalFqdn property: The special FQDN used by the Azure Portal to access the Managed Cluster. This FQDN
+     * is for use only by the Azure Portal and should not be used by other clients. The Azure Portal requires certain
+     * Cross-Origin Resource Sharing (CORS) headers to be sent in some responses, which Kubernetes APIServer doesn't
+     * handle by default. This special FQDN supports CORS, allowing the Azure Portal to function properly.
+     * 
+     * @return the portalFqdn value.
+     */
+    public String portalFqdn() {
+        return this.portalFqdn;
+    }
+
+    /**
+     * Get the defaultResourceQuota property: The default resource quota enforced upon the namespace. Customers can have
+     * other Kubernetes resource quota objects under the namespace. All the resource quotas will be enforced.
+     * 
+     * @return the defaultResourceQuota value.
+     */
+    public ResourceQuota defaultResourceQuota() {
+        return this.defaultResourceQuota;
+    }
+
+    /**
+     * Set the defaultResourceQuota property: The default resource quota enforced upon the namespace. Customers can have
+     * other Kubernetes resource quota objects under the namespace. All the resource quotas will be enforced.
+     * 
+     * @param defaultResourceQuota the defaultResourceQuota value to set.
+     * @return the NamespaceProperties object itself.
+     */
+    public NamespaceProperties withDefaultResourceQuota(ResourceQuota defaultResourceQuota) {
+        this.defaultResourceQuota = defaultResourceQuota;
+        return this;
+    }
+
+    /**
+     * Get the defaultNetworkPolicy property: The default network policy enforced upon the namespace. Customers can have
+     * other Kubernetes network policy objects under the namespace. All the network policies will be enforced.
+     * 
+     * @return the defaultNetworkPolicy value.
+     */
+    public NetworkPolicies defaultNetworkPolicy() {
+        return this.defaultNetworkPolicy;
+    }
+
+    /**
+     * Set the defaultNetworkPolicy property: The default network policy enforced upon the namespace. Customers can have
+     * other Kubernetes network policy objects under the namespace. All the network policies will be enforced.
+     * 
+     * @param defaultNetworkPolicy the defaultNetworkPolicy value to set.
+     * @return the NamespaceProperties object itself.
+     */
+    public NamespaceProperties withDefaultNetworkPolicy(NetworkPolicies defaultNetworkPolicy) {
+        this.defaultNetworkPolicy = defaultNetworkPolicy;
+        return this;
+    }
+
+    /**
+     * Get the adoptionPolicy property: Action if Kubernetes namespace with same name already exists.
+     * 
+     * @return the adoptionPolicy value.
+     */
+    public AdoptionPolicy adoptionPolicy() {
+        return this.adoptionPolicy;
+    }
+
+    /**
+     * Set the adoptionPolicy property: Action if Kubernetes namespace with same name already exists.
+     * 
+     * @param adoptionPolicy the adoptionPolicy value to set.
+     * @return the NamespaceProperties object itself.
+     */
+    public NamespaceProperties withAdoptionPolicy(AdoptionPolicy adoptionPolicy) {
+        this.adoptionPolicy = adoptionPolicy;
+        return this;
+    }
+
+    /**
+     * Get the deletePolicy property: Delete options of a namespace.
+     * 
+     * @return the deletePolicy value.
+     */
+    public DeletePolicy deletePolicy() {
+        return this.deletePolicy;
+    }
+
+    /**
+     * Set the deletePolicy property: Delete options of a namespace.
+     * 
+     * @param deletePolicy the deletePolicy value to set.
+     * @return the NamespaceProperties object itself.
+     */
+    public NamespaceProperties withDeletePolicy(DeletePolicy deletePolicy) {
+        this.deletePolicy = deletePolicy;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (defaultResourceQuota() != null) {
+            defaultResourceQuota().validate();
+        }
+        if (defaultNetworkPolicy() != null) {
+            defaultNetworkPolicy().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeMapField("labels", this.labels, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeMapField("annotations", this.annotations, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("defaultResourceQuota", this.defaultResourceQuota);
+        jsonWriter.writeJsonField("defaultNetworkPolicy", this.defaultNetworkPolicy);
+        jsonWriter.writeStringField("adoptionPolicy",
+            this.adoptionPolicy == null ? null : this.adoptionPolicy.toString());
+        jsonWriter.writeStringField("deletePolicy", this.deletePolicy == null ? null : this.deletePolicy.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NamespaceProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NamespaceProperties if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NamespaceProperties.
+     */
+    public static NamespaceProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NamespaceProperties deserializedNamespaceProperties = new NamespaceProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("provisioningState".equals(fieldName)) {
+                    deserializedNamespaceProperties.provisioningState
+                        = NamespaceProvisioningState.fromString(reader.getString());
+                } else if ("labels".equals(fieldName)) {
+                    Map<String, String> labels = reader.readMap(reader1 -> reader1.getString());
+                    deserializedNamespaceProperties.labels = labels;
+                } else if ("annotations".equals(fieldName)) {
+                    Map<String, String> annotations = reader.readMap(reader1 -> reader1.getString());
+                    deserializedNamespaceProperties.annotations = annotations;
+                } else if ("portalFqdn".equals(fieldName)) {
+                    deserializedNamespaceProperties.portalFqdn = reader.getString();
+                } else if ("defaultResourceQuota".equals(fieldName)) {
+                    deserializedNamespaceProperties.defaultResourceQuota = ResourceQuota.fromJson(reader);
+                } else if ("defaultNetworkPolicy".equals(fieldName)) {
+                    deserializedNamespaceProperties.defaultNetworkPolicy = NetworkPolicies.fromJson(reader);
+                } else if ("adoptionPolicy".equals(fieldName)) {
+                    deserializedNamespaceProperties.adoptionPolicy = AdoptionPolicy.fromString(reader.getString());
+                } else if ("deletePolicy".equals(fieldName)) {
+                    deserializedNamespaceProperties.deletePolicy = DeletePolicy.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNamespaceProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NamespaceProvisioningState.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NamespaceProvisioningState.java
new file mode 100644
index 000000000000..c52c72d0eefd
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NamespaceProvisioningState.java
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The current provisioning state of the namespace.
+ */
+public final class NamespaceProvisioningState extends ExpandableStringEnum<NamespaceProvisioningState> {
+    /**
+     * Static value Updating for NamespaceProvisioningState.
+     */
+    public static final NamespaceProvisioningState UPDATING = fromString("Updating");
+
+    /**
+     * Static value Deleting for NamespaceProvisioningState.
+     */
+    public static final NamespaceProvisioningState DELETING = fromString("Deleting");
+
+    /**
+     * Static value Creating for NamespaceProvisioningState.
+     */
+    public static final NamespaceProvisioningState CREATING = fromString("Creating");
+
+    /**
+     * Static value Succeeded for NamespaceProvisioningState.
+     */
+    public static final NamespaceProvisioningState SUCCEEDED = fromString("Succeeded");
+
+    /**
+     * Static value Failed for NamespaceProvisioningState.
+     */
+    public static final NamespaceProvisioningState FAILED = fromString("Failed");
+
+    /**
+     * Static value Canceled for NamespaceProvisioningState.
+     */
+    public static final NamespaceProvisioningState CANCELED = fromString("Canceled");
+
+    /**
+     * Creates a new instance of NamespaceProvisioningState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public NamespaceProvisioningState() {
+    }
+
+    /**
+     * Creates or finds a NamespaceProvisioningState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding NamespaceProvisioningState.
+     */
+    public static NamespaceProvisioningState fromString(String name) {
+        return fromString(name, NamespaceProvisioningState.class);
+    }
+
+    /**
+     * Gets known NamespaceProvisioningState values.
+     * 
+     * @return known NamespaceProvisioningState values.
+     */
+    public static Collection<NamespaceProvisioningState> values() {
+        return values(NamespaceProvisioningState.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NetworkPolicies.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NetworkPolicies.java
new file mode 100644
index 000000000000..dcd97845c911
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NetworkPolicies.java
@@ -0,0 +1,121 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Default network policy of the namespace, specifying ingress and egress rules.
+ */
+@Fluent
+public final class NetworkPolicies implements JsonSerializable<NetworkPolicies> {
+    /*
+     * Ingress policy for the network.
+     */
+    private PolicyRule ingress;
+
+    /*
+     * Egress policy for the network.
+     */
+    private PolicyRule egress;
+
+    /**
+     * Creates an instance of NetworkPolicies class.
+     */
+    public NetworkPolicies() {
+    }
+
+    /**
+     * Get the ingress property: Ingress policy for the network.
+     * 
+     * @return the ingress value.
+     */
+    public PolicyRule ingress() {
+        return this.ingress;
+    }
+
+    /**
+     * Set the ingress property: Ingress policy for the network.
+     * 
+     * @param ingress the ingress value to set.
+     * @return the NetworkPolicies object itself.
+     */
+    public NetworkPolicies withIngress(PolicyRule ingress) {
+        this.ingress = ingress;
+        return this;
+    }
+
+    /**
+     * Get the egress property: Egress policy for the network.
+     * 
+     * @return the egress value.
+     */
+    public PolicyRule egress() {
+        return this.egress;
+    }
+
+    /**
+     * Set the egress property: Egress policy for the network.
+     * 
+     * @param egress the egress value to set.
+     * @return the NetworkPolicies object itself.
+     */
+    public NetworkPolicies withEgress(PolicyRule egress) {
+        this.egress = egress;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("ingress", this.ingress == null ? null : this.ingress.toString());
+        jsonWriter.writeStringField("egress", this.egress == null ? null : this.egress.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkPolicies from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkPolicies if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NetworkPolicies.
+     */
+    public static NetworkPolicies fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkPolicies deserializedNetworkPolicies = new NetworkPolicies();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("ingress".equals(fieldName)) {
+                    deserializedNetworkPolicies.ingress = PolicyRule.fromString(reader.getString());
+                } else if ("egress".equals(fieldName)) {
+                    deserializedNetworkPolicies.egress = PolicyRule.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkPolicies;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NetworkProfileForSnapshot.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NetworkProfileForSnapshot.java
new file mode 100644
index 000000000000..df9b9e8601f6
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NetworkProfileForSnapshot.java
@@ -0,0 +1,209 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * network profile for managed cluster snapshot, these properties are read only.
+ */
+@Fluent
+public final class NetworkProfileForSnapshot implements JsonSerializable<NetworkProfileForSnapshot> {
+    /*
+     * networkPlugin for managed cluster snapshot.
+     */
+    private NetworkPlugin networkPlugin;
+
+    /*
+     * NetworkPluginMode for managed cluster snapshot.
+     */
+    private NetworkPluginMode networkPluginMode;
+
+    /*
+     * networkPolicy for managed cluster snapshot.
+     */
+    private NetworkPolicy networkPolicy;
+
+    /*
+     * networkMode for managed cluster snapshot.
+     */
+    private NetworkMode networkMode;
+
+    /*
+     * loadBalancerSku for managed cluster snapshot.
+     */
+    private LoadBalancerSku loadBalancerSku;
+
+    /**
+     * Creates an instance of NetworkProfileForSnapshot class.
+     */
+    public NetworkProfileForSnapshot() {
+    }
+
+    /**
+     * Get the networkPlugin property: networkPlugin for managed cluster snapshot.
+     * 
+     * @return the networkPlugin value.
+     */
+    public NetworkPlugin networkPlugin() {
+        return this.networkPlugin;
+    }
+
+    /**
+     * Set the networkPlugin property: networkPlugin for managed cluster snapshot.
+     * 
+     * @param networkPlugin the networkPlugin value to set.
+     * @return the NetworkProfileForSnapshot object itself.
+     */
+    public NetworkProfileForSnapshot withNetworkPlugin(NetworkPlugin networkPlugin) {
+        this.networkPlugin = networkPlugin;
+        return this;
+    }
+
+    /**
+     * Get the networkPluginMode property: NetworkPluginMode for managed cluster snapshot.
+     * 
+     * @return the networkPluginMode value.
+     */
+    public NetworkPluginMode networkPluginMode() {
+        return this.networkPluginMode;
+    }
+
+    /**
+     * Set the networkPluginMode property: NetworkPluginMode for managed cluster snapshot.
+     * 
+     * @param networkPluginMode the networkPluginMode value to set.
+     * @return the NetworkProfileForSnapshot object itself.
+     */
+    public NetworkProfileForSnapshot withNetworkPluginMode(NetworkPluginMode networkPluginMode) {
+        this.networkPluginMode = networkPluginMode;
+        return this;
+    }
+
+    /**
+     * Get the networkPolicy property: networkPolicy for managed cluster snapshot.
+     * 
+     * @return the networkPolicy value.
+     */
+    public NetworkPolicy networkPolicy() {
+        return this.networkPolicy;
+    }
+
+    /**
+     * Set the networkPolicy property: networkPolicy for managed cluster snapshot.
+     * 
+     * @param networkPolicy the networkPolicy value to set.
+     * @return the NetworkProfileForSnapshot object itself.
+     */
+    public NetworkProfileForSnapshot withNetworkPolicy(NetworkPolicy networkPolicy) {
+        this.networkPolicy = networkPolicy;
+        return this;
+    }
+
+    /**
+     * Get the networkMode property: networkMode for managed cluster snapshot.
+     * 
+     * @return the networkMode value.
+     */
+    public NetworkMode networkMode() {
+        return this.networkMode;
+    }
+
+    /**
+     * Set the networkMode property: networkMode for managed cluster snapshot.
+     * 
+     * @param networkMode the networkMode value to set.
+     * @return the NetworkProfileForSnapshot object itself.
+     */
+    public NetworkProfileForSnapshot withNetworkMode(NetworkMode networkMode) {
+        this.networkMode = networkMode;
+        return this;
+    }
+
+    /**
+     * Get the loadBalancerSku property: loadBalancerSku for managed cluster snapshot.
+     * 
+     * @return the loadBalancerSku value.
+     */
+    public LoadBalancerSku loadBalancerSku() {
+        return this.loadBalancerSku;
+    }
+
+    /**
+     * Set the loadBalancerSku property: loadBalancerSku for managed cluster snapshot.
+     * 
+     * @param loadBalancerSku the loadBalancerSku value to set.
+     * @return the NetworkProfileForSnapshot object itself.
+     */
+    public NetworkProfileForSnapshot withLoadBalancerSku(LoadBalancerSku loadBalancerSku) {
+        this.loadBalancerSku = loadBalancerSku;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("networkPlugin", this.networkPlugin == null ? null : this.networkPlugin.toString());
+        jsonWriter.writeStringField("networkPluginMode",
+            this.networkPluginMode == null ? null : this.networkPluginMode.toString());
+        jsonWriter.writeStringField("networkPolicy", this.networkPolicy == null ? null : this.networkPolicy.toString());
+        jsonWriter.writeStringField("networkMode", this.networkMode == null ? null : this.networkMode.toString());
+        jsonWriter.writeStringField("loadBalancerSku",
+            this.loadBalancerSku == null ? null : this.loadBalancerSku.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkProfileForSnapshot from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkProfileForSnapshot if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NetworkProfileForSnapshot.
+     */
+    public static NetworkProfileForSnapshot fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkProfileForSnapshot deserializedNetworkProfileForSnapshot = new NetworkProfileForSnapshot();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("networkPlugin".equals(fieldName)) {
+                    deserializedNetworkProfileForSnapshot.networkPlugin = NetworkPlugin.fromString(reader.getString());
+                } else if ("networkPluginMode".equals(fieldName)) {
+                    deserializedNetworkProfileForSnapshot.networkPluginMode
+                        = NetworkPluginMode.fromString(reader.getString());
+                } else if ("networkPolicy".equals(fieldName)) {
+                    deserializedNetworkProfileForSnapshot.networkPolicy = NetworkPolicy.fromString(reader.getString());
+                } else if ("networkMode".equals(fieldName)) {
+                    deserializedNetworkProfileForSnapshot.networkMode = NetworkMode.fromString(reader.getString());
+                } else if ("loadBalancerSku".equals(fieldName)) {
+                    deserializedNetworkProfileForSnapshot.loadBalancerSku
+                        = LoadBalancerSku.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkProfileForSnapshot;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeCustomizationProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeCustomizationProfile.java
new file mode 100644
index 000000000000..67592d6f63a9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeCustomizationProfile.java
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Settings to determine the node customization used to provision nodes in a pool.
+ */
+@Fluent
+public final class NodeCustomizationProfile implements JsonSerializable<NodeCustomizationProfile> {
+    /*
+     * The resource ID of the node customization resource to use. This can be a version. Omitting the version will use
+     * the latest version of the node customization.
+     */
+    private String nodeCustomizationId;
+
+    /**
+     * Creates an instance of NodeCustomizationProfile class.
+     */
+    public NodeCustomizationProfile() {
+    }
+
+    /**
+     * Get the nodeCustomizationId property: The resource ID of the node customization resource to use. This can be a
+     * version. Omitting the version will use the latest version of the node customization.
+     * 
+     * @return the nodeCustomizationId value.
+     */
+    public String nodeCustomizationId() {
+        return this.nodeCustomizationId;
+    }
+
+    /**
+     * Set the nodeCustomizationId property: The resource ID of the node customization resource to use. This can be a
+     * version. Omitting the version will use the latest version of the node customization.
+     * 
+     * @param nodeCustomizationId the nodeCustomizationId value to set.
+     * @return the NodeCustomizationProfile object itself.
+     */
+    public NodeCustomizationProfile withNodeCustomizationId(String nodeCustomizationId) {
+        this.nodeCustomizationId = nodeCustomizationId;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("nodeCustomizationId", this.nodeCustomizationId);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NodeCustomizationProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NodeCustomizationProfile if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NodeCustomizationProfile.
+     */
+    public static NodeCustomizationProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NodeCustomizationProfile deserializedNodeCustomizationProfile = new NodeCustomizationProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("nodeCustomizationId".equals(fieldName)) {
+                    deserializedNodeCustomizationProfile.nodeCustomizationId = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNodeCustomizationProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeImageVersionsListResult.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeImageVersionsListResult.java
new file mode 100644
index 000000000000..bd57042c4fe0
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeImageVersionsListResult.java
@@ -0,0 +1,116 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.NodeImageVersionInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Holds an array NodeImageVersions.
+ */
+@Fluent
+public final class NodeImageVersionsListResult implements JsonSerializable<NodeImageVersionsListResult> {
+    /*
+     * Array of AKS Node Image versions.
+     */
+    private List<NodeImageVersionInner> value;
+
+    /*
+     * The URL to get the next set of machine results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of NodeImageVersionsListResult class.
+     */
+    public NodeImageVersionsListResult() {
+    }
+
+    /**
+     * Get the value property: Array of AKS Node Image versions.
+     * 
+     * @return the value value.
+     */
+    public List<NodeImageVersionInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: Array of AKS Node Image versions.
+     * 
+     * @param value the value value to set.
+     * @return the NodeImageVersionsListResult object itself.
+     */
+    public NodeImageVersionsListResult withValue(List<NodeImageVersionInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next set of machine results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NodeImageVersionsListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NodeImageVersionsListResult if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NodeImageVersionsListResult.
+     */
+    public static NodeImageVersionsListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NodeImageVersionsListResult deserializedNodeImageVersionsListResult = new NodeImageVersionsListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<NodeImageVersionInner> value
+                        = reader.readArray(reader1 -> NodeImageVersionInner.fromJson(reader1));
+                    deserializedNodeImageVersionsListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedNodeImageVersionsListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNodeImageVersionsListResult;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeOSUpgradeChannel.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeOSUpgradeChannel.java
index 8f9de197ee22..8c741e7ae4c4 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeOSUpgradeChannel.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/NodeOSUpgradeChannel.java
@@ -8,7 +8,8 @@
 import java.util.Collection;
 
 /**
- * Node OS Upgrade Channel. Manner in which the OS on your nodes is updated. The default is NodeImage.
+ * Manner in which the OS on your nodes is updated. The default is Unmanaged, but may change to either NodeImage or
+ * SecurityPatch at GA.
  */
 public final class NodeOSUpgradeChannel extends ExpandableStringEnum<NodeOSUpgradeChannel> {
     /**
@@ -22,14 +23,14 @@ public final class NodeOSUpgradeChannel extends ExpandableStringEnum<NodeOSUpgra
     public static final NodeOSUpgradeChannel UNMANAGED = fromString("Unmanaged");
 
     /**
-     * Static value NodeImage for NodeOSUpgradeChannel.
+     * Static value SecurityPatch for NodeOSUpgradeChannel.
      */
-    public static final NodeOSUpgradeChannel NODE_IMAGE = fromString("NodeImage");
+    public static final NodeOSUpgradeChannel SECURITY_PATCH = fromString("SecurityPatch");
 
     /**
-     * Static value SecurityPatch for NodeOSUpgradeChannel.
+     * Static value NodeImage for NodeOSUpgradeChannel.
      */
-    public static final NodeOSUpgradeChannel SECURITY_PATCH = fromString("SecurityPatch");
+    public static final NodeOSUpgradeChannel NODE_IMAGE = fromString("NodeImage");
 
     /**
      * Creates a new instance of NodeOSUpgradeChannel value.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OSSku.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OSSku.java
index bdb0ac40d084..6d32b394ca4a 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OSSku.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OSSku.java
@@ -8,8 +8,8 @@
 import java.util.Collection;
 
 /**
- * Specifies the OS SKU used by the agent pool. The default is Ubuntu if OSType is Linux. The default is Windows2019
- * when Kubernetes &lt;= 1.24 or Windows2022 when Kubernetes &gt;= 1.25 if OSType is Windows.
+ * Specifies the OS SKU used by the agent pool. If not specified, the default is Ubuntu if OSType=Linux or Windows2019
+ * if OSType=Windows. And the default Windows OSSKU will be changed to Windows2022 after Windows2019 is deprecated.
  */
 public final class OSSku extends ExpandableStringEnum<OSSku> {
     /**
@@ -17,6 +17,11 @@ public final class OSSku extends ExpandableStringEnum<OSSku> {
      */
     public static final OSSku UBUNTU = fromString("Ubuntu");
 
+    /**
+     * Static value Mariner for OSSku.
+     */
+    public static final OSSku MARINER = fromString("Mariner");
+
     /**
      * Static value AzureLinux for OSSku.
      */
@@ -27,6 +32,11 @@ public final class OSSku extends ExpandableStringEnum<OSSku> {
      */
     public static final OSSku AZURE_LINUX3 = fromString("AzureLinux3");
 
+    /**
+     * Static value Flatcar for OSSku.
+     */
+    public static final OSSku FLATCAR = fromString("Flatcar");
+
     /**
      * Static value CBLMariner for OSSku.
      */
@@ -42,11 +52,26 @@ public final class OSSku extends ExpandableStringEnum<OSSku> {
      */
     public static final OSSku WINDOWS2022 = fromString("Windows2022");
 
+    /**
+     * Static value Windows2025 for OSSku.
+     */
+    public static final OSSku WINDOWS2025 = fromString("Windows2025");
+
+    /**
+     * Static value WindowsAnnual for OSSku.
+     */
+    public static final OSSku WINDOWS_ANNUAL = fromString("WindowsAnnual");
+
     /**
      * Static value Ubuntu2204 for OSSku.
      */
     public static final OSSku UBUNTU2204 = fromString("Ubuntu2204");
 
+    /**
+     * Static value Ubuntu2404 for OSSku.
+     */
+    public static final OSSku UBUNTU2404 = fromString("Ubuntu2404");
+
     /**
      * Creates a new instance of OSSku value.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OperationStatusResultList.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OperationStatusResultList.java
new file mode 100644
index 000000000000..6ee5edce05c9
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/OperationStatusResultList.java
@@ -0,0 +1,104 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.OperationStatusResultInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The operations list. It contains an URL link to get the next set of results.
+ */
+@Immutable
+public final class OperationStatusResultList implements JsonSerializable<OperationStatusResultList> {
+    /*
+     * List of operations
+     */
+    private List<OperationStatusResultInner> value;
+
+    /*
+     * URL to get the next set of operation list results (if there are any).
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of OperationStatusResultList class.
+     */
+    public OperationStatusResultList() {
+    }
+
+    /**
+     * Get the value property: List of operations.
+     * 
+     * @return the value value.
+     */
+    public List<OperationStatusResultInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Get the nextLink property: URL to get the next set of operation list results (if there are any).
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of OperationStatusResultList from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of OperationStatusResultList if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the OperationStatusResultList.
+     */
+    public static OperationStatusResultList fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            OperationStatusResultList deserializedOperationStatusResultList = new OperationStatusResultList();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<OperationStatusResultInner> value
+                        = reader.readArray(reader1 -> OperationStatusResultInner.fromJson(reader1));
+                    deserializedOperationStatusResultList.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedOperationStatusResultList.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedOperationStatusResultList;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Operator.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Operator.java
new file mode 100644
index 000000000000..27748a54944a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Operator.java
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * operator represents a key's relationship to a set of values. Valid operators are In and NotIn.
+ */
+public final class Operator extends ExpandableStringEnum<Operator> {
+    /**
+     * Static value In for Operator.
+     */
+    public static final Operator IN = fromString("In");
+
+    /**
+     * Static value NotIn for Operator.
+     */
+    public static final Operator NOT_IN = fromString("NotIn");
+
+    /**
+     * Static value Exists for Operator.
+     */
+    public static final Operator EXISTS = fromString("Exists");
+
+    /**
+     * Static value DoesNotExist for Operator.
+     */
+    public static final Operator DOES_NOT_EXIST = fromString("DoesNotExist");
+
+    /**
+     * Creates a new instance of Operator value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public Operator() {
+    }
+
+    /**
+     * Creates or finds a Operator from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding Operator.
+     */
+    public static Operator fromString(String name) {
+        return fromString(name, Operator.class);
+    }
+
+    /**
+     * Gets known Operator values.
+     * 
+     * @return known Operator values.
+     */
+    public static Collection<Operator> values() {
+        return values(Operator.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PodLinkLocalAccess.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PodLinkLocalAccess.java
new file mode 100644
index 000000000000..cef2262fdc22
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PodLinkLocalAccess.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Defines access to special link local addresses (Azure Instance Metadata Service, aka IMDS) for pods with
+ * hostNetwork=false. If not specified, the default is 'IMDS'.
+ */
+public final class PodLinkLocalAccess extends ExpandableStringEnum<PodLinkLocalAccess> {
+    /**
+     * Static value IMDS for PodLinkLocalAccess.
+     */
+    public static final PodLinkLocalAccess IMDS = fromString("IMDS");
+
+    /**
+     * Static value None for PodLinkLocalAccess.
+     */
+    public static final PodLinkLocalAccess NONE = fromString("None");
+
+    /**
+     * Creates a new instance of PodLinkLocalAccess value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public PodLinkLocalAccess() {
+    }
+
+    /**
+     * Creates or finds a PodLinkLocalAccess from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding PodLinkLocalAccess.
+     */
+    public static PodLinkLocalAccess fromString(String name) {
+        return fromString(name, PodLinkLocalAccess.class);
+    }
+
+    /**
+     * Gets known PodLinkLocalAccess values.
+     * 
+     * @return known PodLinkLocalAccess values.
+     */
+    public static Collection<PodLinkLocalAccess> values() {
+        return values(PodLinkLocalAccess.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PolicyRule.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PolicyRule.java
new file mode 100644
index 000000000000..e0be3112b570
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PolicyRule.java
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Enum representing different network policy rules.
+ */
+public final class PolicyRule extends ExpandableStringEnum<PolicyRule> {
+    /**
+     * Static value DenyAll for PolicyRule.
+     */
+    public static final PolicyRule DENY_ALL = fromString("DenyAll");
+
+    /**
+     * Static value AllowAll for PolicyRule.
+     */
+    public static final PolicyRule ALLOW_ALL = fromString("AllowAll");
+
+    /**
+     * Static value AllowSameNamespace for PolicyRule.
+     */
+    public static final PolicyRule ALLOW_SAME_NAMESPACE = fromString("AllowSameNamespace");
+
+    /**
+     * Creates a new instance of PolicyRule value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public PolicyRule() {
+    }
+
+    /**
+     * Creates or finds a PolicyRule from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding PolicyRule.
+     */
+    public static PolicyRule fromString(String name) {
+        return fromString(name, PolicyRule.class);
+    }
+
+    /**
+     * Gets known PolicyRule values.
+     * 
+     * @return known PolicyRule values.
+     */
+    public static Collection<PolicyRule> values() {
+        return values(PolicyRule.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ProxyRedirectionMechanism.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ProxyRedirectionMechanism.java
new file mode 100644
index 000000000000..24299d253630
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ProxyRedirectionMechanism.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Mode of traffic redirection.
+ */
+public final class ProxyRedirectionMechanism extends ExpandableStringEnum<ProxyRedirectionMechanism> {
+    /**
+     * Static value InitContainers for ProxyRedirectionMechanism.
+     */
+    public static final ProxyRedirectionMechanism INIT_CONTAINERS = fromString("InitContainers");
+
+    /**
+     * Static value CNIChaining for ProxyRedirectionMechanism.
+     */
+    public static final ProxyRedirectionMechanism CNICHAINING = fromString("CNIChaining");
+
+    /**
+     * Creates a new instance of ProxyRedirectionMechanism value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ProxyRedirectionMechanism() {
+    }
+
+    /**
+     * Creates or finds a ProxyRedirectionMechanism from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ProxyRedirectionMechanism.
+     */
+    public static ProxyRedirectionMechanism fromString(String name) {
+        return fromString(name, ProxyRedirectionMechanism.class);
+    }
+
+    /**
+     * Gets known ProxyRedirectionMechanism values.
+     * 
+     * @return known ProxyRedirectionMechanism values.
+     */
+    public static Collection<ProxyRedirectionMechanism> values() {
+        return values(ProxyRedirectionMechanism.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PublicNetworkAccess.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PublicNetworkAccess.java
index fbe44e756c02..2402a0e06db8 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PublicNetworkAccess.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/PublicNetworkAccess.java
@@ -21,6 +21,11 @@ public final class PublicNetworkAccess extends ExpandableStringEnum<PublicNetwor
      */
     public static final PublicNetworkAccess DISABLED = fromString("Disabled");
 
+    /**
+     * Static value SecuredByPerimeter for PublicNetworkAccess.
+     */
+    public static final PublicNetworkAccess SECURED_BY_PERIMETER = fromString("SecuredByPerimeter");
+
     /**
      * Creates a new instance of PublicNetworkAccess value.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RebalanceLoadBalancersRequestBody.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RebalanceLoadBalancersRequestBody.java
new file mode 100644
index 000000000000..85d3aa6fe597
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RebalanceLoadBalancersRequestBody.java
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The names of the load balancers to rebalance. If set to empty, all load balancers will be rebalanced.
+ */
+@Fluent
+public final class RebalanceLoadBalancersRequestBody implements JsonSerializable<RebalanceLoadBalancersRequestBody> {
+    /*
+     * The load balancer names list.
+     */
+    private List<String> loadBalancerNames;
+
+    /**
+     * Creates an instance of RebalanceLoadBalancersRequestBody class.
+     */
+    public RebalanceLoadBalancersRequestBody() {
+    }
+
+    /**
+     * Get the loadBalancerNames property: The load balancer names list.
+     * 
+     * @return the loadBalancerNames value.
+     */
+    public List<String> loadBalancerNames() {
+        return this.loadBalancerNames;
+    }
+
+    /**
+     * Set the loadBalancerNames property: The load balancer names list.
+     * 
+     * @param loadBalancerNames the loadBalancerNames value to set.
+     * @return the RebalanceLoadBalancersRequestBody object itself.
+     */
+    public RebalanceLoadBalancersRequestBody withLoadBalancerNames(List<String> loadBalancerNames) {
+        this.loadBalancerNames = loadBalancerNames;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("loadBalancerNames", this.loadBalancerNames,
+            (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of RebalanceLoadBalancersRequestBody from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of RebalanceLoadBalancersRequestBody if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the RebalanceLoadBalancersRequestBody.
+     */
+    public static RebalanceLoadBalancersRequestBody fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            RebalanceLoadBalancersRequestBody deserializedRebalanceLoadBalancersRequestBody
+                = new RebalanceLoadBalancersRequestBody();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("loadBalancerNames".equals(fieldName)) {
+                    List<String> loadBalancerNames = reader.readArray(reader1 -> reader1.getString());
+                    deserializedRebalanceLoadBalancersRequestBody.loadBalancerNames = loadBalancerNames;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedRebalanceLoadBalancersRequestBody;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RelativeMonthlySchedule.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RelativeMonthlySchedule.java
index aa8addd1d0cf..c97ef4a7fdbd 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RelativeMonthlySchedule.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RelativeMonthlySchedule.java
@@ -23,7 +23,7 @@ public final class RelativeMonthlySchedule implements JsonSerializable<RelativeM
     private int intervalMonths;
 
     /*
-     * The week index. Specifies on which week of the month the dayOfWeek applies.
+     * The week index. Specifies on which instance of the allowed days specified in daysOfWeek the maintenance occurs.
      */
     private Type weekIndex;
 
@@ -59,7 +59,8 @@ public RelativeMonthlySchedule withIntervalMonths(int intervalMonths) {
     }
 
     /**
-     * Get the weekIndex property: The week index. Specifies on which week of the month the dayOfWeek applies.
+     * Get the weekIndex property: The week index. Specifies on which instance of the allowed days specified in
+     * daysOfWeek the maintenance occurs.
      * 
      * @return the weekIndex value.
      */
@@ -68,7 +69,8 @@ public Type weekIndex() {
     }
 
     /**
-     * Set the weekIndex property: The week index. Specifies on which week of the month the dayOfWeek applies.
+     * Set the weekIndex property: The week index. Specifies on which instance of the allowed days specified in
+     * daysOfWeek the maintenance occurs.
      * 
      * @param weekIndex the weekIndex value to set.
      * @return the RelativeMonthlySchedule object itself.
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ResourceQuota.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ResourceQuota.java
new file mode 100644
index 000000000000..0864b9f04fc2
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ResourceQuota.java
@@ -0,0 +1,205 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Resource quota for the namespace.
+ */
+@Fluent
+public final class ResourceQuota implements JsonSerializable<ResourceQuota> {
+    /*
+     * CPU request of the namespace in one-thousandth CPU form. See [CPU resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu) for more
+     * details.
+     */
+    private String cpuRequest;
+
+    /*
+     * CPU limit of the namespace in one-thousandth CPU form. See [CPU resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu) for more
+     * details.
+     */
+    private String cpuLimit;
+
+    /*
+     * Memory request of the namespace in the power-of-two equivalents form: Ei, Pi, Ti, Gi, Mi, Ki. See [Memory
+     * resource units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory)
+     * for more details.
+     */
+    private String memoryRequest;
+
+    /*
+     * Memory limit of the namespace in the power-of-two equivalents form: Ei, Pi, Ti, Gi, Mi, Ki. See [Memory resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory) for more
+     * details.
+     */
+    private String memoryLimit;
+
+    /**
+     * Creates an instance of ResourceQuota class.
+     */
+    public ResourceQuota() {
+    }
+
+    /**
+     * Get the cpuRequest property: CPU request of the namespace in one-thousandth CPU form. See [CPU resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu) for more
+     * details.
+     * 
+     * @return the cpuRequest value.
+     */
+    public String cpuRequest() {
+        return this.cpuRequest;
+    }
+
+    /**
+     * Set the cpuRequest property: CPU request of the namespace in one-thousandth CPU form. See [CPU resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu) for more
+     * details.
+     * 
+     * @param cpuRequest the cpuRequest value to set.
+     * @return the ResourceQuota object itself.
+     */
+    public ResourceQuota withCpuRequest(String cpuRequest) {
+        this.cpuRequest = cpuRequest;
+        return this;
+    }
+
+    /**
+     * Get the cpuLimit property: CPU limit of the namespace in one-thousandth CPU form. See [CPU resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu) for more
+     * details.
+     * 
+     * @return the cpuLimit value.
+     */
+    public String cpuLimit() {
+        return this.cpuLimit;
+    }
+
+    /**
+     * Set the cpuLimit property: CPU limit of the namespace in one-thousandth CPU form. See [CPU resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu) for more
+     * details.
+     * 
+     * @param cpuLimit the cpuLimit value to set.
+     * @return the ResourceQuota object itself.
+     */
+    public ResourceQuota withCpuLimit(String cpuLimit) {
+        this.cpuLimit = cpuLimit;
+        return this;
+    }
+
+    /**
+     * Get the memoryRequest property: Memory request of the namespace in the power-of-two equivalents form: Ei, Pi, Ti,
+     * Gi, Mi, Ki. See [Memory resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory) for more
+     * details.
+     * 
+     * @return the memoryRequest value.
+     */
+    public String memoryRequest() {
+        return this.memoryRequest;
+    }
+
+    /**
+     * Set the memoryRequest property: Memory request of the namespace in the power-of-two equivalents form: Ei, Pi, Ti,
+     * Gi, Mi, Ki. See [Memory resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory) for more
+     * details.
+     * 
+     * @param memoryRequest the memoryRequest value to set.
+     * @return the ResourceQuota object itself.
+     */
+    public ResourceQuota withMemoryRequest(String memoryRequest) {
+        this.memoryRequest = memoryRequest;
+        return this;
+    }
+
+    /**
+     * Get the memoryLimit property: Memory limit of the namespace in the power-of-two equivalents form: Ei, Pi, Ti, Gi,
+     * Mi, Ki. See [Memory resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory) for more
+     * details.
+     * 
+     * @return the memoryLimit value.
+     */
+    public String memoryLimit() {
+        return this.memoryLimit;
+    }
+
+    /**
+     * Set the memoryLimit property: Memory limit of the namespace in the power-of-two equivalents form: Ei, Pi, Ti, Gi,
+     * Mi, Ki. See [Memory resource
+     * units](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-memory) for more
+     * details.
+     * 
+     * @param memoryLimit the memoryLimit value to set.
+     * @return the ResourceQuota object itself.
+     */
+    public ResourceQuota withMemoryLimit(String memoryLimit) {
+        this.memoryLimit = memoryLimit;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("cpuRequest", this.cpuRequest);
+        jsonWriter.writeStringField("cpuLimit", this.cpuLimit);
+        jsonWriter.writeStringField("memoryRequest", this.memoryRequest);
+        jsonWriter.writeStringField("memoryLimit", this.memoryLimit);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ResourceQuota from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ResourceQuota if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ResourceQuota.
+     */
+    public static ResourceQuota fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ResourceQuota deserializedResourceQuota = new ResourceQuota();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("cpuRequest".equals(fieldName)) {
+                    deserializedResourceQuota.cpuRequest = reader.getString();
+                } else if ("cpuLimit".equals(fieldName)) {
+                    deserializedResourceQuota.cpuLimit = reader.getString();
+                } else if ("memoryRequest".equals(fieldName)) {
+                    deserializedResourceQuota.memoryRequest = reader.getString();
+                } else if ("memoryLimit".equals(fieldName)) {
+                    deserializedResourceQuota.memoryLimit = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedResourceQuota;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RestrictionLevel.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RestrictionLevel.java
index 70664c2e4cac..34833ca6a3e0 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RestrictionLevel.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/RestrictionLevel.java
@@ -8,7 +8,7 @@
 import java.util.Collection;
 
 /**
- * The restriction level applied to the cluster's node resource group. If not specified, the default is 'Unrestricted'.
+ * The restriction level applied to the cluster's node resource group.
  */
 public final class RestrictionLevel extends ExpandableStringEnum<RestrictionLevel> {
     /**
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsAvailableVersionsList.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsAvailableVersionsList.java
new file mode 100644
index 000000000000..d806f3572976
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsAvailableVersionsList.java
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.containerservice.fluent.models.SafeguardsAvailableVersionInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Hold values properties, which is array of SafeguardsVersions.
+ */
+@Fluent
+public final class SafeguardsAvailableVersionsList implements JsonSerializable<SafeguardsAvailableVersionsList> {
+    /*
+     * Array of AKS supported Safeguards versions.
+     */
+    private List<SafeguardsAvailableVersionInner> value;
+
+    /*
+     * The URL to get the next Safeguards available version.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of SafeguardsAvailableVersionsList class.
+     */
+    public SafeguardsAvailableVersionsList() {
+    }
+
+    /**
+     * Get the value property: Array of AKS supported Safeguards versions.
+     * 
+     * @return the value value.
+     */
+    public List<SafeguardsAvailableVersionInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: Array of AKS supported Safeguards versions.
+     * 
+     * @param value the value value to set.
+     * @return the SafeguardsAvailableVersionsList object itself.
+     */
+    public SafeguardsAvailableVersionsList withValue(List<SafeguardsAvailableVersionInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: The URL to get the next Safeguards available version.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of SafeguardsAvailableVersionsList from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of SafeguardsAvailableVersionsList if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the SafeguardsAvailableVersionsList.
+     */
+    public static SafeguardsAvailableVersionsList fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            SafeguardsAvailableVersionsList deserializedSafeguardsAvailableVersionsList
+                = new SafeguardsAvailableVersionsList();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<SafeguardsAvailableVersionInner> value
+                        = reader.readArray(reader1 -> SafeguardsAvailableVersionInner.fromJson(reader1));
+                    deserializedSafeguardsAvailableVersionsList.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionsList.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedSafeguardsAvailableVersionsList;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsAvailableVersionsProperties.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsAvailableVersionsProperties.java
new file mode 100644
index 000000000000..8e3f29bd512f
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsAvailableVersionsProperties.java
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Whether the version is default or not and support info.
+ */
+@Immutable
+public final class SafeguardsAvailableVersionsProperties
+    implements JsonSerializable<SafeguardsAvailableVersionsProperties> {
+    /*
+     * The isDefaultVersion property.
+     */
+    private Boolean isDefaultVersion;
+
+    /*
+     * Whether the version is preview or stable.
+     */
+    private SafeguardsSupport support;
+
+    /**
+     * Creates an instance of SafeguardsAvailableVersionsProperties class.
+     */
+    public SafeguardsAvailableVersionsProperties() {
+    }
+
+    /**
+     * Get the isDefaultVersion property: The isDefaultVersion property.
+     * 
+     * @return the isDefaultVersion value.
+     */
+    public Boolean isDefaultVersion() {
+        return this.isDefaultVersion;
+    }
+
+    /**
+     * Get the support property: Whether the version is preview or stable.
+     * 
+     * @return the support value.
+     */
+    public SafeguardsSupport support() {
+        return this.support;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of SafeguardsAvailableVersionsProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of SafeguardsAvailableVersionsProperties if the JsonReader was pointing to an instance of it,
+     * or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the SafeguardsAvailableVersionsProperties.
+     */
+    public static SafeguardsAvailableVersionsProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            SafeguardsAvailableVersionsProperties deserializedSafeguardsAvailableVersionsProperties
+                = new SafeguardsAvailableVersionsProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("isDefaultVersion".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionsProperties.isDefaultVersion
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("support".equals(fieldName)) {
+                    deserializedSafeguardsAvailableVersionsProperties.support
+                        = SafeguardsSupport.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedSafeguardsAvailableVersionsProperties;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsSupport.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsSupport.java
new file mode 100644
index 000000000000..797c2c7c429a
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SafeguardsSupport.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Whether the version is preview or stable.
+ */
+public final class SafeguardsSupport extends ExpandableStringEnum<SafeguardsSupport> {
+    /**
+     * Static value Preview for SafeguardsSupport.
+     */
+    public static final SafeguardsSupport PREVIEW = fromString("Preview");
+
+    /**
+     * Static value Stable for SafeguardsSupport.
+     */
+    public static final SafeguardsSupport STABLE = fromString("Stable");
+
+    /**
+     * Creates a new instance of SafeguardsSupport value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public SafeguardsSupport() {
+    }
+
+    /**
+     * Creates or finds a SafeguardsSupport from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding SafeguardsSupport.
+     */
+    public static SafeguardsSupport fromString(String name) {
+        return fromString(name, SafeguardsSupport.class);
+    }
+
+    /**
+     * Gets known SafeguardsSupport values.
+     * 
+     * @return known SafeguardsSupport values.
+     */
+    public static Collection<SafeguardsSupport> values() {
+        return values(SafeguardsSupport.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ScaleProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ScaleProfile.java
index 1796156c2698..ecb2a1b91692 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ScaleProfile.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ScaleProfile.java
@@ -22,6 +22,11 @@ public final class ScaleProfile implements JsonSerializable<ScaleProfile> {
      */
     private List<ManualScaleProfile> manual;
 
+    /*
+     * Specifications on how to auto-scale the VirtualMachines agent pool within a predefined size range.
+     */
+    private AutoScaleProfile autoscale;
+
     /**
      * Creates an instance of ScaleProfile class.
      */
@@ -48,6 +53,28 @@ public ScaleProfile withManual(List<ManualScaleProfile> manual) {
         return this;
     }
 
+    /**
+     * Get the autoscale property: Specifications on how to auto-scale the VirtualMachines agent pool within a
+     * predefined size range.
+     * 
+     * @return the autoscale value.
+     */
+    public AutoScaleProfile autoscale() {
+        return this.autoscale;
+    }
+
+    /**
+     * Set the autoscale property: Specifications on how to auto-scale the VirtualMachines agent pool within a
+     * predefined size range.
+     * 
+     * @param autoscale the autoscale value to set.
+     * @return the ScaleProfile object itself.
+     */
+    public ScaleProfile withAutoscale(AutoScaleProfile autoscale) {
+        this.autoscale = autoscale;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -57,6 +84,9 @@ public void validate() {
         if (manual() != null) {
             manual().forEach(e -> e.validate());
         }
+        if (autoscale() != null) {
+            autoscale().validate();
+        }
     }
 
     /**
@@ -66,6 +96,7 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeArrayField("manual", this.manual, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeJsonField("autoscale", this.autoscale);
         return jsonWriter.writeEndObject();
     }
 
@@ -87,6 +118,8 @@ public static ScaleProfile fromJson(JsonReader jsonReader) throws IOException {
                 if ("manual".equals(fieldName)) {
                     List<ManualScaleProfile> manual = reader.readArray(reader1 -> ManualScaleProfile.fromJson(reader1));
                     deserializedScaleProfile.manual = manual;
+                } else if ("autoscale".equals(fieldName)) {
+                    deserializedScaleProfile.autoscale = AutoScaleProfile.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerConfigMode.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerConfigMode.java
new file mode 100644
index 000000000000..9a803d31eb10
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerConfigMode.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The config customization mode for this scheduler instance.
+ */
+public final class SchedulerConfigMode extends ExpandableStringEnum<SchedulerConfigMode> {
+    /**
+     * Static value Default for SchedulerConfigMode.
+     */
+    public static final SchedulerConfigMode DEFAULT = fromString("Default");
+
+    /**
+     * Static value ManagedByCRD for SchedulerConfigMode.
+     */
+    public static final SchedulerConfigMode MANAGED_BY_CRD = fromString("ManagedByCRD");
+
+    /**
+     * Creates a new instance of SchedulerConfigMode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public SchedulerConfigMode() {
+    }
+
+    /**
+     * Creates or finds a SchedulerConfigMode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding SchedulerConfigMode.
+     */
+    public static SchedulerConfigMode fromString(String name) {
+        return fromString(name, SchedulerConfigMode.class);
+    }
+
+    /**
+     * Gets known SchedulerConfigMode values.
+     * 
+     * @return known SchedulerConfigMode values.
+     */
+    public static Collection<SchedulerConfigMode> values() {
+        return values(SchedulerConfigMode.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerInstanceProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerInstanceProfile.java
new file mode 100644
index 000000000000..e76e78219620
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerInstanceProfile.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The scheduler profile for a single scheduler instance.
+ */
+@Fluent
+public final class SchedulerInstanceProfile implements JsonSerializable<SchedulerInstanceProfile> {
+    /*
+     * The config customization mode for this scheduler instance.
+     */
+    private SchedulerConfigMode schedulerConfigMode;
+
+    /**
+     * Creates an instance of SchedulerInstanceProfile class.
+     */
+    public SchedulerInstanceProfile() {
+    }
+
+    /**
+     * Get the schedulerConfigMode property: The config customization mode for this scheduler instance.
+     * 
+     * @return the schedulerConfigMode value.
+     */
+    public SchedulerConfigMode schedulerConfigMode() {
+        return this.schedulerConfigMode;
+    }
+
+    /**
+     * Set the schedulerConfigMode property: The config customization mode for this scheduler instance.
+     * 
+     * @param schedulerConfigMode the schedulerConfigMode value to set.
+     * @return the SchedulerInstanceProfile object itself.
+     */
+    public SchedulerInstanceProfile withSchedulerConfigMode(SchedulerConfigMode schedulerConfigMode) {
+        this.schedulerConfigMode = schedulerConfigMode;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("schedulerConfigMode",
+            this.schedulerConfigMode == null ? null : this.schedulerConfigMode.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of SchedulerInstanceProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of SchedulerInstanceProfile if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the SchedulerInstanceProfile.
+     */
+    public static SchedulerInstanceProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            SchedulerInstanceProfile deserializedSchedulerInstanceProfile = new SchedulerInstanceProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("schedulerConfigMode".equals(fieldName)) {
+                    deserializedSchedulerInstanceProfile.schedulerConfigMode
+                        = SchedulerConfigMode.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedSchedulerInstanceProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerProfile.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerProfile.java
new file mode 100644
index 000000000000..8ec16cb1c505
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerProfile.java
@@ -0,0 +1,98 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The pod scheduler profile for the cluster.
+ */
+@Fluent
+public final class SchedulerProfile implements JsonSerializable<SchedulerProfile> {
+    /*
+     * Mapping of each scheduler instance to its profile.
+     */
+    private SchedulerProfileSchedulerInstanceProfiles schedulerInstanceProfiles;
+
+    /**
+     * Creates an instance of SchedulerProfile class.
+     */
+    public SchedulerProfile() {
+    }
+
+    /**
+     * Get the schedulerInstanceProfiles property: Mapping of each scheduler instance to its profile.
+     * 
+     * @return the schedulerInstanceProfiles value.
+     */
+    public SchedulerProfileSchedulerInstanceProfiles schedulerInstanceProfiles() {
+        return this.schedulerInstanceProfiles;
+    }
+
+    /**
+     * Set the schedulerInstanceProfiles property: Mapping of each scheduler instance to its profile.
+     * 
+     * @param schedulerInstanceProfiles the schedulerInstanceProfiles value to set.
+     * @return the SchedulerProfile object itself.
+     */
+    public SchedulerProfile
+        withSchedulerInstanceProfiles(SchedulerProfileSchedulerInstanceProfiles schedulerInstanceProfiles) {
+        this.schedulerInstanceProfiles = schedulerInstanceProfiles;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (schedulerInstanceProfiles() != null) {
+            schedulerInstanceProfiles().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("schedulerInstanceProfiles", this.schedulerInstanceProfiles);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of SchedulerProfile from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of SchedulerProfile if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the SchedulerProfile.
+     */
+    public static SchedulerProfile fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            SchedulerProfile deserializedSchedulerProfile = new SchedulerProfile();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("schedulerInstanceProfiles".equals(fieldName)) {
+                    deserializedSchedulerProfile.schedulerInstanceProfiles
+                        = SchedulerProfileSchedulerInstanceProfiles.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedSchedulerProfile;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerProfileSchedulerInstanceProfiles.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerProfileSchedulerInstanceProfiles.java
new file mode 100644
index 000000000000..7ea490b5f166
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SchedulerProfileSchedulerInstanceProfiles.java
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Mapping of each scheduler instance to its profile.
+ */
+@Fluent
+public final class SchedulerProfileSchedulerInstanceProfiles
+    implements JsonSerializable<SchedulerProfileSchedulerInstanceProfiles> {
+    /*
+     * The scheduler profile for the upstream scheduler instance.
+     */
+    private SchedulerInstanceProfile upstream;
+
+    /**
+     * Creates an instance of SchedulerProfileSchedulerInstanceProfiles class.
+     */
+    public SchedulerProfileSchedulerInstanceProfiles() {
+    }
+
+    /**
+     * Get the upstream property: The scheduler profile for the upstream scheduler instance.
+     * 
+     * @return the upstream value.
+     */
+    public SchedulerInstanceProfile upstream() {
+        return this.upstream;
+    }
+
+    /**
+     * Set the upstream property: The scheduler profile for the upstream scheduler instance.
+     * 
+     * @param upstream the upstream value to set.
+     * @return the SchedulerProfileSchedulerInstanceProfiles object itself.
+     */
+    public SchedulerProfileSchedulerInstanceProfiles withUpstream(SchedulerInstanceProfile upstream) {
+        this.upstream = upstream;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (upstream() != null) {
+            upstream().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("upstream", this.upstream);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of SchedulerProfileSchedulerInstanceProfiles from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of SchedulerProfileSchedulerInstanceProfiles if the JsonReader was pointing to an instance of
+     * it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the SchedulerProfileSchedulerInstanceProfiles.
+     */
+    public static SchedulerProfileSchedulerInstanceProfiles fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            SchedulerProfileSchedulerInstanceProfiles deserializedSchedulerProfileSchedulerInstanceProfiles
+                = new SchedulerProfileSchedulerInstanceProfiles();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("upstream".equals(fieldName)) {
+                    deserializedSchedulerProfileSchedulerInstanceProfiles.upstream
+                        = SchedulerInstanceProfile.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedSchedulerProfileSchedulerInstanceProfiles;
+        });
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SeccompDefault.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SeccompDefault.java
new file mode 100644
index 000000000000..2ff28552ffe6
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SeccompDefault.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Specifies the default seccomp profile applied to all workloads. If not specified, 'Unconfined' will be used by
+ * default.
+ */
+public final class SeccompDefault extends ExpandableStringEnum<SeccompDefault> {
+    /**
+     * Static value Unconfined for SeccompDefault.
+     */
+    public static final SeccompDefault UNCONFINED = fromString("Unconfined");
+
+    /**
+     * Static value RuntimeDefault for SeccompDefault.
+     */
+    public static final SeccompDefault RUNTIME_DEFAULT = fromString("RuntimeDefault");
+
+    /**
+     * Creates a new instance of SeccompDefault value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public SeccompDefault() {
+    }
+
+    /**
+     * Creates or finds a SeccompDefault from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding SeccompDefault.
+     */
+    public static SeccompDefault fromString(String name) {
+        return fromString(name, SeccompDefault.class);
+    }
+
+    /**
+     * Gets known SeccompDefault values.
+     * 
+     * @return known SeccompDefault values.
+     */
+    public static Collection<SeccompDefault> values() {
+        return values(SeccompDefault.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SnapshotType.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SnapshotType.java
index f538d165b648..959836b50d8f 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SnapshotType.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/SnapshotType.java
@@ -16,6 +16,11 @@ public final class SnapshotType extends ExpandableStringEnum<SnapshotType> {
      */
     public static final SnapshotType NODE_POOL = fromString("NodePool");
 
+    /**
+     * Static value ManagedCluster for SnapshotType.
+     */
+    public static final SnapshotType MANAGED_CLUSTER = fromString("ManagedCluster");
+
     /**
      * Creates a new instance of SnapshotType value.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/TransitEncryptionType.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/TransitEncryptionType.java
new file mode 100644
index 000000000000..3b5668d9e0ec
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/TransitEncryptionType.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Configures pod-to-pod encryption. This can be enabled only on Cilium-based clusters. If not specified, the default
+ * value is None.
+ */
+public final class TransitEncryptionType extends ExpandableStringEnum<TransitEncryptionType> {
+    /**
+     * Static value WireGuard for TransitEncryptionType.
+     */
+    public static final TransitEncryptionType WIRE_GUARD = fromString("WireGuard");
+
+    /**
+     * Static value None for TransitEncryptionType.
+     */
+    public static final TransitEncryptionType NONE = fromString("None");
+
+    /**
+     * Creates a new instance of TransitEncryptionType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public TransitEncryptionType() {
+    }
+
+    /**
+     * Creates or finds a TransitEncryptionType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding TransitEncryptionType.
+     */
+    public static TransitEncryptionType fromString(String name) {
+        return fromString(name, TransitEncryptionType.class);
+    }
+
+    /**
+     * Gets known TransitEncryptionType values.
+     * 
+     * @return known TransitEncryptionType values.
+     */
+    public static Collection<TransitEncryptionType> values() {
+        return values(TransitEncryptionType.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Type.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Type.java
index 04ff14100e65..f3baff01d585 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Type.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/Type.java
@@ -8,7 +8,7 @@
 import java.util.Collection;
 
 /**
- * The week index. Specifies on which week of the month the dayOfWeek applies.
+ * The week index. Specifies on which instance of the allowed days specified in daysOfWeek the maintenance occurs.
  */
 public final class Type extends ExpandableStringEnum<Type> {
     /**
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/UpgradeStrategy.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/UpgradeStrategy.java
new file mode 100644
index 000000000000..3f79d70807ce
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/UpgradeStrategy.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Defines the upgrade strategy for the agent pool. The default is Rolling.
+ */
+public final class UpgradeStrategy extends ExpandableStringEnum<UpgradeStrategy> {
+    /**
+     * Static value Rolling for UpgradeStrategy.
+     */
+    public static final UpgradeStrategy ROLLING = fromString("Rolling");
+
+    /**
+     * Static value BlueGreen for UpgradeStrategy.
+     */
+    public static final UpgradeStrategy BLUE_GREEN = fromString("BlueGreen");
+
+    /**
+     * Creates a new instance of UpgradeStrategy value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public UpgradeStrategy() {
+    }
+
+    /**
+     * Creates or finds a UpgradeStrategy from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding UpgradeStrategy.
+     */
+    public static UpgradeStrategy fromString(String name) {
+        return fromString(name, UpgradeStrategy.class);
+    }
+
+    /**
+     * Gets known UpgradeStrategy values.
+     * 
+     * @return known UpgradeStrategy values.
+     */
+    public static Collection<UpgradeStrategy> values() {
+        return values(UpgradeStrategy.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/VmState.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/VmState.java
new file mode 100644
index 000000000000..ef08b1fdaaa1
--- /dev/null
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/VmState.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.containerservice.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Virtual machine state. Indicates the current state of the underlying virtual machine.
+ */
+public final class VmState extends ExpandableStringEnum<VmState> {
+    /**
+     * Static value Running for VmState.
+     */
+    public static final VmState RUNNING = fromString("Running");
+
+    /**
+     * Static value Deleted for VmState.
+     */
+    public static final VmState DELETED = fromString("Deleted");
+
+    /**
+     * Creates a new instance of VmState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public VmState() {
+    }
+
+    /**
+     * Creates or finds a VmState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding VmState.
+     */
+    public static VmState fromString(String name) {
+        return fromString(name, VmState.class);
+    }
+
+    /**
+     * Gets known VmState values.
+     * 
+     * @return known VmState values.
+     */
+    public static Collection<VmState> values() {
+        return values(VmState.class);
+    }
+}
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/WorkloadRuntime.java b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/WorkloadRuntime.java
index 5df9513d6b0e..a2e86053cb31 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/WorkloadRuntime.java
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/WorkloadRuntime.java
@@ -21,6 +21,11 @@ public final class WorkloadRuntime extends ExpandableStringEnum<WorkloadRuntime>
      */
     public static final WorkloadRuntime WASM_WASI = fromString("WasmWasi");
 
+    /**
+     * Static value KataMshvVmIsolation for WorkloadRuntime.
+     */
+    public static final WorkloadRuntime KATA_MSHV_VM_ISOLATION = fromString("KataMshvVmIsolation");
+
     /**
      * Creates a new instance of WorkloadRuntime value.
      * 
diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-containerservice/proxy-config.json b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-containerservice/proxy-config.json
index 417de31e4fca..65e1768573ab 100644
--- a/sdk/containerservice/azure-resourcemanager-containerservice/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-containerservice/proxy-config.json
+++ b/sdk/containerservice/azure-resourcemanager-containerservice/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-containerservice/proxy-config.json
@@ -1 +1 @@
-[["com.azure.resourcemanager.containerservice.implementation.AgentPoolsClientImpl$AgentPoolsService"],["com.azure.resourcemanager.containerservice.implementation.ContainerServicesClientImpl$ContainerServicesService"],["com.azure.resourcemanager.containerservice.implementation.MachinesClientImpl$MachinesService"],["com.azure.resourcemanager.containerservice.implementation.MaintenanceConfigurationsClientImpl$MaintenanceConfigurationsService"],["com.azure.resourcemanager.containerservice.implementation.ManagedClustersClientImpl$ManagedClustersService"],["com.azure.resourcemanager.containerservice.implementation.OpenShiftManagedClustersClientImpl$OpenShiftManagedClustersService"],["com.azure.resourcemanager.containerservice.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.containerservice.implementation.PrivateEndpointConnectionsClientImpl$PrivateEndpointConnectionsService"],["com.azure.resourcemanager.containerservice.implementation.PrivateLinkResourcesClientImpl$PrivateLinkResourcesService"],["com.azure.resourcemanager.containerservice.implementation.ResolvePrivateLinkServiceIdsClientImpl$ResolvePrivateLinkServiceIdsService"],["com.azure.resourcemanager.containerservice.implementation.SnapshotsClientImpl$SnapshotsService"],["com.azure.resourcemanager.containerservice.implementation.TrustedAccessRoleBindingsClientImpl$TrustedAccessRoleBindingsService"],["com.azure.resourcemanager.containerservice.implementation.TrustedAccessRolesClientImpl$TrustedAccessRolesService"]]
\ No newline at end of file
+[["com.azure.resourcemanager.containerservice.implementation.AgentPoolsClientImpl$AgentPoolsService"],["com.azure.resourcemanager.containerservice.implementation.ContainerServiceOperationsClientImpl$ContainerServiceOperationsService"],["com.azure.resourcemanager.containerservice.implementation.ContainerServicesClientImpl$ContainerServicesService"],["com.azure.resourcemanager.containerservice.implementation.IdentityBindingsClientImpl$IdentityBindingsService"],["com.azure.resourcemanager.containerservice.implementation.JwtAuthenticatorsClientImpl$JwtAuthenticatorsService"],["com.azure.resourcemanager.containerservice.implementation.LoadBalancersClientImpl$LoadBalancersService"],["com.azure.resourcemanager.containerservice.implementation.MachinesClientImpl$MachinesService"],["com.azure.resourcemanager.containerservice.implementation.MaintenanceConfigurationsClientImpl$MaintenanceConfigurationsService"],["com.azure.resourcemanager.containerservice.implementation.ManagedClusterSnapshotsClientImpl$ManagedClusterSnapshotsService"],["com.azure.resourcemanager.containerservice.implementation.ManagedClustersClientImpl$ManagedClustersService"],["com.azure.resourcemanager.containerservice.implementation.ManagedNamespacesClientImpl$ManagedNamespacesService"],["com.azure.resourcemanager.containerservice.implementation.MeshMembershipsClientImpl$MeshMembershipsService"],["com.azure.resourcemanager.containerservice.implementation.OpenShiftManagedClustersClientImpl$OpenShiftManagedClustersService"],["com.azure.resourcemanager.containerservice.implementation.OperationStatusResultsClientImpl$OperationStatusResultsService"],["com.azure.resourcemanager.containerservice.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.containerservice.implementation.PrivateEndpointConnectionsClientImpl$PrivateEndpointConnectionsService"],["com.azure.resourcemanager.containerservice.implementation.PrivateLinkResourcesClientImpl$PrivateLinkResourcesService"],["com.azure.resourcemanager.containerservice.implementation.ResolvePrivateLinkServiceIdsClientImpl$ResolvePrivateLinkServiceIdsService"],["com.azure.resourcemanager.containerservice.implementation.SnapshotsClientImpl$SnapshotsService"],["com.azure.resourcemanager.containerservice.implementation.TrustedAccessRoleBindingsClientImpl$TrustedAccessRoleBindingsService"],["com.azure.resourcemanager.containerservice.implementation.TrustedAccessRolesClientImpl$TrustedAccessRolesService"]]
\ No newline at end of file
diff --git a/sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/pom.xml b/sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/pom.xml
index 9e9bd40e785e..8b8535adb23c 100644
--- a/sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/pom.xml
+++ b/sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/containerservicesafeguards/azure-resourcemanager-containerservicesafeguards/pom.xml b/sdk/containerservicesafeguards/azure-resourcemanager-containerservicesafeguards/pom.xml
index 5e8d879611c1..d3668ad33933 100644
--- a/sdk/containerservicesafeguards/azure-resourcemanager-containerservicesafeguards/pom.xml
+++ b/sdk/containerservicesafeguards/azure-resourcemanager-containerservicesafeguards/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/contentsafety/azure-ai-contentsafety/pom.xml b/sdk/contentsafety/azure-ai-contentsafety/pom.xml
index 67df62304c8e..0d22b82de5dc 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/pom.xml
+++ b/sdk/contentsafety/azure-ai-contentsafety/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/core/azure-core-serializer-json-jackson/src/main/java/com/azure/core/serializer/json/jackson/implementation/FlatteningSerializer.java b/sdk/core/azure-core-serializer-json-jackson/src/main/java/com/azure/core/serializer/json/jackson/implementation/FlatteningSerializer.java
index 28a28563451b..4974b72db8f5 100644
--- a/sdk/core/azure-core-serializer-json-jackson/src/main/java/com/azure/core/serializer/json/jackson/implementation/FlatteningSerializer.java
+++ b/sdk/core/azure-core-serializer-json-jackson/src/main/java/com/azure/core/serializer/json/jackson/implementation/FlatteningSerializer.java
@@ -25,9 +25,9 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.AnyGetterWriter;
 import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
+import com.fasterxml.jackson.databind.ser.std.MapSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
 import java.io.IOException;
@@ -247,6 +247,7 @@ public void resolve(SerializerProvider provider) throws JsonMappingException {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void propertyOnlyFlattenSerialize(Object value, JsonGenerator gen, SerializerProvider provider,
         ObjectNode node) throws IOException {
         for (BeanPropertyDefinition beanProp : beanDescription.findProperties()) {
@@ -305,12 +306,14 @@ private void propertyOnlyFlattenSerialize(Object value, JsonGenerator gen, Seria
         if (anyGetter != null && anyGetter.getAnnotation(JsonAnyGetter.class).enabled()) {
             BeanProperty.Std anyProperty = new BeanProperty.Std(PropertyName.construct(anyGetter.getName()),
                 anyGetter.getType(), null, anyGetter, PropertyMetadata.STD_OPTIONAL);
-            JsonSerializer<Object> anySerializer
-                = provider.findTypedValueSerializer(anyGetter.getType(), true, anyProperty);
-            AnyGetterWriter anyGetterWriter = new AnyGetterWriter(anyProperty, anyGetter, anySerializer);
-
+            JsonSerializer<?> anySerializer = provider.findTypedValueSerializer(anyGetter.getType(), true, anyProperty);
             try {
-                anyGetterWriter.getAndSerialize(value, gen, provider);
+                Object anyValue = anyGetter.getValue(value);
+                if (anySerializer instanceof MapSerializer) {
+                    ((MapSerializer) anySerializer).serializeFields((Map<?, ?>) anyValue, gen, provider);
+                } else {
+                    ((JsonSerializer<Object>) anySerializer).serialize(anyValue, gen, provider);
+                }
             } catch (IOException exception) {
                 throw LOGGER.logThrowableAsError(exception);
             } catch (Exception exception) {
diff --git a/sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml b/sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml
index b6c9ec006e14..3528a5b6d586 100644
--- a/sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml
+++ b/sdk/core/azure-core-tracing-opentelemetry-samples/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerTests.java b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerTests.java
index 20385bfe5b7e..9fdf2b95c10e 100644
--- a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerTests.java
+++ b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerTests.java
@@ -81,7 +81,7 @@ public void canDeserializeAdditionalPropertiesThroughInheritance() throws Except
         Assertions.assertEquals("baz", deserialized.additionalProperties().get("bar"));
         Assertions.assertEquals("c.d", deserialized.additionalProperties().get("a.b"));
         Assertions.assertEquals("barbar", deserialized.additionalProperties().get("properties.bar"));
-        Assertions.assertTrue(deserialized instanceof FooChild);
+        Assertions.assertInstanceOf(FooChild.class, deserialized);
         // Check typed properties are populated
         Assertions.assertEquals("hello.world", deserialized.bar());
         Assertions.assertNotNull(deserialized.baz());
diff --git a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerWithJacksonAnnotationTests.java b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerWithJacksonAnnotationTests.java
index 790a3cced52e..1010dc2bcc28 100644
--- a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerWithJacksonAnnotationTests.java
+++ b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/AdditionalPropertiesSerializerWithJacksonAnnotationTests.java
@@ -80,7 +80,7 @@ public void canDeserializeAdditionalPropertiesThroughInheritance() throws Except
         Assertions.assertEquals("baz", deserialized.additionalProperties().get("bar"));
         Assertions.assertEquals("c.d", deserialized.additionalProperties().get("a.b"));
         Assertions.assertEquals("barbar", deserialized.additionalProperties().get("properties.bar"));
-        Assertions.assertTrue(deserialized instanceof NewFooChild);
+        Assertions.assertInstanceOf(NewFooChild.class, deserialized);
     }
 
     @Test
@@ -111,31 +111,6 @@ public void canSerializeAdditionalPropertiesWithNestedAdditionalProperties() thr
             serialized);
     }
 
-    @Test
-    public void canSerializeAdditionalPropertiesWithConflictProperty() throws Exception {
-        NewFoo foo = new NewFoo();
-        foo.bar("hello.world");
-        foo.baz(new ArrayList<>());
-        foo.baz().add("hello");
-        foo.baz().add("hello.world");
-        foo.qux(new HashMap<>());
-        foo.qux().put("hello", "world");
-        foo.qux().put("a.b", "c.d");
-        foo.qux().put("bar.a", "ttyy");
-        foo.qux().put("bar.b", "uuzz");
-        foo.additionalProperties(new HashMap<>());
-        foo.additionalProperties().put("bar", "baz");
-        foo.additionalProperties().put("a.b", "c.d");
-        foo.additionalProperties().put("properties.bar", "barbar");
-        foo.additionalPropertiesProperty(new HashMap<>());
-        foo.additionalPropertiesProperty().put("age", 73);
-
-        String serialized = new JacksonAdapter().serialize(foo, SerializerEncoding.JSON);
-        Assertions.assertEquals(
-            "{\"$type\":\"newfoo\",\"additionalProperties\":{\"age\":73},\"bar\":\"baz\",\"properties\":{\"bar\":\"hello.world\",\"props\":{\"baz\":[\"hello\",\"hello.world\"],\"q\":{\"qux\":{\"hello\":\"world\",\"a.b\":\"c.d\",\"bar.b\":\"uuzz\",\"bar.a\":\"ttyy\"}}}},\"a.b\":\"c.d\",\"properties.bar\":\"barbar\"}",
-            serialized);
-    }
-
     @Test
     public void canDeserializeAdditionalPropertiesWithConflictProperty() throws Exception {
         String wireValue
diff --git a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/BinaryDataSerializationTests.java b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/BinaryDataSerializationTests.java
index 7f212c07e9be..00e391e28b92 100644
--- a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/BinaryDataSerializationTests.java
+++ b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/BinaryDataSerializationTests.java
@@ -242,7 +242,7 @@ public boolean equals(Object obj) {
                 return true;
             } else if (listProperty != null && other.listProperty == null) {
                 return false;
-            } else if (listProperty == null && other.listProperty != null) {
+            } else if (listProperty == null) {
                 return false;
             }
 
@@ -291,7 +291,7 @@ public boolean equals(Object obj) {
                 return true;
             } else if (mapProperty != null && other.mapProperty == null) {
                 return false;
-            } else if (mapProperty == null && other.mapProperty != null) {
+            } else if (mapProperty == null) {
                 return false;
             }
 
diff --git a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/FlatteningSerializerTests.java b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/FlatteningSerializerTests.java
index de7359786cec..930a8bfb1847 100644
--- a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/FlatteningSerializerTests.java
+++ b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/FlatteningSerializerTests.java
@@ -52,6 +52,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -128,14 +129,14 @@ public void canHandleTypeWithTypeIdContainingDotAndNoProperties() {
 
         AnimalWithTypeIdContainingDot rabbitDeserialized
             = deserialize(rabbitSerialized, AnimalWithTypeIdContainingDot.class);
-        assertTrue(rabbitDeserialized instanceof RabbitWithTypeIdContainingDot);
+        assertInstanceOf(RabbitWithTypeIdContainingDot.class, rabbitDeserialized);
         assertNotNull(rabbitDeserialized);
 
         AnimalShelter shelterDeserialized = deserialize(shelterSerialized, AnimalShelter.class);
         assertNotNull(shelterDeserialized);
         assertEquals(2, shelterDeserialized.animalsInfo().size());
         for (FlattenableAnimalInfo animalInfo : shelterDeserialized.animalsInfo()) {
-            assertTrue(animalInfo.animal() instanceof RabbitWithTypeIdContainingDot);
+            assertInstanceOf(RabbitWithTypeIdContainingDot.class, animalInfo.animal());
             assertNotNull(animalInfo.animal());
         }
     }
@@ -160,10 +161,10 @@ public void canHandleTypeWithTypeIdContainingDot0() {
         // De-Serialize
         //
         AnimalWithTypeIdContainingDot animalDeserialized = deserialize(serialized, AnimalWithTypeIdContainingDot.class);
-        assertTrue(animalDeserialized instanceof RabbitWithTypeIdContainingDot);
+        assertInstanceOf(RabbitWithTypeIdContainingDot.class, animalDeserialized);
         RabbitWithTypeIdContainingDot rabbit = (RabbitWithTypeIdContainingDot) animalDeserialized;
         assertNotNull(rabbit.meals());
-        assertEquals(rabbit.meals().size(), 2);
+        assertEquals(2, rabbit.meals().size());
     }
 
     /**
@@ -188,7 +189,7 @@ public void canHandleTypeWithTypeIdContainingDot1() {
         RabbitWithTypeIdContainingDot rabbitDeserialized = deserialize(serialized, RabbitWithTypeIdContainingDot.class);
         assertNotNull(rabbitDeserialized);
         assertNotNull(rabbitDeserialized.meals());
-        assertEquals(rabbitDeserialized.meals().size(), 2);
+        assertEquals(2, rabbitDeserialized.meals().size());
     }
 
     /**
@@ -214,11 +215,11 @@ public void canHandleTypeWithFlattenablePropertyAndTypeIdContainingDot0() {
 
         // de-serialization
         AnimalWithTypeIdContainingDot animalDeserialized = deserialize(serialized, AnimalWithTypeIdContainingDot.class);
-        assertTrue(animalDeserialized instanceof DogWithTypeIdContainingDot);
+        assertInstanceOf(DogWithTypeIdContainingDot.class, animalDeserialized);
         DogWithTypeIdContainingDot dogDeserialized = (DogWithTypeIdContainingDot) animalDeserialized;
         assertNotNull(dogDeserialized);
-        assertEquals(dogDeserialized.breed(), "AKITA");
-        assertEquals(dogDeserialized.cuteLevel(), (Integer) 10);
+        assertEquals("AKITA", dogDeserialized.breed());
+        assertEquals((Integer) 10, dogDeserialized.cuteLevel());
     }
 
     /**
@@ -245,8 +246,8 @@ public void canHandleTypeWithFlattenablePropertyAndTypeIdContainingDot1() {
         // de-serialization
         DogWithTypeIdContainingDot dogDeserialized = deserialize(serialized, DogWithTypeIdContainingDot.class);
         assertNotNull(dogDeserialized);
-        assertEquals(dogDeserialized.breed(), "AKITA");
-        assertEquals(dogDeserialized.cuteLevel(), (Integer) 10);
+        assertEquals("AKITA", dogDeserialized.breed());
+        assertEquals((Integer) 10, dogDeserialized.cuteLevel());
     }
 
     /**
@@ -274,10 +275,10 @@ public void canHandleArrayOfTypeWithTypeIdContainingDot0() {
         assertNotNull(animalsDeserialized);
         assertEquals(1, animalsDeserialized.size());
         AnimalWithTypeIdContainingDot animalDeserialized = animalsDeserialized.get(0);
-        assertTrue(animalDeserialized instanceof RabbitWithTypeIdContainingDot);
+        assertInstanceOf(RabbitWithTypeIdContainingDot.class, animalDeserialized);
         RabbitWithTypeIdContainingDot rabbitDeserialized = (RabbitWithTypeIdContainingDot) animalDeserialized;
         assertNotNull(rabbitDeserialized.meals());
-        assertEquals(rabbitDeserialized.meals().size(), 2);
+        assertEquals(2, rabbitDeserialized.meals().size());
     }
 
     /**
@@ -306,7 +307,7 @@ public void canHandleArrayOfTypeWithTypeIdContainingDot1() {
         assertEquals(1, rabbitsDeserialized.size());
         RabbitWithTypeIdContainingDot rabbitDeserialized = rabbitsDeserialized.get(0);
         assertNotNull(rabbitDeserialized.meals());
-        assertEquals(rabbitDeserialized.meals().size(), 2);
+        assertEquals(2, rabbitDeserialized.meals().size());
     }
 
     /**
@@ -330,15 +331,15 @@ public void canHandleComposedTypeWithTypeIdContainingDot0() {
         //
         AnimalShelter shelterDeserialized = deserialize(serialized, AnimalShelter.class);
         assertNotNull(shelterDeserialized.animalsInfo());
-        assertEquals(shelterDeserialized.animalsInfo().size(), 1);
+        assertEquals(1, shelterDeserialized.animalsInfo().size());
         FlattenableAnimalInfo animalsInfoDeserialized = shelterDeserialized.animalsInfo().get(0);
-        assertTrue(animalsInfoDeserialized.animal() instanceof RabbitWithTypeIdContainingDot);
+        assertInstanceOf(RabbitWithTypeIdContainingDot.class, animalsInfoDeserialized.animal());
         AnimalWithTypeIdContainingDot animalDeserialized = animalsInfoDeserialized.animal();
-        assertTrue(animalDeserialized instanceof RabbitWithTypeIdContainingDot);
+        assertInstanceOf(RabbitWithTypeIdContainingDot.class, animalDeserialized);
         RabbitWithTypeIdContainingDot rabbitDeserialized = (RabbitWithTypeIdContainingDot) animalDeserialized;
         assertNotNull(rabbitDeserialized);
         assertNotNull(rabbitDeserialized.meals());
-        assertEquals(rabbitDeserialized.meals().size(), 2);
+        assertEquals(2, rabbitDeserialized.meals().size());
     }
 
     @Test
@@ -432,8 +433,8 @@ public void canHandleComposedGenericPolymorphicTypeWithTypeId() {
         assertNotNull(composedTurtleDeserialized.turtlesSet2());
         assertEquals(2, composedTurtleDeserialized.turtlesSet2().size());
         //
-        assertTrue(composedTurtleDeserialized.turtlesSet2().get(0) instanceof TurtleWithTypeIdContainingDot);
-        assertTrue(composedTurtleDeserialized.turtlesSet2().get(1) instanceof TurtleWithTypeIdContainingDot);
+        assertInstanceOf(TurtleWithTypeIdContainingDot.class, composedTurtleDeserialized.turtlesSet2().get(0));
+        assertInstanceOf(TurtleWithTypeIdContainingDot.class, composedTurtleDeserialized.turtlesSet2().get(1));
         //
         serialize(composedTurtleDeserialized);
         //
@@ -446,7 +447,7 @@ public void canHandleComposedGenericPolymorphicTypeWithTypeId() {
         composedTurtleDeserialized = deserialize(serializedScalarWithTypeId, ComposeTurtles.class);
         assertNotNull(composedTurtleDeserialized);
         assertNotNull(composedTurtleDeserialized.turtlesSet2Lead());
-        assertTrue(composedTurtleDeserialized.turtlesSet2Lead() instanceof TurtleWithTypeIdContainingDot);
+        assertInstanceOf(TurtleWithTypeIdContainingDot.class, composedTurtleDeserialized.turtlesSet2Lead());
         assertEquals(10, (long) ((TurtleWithTypeIdContainingDot) composedTurtleDeserialized.turtlesSet2Lead()).size());
         assertEquals(100, (long) composedTurtleDeserialized.turtlesSet2Lead().age());
         //
@@ -500,7 +501,7 @@ public void canHandleComposedGenericPolymorphicTypeWithAndWithoutTypeId() {
         assertNotNull(composedTurtleDeserialized.turtlesSet2());
         assertEquals(2, composedTurtleDeserialized.turtlesSet2().size());
         //
-        assertTrue(composedTurtleDeserialized.turtlesSet2().get(0) instanceof TurtleWithTypeIdContainingDot);
+        assertInstanceOf(TurtleWithTypeIdContainingDot.class, composedTurtleDeserialized.turtlesSet2().get(0));
         assertNotNull(composedTurtleDeserialized.turtlesSet2().get(1));
         //
         serialize(composedTurtleDeserialized);
@@ -523,8 +524,8 @@ public void canHandleEscapedProperties() {
         //
         FlattenedProduct productDeserialized = deserialize(serialized, FlattenedProduct.class);
         assertNotNull(productDeserialized);
-        assertEquals(productDeserialized.getProductName(), "drink");
-        assertEquals(productDeserialized.getProductType(), "chai");
+        assertEquals("drink", productDeserialized.getProductName());
+        assertEquals("chai", productDeserialized.getProductType());
     }
 
     @Test
diff --git a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/JacksonAdapterTests.java b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/JacksonAdapterTests.java
index 965cc14947af..aae24c6d3bd4 100644
--- a/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/JacksonAdapterTests.java
+++ b/sdk/core/azure-core-version-tests/src/test/java/com/azure/core/version/tests/JacksonAdapterTests.java
@@ -45,10 +45,9 @@
 import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 public class JacksonAdapterTests {
     private static final JacksonAdapter ADAPTER = new JacksonAdapter();
@@ -221,15 +220,9 @@ public void stronglyTypedHeadersClassThrowsEagerly() {
 
     @Test
     public void invalidStronglyTypedHeadersClassThrowsCorrectException() throws IOException {
-        try {
-            JacksonAdapter.createDefaultSerializerAdapter()
-                .deserialize(new HttpHeaders(), InvalidStronglyTypedHeaders.class);
-
-            fail("An exception should have been thrown.");
-        } catch (RuntimeException ex) {
-            assertTrue(ex.getCause() instanceof JsonProcessingException, "Exception cause type was "
-                + ex.getCause().getClass().getName() + " instead of the expected JsonProcessingException type.");
-        }
+        RuntimeException ex = assertThrows(RuntimeException.class, () -> JacksonAdapter.createDefaultSerializerAdapter()
+            .deserialize(new HttpHeaders(), InvalidStronglyTypedHeaders.class));
+        assertInstanceOf(JsonProcessingException.class, ex.getCause());
     }
 
     @ParameterizedTest
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/AdditionalPropertiesSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/AdditionalPropertiesSerializer.java
index 356e2b99ce49..241e219247c1 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/AdditionalPropertiesSerializer.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/AdditionalPropertiesSerializer.java
@@ -123,7 +123,7 @@ public void serialize(Object value, JsonGenerator jgen, SerializerProvider provi
                     source.add((ObjectNode) field.getValue());
                     target.add((ObjectNode) outNode);
                 } else if (field.getValue() instanceof ArrayNode
-                    && (field.getValue()).size() > 0
+                    && !(field.getValue()).isEmpty()
                     && (field.getValue()).get(0) instanceof ObjectNode) {
                     Iterator<JsonNode> sourceIt = field.getValue().elements();
                     Iterator<JsonNode> targetIt = outNode.elements();
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/FlatteningSerializer.java b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/FlatteningSerializer.java
index c8c765dc965a..c6996faf282a 100644
--- a/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/FlatteningSerializer.java
+++ b/sdk/core/azure-core/src/main/java/com/azure/core/implementation/jackson/FlatteningSerializer.java
@@ -25,9 +25,9 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.ser.AnyGetterWriter;
 import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
 import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
+import com.fasterxml.jackson.databind.ser.std.MapSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 
 import java.io.IOException;
@@ -247,6 +247,7 @@ public void resolve(SerializerProvider provider) throws JsonMappingException {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void propertyOnlyFlattenSerialize(Object value, JsonGenerator gen, SerializerProvider provider,
         ObjectNode node) throws IOException {
         for (BeanPropertyDefinition beanProp : beanDescription.findProperties()) {
@@ -305,12 +306,14 @@ private void propertyOnlyFlattenSerialize(Object value, JsonGenerator gen, Seria
         if (anyGetter != null && anyGetter.getAnnotation(JsonAnyGetter.class).enabled()) {
             BeanProperty.Std anyProperty = new BeanProperty.Std(PropertyName.construct(anyGetter.getName()),
                 anyGetter.getType(), null, anyGetter, PropertyMetadata.STD_OPTIONAL);
-            JsonSerializer<Object> anySerializer
-                = provider.findTypedValueSerializer(anyGetter.getType(), true, anyProperty);
-            AnyGetterWriter anyGetterWriter = new AnyGetterWriter(anyProperty, anyGetter, anySerializer);
-
+            JsonSerializer<?> anySerializer = provider.findTypedValueSerializer(anyGetter.getType(), true, anyProperty);
             try {
-                anyGetterWriter.getAndSerialize(value, gen, provider);
+                Object anyValue = anyGetter.getValue(value);
+                if (anySerializer instanceof MapSerializer) {
+                    ((MapSerializer) anySerializer).serializeFields((Map<?, ?>) anyValue, gen, provider);
+                } else {
+                    ((JsonSerializer<Object>) anySerializer).serialize(anyValue, gen, provider);
+                }
             } catch (IOException exception) {
                 throw LOGGER.logThrowableAsError(exception);
             } catch (Exception exception) {
diff --git a/sdk/core/version-overrides-matrix.json b/sdk/core/version-overrides-matrix.json
index 8b1e03775dd3..5c3feba00e38 100644
--- a/sdk/core/version-overrides-matrix.json
+++ b/sdk/core/version-overrides-matrix.json
@@ -23,6 +23,8 @@
       "jackson_2.12",
       "jackson_2.15",
       "jackson_2.18",
+      "jackson_2.19",
+      "jackson_2.20",
       "reactor_2020",
       "reactor_2024",
       "reactor_2025"
diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml
index ff5b9ed3d208..4cbc9c56436e 100644
--- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml
+++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml
@@ -64,7 +64,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version>  <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version>  <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <exclusions>
         <exclusion>
           <groupId>com.azure</groupId>
diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml
index bfee8fd2b380..edfac082dffd 100644
--- a/sdk/cosmos/azure-cosmos-encryption/pom.xml
+++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml
@@ -82,7 +82,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version>  <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version>  <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/sdk/cosmos/azure-cosmos-kafka-connect/pom.xml b/sdk/cosmos/azure-cosmos-kafka-connect/pom.xml
index 93cce656dd1f..cc6a50439d53 100644
--- a/sdk/cosmos/azure-cosmos-kafka-connect/pom.xml
+++ b/sdk/cosmos/azure-cosmos-kafka-connect/pom.xml
@@ -130,7 +130,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <exclusions>
         <exclusion>
           <groupId>com.azure</groupId>
diff --git a/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml b/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml
index bbc3619f3004..fd07c73ee087 100644
--- a/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml
+++ b/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <exclusions>
         <exclusion>
           <groupId>com.azure</groupId>
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
index 04baa411961f..eeb2fb667d58 100644
--- a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
+++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <exclusions>
         <exclusion>
           <groupId>com.azure</groupId>
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh
index ff1d80cf0f1e..55e058d371f6 100644
--- a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh
+++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh
@@ -3,29 +3,29 @@
 CLUSTER_ID=$1
 [[ -z "$CLUSTER_ID" ]] && exit 1
 
-STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.clusters[] | select(.cluster_id == $I) | .state')
+STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.[] | select(.cluster_id == $I) | .state')
 echo "Cluster $CLUSTER_ID is on state $STATE"
 if [[ "$STATE" != "TERMINATED" ]]
 then
 	while [[ "$STATE" != "RUNNING" ]]
 	do
 		echo "Waiting until cluster $CLUSTER_ID is running, now on state $STATE"
-		STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.clusters[] | select(.cluster_id == $I) | .state')	
+		STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.[] | select(.cluster_id == $I) | .state')
 		sleep 10
 	done
 
 	echo "Restarting cluster $CLUSTER_ID"
-	databricks clusters restart --cluster-id $CLUSTER_ID
+	databricks clusters restart $CLUSTER_ID
 else
 	echo "Starting cluster $CLUSTER_ID"
-	databricks clusters start --cluster-id $CLUSTER_ID	
+	databricks clusters start $CLUSTER_ID
 fi
 
-STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.clusters[] | select(.cluster_id == $I) | .state')
+STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.[] | select(.cluster_id == $I) | .state')
 while [[ "$STATE" != "RUNNING" ]]
 do
 	echo "Waiting until cluster $CLUSTER_ID is running, now on state $STATE"
-	STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.clusters[] | select(.cluster_id == $I) | .state')	
+	STATE=$(databricks clusters list --output json | jq -r --arg I "$CLUSTER_ID" '.[] | select(.cluster_id == $I) | .state')
 	sleep 10
 done
 
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-jar-install.sh b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-jar-install.sh
index 3047ce1cc3e1..a548ce2c0f72 100644
--- a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-jar-install.sh
+++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-jar-install.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
 
 CLUSTER_NAME=$1
-JARPATH=$2
+AVOID_DBFS=$2
+JARPATH=$3
+STORAGE_ACCOUNT_KEY=$4
 [[ -z "$CLUSTER_NAME" ]] && exit 1
 [[ -z "$JARPATH" ]] && exit 1
 
-echo "Looking for cluster '$CLUSTER_NAME'"
+echo "Looking for cluster '$CLUSTER_NAME' - Avoid DBFS '$AVOID_DBFS'"
 
-CLUSTER_ID=$(databricks clusters list --output json | jq -r --arg N "$CLUSTER_NAME" '.clusters[] | select(.cluster_name == $N) | .cluster_id')
+CLUSTER_ID=$(databricks clusters list --output json | jq -r --arg N "$CLUSTER_NAME" '.[] | select(.cluster_name == $N) | .cluster_id')
 
 if [[ -z "$CLUSTER_ID" ]]
 then
@@ -15,16 +17,6 @@ then
 	exit 1
 fi
 
-echo "Uninstalling libraries in $CLUSTER_ID"
-LIBRARIES=$(databricks libraries list --cluster-id $CLUSTER_ID | jq -r '.library_statuses[] | .library.jar')
-for library in $LIBRARIES
-do
-	echo "Uninstalling $library"
-	databricks libraries uninstall --cluster-id $CLUSTER_ID --jar $library
-done
-
-bash sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh $CLUSTER_ID
-
 for file in $JARPATH/*.jar
 do
 	filename=${file##*/}
@@ -40,16 +32,54 @@ then
 	exit 1
 fi
 
-echo "Deleting files in dbfs:/tmp/libraries/$JARFILE"
-dbfs rm dbfs:/tmp/libraries/$JARFILE
-dbfs ls dbfs:/tmp/libraries/
+JAR_CHECK_SUM="$(sha256sum -- "$JARPATH/$JARFILE")" || {
+                echo "ERROR: checksum failed for $JARPATH/$JARFILE" >&2echo "CHECKSUM of the jar (used to ensure there are no concurrent live tests interfering) - $JAR_CHECK_SUM"
+                exit 1
+              }
+JAR_CHECK_SUM="${JAR_CHECK_SUM%% *}"
+echo "CHECKSUM of the jar (used to ensure there are no concurrent live tests interfering) - $JAR_CHECK_SUM"
+echo "##vso[task.setvariable variable=JarCheckSum]$JAR_CHECK_SUM"
 
-echo "Copying files to DBFS $JARPATH/$JARFILE"
-dbfs cp $JARPATH/$JARFILE dbfs:/tmp/libraries/$JARFILE --overwrite
-dbfs ls dbfs:/tmp/libraries/
+echo "CLUSTER_NAME: $CLUSTER_NAME"
+echo "Avoid DBFS: $AVOID_DBFS"
+# DATABRICKS_RUNTIME_VERSION is not populated in the environment and version comparison is messy in bash
+# Using cluster name for the cluster that was created with 16.4
+if [[ "${AVOID_DBFS,,}" == "true" ]]; then
+  account=oltpsparkcijarstore
 
-echo "Installing $JARFILE in $CLUSTER_ID"
-databricks libraries install --cluster-id $CLUSTER_ID --jar dbfs:/tmp/libraries/$JARFILE
+  echo "Uploading jar '$JARPATH/$JARFILE' to Azure Storage account oltpsparkcijarstore (ephemeral tenant) container jarstore BLOB jars/azure-cosmos-spark_3-5_2-12-latest-ci-candidate.jar"
+  az storage blob upload --account-name oltpsparkcijarstore --account-key $STORAGE_ACCOUNT_KEY --container-name jarstore --name jars/azure-cosmos-spark_3-5_2-12-latest-ci-candidate.jar --file $JARPATH/$JARFILE --type block --overwrite true --only-show-errors
 
+  if [ $? -eq 0 ]; then
+    echo "Successfully uploaded JAR to oltpsparkcijarstore (ephemeral tenant)."
+    echo "Rebooting cluster to install new library via init script"
+  else
+    echo "Failed to upload JAR to Workspace Files."
+    echo $?
+    exit $?
+  fi
+else
+  echo "Uninstalling libraries in $CLUSTER_ID"
+  LIBRARIES=$(databricks libraries cluster-status $CLUSTER_ID | jq -r '.[] | .library.jar')
+  for library in $LIBRARIES
+  do
+    databricks -v
+  	echo "Uninstalling $library"
+  	databricks libraries uninstall --json "{\"cluster_id\": \"$CLUSTER_ID\", \"libraries\": [{\"jar\": \"$library\"}]}"
+  done
+
+  bash sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh $CLUSTER_ID
+
+  # For older runtimes: Use DBFS path
+  echo "Using DBFS library installation for DBR $DBR_VERSION"
+  echo "Deleting files in dbfs:/tmp/libraries/$JARFILE"
+  databricks fs rm dbfs:/tmp/libraries/$JARFILE
+
+  echo "Copying files to DBFS $JARPATH/$JARFILE"
+  databricks fs cp $JARPATH/$JARFILE dbfs:/tmp/libraries/$JARFILE --overwrite
+
+  echo "Installing $JARFILE in $CLUSTER_ID"
+  databricks libraries install --json "{\"cluster_id\": \"$CLUSTER_ID\", \"libraries\": [{\"jar\": \"dbfs:/tmp/libraries/$JARFILE\"}]}"
+fi
 
 bash sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-cluster-restart.sh $CLUSTER_ID
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-notebooks-install.sh b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-notebooks-install.sh
index 9a3c60acfd2e..314303fa9920 100644
--- a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-notebooks-install.sh
+++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-notebooks-install.sh
@@ -2,17 +2,19 @@
 
 CLUSTER_NAME=$1
 NOTEBOOKSFOLDER=$2
-COSMOSENDPOINT=$3
-COSMOSKEY=$4
-SUBSCRIPTIONID=$5
-TENANTID=$6
-RESOURCEGROUPNAME=$7
-CLIENTID=$8
-CLIENTSECRET=$9
-COSMOSCONTAINERNAME=${10}
-COSMOSDATABASENAME=${11}
+COSMOSENDPOINTMSI=$3
+COSMOSENDPOINT=$4
+COSMOSKEY=$5
+SUBSCRIPTIONID=$6
+TENANTID=$7
+RESOURCEGROUPNAME=$8
+CLIENTID=$9
+CLIENTSECRET=${10}
+COSMOSCONTAINERNAME=${11}
+COSMOSDATABASENAME=${12}
 [[ -z "$CLUSTER_NAME" ]] && exit 1
 [[ -z "$NOTEBOOKSFOLDER" ]] && exit 1
+[[ -z "$COSMOSENDPOINTMSI" ]] && exit 1
 [[ -z "$COSMOSENDPOINT" ]] && exit 1
 [[ -z "$COSMOSKEY" ]] && exit 1
 [[ -z "$SUBSCRIPTIONID" ]] && exit 1
@@ -23,19 +25,25 @@ COSMOSDATABASENAME=${11}
 [[ -z "$COSMOSCONTAINERNAME" ]] && exit 1
 [[ -z "$COSMOSDATABASENAME" ]] && exit 1
 
-CLUSTER_ID=$(databricks clusters list --output json | jq -r --arg N "$CLUSTER_NAME" '.clusters[] | select(.cluster_name == $N) | .cluster_id')
+CLUSTER_ID=$(databricks clusters list --output json | jq -r --arg N "$CLUSTER_NAME" '.[] | select(.cluster_name == $N) | .cluster_id')
 
 echo "Deleting existing notebooks"
-databricks workspace rm --recursive /notebooks
+if databricks workspace list / | grep -q notebooks; then
+  databricks workspace delete --recursive /notebooks
+fi
 
 echo "Importing notebooks from $NOTEBOOKSFOLDER"
-databricks workspace import_dir $NOTEBOOKSFOLDER /notebooks
+databricks workspace import-dir "$NOTEBOOKSFOLDER" /notebooks
 
-NOTEBOOKS=$(databricks workspace ls /notebooks)
+echo "Validating Notebooks in workspace"
+databricks workspace list /notebooks -o json
+
+NOTEBOOKS=$(databricks workspace list /notebooks -o json | jq -r '.[].path')
 for f in $NOTEBOOKS
 do
-	echo "Creating job for $f"
-	JOB_ID=$(databricks jobs create --json "{\"existing_cluster_id\": \"$CLUSTER_ID\", \"name\": \"$f\",\"notebook_task\": { \"notebook_path\": \"/notebooks/$f\" }}" | jq -r '.job_id')
+	name="${f##*/}"
+	echo "Creating job for $f - $name"
+	JOB_ID=$(databricks jobs create --json "{\"name\": \"$name\", \"tasks\": [{\"task_key\": \"${name}_task\", \"existing_cluster_id\": \"$CLUSTER_ID\", \"notebook_task\": { \"notebook_path\": \"$f\" }}]}" | jq -r '.job_id')
 
 	if [[ -z "$JOB_ID" ]]
 	then
@@ -44,21 +52,22 @@ do
 	fi
 
 	echo "Creating run for job $JOB_ID"
-	RUN_ID=$(databricks jobs run-now --job-id $JOB_ID --notebook-params "{\"cosmosEndpoint\": \"$COSMOSENDPOINT\",\"cosmosMasterKey\": \"$COSMOSKEY\",\"subscriptionId\": \"$SUBSCRIPTIONID\",\"tenantId\": \"$TENANTID\",\"resourceGroupName\": \"$RESOURCEGROUPNAME\",\"clientId\": \"$CLIENTID\",\"clientSecret\": \"$CLIENTSECRET\",\"cosmosContainerName\": \"$COSMOSCONTAINERNAME\", \"cosmosDatabaseName\": \"$COSMOSDATABASENAME\"}" | jq -r '.run_id')
+	echo "DBG_JSON: {\"job_id\": \"$JOB_ID\", \"notebook_params\": {\"cosmosEndpointMsi\": \"$COSMOSENDPOINTMSI\",\"cosmosEndpoint\": \"$COSMOSENDPOINT\",\"cosmosMasterKey\": \"$COSMOSKEY\",\"subscriptionId\": \"$SUBSCRIPTIONID\",\"tenantId\": \"$TENANTID\",\"resourceGroupName\": \"$RESOURCEGROUPNAME\",\"clientId\": \"$CLIENTID\",\"clientSecret\": \"$CLIENTSECRET\",\"cosmosContainerName\": \"$COSMOSCONTAINERNAME\", \"cosmosDatabaseName\": \"$COSMOSDATABASENAME\"}}"
+	RUN_ID=$(databricks jobs run-now --json "{\"job_id\": \"$JOB_ID\", \"notebook_params\": {\"cosmosEndpointMsi\": \"$COSMOSENDPOINTMSI\",\"cosmosEndpoint\": \"$COSMOSENDPOINT\",\"cosmosMasterKey\": \"$COSMOSKEY\",\"subscriptionId\": \"$SUBSCRIPTIONID\",\"tenantId\": \"$TENANTID\",\"resourceGroupName\": \"$RESOURCEGROUPNAME\",\"clientId\": \"$CLIENTID\",\"clientSecret\": \"$CLIENTSECRET\",\"cosmosContainerName\": \"$COSMOSCONTAINERNAME\", \"cosmosDatabaseName\": \"$COSMOSDATABASENAME\"}}" | jq -r '.run_id')
 
 	if [[ -z "$RUN_ID" ]]
 	then
-		echo "Could not run job"
-		databricks jobs delete --job-id $JOB_ID
+		echo "Could not run job $JOB_ID"
+		databricks jobs delete $JOB_ID
 		exit 1
 	fi
 
-	JOB_STATE=$(databricks runs get --run-id $RUN_ID | jq -r '.state.life_cycle_state')
+	JOB_STATE=$(databricks jobs get-run $RUN_ID | jq -r '.state.life_cycle_state')
 
 	if [[ -z "$JOB_STATE" ]]
 	then
 		echo "Could not find state for job $JOB_ID"
-		databricks jobs delete --job-id $JOB_ID
+		databricks jobs delete $JOB_ID
 		exit 1
 	fi
 
@@ -66,20 +75,20 @@ do
 	while [[ "$JOB_STATE" != "INTERNAL_ERROR" && "$JOB_STATE" != "TERMINATED" ]]
 	do
 		echo "Run $RUN_ID is on state '$JOB_STATE'"
-		JOB_STATE=$(databricks runs get --run-id $RUN_ID | jq -r '.state.life_cycle_state')
+		JOB_STATE=$(databricks jobs get-run $RUN_ID | jq -r '.state.life_cycle_state')
 		sleep 10
 	done
 
-	JOB_MESSAGE=$(databricks runs get --run-id $RUN_ID | jq -r '.state.state_message')
+	JOB_MESSAGE=$(databricks jobs get-run $RUN_ID | jq -r '.state.state_message')
 
 	if [[ "$JOB_STATE" != "TERMINATED" ]]
 	then
 		echo "Run $RUN_ID failed with state $JOB_STATE and $JOB_MESSAGE"
-		databricks jobs delete --job-id $JOB_ID
+		databricks jobs delete $JOB_ID
 		exit 1
 	fi
 
-	JOB_RESULT=$(databricks runs get --run-id $RUN_ID | jq -r '.state.result_state')
+	JOB_RESULT=$(databricks jobs get-run $RUN_ID | jq -r '.state.result_state')
 
 	echo "Run $RUN_ID finished with state $JOB_STATE and result $JOB_RESULT with message $JOB_MESSAGE"
 	if [[ "$JOB_RESULT" != "SUCCESS" ]]
@@ -88,5 +97,5 @@ do
 		exit 1
 	fi
 
-	databricks jobs delete --job-id $JOB_ID
+	databricks jobs delete $JOB_ID
 done
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/init-scripts/install-azure-cosmos-spark-init-script.sh b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/init-scripts/install-azure-cosmos-spark-init-script.sh
new file mode 100644
index 000000000000..758b9668d236
--- /dev/null
+++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/init-scripts/install-azure-cosmos-spark-init-script.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# Databricks init script: download a JAR from Azure Blob and add it to driver+executor classpath
+
+set -euo pipefail
+
+JAR_URL='<SAS_URI_WITH_READ_PERMISSION>'
+JAR_NAME='azure-cosmos-spark_3-5_2-12-latest-ci-candidate.jar'
+
+TARGET_DIR="/databricks/jars"
+TMP_FILE="/tmp/${JAR_NAME}.$$"
+
+echo "[init] Downloading $JAR_NAME to $TARGET_DIR ..."
+
+mkdir -p "$TARGET_DIR"
+
+# Download with retries; fail non-zero on HTTP errors
+if command -v curl >/dev/null 2>&1; then
+  curl -fL --retry 8 --retry-connrefused --retry-delay 2 --max-time 600 \
+    "$JAR_URL" -o "$TMP_FILE"
+elif command -v wget >/dev/null 2>&1; then
+  wget --tries=10 --timeout=60 -O "$TMP_FILE" "$JAR_URL"
+else
+  echo "[init][error] Neither curl nor wget is available." >&2
+  exit 1
+fi
+
+# Basic validity check (optional but helpful)
+if command -v unzip >/dev/null 2>&1; then
+  if ! unzip -tq "$TMP_FILE" >/dev/null 2>&1; then
+    echo "[init][error] Downloaded file is not a valid JAR/ZIP." >&2
+    rm -f "$TMP_FILE"
+    exit 1
+  fi
+fi
+
+# Atomic replace into /databricks/jars
+chmod 0644 "$TMP_FILE"
+chown root:root "$TMP_FILE"
+mv -f "$TMP_FILE" "$TARGET_DIR/$JAR_NAME"
+
+echo "[init] Installed: $TARGET_DIR/$JAR_NAME"
+
+# Ensure classpath for both driver and executors (usually /databricks/jars is already included,
+# but we also set spark-defaults to be explicit).
+mkdir -p /databricks/driver/conf
+SPARK_DEFAULTS="/databricks/driver/conf/00-cosmos-extra-classpath.conf"
+
+# Use 'key value' format (spark-defaults.conf style)
+cat > "$SPARK_DEFAULTS" <<EOF
+spark.driver.extraClassPath /databricks/jars/$JAR_NAME
+spark.executor.extraClassPath /databricks/jars/$JAR_NAME
+EOF
+
+chmod 0644 "$SPARK_DEFAULTS"
+echo "[init] Wrote Spark defaults: $SPARK_DEFAULTS"
+
+echo "[init] Done."
diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks/basicScenarioAadManagedIdentity.scala b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks/basicScenarioAadManagedIdentity.scala
index ff6f66c9cac3..5a42d2dd162d 100644
--- a/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks/basicScenarioAadManagedIdentity.scala
+++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks/basicScenarioAadManagedIdentity.scala
@@ -7,7 +7,7 @@
 println("SCENARIO: basicScenarioAadManagedIdentity")
 
 val authType = "ManagedIdentity"
-val cosmosEndpoint = dbutils.widgets.get("cosmosEndpoint")
+val cosmosEndpoint = dbutils.widgets.get("cosmosEndpointMsi")
 val subscriptionId = dbutils.widgets.get("subscriptionId")
 val tenantId = dbutils.widgets.get("tenantId")
 val resourceGroupName = dbutils.widgets.get("resourceGroupName")
diff --git a/sdk/cosmos/azure-cosmos-tests/pom.xml b/sdk/cosmos/azure-cosmos-tests/pom.xml
index ab4c061728a8..8cf17d7b7f75 100644
--- a/sdk/cosmos/azure-cosmos-tests/pom.xml
+++ b/sdk/cosmos/azure-cosmos-tests/pom.xml
@@ -151,7 +151,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosClientBuilderTest.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosClientBuilderTest.java
index cb62f1438f2a..28273b652b34 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosClientBuilderTest.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosClientBuilderTest.java
@@ -3,6 +3,7 @@
 package com.azure.cosmos;
 
 import com.azure.cosmos.implementation.ApiType;
+import com.azure.cosmos.implementation.ConnectionPolicy;
 import com.azure.cosmos.implementation.ISessionContainer;
 import com.azure.cosmos.implementation.ImplementationBridgeHelpers;
 import com.azure.cosmos.implementation.RegionScopedSessionContainer;
@@ -20,6 +21,7 @@
 import org.testng.annotations.Test;
 
 import java.net.URISyntaxException;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -264,6 +266,53 @@ public void validateContainerCreationInterceptor() {
         }
     }
 
+    // Test to validate that the default value of TCP NRTO (5s) is not overridden to a lower value
+    // when the user sets a lower value in DirectConnectionConfig (which is not allowed).
+    // The user can only override the TCP NRTO to a higher value.
+    // This is to ensure that the TCP NRTO is not set to a very low value which can cause
+    // operations such as queries, change feed reads, stored procedure executions to fail
+    // due to the BELatency taking > 5s in some cases for the aforementioned operation types
+    @Test(groups = "emulator")
+    public void validateTcpNrtoOverride() {
+
+        DirectConnectionConfig directConnectionConfig = new DirectConnectionConfig();
+        directConnectionConfig.setNetworkRequestTimeout(Duration.ofSeconds(1));
+
+        try (CosmosClient cosmosClient = new CosmosClientBuilder()
+            .endpoint(TestConfigurations.HOST)
+            .key(TestConfigurations.MASTER_KEY)
+            .directMode(directConnectionConfig)
+            .buildClient()) {
+
+            RxDocumentClientImpl rxDocumentClient = (RxDocumentClientImpl) CosmosBridgeInternal.getAsyncDocumentClient(cosmosClient);
+            ConnectionPolicy connectionPolicy = rxDocumentClient.getConnectionPolicy();
+
+            assertThat(connectionPolicy).isNotNull();
+            assertThat(connectionPolicy.getTcpNetworkRequestTimeout().toMillis()).isEqualTo(5_000L);
+            assertThat(connectionPolicy.getHttpNetworkRequestTimeout().toMillis()).isEqualTo(60_000L);
+        } catch (Exception e) {
+            fail("CosmosClientBuilder should implement AutoCloseable");
+        }
+
+        directConnectionConfig = new DirectConnectionConfig();
+        directConnectionConfig.setNetworkRequestTimeout(Duration.ofSeconds(7));
+
+        try (CosmosClient cosmosClient = new CosmosClientBuilder()
+            .endpoint(TestConfigurations.HOST)
+            .key(TestConfigurations.MASTER_KEY)
+            .directMode(directConnectionConfig)
+            .buildClient()) {
+
+            RxDocumentClientImpl rxDocumentClient = (RxDocumentClientImpl) CosmosBridgeInternal.getAsyncDocumentClient(cosmosClient);
+            ConnectionPolicy connectionPolicy = rxDocumentClient.getConnectionPolicy();
+
+            assertThat(connectionPolicy).isNotNull();
+            assertThat(connectionPolicy.getTcpNetworkRequestTimeout().toMillis()).isEqualTo(7_000L);
+        } catch (Exception e) {
+            fail("CosmosClientBuilder should implement AutoCloseable");
+        }
+    }
+
     private static class CacheKey {
         private final String className;
         private final String queryText;
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemWriteRetriesTest.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemWriteRetriesTest.java
index d14526d539ff..c057eb1b9561 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemWriteRetriesTest.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/CosmosItemWriteRetriesTest.java
@@ -626,7 +626,7 @@ private FaultInjectionRule injectFailure(
 
         FaultInjectionServerErrorResultBuilder faultInjectionResultBuilder = FaultInjectionResultBuilders
             .getResultBuilder(FaultInjectionServerErrorType.RESPONSE_DELAY)
-            .delay(Duration.ofMillis(1500))
+            .delay(Duration.ofMillis(6000))
             .times(1);
 
         if (suppressServiceRequests != null) {
@@ -784,4 +784,4 @@ private ObjectNode getDocumentDefinition(String documentId) {
             throw new IllegalStateException("No json processing error expected", jsonError);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/GlobalPartitionEndpointManagerForPPCBUnitTests.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/GlobalPartitionEndpointManagerForPPCBUnitTests.java
index 8a78b58d4d1f..11d14758f352 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/GlobalPartitionEndpointManagerForPPCBUnitTests.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/GlobalPartitionEndpointManagerForPPCBUnitTests.java
@@ -6,6 +6,7 @@
 import com.azure.cosmos.implementation.AvailabilityStrategyContext;
 import com.azure.cosmos.implementation.CrossRegionAvailabilityContextForRxDocumentServiceRequest;
 import com.azure.cosmos.implementation.GlobalEndpointManager;
+import com.azure.cosmos.implementation.HttpConstants;
 import com.azure.cosmos.implementation.OperationType;
 import com.azure.cosmos.implementation.PartitionKeyRange;
 import com.azure.cosmos.implementation.PartitionKeyRangeWrapper;
@@ -100,6 +101,26 @@ public Object[][] partitionLevelCircuitBreakerConfigs() {
         };
     }
 
+    @DataProvider(name = "nullPartitionKeyRangeHandlingArgs")
+    public Object[][] nullPartitionKeyRangeHandlingArgs() {
+        /*
+           Dimensions:
+             1) resolvedPartitionKeyRangeForCircuitBreaker present or absent
+             2) isCancellationException true/false
+             3) resolvedPartitionKeyRange (normal routing) present or absent (to cover early-return branch where
+                resolvedPartitionKeyRangeForCircuitBreaker != null but resolvedPartitionKeyRange == null)
+         */
+        return new Object[][] {
+            // resolvedPartitionKeyRangeForCircuitBreaker = null, cancellation=true  (should NOT throw)
+            { false, true,  true  }, // keep resolvedPartitionKeyRange present (value doesn't matter here)
+            // resolvedPartitionKeyRangeForCircuitBreaker = null, cancellation=false (should throw 500 / 20913)
+            { false, false, true  },
+            // resolvedPartitionKeyRangeForCircuitBreaker = present, but resolvedPartitionKeyRange = null AND cancellation flag irrelevant (early return, no throw)
+            { true,  true,  false },
+            { true,  false, false }
+        };
+    }
+
     @Test(groups = {"unit"}, dataProvider = "partitionLevelCircuitBreakerConfigs")
     public void recordHealthyStatus(String partitionLevelCircuitBreakerConfigAsJsonString, boolean readOperationTrue) throws IllegalAccessException, NoSuchFieldException {
 
@@ -195,7 +216,7 @@ public void recordHealthyToHealthyWithFailuresStatusTransition(String partitionL
             Mockito.when(this.globalEndpointManagerMock.getWriteEndpoints()).thenReturn((UnmodifiableList<RegionalRoutingContext>) UnmodifiableList.unmodifiableList(applicableReadWriteEndpoints));
 
             globalPartitionEndpointManagerForCircuitBreaker
-                .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
 
             Class<?>[] enclosedClasses = GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class.getDeclaredClasses();
             Class<?> partitionLevelUnavailabilityInfoClass
@@ -269,7 +290,7 @@ public void recordHealthyWithFailuresToUnavailableStatusTransition(String partit
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
             }
 
             Class<?>[] enclosedClasses = GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class.getDeclaredClasses();
@@ -346,7 +367,7 @@ public void recordUnavailableToHealthyTentativeStatusTransition(String partition
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
             }
 
             Class<?>[] enclosedClasses = GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class.getDeclaredClasses();
@@ -434,7 +455,7 @@ public void recordHealthyTentativeToHealthyStatusTransition(String partitionLeve
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
             }
 
             Class<?>[] enclosedClasses = GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class.getDeclaredClasses();
@@ -530,7 +551,7 @@ public void recordHealthyTentativeToUnavailableTransition(String partitionLevelC
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
             }
 
             Class<?>[] enclosedClasses = GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class.getDeclaredClasses();
@@ -571,7 +592,7 @@ public void recordHealthyTentativeToUnavailableTransition(String partitionLevelC
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
             }
 
             locationSpecificHealthContext = locationEndpointToLocationSpecificContextForPartition.get(new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
@@ -626,11 +647,11 @@ public void allRegionsUnavailableHandling(String partitionLevelCircuitBreakerCon
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUsEndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationEastUsEndpointToLocationPair.getKey()), false);
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationCentralUsEndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(LocationCentralUsEndpointToLocationPair.getKey()), false);
             }
 
             Class<?>[] enclosedClasses = GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class.getDeclaredClasses();
@@ -709,7 +730,7 @@ public void multiContainerBothWithSinglePartitionHealthyToUnavailableHandling(St
 
             for (int i = 1; i <= exceptionCountToHandle; i++) {
                 globalPartitionEndpointManagerForCircuitBreaker
-                    .handleLocationExceptionForPartitionKeyRange(request1, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()));
+                    .handleLocationExceptionForPartitionKeyRange(request1, new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()), false);
             }
 
             globalPartitionEndpointManagerForCircuitBreaker.handleLocationSuccessForPartitionKeyRange(request2);
@@ -902,6 +923,90 @@ public void allRegionsUnavailableHandlingWithMultiThreading(String partitionLeve
         }
     }
 
+    /**
+     * Validates handling in handleLocationExceptionForPartitionKeyRange when
+     * resolvedPartitionKeyRangeForCircuitBreaker is absent (null) vs present under
+     * different cancellation flags.
+     * <p>
+     * Expectations:
+     * - If resolvedPartitionKeyRangeForCircuitBreaker == null AND isCancellationException == true
+     * => method returns without throwing.
+     * - If resolvedPartitionKeyRangeForCircuitBreaker == null AND isCancellationException == false
+     * => method MUST throw CosmosException (500 / subStatus 20913).
+     * - If resolvedPartitionKeyRangeForCircuitBreaker != null BUT resolvedPartitionKeyRange == null
+     * => method returns early (no throw) regardless of cancellation flag.
+     */
+    @Test(groups = {"unit"}, dataProvider = "nullPartitionKeyRangeHandlingArgs")
+    public void validateHandlingOnNullPartitionKeyRange(boolean setResolvedPartitionKeyRangeForCircuitBreaker,
+                                                        boolean isCancellationException,
+                                                        boolean setResolvedPartitionKeyRange) {
+
+        GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker globalPartitionEndpointManagerForPerPartitionCircuitBreaker =
+            new GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker(this.globalEndpointManagerMock);
+
+        // Build a minimal request
+        String collectionRid = "dbs/db1/colls/coll1";
+        String pkRangeId = "0";
+        String min = "AA";
+        String max = "BB";
+
+        RxDocumentServiceRequest request = RxDocumentServiceRequest.create(
+            mockDiagnosticsClientContext(),
+            OperationType.Read,
+            ResourceType.Document);
+
+        request.setResourceId(collectionRid);
+        request.requestContext.regionalRoutingContextToRoute =
+            new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey());
+
+        if (setResolvedPartitionKeyRange) {
+            request.requestContext.resolvedPartitionKeyRange = new PartitionKeyRange(pkRangeId, min, max);
+        }
+
+        if (setResolvedPartitionKeyRangeForCircuitBreaker) {
+            // Only set circuit-breaker partition if we also set normal routing partition OR we want to test early return branch
+            PartitionKeyRange pkr = new PartitionKeyRange(pkRangeId, min, max);
+            request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker = pkr;
+            if (!setResolvedPartitionKeyRange) {
+                // Simulate split/invalid: routing partition is null while circuit breaker holder not null.
+                // Code path should early-return and not throw regardless of cancellation flag.
+                request.requestContext.resolvedPartitionKeyRange = null;
+            }
+        }
+
+        boolean expectThrow = !isCancellationException && !setResolvedPartitionKeyRangeForCircuitBreaker;
+        boolean threw = false;
+        CosmosException captured = null;
+
+        try {
+            globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(
+                request,
+                new RegionalRoutingContext(LocationEastUs2EndpointToLocationPair.getKey()),
+                isCancellationException);
+        } catch (CosmosException ce) {
+            threw = true;
+            captured = ce;
+        }
+
+        if (expectThrow) {
+            assertThat(threw)
+                .as("Expected CosmosException when circuit-breaker PK range is null and cancellation = false")
+                .isTrue();
+            assertThat(captured.getStatusCode())
+                .as("Status code should be 500")
+                .isEqualTo(HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR);
+            assertThat(captured.getSubStatusCode())
+                .as("Substatus should be 20913")
+                .isEqualTo(HttpConstants.SubStatusCodes.PPCB_INVALID_STATE);
+        } else {
+            assertThat(threw)
+                .as("Did not expect exception (setResolvedPartitionKeyRangeForCircuitBreaker=" +
+                    setResolvedPartitionKeyRangeForCircuitBreaker +
+                    ", isCancellationException=" + isCancellationException + ")")
+                .isFalse();
+        }
+    }
+
     private static void validateAllRegionsAreNotUnavailableAfterExceptionInLocation(
         GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker globalPartitionEndpointManagerForCircuitBreaker,
         RxDocumentServiceRequest request,
@@ -911,7 +1016,7 @@ private static void validateAllRegionsAreNotUnavailableAfterExceptionInLocation(
         List<RegionalRoutingContext> applicableReadWriteLocations) {
 
         logger.warn("Handling exception for {}", locationWithFailure.getPath());
-        globalPartitionEndpointManagerForCircuitBreaker.handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(locationWithFailure));
+        globalPartitionEndpointManagerForCircuitBreaker.handleLocationExceptionForPartitionKeyRange(request, new RegionalRoutingContext(locationWithFailure), false);
 
         List<String> unavailableRegions
             = globalPartitionEndpointManagerForCircuitBreaker.getUnavailableRegionsForPartitionKeyRange(request, collectionResourceId, partitionKeyRange);
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/MaxRetryCountTests.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/MaxRetryCountTests.java
index c2a7e5b0b496..8237b4013001 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/MaxRetryCountTests.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/MaxRetryCountTests.java
@@ -73,7 +73,7 @@ public class MaxRetryCountTests extends TestSuiteBase {
     private final static Boolean notSpecifiedWhetherIdempotentWriteRetriesAreEnabled = null;
     private final static ThresholdBasedAvailabilityStrategy noAvailabilityStrategy = null;
     private final static Duration defaultNetworkRequestTimeoutDuration = Duration.ofSeconds(5);
-    private final static Duration minNetworkRequestTimeoutDuration = Duration.ofSeconds(1);
+    private final static Duration minNetworkRequestTimeoutDuration = Duration.ofSeconds(6);
     private final static ThrottlingRetryOptions defaultThrottlingRetryOptions = new ThrottlingRetryOptions();
 
     private final static BiConsumer<Integer, Integer> validateStatusCodeIsReadSessionNotAvailableError =
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/PerPartitionCircuitBreakerE2ETests.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/PerPartitionCircuitBreakerE2ETests.java
index 7cbae5749237..d97c5cace8b4 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/PerPartitionCircuitBreakerE2ETests.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/PerPartitionCircuitBreakerE2ETests.java
@@ -11,6 +11,7 @@
 import com.azure.cosmos.implementation.GlobalEndpointManager;
 import com.azure.cosmos.implementation.HttpConstants;
 import com.azure.cosmos.implementation.ImplementationBridgeHelpers;
+import com.azure.cosmos.implementation.OperationType;
 import com.azure.cosmos.implementation.PartitionKeyRange;
 import com.azure.cosmos.implementation.RxDocumentClientImpl;
 import com.azure.cosmos.implementation.TestConfigurations;
@@ -63,6 +64,7 @@
 import java.lang.reflect.Field;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -2716,6 +2718,20 @@ public Object[][] gatewayRoutedFailuresParametersDataProviderMiscDirect() {
         };
     }
 
+    @DataProvider(name = "tinyTimeoutOperationTypes")
+    public Object[][] tinyTimeoutOperationTypes() {
+        return new Object[][] {
+            { OperationType.Read, false },
+            { OperationType.Query, false },   // interpreted as queryItems (single query)
+            { OperationType.Query, true },   // interpreted as readMany (single query)
+            { OperationType.Create, false },
+            { OperationType.Replace, false },
+            { OperationType.Delete, false },
+            { OperationType.Patch, false },
+            { OperationType.Batch, false }
+        };
+    }
+
     @Test(groups = {"circuit-breaker-misc-direct"}, dataProvider = "miscellaneousOpTestConfigsDirect", timeOut = 4 * TIMEOUT)
     public void miscellaneousDocumentOperationHitsTerminalExceptionAcrossKRegionsDirect(
         String testId,
@@ -4096,6 +4112,131 @@ public void testMiscOperation_withAllGatewayRoutedOperationFailuresInPrimaryRegi
          }
      }
 
+    /**
+     * Executes each listed operation type under a deliberately tiny (10 ms) end-to-end latency policy
+     * while a Gateway response delay fault (1s) is injected, asserting every operation times out with
+     * 408 / 20008 (CLIENT_OPERATION_TIMEOUT).
+     *
+     */
+    @Test(groups = { "circuit-breaker-misc-gateway" }, dataProvider = "tinyTimeoutOperationTypes", timeOut = 2 * TIMEOUT)
+    public void validateHandlingOnNullPartitionKeyRangeOnSmallE2ETimeout_allOps(OperationType operationType, boolean isReadMany) {
+
+        System.setProperty(
+            "COSMOS.PARTITION_LEVEL_CIRCUIT_BREAKER_CONFIG",
+            "{\"isPartitionLevelCircuitBreakerEnabled\": true, "
+                + "\"circuitBreakerType\": \"CONSECUTIVE_EXCEPTION_COUNT_BASED\","
+                + "\"consecutiveExceptionCountToleratedForReads\": 10,"
+                + "\"consecutiveExceptionCountToleratedForWrites\": 5,"
+                + "}");
+
+        // Tiny E2E timeout
+        CosmosEndToEndOperationLatencyPolicyConfig tinyTimeoutCfg =
+            new CosmosEndToEndOperationLatencyPolicyConfigBuilder(Duration.ofMillis(5)).build();
+
+        try (CosmosAsyncClient tinyTimeoutClient =
+                 getClientBuilder()
+                     .buildAsyncClient()) {
+
+            CosmosAsyncContainer container = tinyTimeoutClient
+                .getDatabase(this.sharedAsyncDatabaseId)
+                .getContainer(this.sharedMultiPartitionAsyncContainerIdWhereIdIsPartitionKey);
+
+            // Seed item where required (Create doesn't need pre-existing, but harmless if present)
+            TestObject baseItem = TestObject.create(); // id == pk
+
+            CosmosItemRequestOptions itemRequestOptions = new CosmosItemRequestOptions()
+                .setCosmosEndToEndOperationLatencyPolicyConfig(tinyTimeoutCfg);
+            CosmosQueryRequestOptions queryRequestOptions = new CosmosQueryRequestOptions()
+                .setCosmosEndToEndOperationLatencyPolicyConfig(tinyTimeoutCfg);
+            CosmosReadManyRequestOptions readManyRequestOptions = new CosmosReadManyRequestOptions()
+                .setCosmosEndToEndOperationLatencyPolicyConfig(tinyTimeoutCfg);
+            CosmosItemRequestOptions patchItemRequestOptions = new CosmosPatchItemRequestOptions()
+                .setCosmosEndToEndOperationLatencyPolicyConfig(tinyTimeoutCfg);
+
+            FaultInjectionRuleParamsWrapper paramsWrapper = new FaultInjectionRuleParamsWrapper()
+                .withFaultInjectionOperationType(FaultInjectionOperationType.METADATA_REQUEST_PARTITION_KEY_RANGES)
+                .withFaultInjectionApplicableRegions(this.writeRegions.subList(0, 1))
+                .withFaultInjectionConnectionType(FaultInjectionConnectionType.GATEWAY)
+                .withResponseDelay(Duration.ofSeconds(1))          // far beyond 10 ms e2e timeout
+                .withFaultInjectionDuration(Duration.ofSeconds(5))
+                .withHitLimit(1);
+
+            List<FaultInjectionRule> rules = buildGwConnectionDelayInjectionRulesNotScopedToOpType(paramsWrapper);
+            CosmosFaultInjectionHelper.configureFaultInjectionRules(container, rules).block();
+
+            // Execute operation & assert timeout
+            try {
+                switch (operationType) {
+                    case Read:
+                        container.readItem(baseItem.getId(), new PartitionKey(baseItem.getId()), itemRequestOptions, TestObject.class)
+                            .block();
+                        break;
+                    case Query:
+
+                        if (isReadMany) {
+
+                            CosmosItemIdentity cosmosItemIdentity = new CosmosItemIdentity(new PartitionKey(baseItem.getId()), baseItem.getId());
+                            container.readMany(Arrays.asList(cosmosItemIdentity, cosmosItemIdentity), readManyRequestOptions, TestObject.class)
+                                .block();
+                        } else {
+                            container.queryItems("SELECT * FROM c WHERE c.id = '" + baseItem.getId() + "'",
+                                    queryRequestOptions, TestObject.class)
+                                .collectList()
+                                .block();
+                        }
+
+                        break;
+                    case Create:
+                        container.createItem(TestObject.create(),
+                            new PartitionKey(baseItem.getId()),
+                            itemRequestOptions).block();
+                        break;
+                    case Replace: {
+                        // Simple replace: modify a property
+                        baseItem.setStringProp("updated-" + baseItem.getId());
+                        container.replaceItem(baseItem, baseItem.getId(), new PartitionKey(baseItem.getId()), itemRequestOptions).block();
+                        break;
+                    }
+                    case Delete:
+                        container.deleteItem(baseItem, itemRequestOptions).block();
+                        break;
+                    case Patch: {
+                        CosmosPatchOperations ops = CosmosPatchOperations.create().add("/patched", "v1");
+                        container.patchItem(baseItem.getId(), new PartitionKey(baseItem.getId()), ops, (CosmosPatchItemRequestOptions) patchItemRequestOptions, TestObject.class).block();
+                        break;
+                    }
+
+                    // todo: utilize e2e timeout on CosmosBatchItemRequestOptions when available
+                    case Batch: {
+                        try (CosmosAsyncClient backupClient = getClientBuilder().endToEndOperationLatencyPolicyConfig(tinyTimeoutCfg).buildAsyncClient()) {
+                            CosmosAsyncContainer backupContainer = backupClient
+                                .getDatabase(this.sharedAsyncDatabaseId)
+                                .getContainer(this.sharedMultiPartitionAsyncContainerIdWhereIdIsPartitionKey);
+                            CosmosBatch batch = CosmosBatch.createCosmosBatch(new PartitionKey(baseItem.getId()));
+                            batch.readItemOperation(baseItem.getId());
+                            batch.upsertItemOperation(TestObject.create());
+                            backupContainer.executeCosmosBatch(batch).block();
+                        }
+
+                        break;
+                    }
+                    default:
+                        fail("Unsupported operation type in test: " + operationType);
+                }
+                fail("Expected a CosmosException (408/20008) for operationType=" + operationType);
+            } catch (CosmosException ce) {
+                assertThat(ce.getStatusCode())
+                    .as("Status should be 408 for operationType=" + operationType)
+                    .isEqualTo(HttpConstants.StatusCodes.REQUEST_TIMEOUT);
+                assertThat(ce.getSubStatusCode())
+                    .as("Substatus should be 20008 (CLIENT_OPERATION_TIMEOUT) for operationType=" + operationType)
+                    .isEqualTo(HttpConstants.SubStatusCodes.CLIENT_OPERATION_TIMEOUT);
+            } finally {
+                System.clearProperty("COSMOS.PARTITION_LEVEL_CIRCUIT_BREAKER_CONFIG");
+            }
+        }
+    }
+
     private static Function<OperationInvocationParamsWrapper, ResponseWrapper<?>> resolveDataPlaneOperation(FaultInjectionOperationType faultInjectionOperationType) {
 
         switch (faultInjectionOperationType) {
@@ -4766,6 +4907,46 @@ private static List<FaultInjectionRule> buildGwResponseDelayInjectionRulesNotSco
         return faultInjectionRules;
     }
 
+    private static List<FaultInjectionRule> buildGwConnectionDelayInjectionRulesNotScopedToOpType(FaultInjectionRuleParamsWrapper paramsWrapper) {
+
+        FaultInjectionServerErrorResult faultInjectionServerErrorResult = FaultInjectionResultBuilders
+            .getResultBuilder(FaultInjectionServerErrorType.CONNECTION_DELAY)
+            .delay(paramsWrapper.getResponseDelay())
+            .suppressServiceRequests(false)
+            .build();
+
+        List<FaultInjectionRule> faultInjectionRules = new ArrayList<>();
+
+        for (String applicableRegion : paramsWrapper.getFaultInjectionApplicableRegions()) {
+
+            FaultInjectionConditionBuilder faultInjectionConditionBuilder = new FaultInjectionConditionBuilder()
+                .connectionType(FaultInjectionConnectionType.GATEWAY)
+                .region(applicableRegion);
+
+            if (paramsWrapper.getFaultInjectionApplicableFeedRange() != null) {
+                faultInjectionConditionBuilder.endpoints(new FaultInjectionEndpointBuilder(paramsWrapper.getFaultInjectionApplicableFeedRange()).build());
+            }
+
+            FaultInjectionCondition faultInjectionCondition = faultInjectionConditionBuilder.build();
+
+            FaultInjectionRuleBuilder faultInjectionRuleBuilder = new FaultInjectionRuleBuilder("response-delay-rule-" + UUID.randomUUID())
+                .condition(faultInjectionCondition)
+                .result(faultInjectionServerErrorResult);
+
+            if (paramsWrapper.getFaultInjectionDuration() != null) {
+                faultInjectionRuleBuilder.duration(paramsWrapper.getFaultInjectionDuration());
+            }
+
+            if (paramsWrapper.getHitLimit() != null) {
+                faultInjectionRuleBuilder.hitLimit(paramsWrapper.getHitLimit());
+            }
+
+            faultInjectionRules.add(faultInjectionRuleBuilder.build());
+        }
+
+        return faultInjectionRules;
+    }
+
     private static List<FaultInjectionRule> buildReadWriteSessionNotAvailableFaultInjectionRules(FaultInjectionRuleParamsWrapper paramsWrapper) {
 
         FaultInjectionServerErrorResult faultInjectionServerErrorResult = FaultInjectionResultBuilders
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/faultinjection/FaultInjectionServerErrorRuleOnDirectTests.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/faultinjection/FaultInjectionServerErrorRuleOnDirectTests.java
index 079768788bfc..d46cb84141a4 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/faultinjection/FaultInjectionServerErrorRuleOnDirectTests.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/faultinjection/FaultInjectionServerErrorRuleOnDirectTests.java
@@ -1373,6 +1373,70 @@ public void faultInjectionServerErrorRuleTests_InjectionRate75Percent() throws J
         }
     }
 
+    @Test(groups = {"long"}, timeOut = TIMEOUT)
+    public void faultInjectionInjectTcpResponseDelay() throws JsonProcessingException {
+        CosmosAsyncClient newClient = null; // creating new client to force creating new connections
+        // define another rule which can simulate timeout
+        String timeoutRuleId = "serverErrorRule-transitTimeout-" + UUID.randomUUID();
+        FaultInjectionRule timeoutRule =
+            new FaultInjectionRuleBuilder(timeoutRuleId)
+                .condition(
+                    new FaultInjectionConditionBuilder()
+                        .operationType(FaultInjectionOperationType.CREATE_ITEM)
+                        .build()
+                )
+                .result(
+                    FaultInjectionResultBuilders
+                        .getResultBuilder(FaultInjectionServerErrorType.RESPONSE_DELAY)
+                        .times(1)
+                        .delay(Duration.ofSeconds(4))
+                        .build()
+                )
+                .duration(Duration.ofMinutes(5))
+                .build();
+        try {
+            DirectConnectionConfig directConnectionConfig = DirectConnectionConfig.getDefaultConfig();
+
+            // set networkRequestTimeout to 1.1s but CosmosClient internally sets networkRequestTimeout back to 5s, so the injected delay (4s) will not cause failures
+            directConnectionConfig.setNetworkRequestTimeout(Duration.ofMillis(1100));
+
+            newClient = new CosmosClientBuilder()
+                .endpoint(TestConfigurations.HOST)
+                .key(TestConfigurations.MASTER_KEY)
+                .contentResponseOnWriteEnabled(true)
+                .consistencyLevel(BridgeInternal.getContextClient(this.clientWithoutPreferredRegions).getConsistencyLevel())
+                .directMode(directConnectionConfig)
+                .buildAsyncClient();
+
+            CosmosAsyncContainer container =
+                newClient
+                    .getDatabase(cosmosAsyncContainer.getDatabase().getId())
+                    .getContainer(cosmosAsyncContainer.getId());
+
+            CosmosFaultInjectionHelper.configureFaultInjectionRules(container, Arrays.asList(timeoutRule)).block();
+
+            // create a new item to be used by read operations
+            TestObject createdItem = TestObject.create();
+            CosmosItemResponse<TestObject> itemResponse = container.createItem(createdItem).block();
+
+            assertThat(timeoutRule.getHitCount()).isEqualTo(1);
+            this.validateHitCount(timeoutRule, 1, OperationType.Create, ResourceType.Document);
+
+            this.validateFaultInjectionRuleApplied(
+                itemResponse.getDiagnostics(),
+                OperationType.Create,
+                HttpConstants.StatusCodes.CREATED,
+                HttpConstants.SubStatusCodes.UNKNOWN,
+                timeoutRuleId,
+                false
+            );
+
+        } finally {
+            timeoutRule.disable();
+            safeClose(newClient);
+        }
+    }
+
     private void validateFaultInjectionRuleApplied(
         CosmosDiagnostics cosmosDiagnostics,
         OperationType operationType,
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/implementation/ClientRetryPolicyTest.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/implementation/ClientRetryPolicyTest.java
index 93e90ae1bbb2..94575922f652 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/implementation/ClientRetryPolicyTest.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/implementation/ClientRetryPolicyTest.java
@@ -57,7 +57,20 @@ public static Object[][] requestRateTooLargeArgProvider() {
             { OperationType.ReadFeed, ResourceType.DocumentCollection, false }
         };
     }
-    
+
+    @DataProvider(name = "exceptionArgsProvider")
+    public static Object[][] exceptionArgsProvider() {
+        return new Object[][]{
+            {new ServiceUnavailableException(), OperationType.Read},
+            {new ServiceUnavailableException(), OperationType.Create},
+            {new InternalServerErrorException(), OperationType.Read},
+            {new InternalServerErrorException(), OperationType.Create},
+            {new RequestTimeoutException(null, null, HttpConstants.SubStatusCodes.TRANSIT_TIMEOUT), OperationType.Create},
+            {new RequestTimeoutException(null, new ReadTimeoutException(), null, null, HttpConstants.SubStatusCodes.GATEWAY_ENDPOINT_READ_TIMEOUT), OperationType.Create},
+            {new RequestTimeoutException(null, new ReadTimeoutException(), null, null, HttpConstants.SubStatusCodes.GATEWAY_ENDPOINT_READ_TIMEOUT), OperationType.Read},
+        };
+    }
+
     @Test(groups = "unit", dataProvider = "requestRateTooLargeArgProvider")
     public void requestRateTooLarge(
         OperationType operationType,
@@ -120,7 +133,7 @@ public void requestRateTooLarge(
                 .build());
         }
     }
-    
+
     @DataProvider(name = "tcpNetworkFailureOnWriteArgProvider")
     public static Object[][] tcpNetworkFailureOnWriteArgProvider() {
         return new Object[][]{
@@ -624,6 +637,47 @@ public void onBeforeSendRequestNotInvoked() {
         Mockito.verifyNoInteractions(endpointManager);
     }
 
+    @Test(groups = "unit", dataProvider = "exceptionArgsProvider")
+    public void returnWithInternalServerErrorOnPpcbFailure(CosmosException cosmosException, OperationType operationType) throws Exception {
+        ThrottlingRetryOptions throttlingRetryOptions = new ThrottlingRetryOptions();
+        GlobalEndpointManager endpointManager = Mockito.mock(GlobalEndpointManager.class);
+        GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker globalPartitionEndpointManagerForPerPartitionCircuitBreaker
+            = Mockito.mock(GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class);
+        GlobalPartitionEndpointManagerForPerPartitionAutomaticFailover globalPartitionEndpointManagerForPerPartitionAutomaticFailover
+            = Mockito.mock(GlobalPartitionEndpointManagerForPerPartitionAutomaticFailover.class);
+
+        CosmosException cosmosEx = Mockito.mock(CosmosException.class);
+
+        Mockito.when(globalPartitionEndpointManagerForPerPartitionCircuitBreaker.isPerPartitionLevelCircuitBreakingApplicable(Mockito.any())).thenReturn(true);
+        Mockito.doThrow(cosmosEx).when(globalPartitionEndpointManagerForPerPartitionCircuitBreaker).handleLocationExceptionForPartitionKeyRange(Mockito.any(), Mockito.any(), Mockito.anyBoolean());
+
+        Mockito.doReturn(new RegionalRoutingContext(new URI("http://localhost"))).when(endpointManager).resolveServiceEndpoint(Mockito.any(RxDocumentServiceRequest.class));
+        Mockito.doReturn(Mono.empty()).when(endpointManager).refreshLocationAsync(Mockito.eq(null), Mockito.eq(true));
+        ClientRetryPolicy clientRetryPolicy =
+            new ClientRetryPolicy(
+                mockDiagnosticsClientContext(),
+                endpointManager,
+                true,
+                throttlingRetryOptions,
+                null,
+                globalPartitionEndpointManagerForPerPartitionCircuitBreaker,
+                globalPartitionEndpointManagerForPerPartitionAutomaticFailover);
+
+        RxDocumentServiceRequest dsr;
+        Mono<ShouldRetryResult> shouldRetry;
+
+        dsr = RxDocumentServiceRequest.createFromName(mockDiagnosticsClientContext(), operationType, TEST_DOCUMENT_PATH, ResourceType.Document);
+
+        clientRetryPolicy.onBeforeSendRequest(dsr);
+        shouldRetry = clientRetryPolicy.shouldRetry(cosmosException);
+
+        // rethrow exception thrown from PPCB
+        validateSuccess(shouldRetry, ShouldRetryValidator.builder()
+            .withException(cosmosEx)
+            .shouldRetry(false)
+            .build());
+    }
+
     public static void validateSuccess(Mono<ShouldRetryResult> single,
                                        ShouldRetryValidator validator) {
 
diff --git a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/changefeed/epkversion/IncrementalChangeFeedProcessorTest.java b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/changefeed/epkversion/IncrementalChangeFeedProcessorTest.java
index 82fb15a61575..a543309ef37a 100644
--- a/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/changefeed/epkversion/IncrementalChangeFeedProcessorTest.java
+++ b/sdk/cosmos/azure-cosmos-tests/src/test/java/com/azure/cosmos/rx/changefeed/epkversion/IncrementalChangeFeedProcessorTest.java
@@ -88,6 +88,7 @@
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -255,6 +256,107 @@ public void readFeedDocumentsStartFromCustomDate() throws InterruptedException {
         }
     }
 
+    @Test(groups = { "query" }, timeOut = 50 * CHANGE_FEED_PROCESSOR_TIMEOUT)
+    public void verifyConsistentTimestamps() throws InterruptedException {
+        CosmosAsyncContainer createdFeedCollection = createFeedCollection(FEED_COLLECTION_THROUGHPUT);
+        CosmosAsyncContainer createdLeaseCollection = createLeaseCollection(LEASE_COLLECTION_THROUGHPUT);
+
+        try {
+            List<InternalObjectNode> createdDocuments = new ArrayList<>();
+            Map<String, JsonNode> receivedDocuments = new ConcurrentHashMap<>();
+            ChangeFeedProcessor changeFeedProcessor = new ChangeFeedProcessorBuilder()
+                .hostName(hostName)
+                .handleLatestVersionChanges((List<ChangeFeedProcessorItem> docs) -> {
+                    logger.info("START processing from thread {}", Thread.currentThread().getId());
+                    for (ChangeFeedProcessorItem item : docs) {
+                        processItem(item, receivedDocuments);
+                    }
+                    logger.info("END processing from thread {}", Thread.currentThread().getId());
+                })
+                .feedContainer(createdFeedCollection)
+                .leaseContainer(createdLeaseCollection)
+                .options(new ChangeFeedProcessorOptions()
+                    .setLeaseRenewInterval(Duration.ofSeconds(20))
+                    .setLeaseAcquireInterval(Duration.ofSeconds(10))
+                    .setLeaseExpirationInterval(Duration.ofSeconds(30))
+                    .setFeedPollDelay(Duration.ofSeconds(1))
+                    .setLeasePrefix("TEST")
+                    .setMaxItemCount(10)
+                    .setMinScaleCount(1)
+                    .setMaxScaleCount(3)
+                )
+                .buildChangeFeedProcessor();
+            AtomicReference<String> initialTimestamp = new AtomicReference<>();
+
+            startChangeFeedProcessor(changeFeedProcessor);
+
+            assertThat(changeFeedProcessor.isStarted()).as("Change Feed Processor instance is running").isTrue();
+
+            safeStopChangeFeedProcessor(changeFeedProcessor);
+
+            createdLeaseCollection.queryItems("SELECT * FROM c", new CosmosQueryRequestOptions(), JsonNode.class)
+                .byPage()
+                .flatMap(feedResponse -> {
+                    for (JsonNode item : feedResponse.getResults()) {
+                        if (item.get("timestamp") != null) {
+                            initialTimestamp.set(item.get("timestamp").asText());
+                            logger.info("Found timestamp: %s", initialTimestamp);
+                        }
+                    }
+                    return Mono.empty();
+                }).blockLast();
+
+
+
+            startChangeFeedProcessor(changeFeedProcessor);
+
+            // create a gap between previously written documents
+            Thread.sleep(3000);
+
+            // process some documents after the CFP is started and stopped
+            setupReadFeedDocuments(createdDocuments, createdFeedCollection, FEED_COUNT);
+
+            // Wait for the feed processor to receive and process the documents.
+            waitToReceiveDocuments(receivedDocuments, 40 * CHANGE_FEED_PROCESSOR_TIMEOUT, FEED_COUNT);
+            safeStopChangeFeedProcessor(changeFeedProcessor);
+
+            logger.info("After processing documents");
+
+            AtomicReference<String> newTimestamp = new AtomicReference<>();
+
+
+            createdLeaseCollection.queryItems("SELECT * FROM c", new CosmosQueryRequestOptions(), JsonNode.class)
+                .byPage()
+                .flatMap(feedResponse -> {
+                    for (JsonNode item : feedResponse.getResults()) {
+                        if (item.get("timestamp") != null) {
+                            newTimestamp.set(item.get("timestamp").asText());
+                            logger.info("Found timestamp: %s", newTimestamp);
+                        }
+                    }
+                    return Mono.empty();
+                }).blockLast();
+
+
+            assertThat(newTimestamp.get()).doesNotContain("[UTC]");
+            assertThat(initialTimestamp.get()).doesNotContain("[UTC]");
+
+            for (InternalObjectNode item : createdDocuments) {
+                assertThat(receivedDocuments.containsKey(item.getId())).as("Document with getId: " + item.getId()).isTrue();
+            }
+
+            // Wait for the feed processor to shutdown.
+            Thread.sleep(CHANGE_FEED_PROCESSOR_TIMEOUT);
+
+        } finally {
+            safeDeleteCollection(createdFeedCollection);
+            safeDeleteCollection(createdLeaseCollection);
+
+            // Allow some time for the collections to be deleted before exiting.
+            Thread.sleep(500);
+        }
+    }
+
     @Test(groups = {"multi-master"}, timeOut = 50 * CHANGE_FEED_PROCESSOR_TIMEOUT)
     public void readFeedDocumentsStartFromCustomDateForMultiWrite_test() throws InterruptedException {
         CosmosClientBuilder clientBuilder = getClientBuilder();
diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md
index 2af84251114a..f11e53776c33 100644
--- a/sdk/cosmos/azure-cosmos/CHANGELOG.md
+++ b/sdk/cosmos/azure-cosmos/CHANGELOG.md
@@ -8,12 +8,15 @@
 #### Breaking Changes
 
 #### Bugs Fixed
+* Fixed an issue where Per-Partition Circuit Breaker was hitting `NullPointerException` in e2e timeout scenarios. - [PR 46968](https://github.com/Azure/azure-sdk-for-java/pull/46968/files)
 
 #### Other Changes
 * Changed to use `PartitionKeyRangeCache` to get partition key range during startup and split handling. - [46700](https://github.com/Azure/azure-sdk-for-java/pull/46700)
 * Changed to use lower casing http header names for gateway response. - [46736](https://github.com/Azure/azure-sdk-for-java/pull/46736)
 * Improved resilience around several completion events for an ssl handshake. - [PR 46734](https://github.com/Azure/azure-sdk-for-java/pull/46734)
+* Changed timestamp format to be consistent in leases for CFP. - [PR 46784](https://github.com/Azure/azure-sdk-for-java/pull/46784)
 * Added `MetadataThrottlingRetryPolicy` for `PartitionKeyRange` `RequestRateTooLargeException` handling. - [PR 46823](https://github.com/Azure/azure-sdk-for-java/pull/46823)
+* Ensure effective `DirectConnectionConfig#setNetworkRequestTimeout` is set to at least 5 seconds. - [PR 47024](https://github.com/Azure/azure-sdk-for-java/pull/47024)
 
 ### 4.74.0 (2025-09-05)
 
diff --git a/sdk/cosmos/azure-cosmos/docs/StatusCodes.md b/sdk/cosmos/azure-cosmos/docs/StatusCodes.md
index d4d81451a43b..4cc7bb2f5276 100644
--- a/sdk/cosmos/azure-cosmos/docs/StatusCodes.md
+++ b/sdk/cosmos/azure-cosmos/docs/StatusCodes.md
@@ -14,49 +14,49 @@ This document is intentionally not going into details on how resilient applicati
 
 ## Status codes
 
-| Status code |  Substatus code | Expected to be transient | Additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
-| -----------------:|----------------:|:-----------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|200|               0 |No| `OK`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|201|               0 |No| `Created` - returned for createItem or upsertItem when a new document was created                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-|204|               0 |No| `No Content` - returned when no payload would ever be returned - like for delete operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
-|207|               0 |No| `Multi-Status` - returned for transactional batch or bulk operations when some of the item operations have failed and others succeeded. The API allows checking status codes of item operations.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|304|               0 |No| `Not Modified` - will be returned for `ChangeFeed` operations to indicate that there are no more changes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|400|              \* |No| `Bad Request` - indicates that the client violated some protocol constraint. See [Bad Request TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-bad-request) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-|400|            1001 |No| `Bad Request/Partition key mismatch` - indicates that the PartitionKey defined in the point operation does not match the partition key value being extracted in the service form the document's payload based on the `PartitionKeyDefinition` of the container. See [Bad Request TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-bad-request) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-|400|            1004 |No| `Bad Request/CrossPartitionQueryNotServable` - indicates that the client attempted to execute a cross-partition query, which cannot be processed with the current SDK version. Usually this means that the query uses a query construct, which is not yet supported in the SDK version being used. Upgrading the SDK might help to address the problem. See [Bad Request TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-bad-request) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|401|               0 |No| `Unauthorized` - indicates that the client used invalid credentials. The most frequent scenario when this is happening, is when customers rotate the currently used key. Key rotation needs to be replicated across regions, which can take up-to a few minuts. During this time a `401 Unauthroized` would be used when the client is using the old or new key while the replication is still happening. The best way to do key rotation is to rotate the key only after it is not used by applications anymore - that is why a primary and secondary key exists for both writable and read-only keys. More details can be found here - [key rotation best practices](https://learn.microsoft.com/azure/cosmos-db/secure-access-to-data?tabs=using-primary-key#key-rotation). In addition this could also mean an invalid key when using `MasterKey`-based authentication, it could mean there is a time-synchronization issue or when using AAD that the AAD credentials are not correctly set-up. See [Unauthorized TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-unauthorized) for more details. |
-|403|              \* |No| `Forbidden` - indicates that the service rejected the request due to missing permissions. See [Forbidden TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-forbidden)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|403|               3 |Yes (up to few minutes)| `Forbidden/WriteForbidden` - indicates that the client attempted a write operation against a read-only region in a single write region set-up.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-|403|            1008 |Yes (up to few minutes)| `Forbidden/AccountNotFound` - indicates that the client attempted a read or write operation against a replica that did not have information about the database account.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-|403|            5300 |No| `Forbidden/AADForMetadata` - indicates that the client attempted a metadata operation (like creating, deleting or modifying a container/database) when using AAD authentication. This is not possible via the Data plane SDK. To execute control plane operatiosn with AAD authentication, please use the management SDK. See [Forbidden TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-forbidden#partition-key-exceeding-storage) and also the [Azure Cosmos DB Service quotas](https://learn.microsoft.com/azure/cosmos-db/concepts-limits#provisioned-throughput) for more details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-|403|            1014 |No| `Forbidden/LogicalPartitionExceedsStorage` - indicates that the data size of a logical partition exceeds the service quota (currently 20 GB). See [Forbidden TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-forbidden#non-data-operations-are-not-allowed) for more details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-|404|               0 |No| `Not found` - Indicates that the resource the client tried to read does not exist (on the replica being contacted). Depending on the consistency level used this could be a transient error condition - but when using less than strong consistency the application needs to be able to handle temporarily seeing 404/0 from some replica even after document got created gracefully. See [Not found TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-not-found) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-|404|            1002 |In most cases| `Not Found/Read session no available` - Indicates that a client uses session consistency and reached a replica that has a replication lag and has not caught-up to the requested session token. In many cases this error condition will be transient. But there are certain situation in which it could persist for longer period of times - either a wrong session token is being provided in the application or in a Multi-Write region set-up operations are regulary directed to different regions                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-|404|            1003 |Yes (up to few minutes)| `Not Found/Owner resource does not exist` - Indicates that a client attempted to process an operation on a resource whose parent does not exist. For example an attempt to do a point operation on a document when the container does not exist (yet). Can be transient when attempting document operations immediately after creating a container etc. - but when not transient usually means a bug in your application.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-|404|            1024 |x| `Not Found/Incorrect Container resource id` - Indicates that a client attempted to use a container that has recently been deleted and recreated. So, the cached container id in the client is stale - and identifies the previosuly deleted container. The SDK will trigger retries - in general applications need to be able to tolerate that container deletion and immediate recreation will take up-to a few seconds/minutes to be replicated across all regions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-|408|              \* |Yes| `Request timeout` - Indicates a timeout for an attempted operation. See [Request timeout TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-java-sdk-request-timeout) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-|408|           20008 |Yes, unless unrealistic e2e timeout is used| `Request timeout/End-to-end timeout exceeded` - Indicates that the application defined end-to-end timeout was exceeded when processing an operation. This will usually be a transient error condition - exceptions are when the application defines unrealistic end-to-end timeouts - for example when executing a query that could very well take a few seconds because it is relatively inefficient or when the end-to-end timeout is lower than the to-be-expected network transit time between the application's location and the Cosmos DB service endpoint.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-|408|           20901 |No| `Request timeout/Negative End-to-end timeout provided` - Indicates that the application defined a negative end-to-end timeout. This indicates a bug in your application.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|409|               0 |No| `Conflict` - Indicates that the attempt to insert (or upsert) a new document cannot be processed because another document with the same identity (partition key value + value of `id` property) exists or a unqiue key constraint would be violated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|410|              \* |Yes| `Gone` - indicates transient error conditions that could happen while replica get moved to a different node or partitions get split/merged. The SDK will retry these error conditions and usually mitigate them without even surfacing them to the application. If these errors get surfaced to the application as `CosmosException` with status code `410` or `503` these errors should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|410|            1000 |x| `Not Found/Incorrect Container resource id` - Indicates that a client attempted to use a container that has recently been deleted and recreated. So, the cached container id in the client is stale - and identifies the previosuly deleted container. The SDK will trigger retries - in general applications need to be able to tolerate that container deletion and immediate recreation will take up-to a few seconds/minutes to be replicated across all regions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-|410|           21010 |Yes| `Service timeout` - Indicates that an operation has been timed out at the service.  See [Request timeout TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-request-timeout) for more details. This error will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|410|           21006 |Yes| `Global strong write barrier not met` - Indicates that synchronous replication of a write operation in a multi-region account with strong consistency did not complete. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-|410|           21007 |Yes| `Read quorum not met` - Indicates that no read quorum could be achieved when using strong or bounded staleness consistency. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-|412|               0 |No| `Precondition failed` - The document has been modified since the application read it (and retrieved the etag that was used as pre-codnition for the write operation). This is the typical optimistic concurrency signal - and needs to be gracefully handled in your application. The usual patterns is to re-read the document, apply the same changes and retry the write with the updated etag. See [Precondition failed TSG - trouble-shooting guide](https://aka.ms/CosmosDB/sql/errors/precondition-failed) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-|413|              \* |No| `Request entity too large` - indicates that the client attempted to create or update a document with a payload that is too large. See [Azure Cosmos DB Service quotas](https://learn.microsoft.com/azure/cosmos-db/concepts-limits#per-item-limits) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-|429|            3200 |Depends on app RU/s usage| `User throttling` - Indicates that the operations being processed by your Cosmos DB account exceed the provisioned throughput RU/s. Mitigation can be done by either scaling-up - or improving the efficiency especially of queries to reduce the RU/s consumption. See [Throttling TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-request-rate-too-large) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
-|429|            3201 |Yes| `Metadata throttling` - Indicates that metadata operations are being throttled. Increasing provisioned throughput (RU/s) won't help - this usually indicates a bug in your application where metadata calls are triggered extensively or you are not using a singleton pattern for `CosmosClient`/`CosmosAsyncClient`. See [Throttling TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-request-rate-too-large) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|429|          < 3200 |Yes (up to few minutes)| `SLA violating throttling` - Indicates service-side throttling that will count against the service's SLA. These errors should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | 
-|449|               0 |Yes| `RetryWith` - Indicates a concurrent attempt to change documents server-side - for example via patch or stored procedure invocation. The `449` status code will be automatically retried by the SDK. This condition should always be transient as long as the application is not excessively doing concurrent changes to documents.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-|500|               0 |Unknown| `Internal Server error` - Error returned from server, Indicates unexpected and unqualified internal service error.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
-|500|   20902 - 20910 |Unknown| `Internal Server error` - Client generated 500. The error message will have the details about the cause.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|502|           21011 |Unknown| `Bad gateway` - Indicated an HTTP proxy you are using is misbehaving. Any `502` or `504` is a clear signal that the actual problem is not in Cosmos DB but the proxy being used. In general HTTP proxies are not recommended for any production workload.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-|503|              \* |Yes| `Service unavailable` - Indicates that  either service issue occurred or the client event after retries is not able to successfully process an operation. See [Service unavailable TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-service-unavailable)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|503|           21001 |Yes| `Name cache is stale` - Indicates that a container was deleted and recreated - and the client's cache still has the old container metadata. This error indicates that the client even after refreshing the cache got the container metadata of the "old" container. Usually it indicates that the replication of the new container metadata across all regions took longer than usual. This error should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|503|           21002 |Yes| `Partition key range gone` - Indicates that a partition split or merge happened and the client even after several retries was not able to get the metadata for the new partition. This error indicates a delay of replication of partition key range metadata and should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-|503|           21003 |Yes| `Completing split` - Indicates that a partition split or merge is pending and commiting the split takes longer than expected. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|503|           21004 |Yes| `Completing migration` - Indicates that a partition migration due to load-balancing is pending and takes longer than expected. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-|410/503|           21005 |Yes| `Serverside 410` - Indicates that a replica returns a 410 - usually during initialization of the replica. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-|503|           21008 |Yes| `Service unavailable` - Indicates that a replica returned `503` service unavailable. This error should always be transient and will surface as a CosmosException with status code `503` after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
-|504|               0 |Unknown| `Gateway timeout` - Indicated an HTTP proxy you are using timed  out. Any `502` or `504` is a clear signal that the actual problem is not in Cosmos DB but the proxy being used. In general HTTP proxies are not recommended for any production workload.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| Status code |                Substatus code | Expected to be transient | Additional info                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| -----------------:|------------------------------:|:-----------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|200|                             0 |No| `OK`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|201|                             0 |No| `Created` - returned for createItem or upsertItem when a new document was created                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+|204|                             0 |No| `No Content` - returned when no payload would ever be returned - like for delete operations                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+|207|                             0 |No| `Multi-Status` - returned for transactional batch or bulk operations when some of the item operations have failed and others succeeded. The API allows checking status codes of item operations.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|304|                             0 |No| `Not Modified` - will be returned for `ChangeFeed` operations to indicate that there are no more changes                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|400|                            \* |No| `Bad Request` - indicates that the client violated some protocol constraint. See [Bad Request TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-bad-request) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|400|                          1001 |No| `Bad Request/Partition key mismatch` - indicates that the PartitionKey defined in the point operation does not match the partition key value being extracted in the service form the document's payload based on the `PartitionKeyDefinition` of the container. See [Bad Request TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-bad-request) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+|400|                          1004 |No| `Bad Request/CrossPartitionQueryNotServable` - indicates that the client attempted to execute a cross-partition query, which cannot be processed with the current SDK version. Usually this means that the query uses a query construct, which is not yet supported in the SDK version being used. Upgrading the SDK might help to address the problem. See [Bad Request TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-bad-request) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|401|                             0 |No| `Unauthorized` - indicates that the client used invalid credentials. The most frequent scenario when this is happening, is when customers rotate the currently used key. Key rotation needs to be replicated across regions, which can take up-to a few minuts. During this time a `401 Unauthroized` would be used when the client is using the old or new key while the replication is still happening. The best way to do key rotation is to rotate the key only after it is not used by applications anymore - that is why a primary and secondary key exists for both writable and read-only keys. More details can be found here - [key rotation best practices](https://learn.microsoft.com/azure/cosmos-db/secure-access-to-data?tabs=using-primary-key#key-rotation). In addition this could also mean an invalid key when using `MasterKey`-based authentication, it could mean there is a time-synchronization issue or when using AAD that the AAD credentials are not correctly set-up. See [Unauthorized TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-unauthorized) for more details. |
+|403|                            \* |No| `Forbidden` - indicates that the service rejected the request due to missing permissions. See [Forbidden TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-forbidden)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|403|                             3 |Yes (up to few minutes)| `Forbidden/WriteForbidden` - indicates that the client attempted a write operation against a read-only region in a single write region set-up.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+|403|                          1008 |Yes (up to few minutes)| `Forbidden/AccountNotFound` - indicates that the client attempted a read or write operation against a replica that did not have information about the database account.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             |
+|403|                          5300 |No| `Forbidden/AADForMetadata` - indicates that the client attempted a metadata operation (like creating, deleting or modifying a container/database) when using AAD authentication. This is not possible via the Data plane SDK. To execute control plane operatiosn with AAD authentication, please use the management SDK. See [Forbidden TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-forbidden#partition-key-exceeding-storage) and also the [Azure Cosmos DB Service quotas](https://learn.microsoft.com/azure/cosmos-db/concepts-limits#provisioned-throughput) for more details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+|403|                          1014 |No| `Forbidden/LogicalPartitionExceedsStorage` - indicates that the data size of a logical partition exceeds the service quota (currently 20 GB). See [Forbidden TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-forbidden#non-data-operations-are-not-allowed) for more details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|404|                             0 |No| `Not found` - Indicates that the resource the client tried to read does not exist (on the replica being contacted). Depending on the consistency level used this could be a transient error condition - but when using less than strong consistency the application needs to be able to handle temporarily seeing 404/0 from some replica even after document got created gracefully. See [Not found TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-not-found) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+|404|                          1002 |In most cases| `Not Found/Read session no available` - Indicates that a client uses session consistency and reached a replica that has a replication lag and has not caught-up to the requested session token. In many cases this error condition will be transient. But there are certain situation in which it could persist for longer period of times - either a wrong session token is being provided in the application or in a Multi-Write region set-up operations are regulary directed to different regions                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+|404|                          1003 |Yes (up to few minutes)| `Not Found/Owner resource does not exist` - Indicates that a client attempted to process an operation on a resource whose parent does not exist. For example an attempt to do a point operation on a document when the container does not exist (yet). Can be transient when attempting document operations immediately after creating a container etc. - but when not transient usually means a bug in your application.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|404|                          1024 |x| `Not Found/Incorrect Container resource id` - Indicates that a client attempted to use a container that has recently been deleted and recreated. So, the cached container id in the client is stale - and identifies the previosuly deleted container. The SDK will trigger retries - in general applications need to be able to tolerate that container deletion and immediate recreation will take up-to a few seconds/minutes to be replicated across all regions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+|408|                            \* |Yes| `Request timeout` - Indicates a timeout for an attempted operation. See [Request timeout TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-java-sdk-request-timeout) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+|408|                         20008 |Yes, unless unrealistic e2e timeout is used| `Request timeout/End-to-end timeout exceeded` - Indicates that the application defined end-to-end timeout was exceeded when processing an operation. This will usually be a transient error condition - exceptions are when the application defines unrealistic end-to-end timeouts - for example when executing a query that could very well take a few seconds because it is relatively inefficient or when the end-to-end timeout is lower than the to-be-expected network transit time between the application's location and the Cosmos DB service endpoint.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
+|408|                         20901 |No| `Request timeout/Negative End-to-end timeout provided` - Indicates that the application defined a negative end-to-end timeout. This indicates a bug in your application.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|409|                             0 |No| `Conflict` - Indicates that the attempt to insert (or upsert) a new document cannot be processed because another document with the same identity (partition key value + value of `id` property) exists or a unqiue key constraint would be violated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|410|                            \* |Yes| `Gone` - indicates transient error conditions that could happen while replica get moved to a different node or partitions get split/merged. The SDK will retry these error conditions and usually mitigate them without even surfacing them to the application. If these errors get surfaced to the application as `CosmosException` with status code `410` or `503` these errors should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|410|                          1000 |x| `Not Found/Incorrect Container resource id` - Indicates that a client attempted to use a container that has recently been deleted and recreated. So, the cached container id in the client is stale - and identifies the previosuly deleted container. The SDK will trigger retries - in general applications need to be able to tolerate that container deletion and immediate recreation will take up-to a few seconds/minutes to be replicated across all regions.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+|410|                         21010 |Yes| `Service timeout` - Indicates that an operation has been timed out at the service.  See [Request timeout TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-request-timeout) for more details. This error will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|410|                         21006 |Yes| `Global strong write barrier not met` - Indicates that synchronous replication of a write operation in a multi-region account with strong consistency did not complete. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+|410|                         21007 |Yes| `Read quorum not met` - Indicates that no read quorum could be achieved when using strong or bounded staleness consistency. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+|412|                             0 |No| `Precondition failed` - The document has been modified since the application read it (and retrieved the etag that was used as pre-codnition for the write operation). This is the typical optimistic concurrency signal - and needs to be gracefully handled in your application. The usual patterns is to re-read the document, apply the same changes and retry the write with the updated etag. See [Precondition failed TSG - trouble-shooting guide](https://aka.ms/CosmosDB/sql/errors/precondition-failed) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+|413|                            \* |No| `Request entity too large` - indicates that the client attempted to create or update a document with a payload that is too large. See [Azure Cosmos DB Service quotas](https://learn.microsoft.com/azure/cosmos-db/concepts-limits#per-item-limits) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+|429|                          3200 |Depends on app RU/s usage| `User throttling` - Indicates that the operations being processed by your Cosmos DB account exceed the provisioned throughput RU/s. Mitigation can be done by either scaling-up - or improving the efficiency especially of queries to reduce the RU/s consumption. See [Throttling TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-request-rate-too-large) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+|429|                          3201 |Yes| `Metadata throttling` - Indicates that metadata operations are being throttled. Increasing provisioned throughput (RU/s) won't help - this usually indicates a bug in your application where metadata calls are triggered extensively or you are not using a singleton pattern for `CosmosClient`/`CosmosAsyncClient`. See [Throttling TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-request-rate-too-large) for more details.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|429|                        < 3200 |Yes (up to few minutes)| `SLA violating throttling` - Indicates service-side throttling that will count against the service's SLA. These errors should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | 
+|449|                             0 |Yes| `RetryWith` - Indicates a concurrent attempt to change documents server-side - for example via patch or stored procedure invocation. The `449` status code will be automatically retried by the SDK. This condition should always be transient as long as the application is not excessively doing concurrent changes to documents.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+|500|                             0 |Unknown| `Internal Server error` - Error returned from server, Indicates unexpected and unqualified internal service error.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  |
+|500| 20902 - 20910 ; 20912 - 20913 |Unknown| `Internal Server error` - Client generated 500. The error message will have the details about the cause.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|502|                         21011 |Unknown| `Bad gateway` - Indicated an HTTP proxy you are using is misbehaving. Any `502` or `504` is a clear signal that the actual problem is not in Cosmos DB but the proxy being used. In general HTTP proxies are not recommended for any production workload.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+|503|                            \* |Yes| `Service unavailable` - Indicates that  either service issue occurred or the client event after retries is not able to successfully process an operation. See [Service unavailable TSG - trouble-shooting guide](https://learn.microsoft.com/azure/cosmos-db/nosql/troubleshoot-service-unavailable)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|503|                         21001 |Yes| `Name cache is stale` - Indicates that a container was deleted and recreated - and the client's cache still has the old container metadata. This error indicates that the client even after refreshing the cache got the container metadata of the "old" container. Usually it indicates that the replication of the new container metadata across all regions took longer than usual. This error should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|503|                         21002 |Yes| `Partition key range gone` - Indicates that a partition split or merge happened and the client even after several retries was not able to get the metadata for the new partition. This error indicates a delay of replication of partition key range metadata and should always be transient.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+|503|                         21003 |Yes| `Completing split` - Indicates that a partition split or merge is pending and commiting the split takes longer than expected. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|503|                         21004 |Yes| `Completing migration` - Indicates that a partition migration due to load-balancing is pending and takes longer than expected. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+|410/503|                         21005 |Yes| `Serverside 410` - Indicates that a replica returns a 410 - usually during initialization of the replica. This error should always be transient and will be mapped to a CosmosException with status code `503` when surfacing it to the application after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+|503|                         21008 |Yes| `Service unavailable` - Indicates that a replica returned `503` service unavailable. This error should always be transient and will surface as a CosmosException with status code `503` after exceeding SDK-retries.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
+|504|                             0 |Unknown| `Gateway timeout` - Indicated an HTTP proxy you are using timed  out. Any `502` or `504` is a clear signal that the actual problem is not in Cosmos DB but the proxy being used. In general HTTP proxies are not recommended for any production workload.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DirectConnectionConfig.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DirectConnectionConfig.java
index 69668c0be033..c42d03c9efc5 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DirectConnectionConfig.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DirectConnectionConfig.java
@@ -263,7 +263,7 @@ public Duration getNetworkRequestTimeout() {
      * Sets the network request timeout interval (time to wait for response from network peer).
      *
      * Default value is 5 seconds.
-     * It only allows values &ge;1s and &le;10s. (backend allows requests to take up-to 5 seconds processing time - 5 seconds
+     * It only allows values &ge;5s and &le;10s. (backend allows requests to take up-to 5 seconds processing time - 5 seconds
      * buffer so 10 seconds in total for transport is more than sufficient).
      *
      * Attention! Please adjust this value with caution.
@@ -275,13 +275,16 @@ public Duration getNetworkRequestTimeout() {
      * @return the {@link DirectConnectionConfig}
      */
     public DirectConnectionConfig setNetworkRequestTimeout(Duration networkRequestTimeout) {
+
+        long networkRequestTimeoutInMs = networkRequestTimeout.toMillis();
+
         checkNotNull(networkRequestTimeout, "NetworkRequestTimeout can not be null");
-        checkArgument(networkRequestTimeout.toMillis() >= MIN_NETWORK_REQUEST_TIMEOUT.toMillis(),
+        checkArgument(networkRequestTimeoutInMs >= MIN_NETWORK_REQUEST_TIMEOUT.toMillis(),
             "NetworkRequestTimeout can not be less than %s Millis", MIN_NETWORK_REQUEST_TIMEOUT.toMillis());
-        checkArgument(networkRequestTimeout.toMillis() <= MAX_NETWORK_REQUEST_TIMEOUT.toMillis(),
+        checkArgument(networkRequestTimeoutInMs <= MAX_NETWORK_REQUEST_TIMEOUT.toMillis(),
             "NetworkRequestTimeout can not be larger than %s Millis", MAX_NETWORK_REQUEST_TIMEOUT.toMillis());
 
-        this.networkRequestTimeout = networkRequestTimeout;
+        this.networkRequestTimeout = Duration.ofMillis(Math.max(networkRequestTimeoutInMs, DEFAULT_NETWORK_REQUEST_TIMEOUT.toMillis()));
         return this;
     }
 
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ClientRetryPolicy.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ClientRetryPolicy.java
index 8306f185032c..ca9731f86e50 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ClientRetryPolicy.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/ClientRetryPolicy.java
@@ -137,7 +137,7 @@ public Mono<ShouldRetryResult> shouldRetry(Exception e) {
                 WebExceptionUtility.isReadTimeoutException(clientException) &&
                 Exceptions.isSubStatusCode(clientException, HttpConstants.SubStatusCodes.GATEWAY_ENDPOINT_READ_TIMEOUT)) {
 
-                return shouldRetryOnGatewayTimeout();
+                return shouldRetryOnGatewayTimeout(clientException);
             }
         }
 
@@ -177,18 +177,20 @@ public Mono<ShouldRetryResult> shouldRetry(Exception e) {
             }
 
             return this.shouldRetryOnRequestTimeout(
+                clientException,
                 this.isReadRequest,
                 this.request.getNonIdempotentWriteRetriesEnabled(),
                 clientException.getSubStatusCode());
         }
 
-        if (clientException != null && Exceptions.isStatusCode(clientException, HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR)) {
 
-            if (logger.isDebugEnabled()) {
-                logger.info("Internal server error - IsReadRequest {}", this.isReadRequest, e);
-            }
+        if (clientException != null
+            && Exceptions.isStatusCode(clientException, HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR)
+            && !Exceptions.isClientAssignedSubStatusCodeForInternalServerError(clientException.getStatusCode(), clientException.getSubStatusCode())) {
+
+            logger.error("Internal server error - IsReadRequest " + this.isReadRequest, e);
 
-            return this.shouldRetryOnInternalServerError();
+            return this.shouldRetryOnInternalServerError(clientException);
         }
 
         if (this.request != null
@@ -302,12 +304,18 @@ private Mono<ShouldRetryResult> shouldRetryOnEndpointFailureAsync(boolean isRead
         return refreshLocationCompletable.then(Mono.just(ShouldRetryResult.retryAfter(retryDelay)));
     }
 
-    private Mono<ShouldRetryResult> shouldRetryOnGatewayTimeout() {
+    private Mono<ShouldRetryResult> shouldRetryOnGatewayTimeout(CosmosException clientException) {
 
         boolean canPerformCrossRegionRetryOnGatewayReadTimeout = canRequestToGatewayBeSafelyRetriedOnReadTimeout(this.request);
 
         if (this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.isPerPartitionLevelCircuitBreakingApplicable(this.request)) {
-            this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(this.request, this.request.requestContext.regionalRoutingContextToRoute);
+            try {
+                this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(this.request, this.request.requestContext.regionalRoutingContextToRoute, false);
+            } catch (CosmosException e) {
+                logger.error("Per-partition circuit breaker hit an exception when failing over for", clientException);
+                BridgeInternal.setCosmosDiagnostics(e, this.cosmosDiagnostics);
+                return Mono.just(ShouldRetryResult.errorOnNonRelatedException(e));
+            }
         }
 
         //if operation is data plane read, metadata read, or query plan it can be retried on a different endpoint.
@@ -372,8 +380,13 @@ private Mono<ShouldRetryResult> shouldRetryOnBackendServiceUnavailableAsync(
         CosmosException cosmosException) {
 
         if (this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.isPerPartitionLevelCircuitBreakingApplicable(this.request)) {
-            this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker
-                .handleLocationExceptionForPartitionKeyRange(this.request, this.request.requestContext.regionalRoutingContextToRoute);
+            try {
+                this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(this.request, this.request.requestContext.regionalRoutingContextToRoute, false);
+            } catch (CosmosException e) {
+                logger.error("Per-partition circuit breaker hit an exception when failing over for", cosmosException);
+                BridgeInternal.setCosmosDiagnostics(e, this.cosmosDiagnostics);
+                return Mono.just(ShouldRetryResult.errorOnNonRelatedException(e));
+            }
         }
 
         boolean isPPAFBasedFailoverApplied = this.globalPartitionEndpointManagerForPerPartitionAutomaticFailover.tryMarkEndpointAsUnavailableForPartitionKeyRange(this.request, false);
@@ -438,6 +451,7 @@ private Mono<ShouldRetryResult> shouldRetryOnBackendServiceUnavailableAsync(
     }
 
     private Mono<ShouldRetryResult> shouldRetryOnRequestTimeout(
+        CosmosException cosmosException,
         boolean isReadRequest,
         boolean nonIdempotentWriteRetriesEnabled,
         int subStatusCode) {
@@ -445,10 +459,13 @@ private Mono<ShouldRetryResult> shouldRetryOnRequestTimeout(
         if (subStatusCode == HttpConstants.SubStatusCodes.TRANSIT_TIMEOUT) {
             if (this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.isPerPartitionLevelCircuitBreakingApplicable(this.request)) {
                 if (!isReadRequest && !nonIdempotentWriteRetriesEnabled) {
-
-                    this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(
-                        this.request,
-                        this.request.requestContext.regionalRoutingContextToRoute);
+                    try {
+                        this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(this.request, this.request.requestContext.regionalRoutingContextToRoute, false);
+                    } catch (CosmosException e) {
+                        logger.error("Per-partition circuit breaker hit an exception when failing over for", cosmosException);
+                        BridgeInternal.setCosmosDiagnostics(e, this.cosmosDiagnostics);
+                        return Mono.just(ShouldRetryResult.errorOnNonRelatedException(e));
+                    }
                 }
             }
         }
@@ -460,14 +477,16 @@ private Mono<ShouldRetryResult> shouldRetryOnRequestTimeout(
         return Mono.just(ShouldRetryResult.NO_RETRY);
     }
 
-    private Mono<ShouldRetryResult> shouldRetryOnInternalServerError() {
+    private Mono<ShouldRetryResult> shouldRetryOnInternalServerError(CosmosException cosmosException) {
 
         if (this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.isPerPartitionLevelCircuitBreakingApplicable(this.request)) {
-
-            this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(
-                this.request,
-                this.request.requestContext.regionalRoutingContextToRoute);
-
+            try {
+                this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker.handleLocationExceptionForPartitionKeyRange(this.request, this.request.requestContext.regionalRoutingContextToRoute, false);
+            } catch (CosmosException e) {
+                logger.error("Per-partition circuit breaker hit an exception when failing over for", cosmosException);
+                BridgeInternal.setCosmosDiagnostics(e, this.cosmosDiagnostics);
+                return Mono.just(ShouldRetryResult.errorOnNonRelatedException(e));
+            }
         }
 
         return Mono.just(ShouldRetryResult.NO_RETRY);
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Exceptions.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Exceptions.java
index 049603aa6f26..6b9f46517a99 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Exceptions.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Exceptions.java
@@ -70,4 +70,8 @@ public static boolean isAvoidQuorumSelectionException(CosmosException cosmosExce
         return Exceptions.isStatusCode(cosmosException, HttpConstants.StatusCodes.GONE)
             && Exceptions.isSubStatusCode(cosmosException, HttpConstants.SubStatusCodes.LEASE_NOT_FOUND);
     }
+
+    public static boolean isClientAssignedSubStatusCodeForInternalServerError(int statusCode, int subStatusCode) {
+        return statusCode == HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR && (subStatusCode >= 20_000 && subStatusCode < 21_000);
+    }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
index fea6efeccfc6..1f7a42c678d1 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java
@@ -465,6 +465,7 @@ public static class SubStatusCodes {
         public static final int UNKNOWN_QUORUM_RESULT = 20909;
         public static final int INVALID_RESULT = 20910;
         public static final int CLOSED_CLIENT = 20912;
+        public static final int PPCB_INVALID_STATE = 20913;
 
         //SDK Codes (Server)
         // IMPORTANT - whenever possible use consistency substatus codes that .Net SDK also uses
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
index 61ed1ee76460..64be7f99970c 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/RxDocumentClientImpl.java
@@ -7755,10 +7755,10 @@ private void handleLocationCancellationExceptionForPartitionKeyRange(RxDocumentS
 
         if (firstContactedLocationEndpoint != null) {
             this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker
-                .handleLocationExceptionForPartitionKeyRange(failedRequest, firstContactedLocationEndpoint);
+                .handleLocationExceptionForPartitionKeyRange(failedRequest, firstContactedLocationEndpoint, true);
         } else {
             this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker
-                .handleLocationExceptionForPartitionKeyRange(failedRequest, failedRequest.requestContext.regionalRoutingContextToRoute);
+                .handleLocationExceptionForPartitionKeyRange(failedRequest, failedRequest.requestContext.regionalRoutingContextToRoute, true);
         }
     }
 
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/epkversion/ServiceItemLeaseV1.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/epkversion/ServiceItemLeaseV1.java
index 468cfafaab84..820fc6717781 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/epkversion/ServiceItemLeaseV1.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/epkversion/ServiceItemLeaseV1.java
@@ -54,7 +54,7 @@ public class ServiceItemLeaseV1 implements Lease {
 
     public ServiceItemLeaseV1() {
         ZonedDateTime currentTime = ZonedDateTime.now(ZoneId.of("UTC"));
-        this.timestamp = currentTime.toString();
+        this.timestamp = currentTime.toInstant().toString();
         this._ts = String.valueOf(currentTime.getSecond());
         this.properties = new HashMap<>();
         //  By default, this is EPK_RANGE_BASED_LEASE version
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/pkversion/ServiceItemLease.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/pkversion/ServiceItemLease.java
index 2a693bcf2855..e0f4a0be1a18 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/pkversion/ServiceItemLease.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/pkversion/ServiceItemLease.java
@@ -46,7 +46,7 @@ public class ServiceItemLease implements Lease {
 
     public ServiceItemLease() {
         ZonedDateTime currentTime = ZonedDateTime.now(ZoneId.of("UTC"));
-        this.timestamp = currentTime.toString();
+        this.timestamp = currentTime.toInstant().toString();
         this._ts = String.valueOf(currentTime.getSecond());
         this.properties = new HashMap<>();
     }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/ConsecutiveExceptionBasedCircuitBreaker.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/ConsecutiveExceptionBasedCircuitBreaker.java
index ca011d45ca1a..6af0848583ab 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/ConsecutiveExceptionBasedCircuitBreaker.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/ConsecutiveExceptionBasedCircuitBreaker.java
@@ -62,10 +62,13 @@ public LocationSpecificHealthContext handleException(
             case Unavailable:
                 // the tests done so far view this as an unreachable piece of code - but not failing the operation
                 // with IllegalStateException and simply logging that a presumed unreachable code path seems to make sense for now
-                logger.warn("Region {} should not be handling failures in {} health status for partition key range : {} and collection RID : {}",
-                    regionWithException,
-                    locationHealthStatus.getStringifiedLocationHealthStatus(),
-                    partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive() + "-" + partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
+                logger.warn("Region " +
+                    regionWithException +
+                    " should not be handling failures in " +
+                    locationHealthStatus.getStringifiedLocationHealthStatus() +
+                    " health status for partitionKeyRange : " +
+                    partitionKeyRangeWrapper.getPartitionKeyRange() +
+                    " and collectionResourceId : " +
                     partitionKeyRangeWrapper.getCollectionResourceId());
                 return locationSpecificHealthContext;
             default:
@@ -148,10 +151,13 @@ public LocationSpecificHealthContext handleSuccess(
             case Unavailable:
                 // the tests done so far view this as an unreachable piece of code - but not failing the operation
                 // and simply logging that a presumed unreachable code path seems to make sense for now
-                logger.warn("Region {} should not be handling successes in {} health status for partition key range : {} and collection RID : {}",
-                    regionWithSuccess,
-                    locationHealthStatus.getStringifiedLocationHealthStatus(),
-                    partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive() + "-" + partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
+                logger.warn("Region " +
+                    regionWithSuccess +
+                    " should not be handling successes in " +
+                    locationHealthStatus.getStringifiedLocationHealthStatus() +
+                    " health status for partitionKeyRange : " +
+                    partitionKeyRangeWrapper.getPartitionKeyRange() +
+                    " and collectionResourceId : " +
                     partitionKeyRangeWrapper.getCollectionResourceId());
                 return locationSpecificHealthContext;
             default:
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.java
index 41f711fb4857..6a0d9a3bb607 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.java
@@ -3,8 +3,12 @@
 
 package com.azure.cosmos.implementation.perPartitionCircuitBreaker;
 
+import com.azure.cosmos.BridgeInternal;
+import com.azure.cosmos.CosmosDiagnostics;
+import com.azure.cosmos.CosmosException;
 import com.azure.cosmos.implementation.Configs;
 import com.azure.cosmos.implementation.GlobalEndpointManager;
+import com.azure.cosmos.implementation.HttpConstants;
 import com.azure.cosmos.implementation.OperationType;
 import com.azure.cosmos.implementation.PartitionKeyRange;
 import com.azure.cosmos.implementation.PartitionKeyRangeWrapper;
@@ -28,6 +32,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
@@ -40,6 +45,8 @@
 public class GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker implements AutoCloseable {
 
     private static final Logger logger = LoggerFactory.getLogger(GlobalPartitionEndpointManagerForPerPartitionCircuitBreaker.class);
+    private static final Map<String, String> EMPTY_MAP = new HashMap<>();
+    private static final String BASE_EXCEPTION_MESSAGE = "FAILED IN Per-Partition Circuit Breaker: ";
 
     private final GlobalEndpointManager globalEndpointManager;
     private final ConcurrentHashMap<PartitionKeyRangeWrapper, PartitionLevelLocationUnavailabilityInfo> partitionKeyRangeToLocationSpecificUnavailabilityInfo;
@@ -70,111 +77,141 @@ public void init() {
         }
     }
 
-    public void handleLocationExceptionForPartitionKeyRange(RxDocumentServiceRequest request, RegionalRoutingContext failedRegionalRoutingContext) {
+    public void handleLocationExceptionForPartitionKeyRange(
+        RxDocumentServiceRequest request,
+        RegionalRoutingContext failedRegionalRoutingContext,
+        boolean isCancellationException) {
+
+        try {
+            checkNotNull(request, "Argument 'request' cannot be null!");
+            checkNotNull(request.requestContext, "Argument 'request.requestContext' cannot be null!");
+
+            PartitionKeyRange resolvedPartitionKeyRangeForCircuitBreaker = request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker;
+            PartitionKeyRange resolvedPartitionKeyRange = request.requestContext.resolvedPartitionKeyRange;
+
+            // in scenarios where partition is splitting or invalid partition (name cache is stale) then resolvedPartitionKeyRange could be set to null
+            // no reason to circuit break a partition key range which is effectively won't be used in the future
+            if (resolvedPartitionKeyRangeForCircuitBreaker != null && resolvedPartitionKeyRange == null) {
+                logger.info("Skipping circuit breaking for partitionKeyRange which is splitting or invalid partition (name cache is stale), partitionKeyRange: " +
+                    resolvedPartitionKeyRangeForCircuitBreaker +
+                    " and operationType: " +
+                    request.getOperationType() +
+                    " and collectionResourceId: " +
+                    request.getResourceId());
+                return;
+            }
 
-        checkNotNull(request, "Argument 'request' cannot be null!");
-        checkNotNull(request.requestContext, "Argument 'request.requestContext' cannot be null!");
+            // in scenarios where resolvedPartitionKeyRangeForCircuitBreaker is null, we cannot circuit break at partition level
+            // if the exception is due to a cancellation, then we don't have enough information to decide if we should circuit break or not
+            // so we skip circuit breaking in this case if cancellation kick in ungracefully (e.g. user cancelled the request, or end-to-end timeout on the operation before routing decision is made)
+            // if the exception is not due to a cancellation, then we should have enough information to decide if we should circuit break or not
+            // so we proceed with circuit breaking in this case
+            if (resolvedPartitionKeyRangeForCircuitBreaker == null && isCancellationException) {
+                logger.warn("Skipping circuit breaking for operation as partitionKeyRange information isn't available for an e2e timeout cancelled request with operationType: " +
+                    request.getOperationType() +
+                    " and collectionResourceId: " +
+                    request.getResourceId());
+                return;
+            }
 
-        PartitionKeyRange resolvedPartitionKeyRangeForCircuitBreaker = request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker;
-        PartitionKeyRange resolvedPartitionKeyRange = request.requestContext.resolvedPartitionKeyRange;
+            checkNotNull(request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker, "Argument 'request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker' cannot be null!");
 
-        // in scenarios where partition is splitting or invalid partition then resolvedPartitionKeyRange could be set to null
-        // no reason to circuit break a partition key range which is effectively won't be used in the future
-        if (resolvedPartitionKeyRangeForCircuitBreaker != null && resolvedPartitionKeyRange == null) {
-            return;
-        }
+            String collectionResourceId = request.getResourceId();
+            checkNotNull(request, collectionResourceId, "Argument 'collectionResourceId' cannot be null!");
 
-        checkNotNull(request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker, "Argument 'request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker' cannot be null!");
+            PartitionKeyRangeWrapper partitionKeyRangeWrapper = new PartitionKeyRangeWrapper(resolvedPartitionKeyRangeForCircuitBreaker, collectionResourceId);
 
-        String collectionResourceId = request.getResourceId();
-        checkNotNull(collectionResourceId, "Argument 'collectionResourceId' cannot be null!");
+            AtomicBoolean isFailoverPossible = new AtomicBoolean(true);
+            AtomicBoolean isFailureThresholdBreached = new AtomicBoolean(false);
 
-        PartitionKeyRangeWrapper partitionKeyRangeWrapper = new PartitionKeyRangeWrapper(resolvedPartitionKeyRangeForCircuitBreaker, collectionResourceId);
+            this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.compute(partitionKeyRangeWrapper, (partitionKeyRangeWrapperAsKey, partitionLevelLocationUnavailabilityInfoAsVal) -> {
 
-        AtomicBoolean isFailoverPossible = new AtomicBoolean(true);
-        AtomicBoolean isFailureThresholdBreached = new AtomicBoolean(false);
+                if (partitionLevelLocationUnavailabilityInfoAsVal == null) {
+                    partitionLevelLocationUnavailabilityInfoAsVal = new PartitionLevelLocationUnavailabilityInfo();
+                }
 
-        this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.compute(partitionKeyRangeWrapper, (partitionKeyRangeWrapperAsKey, partitionLevelLocationUnavailabilityInfoAsVal) -> {
+                isFailureThresholdBreached.set(partitionLevelLocationUnavailabilityInfoAsVal.handleException(
+                    partitionKeyRangeWrapperAsKey,
+                    failedRegionalRoutingContext,
+                    request.isReadOnlyRequest()));
 
-            if (partitionLevelLocationUnavailabilityInfoAsVal == null) {
-                partitionLevelLocationUnavailabilityInfoAsVal = new PartitionLevelLocationUnavailabilityInfo();
-            }
+                if (isFailureThresholdBreached.get()) {
 
-            isFailureThresholdBreached.set(partitionLevelLocationUnavailabilityInfoAsVal.handleException(
-                partitionKeyRangeWrapperAsKey,
-                failedRegionalRoutingContext,
-                request.isReadOnlyRequest()));
+                    UnmodifiableList<RegionalRoutingContext> applicableRegionalRoutingContexts = request.isReadOnlyRequest() ?
+                        this.globalEndpointManager.getApplicableReadRegionalRoutingContexts(request.requestContext.getExcludeRegions()) :
+                        this.globalEndpointManager.getApplicableWriteRegionalRoutingContexts(request.requestContext.getExcludeRegions());
 
-            if (isFailureThresholdBreached.get()) {
+                    isFailoverPossible.set(
+                        partitionLevelLocationUnavailabilityInfoAsVal.areLocationsAvailableForPartitionKeyRange(applicableRegionalRoutingContexts));
+                }
 
-                UnmodifiableList<RegionalRoutingContext> applicableRegionalRoutingContexts = request.isReadOnlyRequest() ?
-                    this.globalEndpointManager.getApplicableReadRegionalRoutingContexts(request.requestContext.getExcludeRegions()) :
-                    this.globalEndpointManager.getApplicableWriteRegionalRoutingContexts(request.requestContext.getExcludeRegions());
+                request.requestContext.setPerPartitionCircuitBreakerInfoHolder(partitionLevelLocationUnavailabilityInfoAsVal.regionToLocationSpecificHealthContext);
+                return partitionLevelLocationUnavailabilityInfoAsVal;
+            });
 
-                isFailoverPossible.set(
-                    partitionLevelLocationUnavailabilityInfoAsVal.areLocationsAvailableForPartitionKeyRange(applicableRegionalRoutingContexts));
+            // set to true if and only if failure threshold exceeded for the region
+            // and if failover is possible
+            // a failover is only possible when there are available regions left to fail over to
+            if (isFailoverPossible.get()) {
+                return;
             }
 
-            request.requestContext.setPerPartitionCircuitBreakerInfoHolder(partitionLevelLocationUnavailabilityInfoAsVal.regionToLocationSpecificHealthContext);
-            return partitionLevelLocationUnavailabilityInfoAsVal;
-        });
-
-        // set to true if and only if failure threshold exceeded for the region
-        // and if failover is possible
-        // a failover is only possible when there are available regions left to fail over to
-        if (isFailoverPossible.get()) {
-            return;
-        }
-
-        if (logger.isWarnEnabled()) {
-            logger.warn("It is not possible to mark region {} as Unavailable for partition key range {}-{} and collection rid {} " +
-                    "as all regions will be Unavailable in that case, will remove health status tracking for this partition!",
+            logger.warn("It is not possible to mark region " +
                 this.globalEndpointManager.getRegionName(
-                    failedRegionalRoutingContext.getGatewayRegionalEndpoint(), request.isReadOnlyRequest() ? OperationType.Read : OperationType.Create),
-                resolvedPartitionKeyRangeForCircuitBreaker.getMinInclusive(),
-                resolvedPartitionKeyRangeForCircuitBreaker.getMaxExclusive(),
-                collectionResourceId);
+                failedRegionalRoutingContext.getGatewayRegionalEndpoint(), request.isReadOnlyRequest() ? OperationType.Read : OperationType.Create) + " as Unavailable as " +
+                " all regions will be Unavailable in that case, will remove health status tracking for this partitionKeyRange : " +
+                resolvedPartitionKeyRangeForCircuitBreaker +
+                " and collectionResourceId : " +
+                collectionResourceId +
+                " and operationType: " +
+                request.getOperationType());
+
+            // no regions to fail over to
+            this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.remove(partitionKeyRangeWrapper);
+        } catch (Exception e) {
+            throw wrapAsCosmosException(request, e);
         }
-
-        // no regions to fail over to
-        this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.remove(partitionKeyRangeWrapper);
     }
 
     public void handleLocationSuccessForPartitionKeyRange(RxDocumentServiceRequest request) {
 
-        checkNotNull(request, "Argument 'request' cannot be null!");
-        checkNotNull(request.requestContext, "Argument 'request.requestContext' cannot be null!");
+        try {
+            checkNotNull(request, "Argument 'request' cannot be null!");
+            checkNotNull(request.requestContext, "Argument 'request.requestContext' cannot be null!");
 
-        PartitionKeyRange resolvedPartitionKeyRangeForCircuitBreaker = request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker;
-        PartitionKeyRange resolvedPartitionKeyRange = request.requestContext.resolvedPartitionKeyRange;
+            PartitionKeyRange resolvedPartitionKeyRangeForCircuitBreaker = request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker;
+            PartitionKeyRange resolvedPartitionKeyRange = request.requestContext.resolvedPartitionKeyRange;
 
-        // in scenarios where partition is splitting or invalid partition then resolvedPartitionKeyRange could be set to null
-        // no reason to circuit break a partition key range which is effectively won't be used in the future
-        if (resolvedPartitionKeyRangeForCircuitBreaker != null && resolvedPartitionKeyRange == null) {
-            return;
-        }
+            // in scenarios where partition is splitting or invalid partition then resolvedPartitionKeyRange could be set to null
+            // no reason to circuit break a partition key range which is effectively won't be used in the future
+            if (resolvedPartitionKeyRangeForCircuitBreaker != null && resolvedPartitionKeyRange == null) {
+                return;
+            }
 
-        checkNotNull(request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker, "Argument 'request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker' cannot be null!");
+            checkNotNull(request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker, "Argument 'request.requestContext.resolvedPartitionKeyRangeForCircuitBreaker' cannot be null!");
 
-        String resourceId = request.getResourceId();
+            String resourceId = request.getResourceId();
 
-        PartitionKeyRangeWrapper partitionKeyRangeWrapper = new PartitionKeyRangeWrapper(resolvedPartitionKeyRangeForCircuitBreaker, resourceId);
-        RegionalRoutingContext succeededRegionalRoutingContext = request.requestContext.regionalRoutingContextToRoute;
+            PartitionKeyRangeWrapper partitionKeyRangeWrapper = new PartitionKeyRangeWrapper(resolvedPartitionKeyRangeForCircuitBreaker, resourceId);
+            RegionalRoutingContext succeededRegionalRoutingContext = request.requestContext.regionalRoutingContextToRoute;
 
-        this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.compute(partitionKeyRangeWrapper, (partitionKeyRangeWrapperAsKey, partitionKeyRangeToFailoverInfoAsVal) -> {
+            this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.compute(partitionKeyRangeWrapper, (partitionKeyRangeWrapperAsKey, partitionKeyRangeToFailoverInfoAsVal) -> {
 
-            if (partitionKeyRangeToFailoverInfoAsVal == null) {
-                partitionKeyRangeToFailoverInfoAsVal = new PartitionLevelLocationUnavailabilityInfo();
-            }
+                if (partitionKeyRangeToFailoverInfoAsVal == null) {
+                    partitionKeyRangeToFailoverInfoAsVal = new PartitionLevelLocationUnavailabilityInfo();
+                }
 
-            partitionKeyRangeToFailoverInfoAsVal.handleSuccess(
-                partitionKeyRangeWrapper,
-                succeededRegionalRoutingContext,
-                request.isReadOnlyRequest());
+                partitionKeyRangeToFailoverInfoAsVal.handleSuccess(
+                    partitionKeyRangeWrapper,
+                    succeededRegionalRoutingContext,
+                    request.isReadOnlyRequest());
 
-            request.requestContext.setPerPartitionCircuitBreakerInfoHolder(partitionKeyRangeToFailoverInfoAsVal.regionToLocationSpecificHealthContext);
-            return partitionKeyRangeToFailoverInfoAsVal;
-        });
+                request.requestContext.setPerPartitionCircuitBreakerInfoHolder(partitionKeyRangeToFailoverInfoAsVal.regionToLocationSpecificHealthContext);
+                return partitionKeyRangeToFailoverInfoAsVal;
+            });
+        } catch (Exception e) {
+            throw wrapAsCosmosException(request, e);
+        }
     }
 
     public List<String> getUnavailableRegionsForPartitionKeyRange(
@@ -182,56 +219,60 @@ public List<String> getUnavailableRegionsForPartitionKeyRange(
         String collectionResourceId,
         PartitionKeyRange partitionKeyRange) {
 
-        if (!this.isPerPartitionLevelCircuitBreakingApplicable(request)) {
-            return Collections.emptyList();
-        }
+        try {
+            if (!this.isPerPartitionLevelCircuitBreakingApplicable(request)) {
+                return Collections.emptyList();
+            }
 
-        checkNotNull(partitionKeyRange, "Argument 'partitionKeyRange' cannot be null!");
-        checkNotNull(collectionResourceId, "Argument 'collectionResourceId' cannot be null!");
+            checkNotNull(partitionKeyRange, "Argument 'partitionKeyRange' cannot be null!");
+            checkNotNull(collectionResourceId, "Argument 'collectionResourceId' cannot be null!");
 
-        PartitionKeyRangeWrapper partitionKeyRangeWrapper = new PartitionKeyRangeWrapper(partitionKeyRange, collectionResourceId);
+            PartitionKeyRangeWrapper partitionKeyRangeWrapper = new PartitionKeyRangeWrapper(partitionKeyRange, collectionResourceId);
 
-        PartitionLevelLocationUnavailabilityInfo partitionLevelLocationUnavailabilityInfoSnapshot =
-            this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.get(partitionKeyRangeWrapper);
+            PartitionLevelLocationUnavailabilityInfo partitionLevelLocationUnavailabilityInfoSnapshot =
+                this.partitionKeyRangeToLocationSpecificUnavailabilityInfo.get(partitionKeyRangeWrapper);
 
-        List<String> unavailableRegions = new ArrayList<>();
+            List<String> unavailableRegions = new ArrayList<>();
 
-        if (partitionLevelLocationUnavailabilityInfoSnapshot != null) {
-            Map<RegionalRoutingContext, LocationSpecificHealthContext> locationEndpointToFailureMetricsForPartition =
-                partitionLevelLocationUnavailabilityInfoSnapshot.locationEndpointToLocationSpecificContextForPartition;
+            if (partitionLevelLocationUnavailabilityInfoSnapshot != null) {
+                Map<RegionalRoutingContext, LocationSpecificHealthContext> locationEndpointToFailureMetricsForPartition =
+                    partitionLevelLocationUnavailabilityInfoSnapshot.locationEndpointToLocationSpecificContextForPartition;
 
-            PriorityQueue<RegionalRoutingContext> unavailableRoutingContexts = new PriorityQueue<>((endpoint1, endpoint2) -> {
+                PriorityQueue<RegionalRoutingContext> unavailableRoutingContexts = new PriorityQueue<>((endpoint1, endpoint2) -> {
 
-                LocationSpecificHealthContext locationSpecificHealthContextForEndpoint1
-                    = locationEndpointToFailureMetricsForPartition.get(endpoint1);
-                LocationSpecificHealthContext locationSpecificHealthContextForEndpoint2
-                    = locationEndpointToFailureMetricsForPartition.get(endpoint2);
+                    LocationSpecificHealthContext locationSpecificHealthContextForEndpoint1
+                        = locationEndpointToFailureMetricsForPartition.get(endpoint1);
+                    LocationSpecificHealthContext locationSpecificHealthContextForEndpoint2
+                        = locationEndpointToFailureMetricsForPartition.get(endpoint2);
 
-                if (locationSpecificHealthContextForEndpoint1 == null || locationSpecificHealthContextForEndpoint2 == null) {
-                    return 0;
-                }
+                    if (locationSpecificHealthContextForEndpoint1 == null || locationSpecificHealthContextForEndpoint2 == null) {
+                        return 0;
+                    }
 
-                return locationSpecificHealthContextForEndpoint1.getUnavailableSince().compareTo(locationSpecificHealthContextForEndpoint2.getUnavailableSince());
-            });
+                    return locationSpecificHealthContextForEndpoint1.getUnavailableSince().compareTo(locationSpecificHealthContextForEndpoint2.getUnavailableSince());
+                });
 
-            for (Map.Entry<RegionalRoutingContext, LocationSpecificHealthContext> pair : locationEndpointToFailureMetricsForPartition.entrySet()) {
+                for (Map.Entry<RegionalRoutingContext, LocationSpecificHealthContext> pair : locationEndpointToFailureMetricsForPartition.entrySet()) {
 
-                RegionalRoutingContext regionalRoutingContext = pair.getKey();
-                LocationSpecificHealthContext locationSpecificHealthContext = pair.getValue();
+                    RegionalRoutingContext regionalRoutingContext = pair.getKey();
+                    LocationSpecificHealthContext locationSpecificHealthContext = pair.getValue();
 
-                if (locationSpecificHealthContext.getLocationHealthStatus() == LocationHealthStatus.Unavailable) {
-                    unavailableRoutingContexts.add(regionalRoutingContext);
+                    if (locationSpecificHealthContext.getLocationHealthStatus() == LocationHealthStatus.Unavailable) {
+                        unavailableRoutingContexts.add(regionalRoutingContext);
+                    }
                 }
-            }
 
-            while (!unavailableRoutingContexts.isEmpty()) {
-                RegionalRoutingContext unavailableRegionalRoutingContext = unavailableRoutingContexts.poll();
-                URI unavailableEndpoint = unavailableRegionalRoutingContext.getGatewayRegionalEndpoint();
-                unavailableRegions.add(this.globalEndpointManager.getRegionName(unavailableEndpoint, request.isReadOnlyRequest() ? OperationType.Read : OperationType.Create));
+                while (!unavailableRoutingContexts.isEmpty()) {
+                    RegionalRoutingContext unavailableRegionalRoutingContext = unavailableRoutingContexts.poll();
+                    URI unavailableEndpoint = unavailableRegionalRoutingContext.getGatewayRegionalEndpoint();
+                    unavailableRegions.add(this.globalEndpointManager.getRegionName(unavailableEndpoint, request.isReadOnlyRequest() ? OperationType.Read : OperationType.Create));
+                }
             }
-        }
 
-        return UnmodifiableList.unmodifiableList(unavailableRegions);
+            return UnmodifiableList.unmodifiableList(unavailableRegions);
+        } catch (Exception e) {
+            throw wrapAsCosmosException(request, e);
+        }
     }
 
     private Flux<?> updateStaleLocationInfo() {
@@ -276,11 +317,7 @@ private Flux<?> updateStaleLocationInfo() {
                         return Mono.empty();
                     }
                 } catch (Exception e) {
-
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("An exception : {} was thrown trying to recover an Unavailable partition key range!", e.getMessage());
-                    }
-
+                    logger.warn("An exception was thrown trying to recover an Unavailable partitionKeyRange!", e);
                     return Flux.empty();
                 }
             }, 1, 1)
@@ -307,12 +344,11 @@ private Flux<?> updateStaleLocationInfo() {
                                     .timeout(Duration.ofSeconds(Configs.getConnectionEstablishmentTimeoutForPartitionRecoveryInSeconds()))
                                     .doOnComplete(() -> {
 
-                                        if (logger.isDebugEnabled()) {
-                                            logger.debug("Partition health recovery query for partition key range : {} and " +
-                                                    "collection rid : {} has succeeded...",
-                                                partitionKeyRangeWrapper.getPartitionKeyRange(),
-                                                partitionKeyRangeWrapper.getCollectionResourceId());
-                                        }
+                                        logger.debug("Partition health recovery query for partitionKeyRange : " +
+                                            partitionKeyRangeWrapper.getPartitionKeyRange() +
+                                            " and collectionResourceId : "
+                                            + partitionKeyRangeWrapper.getCollectionResourceId() +
+                                            " has succeeded...");
 
                                         partitionLevelLocationUnavailabilityInfo.locationEndpointToLocationSpecificContextForPartition.compute(locationWithStaleUnavailabilityInfo, (locationWithStaleUnavailabilityInfoAsKey, locationSpecificContextAsVal) -> {
 
@@ -329,10 +365,7 @@ private Flux<?> updateStaleLocationInfo() {
                                         });
                                     })
                                     .onErrorResume(throwable -> {
-                                        if (logger.isDebugEnabled()) {
-                                            logger.debug("An exception : {} was thrown trying to recover an Unavailable partition key range!", throwable.getMessage());
-                                        }
-
+                                        logger.debug("An exception was thrown trying to recover an Unavailable partition key range!", throwable);
                                         return Mono.empty();
                                     });
                             }
@@ -353,18 +386,14 @@ private Flux<?> updateStaleLocationInfo() {
                         }
                     }
                 } catch (Exception e) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("An exception {} was thrown trying to recover an Unavailable partition key range!", e.getMessage());
-                    }
+                    logger.debug("An exception was thrown trying to recover an Unavailable partition key range!", e);
                     return Flux.empty();
                 }
 
                 return Flux.empty();
             }, 1, 1)
             .onErrorResume(throwable -> {
-                if (logger.isWarnEnabled()) {
-                    logger.warn("An exception : {} was thrown trying to recover an Unavailable partition key range!, fail-back flow won't be executed!", throwable.getMessage());
-                }
+                logger.warn("An exception : was thrown trying to recover an Unavailable partitionKeyRange!, fail-back flow won't be executed!", throwable);
                 return Flux.empty();
             });
     }
@@ -564,4 +593,31 @@ public synchronized void resetCircuitBreakerConfig() {
         this.locationSpecificHealthContextTransitionHandler
             = new LocationSpecificHealthContextTransitionHandler(this.consecutiveExceptionBasedCircuitBreaker);
     }
+
+    private static CosmosException wrapAsCosmosException(RxDocumentServiceRequest request, Exception innerException) {
+        CosmosDiagnostics cosmosDiagnostics = null;
+        String resourceAddress = null;
+
+        if (request != null) {
+
+            if (request.requestContext != null) {
+                cosmosDiagnostics = request.requestContext.cosmosDiagnostics;
+                resourceAddress = request.requestContext.resourcePhysicalAddress != null
+                    ? request.requestContext.resourcePhysicalAddress
+                    : "N/A";
+            }
+        }
+
+        CosmosException cosmosException = BridgeInternal.createCosmosException(
+            BASE_EXCEPTION_MESSAGE + innerException.getMessage(),
+            innerException,
+            EMPTY_MAP,
+            HttpConstants.StatusCodes.INTERNAL_SERVER_ERROR,
+            resourceAddress);
+
+        cosmosException = BridgeInternal.setCosmosDiagnostics(cosmosException, cosmosDiagnostics);
+        BridgeInternal.setSubStatusCode(cosmosException, HttpConstants.SubStatusCodes.PPCB_INVALID_STATE);
+
+        throw cosmosException;
+    }
 }
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/LocationSpecificHealthContextTransitionHandler.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/LocationSpecificHealthContextTransitionHandler.java
index bbca7003cef6..174cf4eda822 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/LocationSpecificHealthContextTransitionHandler.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/perPartitionCircuitBreaker/LocationSpecificHealthContextTransitionHandler.java
@@ -61,15 +61,12 @@ public LocationSpecificHealthContext handleSuccess(
                             isReadOnlyRequest);
 
                     if (this.consecutiveExceptionBasedCircuitBreaker.canHealthStatusBeUpgraded(locationSpecificHealthContextInner, isReadOnlyRequest)) {
-
-                        if (logger.isDebugEnabled()) {
-                            logger.debug("Partition {}-{} of collection : {} marked as Healthy from HealthyTentative for region : {}",
-                                partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                                partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                                partitionKeyRangeWrapper.getCollectionResourceId(),
-                                regionWithSuccess);
-                        }
-
+                        logger.debug("PartitionKeyRange : " +
+                            partitionKeyRangeWrapper.getPartitionKeyRange() +
+                            " of collectionResourceId : " +
+                            partitionKeyRangeWrapper.getCollectionResourceId() +
+                            " marked as Healthy from HealthyTentative for region : " +
+                            regionWithSuccess);
                         return this.transitionHealthStatus(LocationHealthStatus.Healthy, isReadOnlyRequest);
                     } else {
                         return locationSpecificHealthContextInner;
@@ -80,27 +77,16 @@ public LocationSpecificHealthContext handleSuccess(
                 Instant unavailableSinceActual = locationSpecificHealthContext.getUnavailableSince();
                 if (!forceStatusChange) {
                     if (Duration.between(unavailableSinceActual, Instant.now()).compareTo(Duration.ofSeconds(Configs.getAllowedPartitionUnavailabilityDurationInSeconds())) > 0) {
-
-                        if (logger.isDebugEnabled()) {
-                            logger.debug("Partition {}-{} of collection : {} marked as HealthyTentative from Unavailable for region : {}",
-                                partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                                partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                                partitionKeyRangeWrapper.getCollectionResourceId(),
-                                regionWithSuccess);
-                        }
-
+                        logger.debug("PartitionKeyRange : " +
+                            partitionKeyRangeWrapper.getPartitionKeyRange() +
+                            " of collectionResourceId : " +
+                            partitionKeyRangeWrapper.getCollectionResourceId() +
+                            " marked as HealthyTentative from Unavailable for region :" +
+                            regionWithSuccess);
                         return this.transitionHealthStatus(LocationHealthStatus.HealthyTentative, isReadOnlyRequest);
                     }
                 } else {
-
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Partition {}-{} of collection : {} marked as HealthyTentative from Unavailable for region : {}",
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                            partitionKeyRangeWrapper.getCollectionResourceId(),
-                            regionWithSuccess);
-                    }
-
+                    logger.debug("PartitionKeyRange " + partitionKeyRangeWrapper.getPartitionKeyRange() + " and collectionResourceId : " + partitionKeyRangeWrapper.getCollectionResourceId() + " marked as HealthyTentative from Unavailable for region : " + regionWithSuccess);;
                     return this.transitionHealthStatus(LocationHealthStatus.HealthyTentative, isReadOnlyRequest);
                 }
                 break;
@@ -121,15 +107,7 @@ public LocationSpecificHealthContext handleException(
 
         switch (currentLocationHealthStatusSnapshot) {
             case Healthy:
-
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Partition {}-{} of collection : {} marked as HealthyWithFailures from Healthy for region : {}",
-                        partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                        partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                        partitionKeyRangeWrapper.getCollectionResourceId(),
-                        regionWithException);
-                }
-
+                logger.debug("PartitionKeyRange " + partitionKeyRangeWrapper.getPartitionKeyRange() + " of collectionResourceId : " + partitionKeyRangeWrapper.getCollectionResourceId() + " marked as HealthyWithFailures from Healthy for region : " + regionWithException);
                 return this.transitionHealthStatus(LocationHealthStatus.HealthyWithFailures, isReadOnlyRequest);
             case HealthyWithFailures:
                 if (!this.consecutiveExceptionBasedCircuitBreaker.shouldHealthStatusBeDowngraded(locationSpecificHealthContext, isReadOnlyRequest)) {
@@ -142,26 +120,24 @@ public LocationSpecificHealthContext handleException(
                             regionWithException,
                             isReadOnlyRequest);
 
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Partition {}-{} of collection : {} has exception count of {} for region : {}",
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                            partitionKeyRangeWrapper.getCollectionResourceId(),
-                            isReadOnlyRequest ? locationSpecificHealthContextInner.getExceptionCountForReadForCircuitBreaking() : locationSpecificHealthContextInner.getExceptionCountForWriteForCircuitBreaking(),
-                            regionWithException);
-                    }
+                    logger.debug("PartitionKeyRange " +
+                        partitionKeyRangeWrapper.getPartitionKeyRange() +
+                        " of collectionResourceId " +
+                        partitionKeyRangeWrapper.getCollectionResourceId() +
+                        " has exception count of " +
+                        (isReadOnlyRequest ? locationSpecificHealthContextInner.getExceptionCountForReadForCircuitBreaking() : locationSpecificHealthContextInner.getExceptionCountForWriteForCircuitBreaking()) +
+                        " for region : " +
+                        regionWithException);
 
                     return locationSpecificHealthContextInner;
                 } else {
 
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Partition {}-{} of collection : {} marked as Unavailable from HealthyWithFailures for region : {}",
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                            partitionKeyRangeWrapper.getPartitionKeyRange(),
-                            regionWithException);
-                    }
-
+                    logger.warn("PartitionKeyRange " +
+                        partitionKeyRangeWrapper.getPartitionKeyRange() +
+                        " of collectionResourceId " +
+                        partitionKeyRangeWrapper.getCollectionResourceId() +
+                        " marked as Unavailable from HealthyWithFailures for region : " +
+                        regionWithException);
                     return this.transitionHealthStatus(LocationHealthStatus.Unavailable, isReadOnlyRequest);
                 }
             case HealthyTentative:
@@ -173,15 +149,12 @@ public LocationSpecificHealthContext handleException(
                             regionWithException,
                             isReadOnlyRequest);
                 } else {
-
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Partition {}-{} of collection : {} marked as Unavailable from HealthyTentative for region : {}",
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMinInclusive(),
-                            partitionKeyRangeWrapper.getPartitionKeyRange().getMaxExclusive(),
-                            partitionKeyRangeWrapper.getCollectionResourceId(),
-                            regionWithException);
-                    }
-
+                    logger.warn("PartitionKeyRange " +
+                        partitionKeyRangeWrapper.getPartitionKeyRange() +
+                        " of collectionResourceId " +
+                        partitionKeyRangeWrapper.getCollectionResourceId() +
+                        " marked as Unavailable from HealthyTentative for region : " +
+                        regionWithException);
                     return this.transitionHealthStatus(LocationHealthStatus.Unavailable, isReadOnlyRequest);
                 }
             case Unavailable:
diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/Fetcher.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/Fetcher.java
index 75aa8cdcde51..7089f50d0a8b 100644
--- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/Fetcher.java
+++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/Fetcher.java
@@ -242,10 +242,10 @@ private void handleCancellationExceptionForPartitionKeyRange(RxDocumentServiceRe
 
         if (firstContactedLocationEndpoint != null) {
             this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker
-                .handleLocationExceptionForPartitionKeyRange(failedRequest, firstContactedLocationEndpoint);
+                .handleLocationExceptionForPartitionKeyRange(failedRequest, firstContactedLocationEndpoint, true);
         } else {
             this.globalPartitionEndpointManagerForPerPartitionCircuitBreaker
-                .handleLocationExceptionForPartitionKeyRange(failedRequest, failedRequest.requestContext.regionalRoutingContextToRoute);
+                .handleLocationExceptionForPartitionKeyRange(failedRequest, failedRequest.requestContext.regionalRoutingContextToRoute, true);
         }
     }
 }
diff --git a/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml b/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml
index 082ec9d157d2..a836fb985514 100644
--- a/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml
+++ b/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/cosmos/kafka-cosmos-matrix.json b/sdk/cosmos/kafka-cosmos-matrix.json
index 9cce7eada94d..a8541798f1ce 100644
--- a/sdk/cosmos/kafka-cosmos-matrix.json
+++ b/sdk/cosmos/kafka-cosmos-matrix.json
@@ -8,6 +8,6 @@
         "OSVmImage": "env:LINUXVMIMAGE"
       }
     },
-    "JavaTestVersion": ["1.8", "1.11", "1.17", "1.21"]
+    "JavaTestVersion": ["1.8", "1.11", "1.17", "1.21", "1.25"]
   }
 }
diff --git a/sdk/cosmos/kafka-testcontainer-matrix.json b/sdk/cosmos/kafka-testcontainer-matrix.json
index f596cb337b07..150b71b5bffc 100644
--- a/sdk/cosmos/kafka-testcontainer-matrix.json
+++ b/sdk/cosmos/kafka-testcontainer-matrix.json
@@ -8,6 +8,6 @@
         "OSVmImage": "env:LINUXVMIMAGE"
       }
     },
-    "JavaTestVersion": ["1.8", "1.11", "1.17", "1.21"]
+    "JavaTestVersion": ["1.8", "1.11", "1.17", "1.21", "1.25"]
   }
 }
diff --git a/sdk/cosmos/spark.databricks.yml b/sdk/cosmos/spark.databricks.yml
index 74fa632ba81e..81c18ec7aa20 100644
--- a/sdk/cosmos/spark.databricks.yml
+++ b/sdk/cosmos/spark.databricks.yml
@@ -1,4 +1,6 @@
 parameters:
+  - name: CosmosEndpointMsi
+    type: string
   - name: CosmosEndpoint
     type: string
   - name: CosmosKey
@@ -25,10 +27,16 @@ parameters:
     type: string
   - name: CosmosDatabaseName
     type: string
-
+  - name: AvoidDBFS
+    type: boolean
+    default: false
+  - name: JarStorageAccountKey
+    type: string
+  - name: JarReadOnlySasUri
+    type: string
 stages:
   - stage:
-    displayName: 'Spark Databricks integration ${{ parameters.SparkVersion }}'
+    displayName: 'Spark Databricks integration ${{ parameters.ClusterName }} - ${{ parameters.SparkVersion }}'
     dependsOn: []
     jobs:
     - job:
@@ -54,20 +62,25 @@ stages:
         displayName: Use Python $(PythonVersion)
         inputs:
           versionSpec: $(PythonVersion)
+      - task: Bash@3
+        displayName: Install setuptools and wheel
+        inputs:
+          targetType: inline
+          script: python -m pip install --upgrade pip setuptools wheel
       - task: Bash@3
         displayName: Install Databricks CLI
         inputs:
           targetType: inline
-          script: python -m pip install --upgrade pip setuptools wheel databricks-cli
+          script: |
+            curl -fsSL curl https://raw.githubusercontent.com/databricks/setup-cli/main/install.sh | sh
+            databricks -v
       - task: Bash@3
         displayName: 'Connect to Databricks workspace $(DatabricksEndpoint)'
         inputs:
           targetType: inline
           script: >-
-            databricks configure --token <<EOF
-
-            $DATABRICKSENDPOINT
-
+            databricks configure --token --profile DEFAULT --host $DATABRICKSENDPOINT <<EOF
+          
             $DATABRICKSTOKEN
 
             EOF
@@ -78,9 +91,50 @@ stages:
         displayName: Importing Jars
         inputs:
           filePath: $(build.sourcesdirectory)/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-jar-install.sh
-          arguments: '${{ parameters.ClusterName }} $(build.sourcesdirectory)/sdk/cosmos/${{ parameters.SparkVersion }}/target'
+          arguments: '${{ parameters.ClusterName }} ${{ parameters.AvoidDBFS }} $(build.sourcesdirectory)/sdk/cosmos/${{ parameters.SparkVersion }}/target ${{ parameters.JarStorageAccountKey }}'
       - task: Bash@3
         displayName: Importing and executing notebooks
         inputs:
           filePath: $(build.sourcesdirectory)/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/databricks-notebooks-install.sh
-          arguments: ${{ parameters.ClusterName }} $(build.sourcesdirectory)/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks ${{ parameters.CosmosEndpoint }} ${{ parameters.CosmosKey }} ${{ parameters.SubscriptionId }} ${{ parameters.TenantId }} ${{ parameters.ResourceGroupName }} ${{ parameters.ClientId }} ${{ parameters.ClientSecret }} ${{ parameters.CosmosContainerName }} ${{ parameters.CosmosDatabaseName }}
+          arguments: ${{ parameters.ClusterName }} $(build.sourcesdirectory)/sdk/cosmos/azure-cosmos-spark_3_2-12/test-databricks/notebooks ${{ parameters.CosmosEndpointMsi }} ${{ parameters.CosmosEndpoint }} ${{ parameters.CosmosKey }} ${{ parameters.SubscriptionId }} ${{ parameters.TenantId }} ${{ parameters.ResourceGroupName }} ${{ parameters.ClientId }} ${{ parameters.ClientSecret }} ${{ parameters.CosmosContainerName }} ${{ parameters.CosmosDatabaseName }}
+      - task: Bash@3
+        displayName: 'Validating Checksum'
+        inputs:
+          targetType: inline
+          script: >-
+            if [[ "${AVOID_DBFS,,}" == "true" ]]; then
+              TMP_FILE="/tmp/${JAR_NAME}.$$"
+              echo "[init] Downloading $JAR_NAME to validate checksum..."
+              # Download with retries; fail non-zero on HTTP errors
+              if command -v curl >/dev/null 2>&1; then
+                curl -fL --retry 8 --retry-connrefused --retry-delay 2 --max-time 600 \
+                  "$JAR_URL" -o "$TMP_FILE"
+              elif command -v wget >/dev/null 2>&1; then
+                wget --tries=10 --timeout=60 -O "$TMP_FILE" "$JAR_URL"
+              else
+                echo "[init][error] Neither curl nor wget is available." >&2
+                exit 1
+              fi
+
+              chmod 0644 "$TMP_FILE"
+
+              CHECKSUM_AFTER_EXECUTION="$(sha256sum -- "$TMP_FILE")" || {
+                echo "ERROR: checksum failed for $TMP_FILE" >&2
+                exit 1
+              }
+              CHECKSUM_AFTER_EXECUTION="${CHECKSUM_AFTER_EXECUTION%% *}"
+              echo "CheckSum of JAR build on this agent: $JAR_CHECK_SUM"
+              echo "CheckSum of jar after notebook execution: $CHECKSUM_AFTER_EXECUTION"
+            
+              if [[ "$CHECKSUM_AFTER_EXECUTION" != "$(JarCheckSum)" ]]; then
+                echo "Checksum mismatch — failing." >&2
+                exit 1
+              fi
+            else
+              echo "Skipping checksum validation for runtimes still installing jars from DBFS"
+            fi
+        env:
+          JAR_URL: '${{ parameters.JarReadOnlySasUri }}'
+          JAR_NAME: 'azure-cosmos-spark_3-5_2-12-latest-ci-candidate.jar'
+          JAR_CHECK_SUM: $(JarCheckSum)
+          AVOID_DBFS:  ${{ parameters.AvoidDBFS }}
diff --git a/sdk/cosmos/spark.yml b/sdk/cosmos/spark.yml
index 69e8612822f6..465a66078343 100644
--- a/sdk/cosmos/spark.yml
+++ b/sdk/cosmos/spark.yml
@@ -10,6 +10,7 @@ variables:
 stages:
   - template: /sdk/cosmos/spark.databricks.yml
     parameters:
+      CosmosEndpointMsi: $(spark-databricks-cosmos-endpoint-msi)
       CosmosEndpoint: $(spark-databricks-cosmos-endpoint)
       CosmosKey: $(spark-databricks-cosmos-key)
       DatabricksEndpoint: $(spark-databricks-endpoint-with-msi)
@@ -23,8 +24,11 @@ stages:
       DatabricksToken: $(spark-databricks-token-with-msi)
       SparkVersion: 'azure-cosmos-spark_3-3_2-12'
       ClusterName: 'oltp-ci-spark33-2workers-ds3v2'
+      JarStorageAccountKey: $(spark-databricks-cosmos-spn-clientIdCert)
+      JarReadOnlySasUri: $(spark-databricks-cosmos-spn-clientCertBase64)
   - template: /sdk/cosmos/spark.databricks.yml
     parameters:
+      CosmosEndpointMsi: $(spark-databricks-cosmos-endpoint-msi)
       CosmosEndpoint: $(spark-databricks-cosmos-endpoint)
       CosmosKey: $(spark-databricks-cosmos-key)
       DatabricksEndpoint: $(spark-databricks-endpoint-with-msi)
@@ -38,8 +42,11 @@ stages:
       DatabricksToken: $(spark-databricks-token-with-msi)
       SparkVersion: 'azure-cosmos-spark_3-4_2-12'
       ClusterName: 'oltp-ci-spark34-2workers-ds3v2'
+      JarStorageAccountKey: $(spark-databricks-cosmos-spn-clientIdCert)
+      JarReadOnlySasUri: $(spark-databricks-cosmos-spn-clientCertBase64)
   - template: /sdk/cosmos/spark.databricks.yml
     parameters:
+      CosmosEndpointMsi: $(spark-databricks-cosmos-endpoint-msi)
       CosmosEndpoint: $(spark-databricks-cosmos-endpoint)
       CosmosKey: $(spark-databricks-cosmos-key)
       DatabricksEndpoint: $(spark-databricks-endpoint-with-msi)
@@ -53,3 +60,26 @@ stages:
       DatabricksToken: $(spark-databricks-token-with-msi)
       SparkVersion: 'azure-cosmos-spark_3-5_2-12'
       ClusterName: 'oltp-ci-spark35-2workers-ds3v2'
+      AvoidDBFS: false
+      JarStorageAccountKey: $(spark-databricks-cosmos-spn-clientIdCert)
+      JarReadOnlySasUri: $(spark-databricks-cosmos-spn-clientCertBase64)
+  - template: /sdk/cosmos/spark.databricks.yml
+    parameters:
+      CosmosEndpointMsi: $(spark-databricks-cosmos-endpoint-msi)
+      CosmosEndpoint: $(spark-databricks-cosmos-endpoint)
+      CosmosKey: $(spark-databricks-cosmos-key)
+      DatabricksEndpoint: $(spark-databricks-endpoint-with-msi)
+      SubscriptionId: '8fba6d4f-7c37-4d13-9063-fd58ad2b86e2'
+      TenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
+      ResourceGroupName: 'oltp-spark-ci'
+      ClientId: $(spark-databricks-cosmos-spn-clientId)
+      ClientSecret: $(spark-databricks-cosmos-spn-clientSecret)
+      CosmosContainerName: 'sampleContainer6'
+      CosmosDatabaseName: 'sampleDB6'
+      DatabricksToken: $(spark-databricks-token-with-msi)
+      SparkVersion: 'azure-cosmos-spark_3-5_2-12'
+      ClusterName: 'oltp-ci-spark35-2workers-ds3v2-16.4'
+      AvoidDBFS: true
+      JarStorageAccountKey: $(spark-databricks-cosmos-spn-clientIdCert)
+      JarReadOnlySasUri: $(spark-databricks-cosmos-spn-clientCertBase64)
+
diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml
index 40bdd999df64..17af3836ec2d 100644
--- a/sdk/cosmos/tests.yml
+++ b/sdk/cosmos/tests.yml
@@ -15,7 +15,7 @@ extends:
               Selection: all
               GenerateVMJobs: true
           MatrixReplace:
-            - .*Version=1.21/1.17
+            - .*Version=1.2(1|5)/1.17
           ServiceDirectory: cosmos
           Artifacts:
             - name: azure-cosmos
@@ -47,7 +47,7 @@ extends:
               Selection: all
               GenerateVMJobs: true
           MatrixReplace:
-            - .*Version=1.21/1.17
+            - .*Version=1.2(1|5)/1.17
           ServiceDirectory: cosmos
           Artifacts:
             - name: azure-cosmos
@@ -79,7 +79,7 @@ extends:
               Selection: all
               GenerateVMJobs: true
           MatrixReplace:
-            - .*Version=1.21/1.17
+            - .*Version=1.2(1|5)/1.17
           ServiceDirectory: cosmos
           Artifacts:
             - name: azure-cosmos
@@ -111,7 +111,7 @@ extends:
               Selection: all
               GenerateVMJobs: true
           MatrixReplace:
-            - .*Version=1.21/1.17
+            - .*Version=1.2(1|5)/1.17
           ServiceDirectory: cosmos
           Artifacts:
             - name: azure-cosmos
@@ -143,7 +143,7 @@ extends:
               Selection: all
               GenerateVMJobs: true
           MatrixReplace:
-            - .*Version=1.21/1.17
+            - .*Version=1.2(1|5)/1.17
           ServiceDirectory: cosmos
           Artifacts:
             - name: azure-cosmos
diff --git a/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/pom.xml b/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/pom.xml
index 24c997ce69de..88e505b4cb09 100644
--- a/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/pom.xml
+++ b/sdk/cosmosdbforpostgresql/azure-resourcemanager-cosmosdbforpostgresql/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml b/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml
index 94bfb69ffed0..e20f8eb4930e 100644
--- a/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml
+++ b/sdk/costmanagement/azure-resourcemanager-costmanagement/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml b/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml
index 9834aef9cfe7..a1ede39d7da6 100644
--- a/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml
+++ b/sdk/customerinsights/azure-resourcemanager-customerinsights/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/CHANGELOG.md b/sdk/dashboard/azure-resourcemanager-dashboard/CHANGELOG.md
index 90782b1516e5..4dd3cd42f9a1 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/CHANGELOG.md
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/CHANGELOG.md
@@ -1,14 +1,205 @@
 # Release History
 
-## 1.2.0-beta.3 (Unreleased)
+## 1.2.0 (2025-10-10)
 
-### Features Added
+- Azure Resource Manager Dashboard client library for Java. This package contains Microsoft Azure SDK for Dashboard Management SDK. The Microsoft.Dashboard Rest API spec. Package api-version 2025-08-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Breaking Changes
 
-### Bugs Fixed
+#### `models.GrafanasUpdateResponse` was removed
+
+#### `models.GrafanasUpdateHeaders` was removed
+
+#### `models.ManagedPrivateEndpointModelListResponse` was removed
+
+#### `models.ManagedGrafanaListResponse` was removed
+
+#### `models.PrivateEndpointConnectionListResult` was removed
+
+#### `models.OperationListResult` was removed
+
+#### `models.PrivateLinkResourceListResult` was removed
+
+#### `models.AzureMonitorWorkspaceIntegration` was modified
+
+* `validate()` was removed
+
+#### `models.ResourceSku` was modified
+
+* `validate()` was removed
+
+#### `models.GrafanaIntegrations` was modified
+
+* `validate()` was removed
+
+#### `models.ManagedPrivateEndpointConnectionState` was modified
+
+* `validate()` was removed
+
+#### `models.Smtp` was modified
+
+* `validate()` was removed
+
+#### `models.EnterpriseConfigurations` was modified
+
+* `validate()` was removed
+
+#### `models.ManagedServiceIdentity` was modified
+
+* `validate()` was removed
+* `java.util.UUID principalId()` -> `java.lang.String principalId()`
+* `java.util.UUID tenantId()` -> `java.lang.String tenantId()`
+
+#### `models.SaasSubscriptionDetails` was modified
+
+* `withPlanId(java.lang.String)` was removed
+* `validate()` was removed
+* `withOfferId(java.lang.String)` was removed
+* `withPublisherId(java.lang.String)` was removed
+* `withTerm(models.SubscriptionTerm)` was removed
+
+#### `models.MarketplaceTrialQuota` was modified
+
+* `validate()` was removed
+* `withAvailablePromotion(models.AvailablePromotion)` was removed
+* `withTrialStartAt(java.time.OffsetDateTime)` was removed
+* `withGrafanaResourceId(java.lang.String)` was removed
+* `withTrialEndAt(java.time.OffsetDateTime)` was removed
+
+#### `models.ManagedPrivateEndpointUpdateParameters` was modified
+
+* `validate()` was removed
+
+#### `models.GrafanaPlugin` was modified
+
+* `validate()` was removed
+
+#### `models.UserAssignedIdentity` was modified
+
+* `java.util.UUID clientId()` -> `java.lang.String clientId()`
+* `java.util.UUID principalId()` -> `java.lang.String principalId()`
+* `validate()` was removed
+
+#### `models.PrivateEndpoint` was modified
+
+* `validate()` was removed
+
+#### `models.OperationDisplay` was modified
+
+* `validate()` was removed
+
+#### `models.PrivateLinkServiceConnectionState` was modified
+
+* `validate()` was removed
+
+#### `models.GrafanaAvailablePlugin` was modified
+
+* `validate()` was removed
+
+#### `models.GrafanaConfigurations` was modified
+
+* `validate()` was removed
+
+#### `models.ManagedGrafanaProperties` was modified
+
+* `validate()` was removed
+
+#### `models.SubscriptionTerm` was modified
+
+* `withEndDate(java.time.OffsetDateTime)` was removed
+* `withTermUnit(java.lang.String)` was removed
+* `withStartDate(java.time.OffsetDateTime)` was removed
+* `validate()` was removed
+
+#### `models.ManagedGrafanaUpdateParameters` was modified
+
+* `validate()` was removed
+
+#### `models.ManagedGrafanaPropertiesUpdateParameters` was modified
+
+* `validate()` was removed
+
+### Features Added
+
+* `models.UnifiedAlertingScreenshots` was added
+
+* `models.ManagedDashboards` was added
+
+* `models.IntegrationFabricProperties` was added
+
+* `models.ManagedDashboard$DefinitionStages` was added
+
+* `models.IntegrationFabricPropertiesUpdateParameters` was added
+
+* `models.IntegrationFabric$DefinitionStages` was added
+
+* `models.Security` was added
+
+* `models.Size` was added
+
+* `models.IntegrationFabric$Update` was added
+
+* `models.Users` was added
+
+* `models.ManagedDashboard$UpdateStages` was added
+
+* `models.IntegrationFabric$Definition` was added
+
+* `models.ManagedDashboard` was added
+
+* `models.ManagedDashboard$Definition` was added
+
+* `models.IntegrationFabricUpdateParameters` was added
+
+* `models.IntegrationFabrics` was added
+
+* `models.ManagedDashboardUpdateParameters` was added
+
+* `models.IntegrationFabric` was added
+
+* `models.Snapshots` was added
+
+* `models.CreatorCanAdmin` was added
+
+* `models.IntegrationFabric$UpdateStages` was added
+
+* `models.ManagedDashboard$Update` was added
+
+#### `models.ResourceSku` was modified
+
+* `withSize(models.Size)` was added
+* `size()` was added
+
+#### `DashboardManager` was modified
+
+* `integrationFabrics()` was added
+* `managedDashboards()` was added
+
+#### `models.GrafanaAvailablePlugin` was modified
+
+* `author()` was added
+* `type()` was added
+
+#### `models.GrafanaConfigurations` was modified
+
+* `withUnifiedAlertingScreenshots(models.UnifiedAlertingScreenshots)` was added
+* `unifiedAlertingScreenshots()` was added
+* `snapshots()` was added
+* `withSecurity(models.Security)` was added
+* `security()` was added
+* `users()` was added
+* `withUsers(models.Users)` was added
+* `withSnapshots(models.Snapshots)` was added
+
+#### `models.ManagedGrafanaProperties` was modified
+
+* `withCreatorCanAdmin(models.CreatorCanAdmin)` was added
+* `creatorCanAdmin()` was added
+
+#### `models.ManagedGrafanaPropertiesUpdateParameters` was modified
 
-### Other Changes
+* `creatorCanAdmin()` was added
+* `withCreatorCanAdmin(models.CreatorCanAdmin)` was added
 
 ## 1.2.0-beta.2 (2025-07-21)
 
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/README.md b/sdk/dashboard/azure-resourcemanager-dashboard/README.md
index 4316fff37270..5b9f33fce658 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/README.md
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager Dashboard client library for Java.
 
-This package contains Microsoft Azure SDK for Dashboard Management SDK. The Microsoft.Dashboard Rest API spec. Package api-version 2024-11-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for Dashboard Management SDK. The Microsoft.Dashboard Rest API spec. Package api-version 2025-08-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-dashboard</artifactId>
-    <version>1.2.0-beta.2</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/SAMPLE.md b/sdk/dashboard/azure-resourcemanager-dashboard/SAMPLE.md
index adc9d088a4e0..ebd30984c5b6 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/SAMPLE.md
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/SAMPLE.md
@@ -61,7 +61,7 @@
  */
 public final class GrafanaCheckEnterpriseDetailsSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/EnterpriseDetails_Post.json
+     * x-ms-original-file: 2025-08-01/EnterpriseDetails_Post.json
      */
     /**
      * Sample code: EnterpriseDetails_Post.
@@ -107,7 +107,7 @@ import java.util.Map;
  */
 public final class GrafanaCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Create.json
+     * x-ms-original-file: 2025-08-01/Grafana_Create.json
      */
     /**
      * Sample code: Grafana_Create.
@@ -171,7 +171,7 @@ public final class GrafanaCreateSamples {
  */
 public final class GrafanaDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Delete.json
+     * x-ms-original-file: 2025-08-01/Grafana_Delete.json
      */
     /**
      * Sample code: Grafana_Delete.
@@ -192,7 +192,7 @@ public final class GrafanaDeleteSamples {
  */
 public final class GrafanaFetchAvailablePluginsSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_FetchAvailablePlugins.json
+     * x-ms-original-file: 2025-08-01/Grafana_FetchAvailablePlugins.json
      */
     /**
      * Sample code: Grafana_FetchAvailablePlugins.
@@ -214,7 +214,7 @@ public final class GrafanaFetchAvailablePluginsSamples {
  */
 public final class GrafanaGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Get.json
+     * x-ms-original-file: 2025-08-01/Grafana_Get.json
      */
     /**
      * Sample code: Grafana_Get.
@@ -236,7 +236,7 @@ public final class GrafanaGetByResourceGroupSamples {
  */
 public final class GrafanaListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_List.json
+     * x-ms-original-file: 2025-08-01/Grafana_List.json
      */
     /**
      * Sample code: Grafana_List.
@@ -257,7 +257,7 @@ public final class GrafanaListSamples {
  */
 public final class GrafanaListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_ListByResourceGroup.json
+     * x-ms-original-file: 2025-08-01/Grafana_ListByResourceGroup.json
      */
     /**
      * Sample code: Grafana_ListByResourceGroup.
@@ -299,7 +299,7 @@ import java.util.Map;
  */
 public final class GrafanaUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Update.json
+     * x-ms-original-file: 2025-08-01/Grafana_Update.json
      */
     /**
      * Sample code: Grafana_Update.
@@ -363,7 +363,7 @@ import java.util.Arrays;
  */
 public final class IntegrationFabricsCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Create.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Create.json
      */
     /**
      * Sample code: IntegrationFabrics_Create.
@@ -393,7 +393,7 @@ public final class IntegrationFabricsCreateSamples {
  */
 public final class IntegrationFabricsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Delete.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Delete.json
      */
     /**
      * Sample code: IntegrationFabrics_Delete.
@@ -415,7 +415,7 @@ public final class IntegrationFabricsDeleteSamples {
  */
 public final class IntegrationFabricsGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Get.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Get.json
      */
     /**
      * Sample code: IntegrationFabrics_Get.
@@ -437,7 +437,7 @@ public final class IntegrationFabricsGetSamples {
  */
 public final class IntegrationFabricsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_List.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_List.json
      */
     /**
      * Sample code: IntegrationFabrics_List.
@@ -464,7 +464,7 @@ import java.util.Map;
  */
 public final class IntegrationFabricsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Update.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Update.json
      */
     /**
      * Sample code: IntegrationFabrics_Update.
@@ -506,7 +506,7 @@ import java.util.Map;
  */
 public final class ManagedDashboardsCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Create.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Create.json
      */
     /**
      * Sample code: Dashboard_Create.
@@ -544,7 +544,7 @@ public final class ManagedDashboardsCreateSamples {
  */
 public final class ManagedDashboardsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Delete.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Delete.json
      */
     /**
      * Sample code: Dashboard_Delete.
@@ -566,7 +566,7 @@ public final class ManagedDashboardsDeleteSamples {
  */
 public final class ManagedDashboardsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Get.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Get.json
      */
     /**
      * Sample code: Dashboard_Get.
@@ -588,7 +588,7 @@ public final class ManagedDashboardsGetByResourceGroupSamples {
  */
 public final class ManagedDashboardsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_List.json
+     * x-ms-original-file: 2025-08-01/Dashboard_List.json
      */
     /**
      * Sample code: Dashboard_ListByResourceGroup.
@@ -609,7 +609,7 @@ public final class ManagedDashboardsListSamples {
  */
 public final class ManagedDashboardsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_ListByResourceGroup.json
+     * x-ms-original-file: 2025-08-01/Dashboard_ListByResourceGroup.json
      */
     /**
      * Sample code: Dashboard_ListByResourceGroup.
@@ -634,7 +634,7 @@ import java.util.Map;
  */
 public final class ManagedDashboardsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Update.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Update.json
      */
     /**
      * Sample code: Dashboard_Update.
@@ -672,7 +672,7 @@ import java.util.Arrays;
  */
 public final class ManagedPrivateEndpointsCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Create.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Create.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Create.
@@ -703,7 +703,7 @@ public final class ManagedPrivateEndpointsCreateSamples {
  */
 public final class ManagedPrivateEndpointsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Delete.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Delete.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Delete.
@@ -725,7 +725,7 @@ public final class ManagedPrivateEndpointsDeleteSamples {
  */
 public final class ManagedPrivateEndpointsGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Get.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Get.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Get.
@@ -747,7 +747,7 @@ public final class ManagedPrivateEndpointsGetSamples {
  */
 public final class ManagedPrivateEndpointsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_List.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_List.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_List.
@@ -768,7 +768,7 @@ public final class ManagedPrivateEndpointsListSamples {
  */
 public final class ManagedPrivateEndpointsRefreshSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Refresh.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Refresh.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Refresh.
@@ -793,7 +793,7 @@ import java.util.Map;
  */
 public final class ManagedPrivateEndpointsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Patch.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Patch.json
      */
     /**
      * Sample code: ManagedPrivateEndpoints_Patch.
@@ -829,7 +829,7 @@ public final class ManagedPrivateEndpointsUpdateSamples {
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Operations_List.json
+     * x-ms-original-file: 2025-08-01/Operations_List.json
      */
     /**
      * Sample code: Operations_List.
@@ -850,7 +850,7 @@ public final class OperationsListSamples {
  */
 public final class PrivateEndpointConnectionsApproveSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_Approve.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_Approve.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Approve.
@@ -874,7 +874,7 @@ public final class PrivateEndpointConnectionsApproveSamples {
  */
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_Delete.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_Delete.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Delete.
@@ -896,7 +896,7 @@ public final class PrivateEndpointConnectionsDeleteSamples {
  */
 public final class PrivateEndpointConnectionsGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_Get.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_Get.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Get.
@@ -918,7 +918,7 @@ public final class PrivateEndpointConnectionsGetSamples {
  */
 public final class PrivateEndpointConnectionsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_List.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_List.json
      */
     /**
      * Sample code: PrivateEndpointConnections_List.
@@ -939,7 +939,7 @@ public final class PrivateEndpointConnectionsListSamples {
  */
 public final class PrivateLinkResourcesGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateLinkResources_Get.json
+     * x-ms-original-file: 2025-08-01/PrivateLinkResources_Get.json
      */
     /**
      * Sample code: PrivateLinkResources_Get.
@@ -961,7 +961,7 @@ public final class PrivateLinkResourcesGetSamples {
  */
 public final class PrivateLinkResourcesListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateLinkResources_List.json
+     * x-ms-original-file: 2025-08-01/PrivateLinkResources_List.json
      */
     /**
      * Sample code: PrivateLinkResources_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml b/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml
index b2dba8c08233..a7cb970be492 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/pom.xml
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-dashboard</artifactId>
-  <version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dashboard;current} -->
+  <version>1.2.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dashboard;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Dashboard Management</name>
-  <description>This package contains Microsoft Azure SDK for Dashboard Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. The Microsoft.Dashboard Rest API spec. Package api-version 2024-11-01-preview.</description>
+  <description>This package contains Microsoft Azure SDK for Dashboard Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. The Microsoft.Dashboard Rest API spec. Package api-version 2025-08-01.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientImpl.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientImpl.java
index 771d76cc328c..75490aebfa13 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientImpl.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientImpl.java
@@ -247,7 +247,7 @@ public ManagedPrivateEndpointsClient getManagedPrivateEndpoints() {
         this.defaultPollInterval = defaultPollInterval;
         this.endpoint = endpoint;
         this.subscriptionId = subscriptionId;
-        this.apiVersion = "2024-11-01-preview";
+        this.apiVersion = "2025-08-01";
         this.operations = new OperationsClientImpl(this);
         this.privateEndpointConnections = new PrivateEndpointConnectionsClientImpl(this);
         this.privateLinkResources = new PrivateLinkResourcesClientImpl(this);
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/CreatorCanAdmin.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/CreatorCanAdmin.java
new file mode 100644
index 000000000000..f1df3d67107c
--- /dev/null
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/CreatorCanAdmin.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.dashboard.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The creator will have admin access for the Grafana instance.
+ */
+public final class CreatorCanAdmin extends ExpandableStringEnum<CreatorCanAdmin> {
+    /**
+     * Creator admin access is disabled.
+     */
+    public static final CreatorCanAdmin DISABLED = fromString("Disabled");
+
+    /**
+     * Creator admin access is enabled.
+     */
+    public static final CreatorCanAdmin ENABLED = fromString("Enabled");
+
+    /**
+     * Creates a new instance of CreatorCanAdmin value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public CreatorCanAdmin() {
+    }
+
+    /**
+     * Creates or finds a CreatorCanAdmin from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding CreatorCanAdmin.
+     */
+    public static CreatorCanAdmin fromString(String name) {
+        return fromString(name, CreatorCanAdmin.class);
+    }
+
+    /**
+     * Gets known CreatorCanAdmin values.
+     * 
+     * @return known CreatorCanAdmin values.
+     */
+    public static Collection<CreatorCanAdmin> values() {
+        return values(CreatorCanAdmin.class);
+    }
+}
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePlugin.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePlugin.java
index 6c2e3250043c..08b66bfd133b 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePlugin.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePlugin.java
@@ -26,6 +26,16 @@ public final class GrafanaAvailablePlugin implements JsonSerializable<GrafanaAva
      */
     private String name;
 
+    /*
+     * Grafana plugin type
+     */
+    private String type;
+
+    /*
+     * Grafana plugin author/publisher name
+     */
+    private String author;
+
     /**
      * Creates an instance of GrafanaAvailablePlugin class.
      */
@@ -50,6 +60,24 @@ public String name() {
         return this.name;
     }
 
+    /**
+     * Get the type property: Grafana plugin type.
+     * 
+     * @return the type value.
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the author property: Grafana plugin author/publisher name.
+     * 
+     * @return the author value.
+     */
+    public String author() {
+        return this.author;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -78,6 +106,10 @@ public static GrafanaAvailablePlugin fromJson(JsonReader jsonReader) throws IOEx
                     deserializedGrafanaAvailablePlugin.pluginId = reader.getString();
                 } else if ("name".equals(fieldName)) {
                     deserializedGrafanaAvailablePlugin.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedGrafanaAvailablePlugin.type = reader.getString();
+                } else if ("author".equals(fieldName)) {
+                    deserializedGrafanaAvailablePlugin.author = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaProperties.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaProperties.java
index 125d42e84f18..740c0a3efb54 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaProperties.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaProperties.java
@@ -49,6 +49,11 @@ public final class ManagedGrafanaProperties implements JsonSerializable<ManagedG
      */
     private ApiKey apiKey;
 
+    /*
+     * The creator will have admin access for the Grafana instance.
+     */
+    private CreatorCanAdmin creatorCanAdmin;
+
     /*
      * Whether a Grafana instance uses deterministic outbound IPs.
      */
@@ -188,6 +193,26 @@ public ManagedGrafanaProperties withApiKey(ApiKey apiKey) {
         return this;
     }
 
+    /**
+     * Get the creatorCanAdmin property: The creator will have admin access for the Grafana instance.
+     * 
+     * @return the creatorCanAdmin value.
+     */
+    public CreatorCanAdmin creatorCanAdmin() {
+        return this.creatorCanAdmin;
+    }
+
+    /**
+     * Set the creatorCanAdmin property: The creator will have admin access for the Grafana instance.
+     * 
+     * @param creatorCanAdmin the creatorCanAdmin value to set.
+     * @return the ManagedGrafanaProperties object itself.
+     */
+    public ManagedGrafanaProperties withCreatorCanAdmin(CreatorCanAdmin creatorCanAdmin) {
+        this.creatorCanAdmin = creatorCanAdmin;
+        return this;
+    }
+
     /**
      * Get the deterministicOutboundIp property: Whether a Grafana instance uses deterministic outbound IPs.
      * 
@@ -362,6 +387,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("zoneRedundancy",
             this.zoneRedundancy == null ? null : this.zoneRedundancy.toString());
         jsonWriter.writeStringField("apiKey", this.apiKey == null ? null : this.apiKey.toString());
+        jsonWriter.writeStringField("creatorCanAdmin",
+            this.creatorCanAdmin == null ? null : this.creatorCanAdmin.toString());
         jsonWriter.writeStringField("deterministicOutboundIP",
             this.deterministicOutboundIp == null ? null : this.deterministicOutboundIp.toString());
         jsonWriter.writeStringField("autoGeneratedDomainNameLabelScope",
@@ -403,6 +430,9 @@ public static ManagedGrafanaProperties fromJson(JsonReader jsonReader) throws IO
                     deserializedManagedGrafanaProperties.zoneRedundancy = ZoneRedundancy.fromString(reader.getString());
                 } else if ("apiKey".equals(fieldName)) {
                     deserializedManagedGrafanaProperties.apiKey = ApiKey.fromString(reader.getString());
+                } else if ("creatorCanAdmin".equals(fieldName)) {
+                    deserializedManagedGrafanaProperties.creatorCanAdmin
+                        = CreatorCanAdmin.fromString(reader.getString());
                 } else if ("deterministicOutboundIP".equals(fieldName)) {
                     deserializedManagedGrafanaProperties.deterministicOutboundIp
                         = DeterministicOutboundIp.fromString(reader.getString());
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaPropertiesUpdateParameters.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaPropertiesUpdateParameters.java
index 5ce89b64a822..b04c3ea78bed 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaPropertiesUpdateParameters.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaPropertiesUpdateParameters.java
@@ -28,6 +28,11 @@ public final class ManagedGrafanaPropertiesUpdateParameters
      */
     private ApiKey apiKey;
 
+    /*
+     * The creator will have admin access for the Grafana instance.
+     */
+    private CreatorCanAdmin creatorCanAdmin;
+
     /*
      * Whether a Grafana instance uses deterministic outbound IPs.
      */
@@ -111,6 +116,26 @@ public ManagedGrafanaPropertiesUpdateParameters withApiKey(ApiKey apiKey) {
         return this;
     }
 
+    /**
+     * Get the creatorCanAdmin property: The creator will have admin access for the Grafana instance.
+     * 
+     * @return the creatorCanAdmin value.
+     */
+    public CreatorCanAdmin creatorCanAdmin() {
+        return this.creatorCanAdmin;
+    }
+
+    /**
+     * Set the creatorCanAdmin property: The creator will have admin access for the Grafana instance.
+     * 
+     * @param creatorCanAdmin the creatorCanAdmin value to set.
+     * @return the ManagedGrafanaPropertiesUpdateParameters object itself.
+     */
+    public ManagedGrafanaPropertiesUpdateParameters withCreatorCanAdmin(CreatorCanAdmin creatorCanAdmin) {
+        this.creatorCanAdmin = creatorCanAdmin;
+        return this;
+    }
+
     /**
      * Get the deterministicOutboundIp property: Whether a Grafana instance uses deterministic outbound IPs.
      * 
@@ -269,6 +294,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("zoneRedundancy",
             this.zoneRedundancy == null ? null : this.zoneRedundancy.toString());
         jsonWriter.writeStringField("apiKey", this.apiKey == null ? null : this.apiKey.toString());
+        jsonWriter.writeStringField("creatorCanAdmin",
+            this.creatorCanAdmin == null ? null : this.creatorCanAdmin.toString());
         jsonWriter.writeStringField("deterministicOutboundIP",
             this.deterministicOutboundIp == null ? null : this.deterministicOutboundIp.toString());
         jsonWriter.writeStringField("publicNetworkAccess",
@@ -302,6 +329,9 @@ public static ManagedGrafanaPropertiesUpdateParameters fromJson(JsonReader jsonR
                         = ZoneRedundancy.fromString(reader.getString());
                 } else if ("apiKey".equals(fieldName)) {
                     deserializedManagedGrafanaPropertiesUpdateParameters.apiKey = ApiKey.fromString(reader.getString());
+                } else if ("creatorCanAdmin".equals(fieldName)) {
+                    deserializedManagedGrafanaPropertiesUpdateParameters.creatorCanAdmin
+                        = CreatorCanAdmin.fromString(reader.getString());
                 } else if ("deterministicOutboundIP".equals(fieldName)) {
                     deserializedManagedGrafanaPropertiesUpdateParameters.deterministicOutboundIp
                         = DeterministicOutboundIp.fromString(reader.getString());
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ResourceSku.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ResourceSku.java
index 1069e2bf5c24..692e7b567eea 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ResourceSku.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/ResourceSku.java
@@ -21,6 +21,11 @@ public final class ResourceSku implements JsonSerializable<ResourceSku> {
      */
     private String name;
 
+    /*
+     * Specifies the capacity tier of the Grafana instance.
+     */
+    private Size size;
+
     /**
      * Creates an instance of ResourceSku class.
      */
@@ -47,6 +52,26 @@ public ResourceSku withName(String name) {
         return this;
     }
 
+    /**
+     * Get the size property: Specifies the capacity tier of the Grafana instance.
+     * 
+     * @return the size value.
+     */
+    public Size size() {
+        return this.size;
+    }
+
+    /**
+     * Set the size property: Specifies the capacity tier of the Grafana instance.
+     * 
+     * @param size the size value to set.
+     * @return the ResourceSku object itself.
+     */
+    public ResourceSku withSize(Size size) {
+        this.size = size;
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -54,6 +79,7 @@ public ResourceSku withName(String name) {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("name", this.name);
+        jsonWriter.writeStringField("size", this.size == null ? null : this.size.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -75,6 +101,8 @@ public static ResourceSku fromJson(JsonReader jsonReader) throws IOException {
 
                 if ("name".equals(fieldName)) {
                     deserializedResourceSku.name = reader.getString();
+                } else if ("size".equals(fieldName)) {
+                    deserializedResourceSku.size = Size.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/Size.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/Size.java
new file mode 100644
index 000000000000..b208b7573ebe
--- /dev/null
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/java/com/azure/resourcemanager/dashboard/models/Size.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.dashboard.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Specifies the capacity tier of the Grafana instance.
+ */
+public final class Size extends ExpandableStringEnum<Size> {
+    /**
+     * X1 capacity tier.
+     */
+    public static final Size X1 = fromString("X1");
+
+    /**
+     * X2 capacity tier.
+     */
+    public static final Size X2 = fromString("X2");
+
+    /**
+     * Creates a new instance of Size value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public Size() {
+    }
+
+    /**
+     * Creates or finds a Size from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding Size.
+     */
+    public static Size fromString(String name) {
+        return fromString(name, Size.class);
+    }
+
+    /**
+     * Gets known Size values.
+     * 
+     * @return known Size values.
+     */
+    public static Collection<Size> values() {
+        return values(Size.class);
+    }
+}
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_apiview_properties.json b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_apiview_properties.json
index da1525dc4e7e..b59efc415a47 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_apiview_properties.json
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_apiview_properties.json
@@ -90,6 +90,7 @@
     "com.azure.resourcemanager.dashboard.models.AutoGeneratedDomainNameLabelScope": "Microsoft.Dashboard.AutoGeneratedDomainNameLabelScope",
     "com.azure.resourcemanager.dashboard.models.AvailablePromotion": "Microsoft.Dashboard.AvailablePromotion",
     "com.azure.resourcemanager.dashboard.models.AzureMonitorWorkspaceIntegration": "Microsoft.Dashboard.AzureMonitorWorkspaceIntegration",
+    "com.azure.resourcemanager.dashboard.models.CreatorCanAdmin": "Microsoft.Dashboard.CreatorCanAdmin",
     "com.azure.resourcemanager.dashboard.models.DeterministicOutboundIp": "Microsoft.Dashboard.DeterministicOutboundIP",
     "com.azure.resourcemanager.dashboard.models.EnterpriseConfigurations": "Microsoft.Dashboard.EnterpriseConfigurations",
     "com.azure.resourcemanager.dashboard.models.GrafanaAvailablePlugin": "Microsoft.Dashboard.GrafanaAvailablePlugin",
@@ -121,6 +122,7 @@
     "com.azure.resourcemanager.dashboard.models.ResourceSku": "Microsoft.Dashboard.ResourceSku",
     "com.azure.resourcemanager.dashboard.models.SaasSubscriptionDetails": "Microsoft.Dashboard.SaasSubscriptionDetails",
     "com.azure.resourcemanager.dashboard.models.Security": "Microsoft.Dashboard.Security",
+    "com.azure.resourcemanager.dashboard.models.Size": "Microsoft.Dashboard.Size",
     "com.azure.resourcemanager.dashboard.models.Smtp": "Microsoft.Dashboard.Smtp",
     "com.azure.resourcemanager.dashboard.models.Snapshots": "Microsoft.Dashboard.Snapshots",
     "com.azure.resourcemanager.dashboard.models.StartTlsPolicy": "Microsoft.Dashboard.StartTLSPolicy",
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_metadata.json b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_metadata.json
index 32b300758225..2d877e0e3479 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_metadata.json
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/main/resources/META-INF/azure-resourcemanager-dashboard_metadata.json
@@ -1 +1 @@
-{"flavor":"azure","apiVersion":"2024-11-01-preview","crossLanguageDefinitions":{"com.azure.resourcemanager.dashboard.fluent.DashboardManagementClient":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.fluent.GrafanasClient":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.beginCreate":"Microsoft.Dashboard.ManagedGrafanas.create","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.beginDelete":"Microsoft.Dashboard.ManagedGrafanas.delete","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.beginUpdate":"Microsoft.Dashboard.ManagedGrafanas.update","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.checkEnterpriseDetails":"Microsoft.Dashboard.ManagedGrafanas.checkEnterpriseDetails","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.checkEnterpriseDetailsWithResponse":"Microsoft.Dashboard.ManagedGrafanas.checkEnterpriseDetails","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.create":"Microsoft.Dashboard.ManagedGrafanas.create","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.delete":"Microsoft.Dashboard.ManagedGrafanas.delete","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.fetchAvailablePlugins":"Microsoft.Dashboard.ManagedGrafanas.fetchAvailablePlugins","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.fetchAvailablePluginsWithResponse":"Microsoft.Dashboard.ManagedGrafanas.fetchAvailablePlugins","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.getByResourceGroup":"Microsoft.Dashboard.ManagedGrafanas.get","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.getByResourceGroupWithResponse":"Microsoft.Dashboard.ManagedGrafanas.get","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.list":"Microsoft.Dashboard.ManagedGrafanas.list","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.listByResourceGroup":"Microsoft.Dashboard.ManagedGrafanas.listByResourceGroup","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.update":"Microsoft.Dashboard.ManagedGrafanas.update","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient":"Microsoft.Dashboard.IntegrationFabrics","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.beginCreate":"Microsoft.Dashboard.IntegrationFabrics.create","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.beginDelete":"Microsoft.Dashboard.IntegrationFabrics.delete","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.beginUpdate":"Microsoft.Dashboard.IntegrationFabrics.update","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.create":"Microsoft.Dashboard.IntegrationFabrics.create","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.delete":"Microsoft.Dashboard.IntegrationFabrics.delete","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.get":"Microsoft.Dashboard.IntegrationFabrics.get","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.getWithResponse":"Microsoft.Dashboard.IntegrationFabrics.get","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.list":"Microsoft.Dashboard.IntegrationFabrics.list","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.update":"Microsoft.Dashboard.IntegrationFabrics.update","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient":"Microsoft.Dashboard.ManagedDashboards","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.beginCreate":"Microsoft.Dashboard.ManagedDashboards.create","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.create":"Microsoft.Dashboard.ManagedDashboards.create","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.delete":"Microsoft.Dashboard.ManagedDashboards.delete","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.deleteWithResponse":"Microsoft.Dashboard.ManagedDashboards.delete","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.getByResourceGroup":"Microsoft.Dashboard.ManagedDashboards.get","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.getByResourceGroupWithResponse":"Microsoft.Dashboard.ManagedDashboards.get","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.list":"Microsoft.Dashboard.ManagedDashboards.listBySubscription","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.listByResourceGroup":"Microsoft.Dashboard.ManagedDashboards.list","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.update":"Microsoft.Dashboard.ManagedDashboards.update","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.updateWithResponse":"Microsoft.Dashboard.ManagedDashboards.update","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginCreate":"Microsoft.Dashboard.ManagedPrivateEndpointModels.create","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginDelete":"Microsoft.Dashboard.ManagedPrivateEndpointModels.delete","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginRefresh":"Microsoft.Dashboard.ManagedGrafanas.refresh","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginUpdate":"Microsoft.Dashboard.ManagedPrivateEndpointModels.update","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.create":"Microsoft.Dashboard.ManagedPrivateEndpointModels.create","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.delete":"Microsoft.Dashboard.ManagedPrivateEndpointModels.delete","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.get":"Microsoft.Dashboard.ManagedPrivateEndpointModels.get","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.getWithResponse":"Microsoft.Dashboard.ManagedPrivateEndpointModels.get","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.list":"Microsoft.Dashboard.ManagedPrivateEndpointModels.list","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.refresh":"Microsoft.Dashboard.ManagedGrafanas.refresh","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.update":"Microsoft.Dashboard.ManagedPrivateEndpointModels.update","com.azure.resourcemanager.dashboard.fluent.OperationsClient":"Microsoft.Dashboard.Operations","com.azure.resourcemanager.dashboard.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient":"Microsoft.Dashboard.PrivateEndpointConnections","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.approve":"Microsoft.Dashboard.PrivateEndpointConnections.approve","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.beginApprove":"Microsoft.Dashboard.PrivateEndpointConnections.approve","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.beginDelete":"Microsoft.Dashboard.PrivateEndpointConnections.delete","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.delete":"Microsoft.Dashboard.PrivateEndpointConnections.delete","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.get":"Microsoft.Dashboard.PrivateEndpointConnections.get","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.getWithResponse":"Microsoft.Dashboard.PrivateEndpointConnections.get","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.list":"Microsoft.Dashboard.PrivateEndpointConnections.list","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient":"Microsoft.Dashboard.PrivateLinkResources","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient.get":"Microsoft.Dashboard.PrivateLinkResources.get","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient.getWithResponse":"Microsoft.Dashboard.PrivateLinkResources.get","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient.list":"Microsoft.Dashboard.PrivateLinkResources.list","com.azure.resourcemanager.dashboard.fluent.models.EnterpriseDetailsInner":"Microsoft.Dashboard.EnterpriseDetails","com.azure.resourcemanager.dashboard.fluent.models.GrafanaAvailablePluginListResponseInner":"Microsoft.Dashboard.GrafanaAvailablePluginListResponse","com.azure.resourcemanager.dashboard.fluent.models.IntegrationFabricInner":"Microsoft.Dashboard.IntegrationFabric","com.azure.resourcemanager.dashboard.fluent.models.ManagedDashboardInner":"Microsoft.Dashboard.ManagedDashboard","com.azure.resourcemanager.dashboard.fluent.models.ManagedDashboardProperties":"Microsoft.Dashboard.ManagedDashboardProperties","com.azure.resourcemanager.dashboard.fluent.models.ManagedGrafanaInner":"Microsoft.Dashboard.ManagedGrafana","com.azure.resourcemanager.dashboard.fluent.models.ManagedPrivateEndpointModelInner":"Microsoft.Dashboard.ManagedPrivateEndpointModel","com.azure.resourcemanager.dashboard.fluent.models.ManagedPrivateEndpointModelProperties":"Microsoft.Dashboard.ManagedPrivateEndpointModelProperties","com.azure.resourcemanager.dashboard.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","com.azure.resourcemanager.dashboard.fluent.models.PrivateEndpointConnectionInner":"Microsoft.Dashboard.PrivateEndpointConnection","com.azure.resourcemanager.dashboard.fluent.models.PrivateEndpointConnectionProperties":"Microsoft.Dashboard.PrivateEndpointConnectionProperties","com.azure.resourcemanager.dashboard.fluent.models.PrivateLinkResourceInner":"Microsoft.Dashboard.PrivateLinkResource","com.azure.resourcemanager.dashboard.fluent.models.PrivateLinkResourceProperties":"Microsoft.Dashboard.PrivateLinkResourceProperties","com.azure.resourcemanager.dashboard.implementation.DashboardManagementClientBuilder":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.implementation.models.IntegrationFabricListResponse":"Microsoft.Dashboard.IntegrationFabricListResponse","com.azure.resourcemanager.dashboard.implementation.models.ManagedDashboardListResponse":"Microsoft.Dashboard.ManagedDashboardListResponse","com.azure.resourcemanager.dashboard.implementation.models.ManagedGrafanaListResponse":"Microsoft.Dashboard.ManagedGrafanaListResponse","com.azure.resourcemanager.dashboard.implementation.models.ManagedPrivateEndpointModelListResponse":"Microsoft.Dashboard.ManagedPrivateEndpointModelListResponse","com.azure.resourcemanager.dashboard.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","com.azure.resourcemanager.dashboard.implementation.models.PrivateEndpointConnectionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.dashboard.implementation.models.PrivateLinkResourceListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.dashboard.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","com.azure.resourcemanager.dashboard.models.ApiKey":"Microsoft.Dashboard.ApiKey","com.azure.resourcemanager.dashboard.models.AutoGeneratedDomainNameLabelScope":"Microsoft.Dashboard.AutoGeneratedDomainNameLabelScope","com.azure.resourcemanager.dashboard.models.AvailablePromotion":"Microsoft.Dashboard.AvailablePromotion","com.azure.resourcemanager.dashboard.models.AzureMonitorWorkspaceIntegration":"Microsoft.Dashboard.AzureMonitorWorkspaceIntegration","com.azure.resourcemanager.dashboard.models.DeterministicOutboundIp":"Microsoft.Dashboard.DeterministicOutboundIP","com.azure.resourcemanager.dashboard.models.EnterpriseConfigurations":"Microsoft.Dashboard.EnterpriseConfigurations","com.azure.resourcemanager.dashboard.models.GrafanaAvailablePlugin":"Microsoft.Dashboard.GrafanaAvailablePlugin","com.azure.resourcemanager.dashboard.models.GrafanaConfigurations":"Microsoft.Dashboard.GrafanaConfigurations","com.azure.resourcemanager.dashboard.models.GrafanaIntegrations":"Microsoft.Dashboard.GrafanaIntegrations","com.azure.resourcemanager.dashboard.models.GrafanaPlugin":"Microsoft.Dashboard.GrafanaPlugin","com.azure.resourcemanager.dashboard.models.IntegrationFabricProperties":"Microsoft.Dashboard.IntegrationFabricProperties","com.azure.resourcemanager.dashboard.models.IntegrationFabricPropertiesUpdateParameters":"Microsoft.Dashboard.IntegrationFabricPropertiesUpdateParameters","com.azure.resourcemanager.dashboard.models.IntegrationFabricUpdateParameters":"Microsoft.Dashboard.IntegrationFabricUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedDashboardUpdateParameters":"Microsoft.Dashboard.ManagedDashboardUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedGrafanaProperties":"Microsoft.Dashboard.ManagedGrafanaProperties","com.azure.resourcemanager.dashboard.models.ManagedGrafanaPropertiesUpdateParameters":"Microsoft.Dashboard.ManagedGrafanaPropertiesUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedGrafanaUpdateParameters":"Microsoft.Dashboard.ManagedGrafanaUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedPrivateEndpointConnectionState":"Microsoft.Dashboard.ManagedPrivateEndpointConnectionState","com.azure.resourcemanager.dashboard.models.ManagedPrivateEndpointConnectionStatus":"Microsoft.Dashboard.ManagedPrivateEndpointConnectionStatus","com.azure.resourcemanager.dashboard.models.ManagedPrivateEndpointUpdateParameters":"Microsoft.Dashboard.ManagedPrivateEndpointUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedServiceIdentity":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentity","com.azure.resourcemanager.dashboard.models.ManagedServiceIdentityType":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType","com.azure.resourcemanager.dashboard.models.MarketplaceAutoRenew":"Microsoft.Dashboard.MarketplaceAutoRenew","com.azure.resourcemanager.dashboard.models.MarketplaceTrialQuota":"Microsoft.Dashboard.MarketplaceTrialQuota","com.azure.resourcemanager.dashboard.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","com.azure.resourcemanager.dashboard.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","com.azure.resourcemanager.dashboard.models.PrivateEndpoint":"Azure.ResourceManager.CommonTypes.PrivateEndpoint","com.azure.resourcemanager.dashboard.models.PrivateEndpointConnectionProvisioningState":"Azure.ResourceManager.CommonTypes.PrivateEndpointConnectionProvisioningState","com.azure.resourcemanager.dashboard.models.PrivateEndpointServiceConnectionStatus":"Azure.ResourceManager.CommonTypes.PrivateEndpointServiceConnectionStatus","com.azure.resourcemanager.dashboard.models.PrivateLinkServiceConnectionState":"Azure.ResourceManager.CommonTypes.PrivateLinkServiceConnectionState","com.azure.resourcemanager.dashboard.models.ProvisioningState":"Microsoft.Dashboard.ProvisioningState","com.azure.resourcemanager.dashboard.models.PublicNetworkAccess":"Microsoft.Dashboard.PublicNetworkAccess","com.azure.resourcemanager.dashboard.models.ResourceSku":"Microsoft.Dashboard.ResourceSku","com.azure.resourcemanager.dashboard.models.SaasSubscriptionDetails":"Microsoft.Dashboard.SaasSubscriptionDetails","com.azure.resourcemanager.dashboard.models.Security":"Microsoft.Dashboard.Security","com.azure.resourcemanager.dashboard.models.Smtp":"Microsoft.Dashboard.Smtp","com.azure.resourcemanager.dashboard.models.Snapshots":"Microsoft.Dashboard.Snapshots","com.azure.resourcemanager.dashboard.models.StartTlsPolicy":"Microsoft.Dashboard.StartTLSPolicy","com.azure.resourcemanager.dashboard.models.SubscriptionTerm":"Microsoft.Dashboard.SubscriptionTerm","com.azure.resourcemanager.dashboard.models.UnifiedAlertingScreenshots":"Microsoft.Dashboard.UnifiedAlertingScreenshots","com.azure.resourcemanager.dashboard.models.UserAssignedIdentity":"Azure.ResourceManager.CommonTypes.UserAssignedIdentity","com.azure.resourcemanager.dashboard.models.Users":"Microsoft.Dashboard.Users","com.azure.resourcemanager.dashboard.models.ZoneRedundancy":"Microsoft.Dashboard.ZoneRedundancy"},"generatedFiles":["src/main/java/com/azure/resourcemanager/dashboard/DashboardManager.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/DashboardManagementClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/GrafanasClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/IntegrationFabricsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/ManagedDashboardsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/ManagedPrivateEndpointsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/OperationsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/PrivateEndpointConnectionsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/PrivateLinkResourcesClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/EnterpriseDetailsInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/GrafanaAvailablePluginListResponseInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/IntegrationFabricInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedDashboardInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedDashboardProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedGrafanaInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedPrivateEndpointModelInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedPrivateEndpointModelProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/OperationInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateEndpointConnectionInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateEndpointConnectionProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateLinkResourceInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateLinkResourceProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientBuilder.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/EnterpriseDetailsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/GrafanaAvailablePluginListResponseImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/GrafanasClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/GrafanasImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/IntegrationFabricImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/IntegrationFabricsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/IntegrationFabricsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedDashboardImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedDashboardsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedDashboardsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedGrafanaImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedPrivateEndpointModelImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedPrivateEndpointsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedPrivateEndpointsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/OperationImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/OperationsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/OperationsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateEndpointConnectionImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateEndpointConnectionsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateEndpointConnectionsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateLinkResourceImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateLinkResourcesClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateLinkResourcesImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ResourceManagerUtils.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/IntegrationFabricListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/ManagedDashboardListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/ManagedGrafanaListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/ManagedPrivateEndpointModelListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/OperationListResult.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/PrivateEndpointConnectionListResult.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/PrivateLinkResourceListResult.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/models/ActionType.java","src/main/java/com/azure/resourcemanager/dashboard/models/ApiKey.java","src/main/java/com/azure/resourcemanager/dashboard/models/AutoGeneratedDomainNameLabelScope.java","src/main/java/com/azure/resourcemanager/dashboard/models/AvailablePromotion.java","src/main/java/com/azure/resourcemanager/dashboard/models/AzureMonitorWorkspaceIntegration.java","src/main/java/com/azure/resourcemanager/dashboard/models/DeterministicOutboundIp.java","src/main/java/com/azure/resourcemanager/dashboard/models/EnterpriseConfigurations.java","src/main/java/com/azure/resourcemanager/dashboard/models/EnterpriseDetails.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePlugin.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePluginListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaConfigurations.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaIntegrations.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaPlugin.java","src/main/java/com/azure/resourcemanager/dashboard/models/Grafanas.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabric.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabricProperties.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabricPropertiesUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabricUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabrics.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedDashboard.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedDashboardUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedDashboards.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafana.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaProperties.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaPropertiesUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointConnectionState.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointConnectionStatus.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointModel.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpoints.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedServiceIdentity.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedServiceIdentityType.java","src/main/java/com/azure/resourcemanager/dashboard/models/MarketplaceAutoRenew.java","src/main/java/com/azure/resourcemanager/dashboard/models/MarketplaceTrialQuota.java","src/main/java/com/azure/resourcemanager/dashboard/models/Operation.java","src/main/java/com/azure/resourcemanager/dashboard/models/OperationDisplay.java","src/main/java/com/azure/resourcemanager/dashboard/models/Operations.java","src/main/java/com/azure/resourcemanager/dashboard/models/Origin.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpoint.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointConnection.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointConnectionProvisioningState.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointConnections.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointServiceConnectionStatus.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateLinkResource.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateLinkResources.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateLinkServiceConnectionState.java","src/main/java/com/azure/resourcemanager/dashboard/models/ProvisioningState.java","src/main/java/com/azure/resourcemanager/dashboard/models/PublicNetworkAccess.java","src/main/java/com/azure/resourcemanager/dashboard/models/ResourceSku.java","src/main/java/com/azure/resourcemanager/dashboard/models/SaasSubscriptionDetails.java","src/main/java/com/azure/resourcemanager/dashboard/models/Security.java","src/main/java/com/azure/resourcemanager/dashboard/models/Smtp.java","src/main/java/com/azure/resourcemanager/dashboard/models/Snapshots.java","src/main/java/com/azure/resourcemanager/dashboard/models/StartTlsPolicy.java","src/main/java/com/azure/resourcemanager/dashboard/models/SubscriptionTerm.java","src/main/java/com/azure/resourcemanager/dashboard/models/UnifiedAlertingScreenshots.java","src/main/java/com/azure/resourcemanager/dashboard/models/UserAssignedIdentity.java","src/main/java/com/azure/resourcemanager/dashboard/models/Users.java","src/main/java/com/azure/resourcemanager/dashboard/models/ZoneRedundancy.java","src/main/java/com/azure/resourcemanager/dashboard/models/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/package-info.java","src/main/java/module-info.java"]}
\ No newline at end of file
+{"flavor":"azure","apiVersion":"2025-08-01","crossLanguageDefinitions":{"com.azure.resourcemanager.dashboard.fluent.DashboardManagementClient":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.fluent.GrafanasClient":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.beginCreate":"Microsoft.Dashboard.ManagedGrafanas.create","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.beginDelete":"Microsoft.Dashboard.ManagedGrafanas.delete","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.beginUpdate":"Microsoft.Dashboard.ManagedGrafanas.update","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.checkEnterpriseDetails":"Microsoft.Dashboard.ManagedGrafanas.checkEnterpriseDetails","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.checkEnterpriseDetailsWithResponse":"Microsoft.Dashboard.ManagedGrafanas.checkEnterpriseDetails","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.create":"Microsoft.Dashboard.ManagedGrafanas.create","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.delete":"Microsoft.Dashboard.ManagedGrafanas.delete","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.fetchAvailablePlugins":"Microsoft.Dashboard.ManagedGrafanas.fetchAvailablePlugins","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.fetchAvailablePluginsWithResponse":"Microsoft.Dashboard.ManagedGrafanas.fetchAvailablePlugins","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.getByResourceGroup":"Microsoft.Dashboard.ManagedGrafanas.get","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.getByResourceGroupWithResponse":"Microsoft.Dashboard.ManagedGrafanas.get","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.list":"Microsoft.Dashboard.ManagedGrafanas.list","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.listByResourceGroup":"Microsoft.Dashboard.ManagedGrafanas.listByResourceGroup","com.azure.resourcemanager.dashboard.fluent.GrafanasClient.update":"Microsoft.Dashboard.ManagedGrafanas.update","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient":"Microsoft.Dashboard.IntegrationFabrics","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.beginCreate":"Microsoft.Dashboard.IntegrationFabrics.create","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.beginDelete":"Microsoft.Dashboard.IntegrationFabrics.delete","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.beginUpdate":"Microsoft.Dashboard.IntegrationFabrics.update","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.create":"Microsoft.Dashboard.IntegrationFabrics.create","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.delete":"Microsoft.Dashboard.IntegrationFabrics.delete","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.get":"Microsoft.Dashboard.IntegrationFabrics.get","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.getWithResponse":"Microsoft.Dashboard.IntegrationFabrics.get","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.list":"Microsoft.Dashboard.IntegrationFabrics.list","com.azure.resourcemanager.dashboard.fluent.IntegrationFabricsClient.update":"Microsoft.Dashboard.IntegrationFabrics.update","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient":"Microsoft.Dashboard.ManagedDashboards","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.beginCreate":"Microsoft.Dashboard.ManagedDashboards.create","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.create":"Microsoft.Dashboard.ManagedDashboards.create","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.delete":"Microsoft.Dashboard.ManagedDashboards.delete","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.deleteWithResponse":"Microsoft.Dashboard.ManagedDashboards.delete","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.getByResourceGroup":"Microsoft.Dashboard.ManagedDashboards.get","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.getByResourceGroupWithResponse":"Microsoft.Dashboard.ManagedDashboards.get","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.list":"Microsoft.Dashboard.ManagedDashboards.listBySubscription","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.listByResourceGroup":"Microsoft.Dashboard.ManagedDashboards.list","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.update":"Microsoft.Dashboard.ManagedDashboards.update","com.azure.resourcemanager.dashboard.fluent.ManagedDashboardsClient.updateWithResponse":"Microsoft.Dashboard.ManagedDashboards.update","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginCreate":"Microsoft.Dashboard.ManagedPrivateEndpointModels.create","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginDelete":"Microsoft.Dashboard.ManagedPrivateEndpointModels.delete","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginRefresh":"Microsoft.Dashboard.ManagedGrafanas.refresh","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.beginUpdate":"Microsoft.Dashboard.ManagedPrivateEndpointModels.update","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.create":"Microsoft.Dashboard.ManagedPrivateEndpointModels.create","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.delete":"Microsoft.Dashboard.ManagedPrivateEndpointModels.delete","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.get":"Microsoft.Dashboard.ManagedPrivateEndpointModels.get","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.getWithResponse":"Microsoft.Dashboard.ManagedPrivateEndpointModels.get","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.list":"Microsoft.Dashboard.ManagedPrivateEndpointModels.list","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.refresh":"Microsoft.Dashboard.ManagedGrafanas.refresh","com.azure.resourcemanager.dashboard.fluent.ManagedPrivateEndpointsClient.update":"Microsoft.Dashboard.ManagedPrivateEndpointModels.update","com.azure.resourcemanager.dashboard.fluent.OperationsClient":"Microsoft.Dashboard.Operations","com.azure.resourcemanager.dashboard.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient":"Microsoft.Dashboard.PrivateEndpointConnections","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.approve":"Microsoft.Dashboard.PrivateEndpointConnections.approve","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.beginApprove":"Microsoft.Dashboard.PrivateEndpointConnections.approve","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.beginDelete":"Microsoft.Dashboard.PrivateEndpointConnections.delete","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.delete":"Microsoft.Dashboard.PrivateEndpointConnections.delete","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.get":"Microsoft.Dashboard.PrivateEndpointConnections.get","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.getWithResponse":"Microsoft.Dashboard.PrivateEndpointConnections.get","com.azure.resourcemanager.dashboard.fluent.PrivateEndpointConnectionsClient.list":"Microsoft.Dashboard.PrivateEndpointConnections.list","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient":"Microsoft.Dashboard.PrivateLinkResources","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient.get":"Microsoft.Dashboard.PrivateLinkResources.get","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient.getWithResponse":"Microsoft.Dashboard.PrivateLinkResources.get","com.azure.resourcemanager.dashboard.fluent.PrivateLinkResourcesClient.list":"Microsoft.Dashboard.PrivateLinkResources.list","com.azure.resourcemanager.dashboard.fluent.models.EnterpriseDetailsInner":"Microsoft.Dashboard.EnterpriseDetails","com.azure.resourcemanager.dashboard.fluent.models.GrafanaAvailablePluginListResponseInner":"Microsoft.Dashboard.GrafanaAvailablePluginListResponse","com.azure.resourcemanager.dashboard.fluent.models.IntegrationFabricInner":"Microsoft.Dashboard.IntegrationFabric","com.azure.resourcemanager.dashboard.fluent.models.ManagedDashboardInner":"Microsoft.Dashboard.ManagedDashboard","com.azure.resourcemanager.dashboard.fluent.models.ManagedDashboardProperties":"Microsoft.Dashboard.ManagedDashboardProperties","com.azure.resourcemanager.dashboard.fluent.models.ManagedGrafanaInner":"Microsoft.Dashboard.ManagedGrafana","com.azure.resourcemanager.dashboard.fluent.models.ManagedPrivateEndpointModelInner":"Microsoft.Dashboard.ManagedPrivateEndpointModel","com.azure.resourcemanager.dashboard.fluent.models.ManagedPrivateEndpointModelProperties":"Microsoft.Dashboard.ManagedPrivateEndpointModelProperties","com.azure.resourcemanager.dashboard.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","com.azure.resourcemanager.dashboard.fluent.models.PrivateEndpointConnectionInner":"Microsoft.Dashboard.PrivateEndpointConnection","com.azure.resourcemanager.dashboard.fluent.models.PrivateEndpointConnectionProperties":"Microsoft.Dashboard.PrivateEndpointConnectionProperties","com.azure.resourcemanager.dashboard.fluent.models.PrivateLinkResourceInner":"Microsoft.Dashboard.PrivateLinkResource","com.azure.resourcemanager.dashboard.fluent.models.PrivateLinkResourceProperties":"Microsoft.Dashboard.PrivateLinkResourceProperties","com.azure.resourcemanager.dashboard.implementation.DashboardManagementClientBuilder":"Microsoft.Dashboard","com.azure.resourcemanager.dashboard.implementation.models.IntegrationFabricListResponse":"Microsoft.Dashboard.IntegrationFabricListResponse","com.azure.resourcemanager.dashboard.implementation.models.ManagedDashboardListResponse":"Microsoft.Dashboard.ManagedDashboardListResponse","com.azure.resourcemanager.dashboard.implementation.models.ManagedGrafanaListResponse":"Microsoft.Dashboard.ManagedGrafanaListResponse","com.azure.resourcemanager.dashboard.implementation.models.ManagedPrivateEndpointModelListResponse":"Microsoft.Dashboard.ManagedPrivateEndpointModelListResponse","com.azure.resourcemanager.dashboard.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","com.azure.resourcemanager.dashboard.implementation.models.PrivateEndpointConnectionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.dashboard.implementation.models.PrivateLinkResourceListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.dashboard.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","com.azure.resourcemanager.dashboard.models.ApiKey":"Microsoft.Dashboard.ApiKey","com.azure.resourcemanager.dashboard.models.AutoGeneratedDomainNameLabelScope":"Microsoft.Dashboard.AutoGeneratedDomainNameLabelScope","com.azure.resourcemanager.dashboard.models.AvailablePromotion":"Microsoft.Dashboard.AvailablePromotion","com.azure.resourcemanager.dashboard.models.AzureMonitorWorkspaceIntegration":"Microsoft.Dashboard.AzureMonitorWorkspaceIntegration","com.azure.resourcemanager.dashboard.models.CreatorCanAdmin":"Microsoft.Dashboard.CreatorCanAdmin","com.azure.resourcemanager.dashboard.models.DeterministicOutboundIp":"Microsoft.Dashboard.DeterministicOutboundIP","com.azure.resourcemanager.dashboard.models.EnterpriseConfigurations":"Microsoft.Dashboard.EnterpriseConfigurations","com.azure.resourcemanager.dashboard.models.GrafanaAvailablePlugin":"Microsoft.Dashboard.GrafanaAvailablePlugin","com.azure.resourcemanager.dashboard.models.GrafanaConfigurations":"Microsoft.Dashboard.GrafanaConfigurations","com.azure.resourcemanager.dashboard.models.GrafanaIntegrations":"Microsoft.Dashboard.GrafanaIntegrations","com.azure.resourcemanager.dashboard.models.GrafanaPlugin":"Microsoft.Dashboard.GrafanaPlugin","com.azure.resourcemanager.dashboard.models.IntegrationFabricProperties":"Microsoft.Dashboard.IntegrationFabricProperties","com.azure.resourcemanager.dashboard.models.IntegrationFabricPropertiesUpdateParameters":"Microsoft.Dashboard.IntegrationFabricPropertiesUpdateParameters","com.azure.resourcemanager.dashboard.models.IntegrationFabricUpdateParameters":"Microsoft.Dashboard.IntegrationFabricUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedDashboardUpdateParameters":"Microsoft.Dashboard.ManagedDashboardUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedGrafanaProperties":"Microsoft.Dashboard.ManagedGrafanaProperties","com.azure.resourcemanager.dashboard.models.ManagedGrafanaPropertiesUpdateParameters":"Microsoft.Dashboard.ManagedGrafanaPropertiesUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedGrafanaUpdateParameters":"Microsoft.Dashboard.ManagedGrafanaUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedPrivateEndpointConnectionState":"Microsoft.Dashboard.ManagedPrivateEndpointConnectionState","com.azure.resourcemanager.dashboard.models.ManagedPrivateEndpointConnectionStatus":"Microsoft.Dashboard.ManagedPrivateEndpointConnectionStatus","com.azure.resourcemanager.dashboard.models.ManagedPrivateEndpointUpdateParameters":"Microsoft.Dashboard.ManagedPrivateEndpointUpdateParameters","com.azure.resourcemanager.dashboard.models.ManagedServiceIdentity":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentity","com.azure.resourcemanager.dashboard.models.ManagedServiceIdentityType":"Azure.ResourceManager.CommonTypes.ManagedServiceIdentityType","com.azure.resourcemanager.dashboard.models.MarketplaceAutoRenew":"Microsoft.Dashboard.MarketplaceAutoRenew","com.azure.resourcemanager.dashboard.models.MarketplaceTrialQuota":"Microsoft.Dashboard.MarketplaceTrialQuota","com.azure.resourcemanager.dashboard.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","com.azure.resourcemanager.dashboard.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","com.azure.resourcemanager.dashboard.models.PrivateEndpoint":"Azure.ResourceManager.CommonTypes.PrivateEndpoint","com.azure.resourcemanager.dashboard.models.PrivateEndpointConnectionProvisioningState":"Azure.ResourceManager.CommonTypes.PrivateEndpointConnectionProvisioningState","com.azure.resourcemanager.dashboard.models.PrivateEndpointServiceConnectionStatus":"Azure.ResourceManager.CommonTypes.PrivateEndpointServiceConnectionStatus","com.azure.resourcemanager.dashboard.models.PrivateLinkServiceConnectionState":"Azure.ResourceManager.CommonTypes.PrivateLinkServiceConnectionState","com.azure.resourcemanager.dashboard.models.ProvisioningState":"Microsoft.Dashboard.ProvisioningState","com.azure.resourcemanager.dashboard.models.PublicNetworkAccess":"Microsoft.Dashboard.PublicNetworkAccess","com.azure.resourcemanager.dashboard.models.ResourceSku":"Microsoft.Dashboard.ResourceSku","com.azure.resourcemanager.dashboard.models.SaasSubscriptionDetails":"Microsoft.Dashboard.SaasSubscriptionDetails","com.azure.resourcemanager.dashboard.models.Security":"Microsoft.Dashboard.Security","com.azure.resourcemanager.dashboard.models.Size":"Microsoft.Dashboard.Size","com.azure.resourcemanager.dashboard.models.Smtp":"Microsoft.Dashboard.Smtp","com.azure.resourcemanager.dashboard.models.Snapshots":"Microsoft.Dashboard.Snapshots","com.azure.resourcemanager.dashboard.models.StartTlsPolicy":"Microsoft.Dashboard.StartTLSPolicy","com.azure.resourcemanager.dashboard.models.SubscriptionTerm":"Microsoft.Dashboard.SubscriptionTerm","com.azure.resourcemanager.dashboard.models.UnifiedAlertingScreenshots":"Microsoft.Dashboard.UnifiedAlertingScreenshots","com.azure.resourcemanager.dashboard.models.UserAssignedIdentity":"Azure.ResourceManager.CommonTypes.UserAssignedIdentity","com.azure.resourcemanager.dashboard.models.Users":"Microsoft.Dashboard.Users","com.azure.resourcemanager.dashboard.models.ZoneRedundancy":"Microsoft.Dashboard.ZoneRedundancy"},"generatedFiles":["src/main/java/com/azure/resourcemanager/dashboard/DashboardManager.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/DashboardManagementClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/GrafanasClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/IntegrationFabricsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/ManagedDashboardsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/ManagedPrivateEndpointsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/OperationsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/PrivateEndpointConnectionsClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/PrivateLinkResourcesClient.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/EnterpriseDetailsInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/GrafanaAvailablePluginListResponseInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/IntegrationFabricInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedDashboardInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedDashboardProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedGrafanaInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedPrivateEndpointModelInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/ManagedPrivateEndpointModelProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/OperationInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateEndpointConnectionInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateEndpointConnectionProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateLinkResourceInner.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/PrivateLinkResourceProperties.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/models/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/fluent/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientBuilder.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/DashboardManagementClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/EnterpriseDetailsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/GrafanaAvailablePluginListResponseImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/GrafanasClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/GrafanasImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/IntegrationFabricImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/IntegrationFabricsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/IntegrationFabricsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedDashboardImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedDashboardsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedDashboardsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedGrafanaImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedPrivateEndpointModelImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedPrivateEndpointsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ManagedPrivateEndpointsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/OperationImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/OperationsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/OperationsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateEndpointConnectionImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateEndpointConnectionsClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateEndpointConnectionsImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateLinkResourceImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateLinkResourcesClientImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/PrivateLinkResourcesImpl.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/ResourceManagerUtils.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/IntegrationFabricListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/ManagedDashboardListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/ManagedGrafanaListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/ManagedPrivateEndpointModelListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/OperationListResult.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/PrivateEndpointConnectionListResult.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/models/PrivateLinkResourceListResult.java","src/main/java/com/azure/resourcemanager/dashboard/implementation/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/models/ActionType.java","src/main/java/com/azure/resourcemanager/dashboard/models/ApiKey.java","src/main/java/com/azure/resourcemanager/dashboard/models/AutoGeneratedDomainNameLabelScope.java","src/main/java/com/azure/resourcemanager/dashboard/models/AvailablePromotion.java","src/main/java/com/azure/resourcemanager/dashboard/models/AzureMonitorWorkspaceIntegration.java","src/main/java/com/azure/resourcemanager/dashboard/models/CreatorCanAdmin.java","src/main/java/com/azure/resourcemanager/dashboard/models/DeterministicOutboundIp.java","src/main/java/com/azure/resourcemanager/dashboard/models/EnterpriseConfigurations.java","src/main/java/com/azure/resourcemanager/dashboard/models/EnterpriseDetails.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePlugin.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaAvailablePluginListResponse.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaConfigurations.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaIntegrations.java","src/main/java/com/azure/resourcemanager/dashboard/models/GrafanaPlugin.java","src/main/java/com/azure/resourcemanager/dashboard/models/Grafanas.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabric.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabricProperties.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabricPropertiesUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabricUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/IntegrationFabrics.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedDashboard.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedDashboardUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedDashboards.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafana.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaProperties.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaPropertiesUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedGrafanaUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointConnectionState.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointConnectionStatus.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointModel.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpointUpdateParameters.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedPrivateEndpoints.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedServiceIdentity.java","src/main/java/com/azure/resourcemanager/dashboard/models/ManagedServiceIdentityType.java","src/main/java/com/azure/resourcemanager/dashboard/models/MarketplaceAutoRenew.java","src/main/java/com/azure/resourcemanager/dashboard/models/MarketplaceTrialQuota.java","src/main/java/com/azure/resourcemanager/dashboard/models/Operation.java","src/main/java/com/azure/resourcemanager/dashboard/models/OperationDisplay.java","src/main/java/com/azure/resourcemanager/dashboard/models/Operations.java","src/main/java/com/azure/resourcemanager/dashboard/models/Origin.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpoint.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointConnection.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointConnectionProvisioningState.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointConnections.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateEndpointServiceConnectionStatus.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateLinkResource.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateLinkResources.java","src/main/java/com/azure/resourcemanager/dashboard/models/PrivateLinkServiceConnectionState.java","src/main/java/com/azure/resourcemanager/dashboard/models/ProvisioningState.java","src/main/java/com/azure/resourcemanager/dashboard/models/PublicNetworkAccess.java","src/main/java/com/azure/resourcemanager/dashboard/models/ResourceSku.java","src/main/java/com/azure/resourcemanager/dashboard/models/SaasSubscriptionDetails.java","src/main/java/com/azure/resourcemanager/dashboard/models/Security.java","src/main/java/com/azure/resourcemanager/dashboard/models/Size.java","src/main/java/com/azure/resourcemanager/dashboard/models/Smtp.java","src/main/java/com/azure/resourcemanager/dashboard/models/Snapshots.java","src/main/java/com/azure/resourcemanager/dashboard/models/StartTlsPolicy.java","src/main/java/com/azure/resourcemanager/dashboard/models/SubscriptionTerm.java","src/main/java/com/azure/resourcemanager/dashboard/models/UnifiedAlertingScreenshots.java","src/main/java/com/azure/resourcemanager/dashboard/models/UserAssignedIdentity.java","src/main/java/com/azure/resourcemanager/dashboard/models/Users.java","src/main/java/com/azure/resourcemanager/dashboard/models/ZoneRedundancy.java","src/main/java/com/azure/resourcemanager/dashboard/models/package-info.java","src/main/java/com/azure/resourcemanager/dashboard/package-info.java","src/main/java/module-info.java"]}
\ No newline at end of file
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCheckEnterpriseDetailsSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCheckEnterpriseDetailsSamples.java
index ae48a8facabd..d44fadb3931f 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCheckEnterpriseDetailsSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCheckEnterpriseDetailsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GrafanaCheckEnterpriseDetailsSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/EnterpriseDetails_Post.json
+     * x-ms-original-file: 2025-08-01/EnterpriseDetails_Post.json
      */
     /**
      * Sample code: EnterpriseDetails_Post.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCreateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCreateSamples.java
index df88caaf077d..e1404ef3b6c6 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCreateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaCreateSamples.java
@@ -33,7 +33,7 @@
  */
 public final class GrafanaCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Create.json
+     * x-ms-original-file: 2025-08-01/Grafana_Create.json
      */
     /**
      * Sample code: Grafana_Create.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaDeleteSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaDeleteSamples.java
index 7df2679273ea..57d9a582e0eb 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaDeleteSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GrafanaDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Delete.json
+     * x-ms-original-file: 2025-08-01/Grafana_Delete.json
      */
     /**
      * Sample code: Grafana_Delete.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaFetchAvailablePluginsSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaFetchAvailablePluginsSamples.java
index 2fcd7493444e..689520acf008 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaFetchAvailablePluginsSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaFetchAvailablePluginsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GrafanaFetchAvailablePluginsSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_FetchAvailablePlugins.json
+     * x-ms-original-file: 2025-08-01/Grafana_FetchAvailablePlugins.json
      */
     /**
      * Sample code: Grafana_FetchAvailablePlugins.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaGetByResourceGroupSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaGetByResourceGroupSamples.java
index d08a5c8a305d..7e5ae761b6a1 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaGetByResourceGroupSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GrafanaGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Get.json
+     * x-ms-original-file: 2025-08-01/Grafana_Get.json
      */
     /**
      * Sample code: Grafana_Get.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListByResourceGroupSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListByResourceGroupSamples.java
index b147544550ae..933d0d1dd1d1 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListByResourceGroupSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GrafanaListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_ListByResourceGroup.json
+     * x-ms-original-file: 2025-08-01/Grafana_ListByResourceGroup.json
      */
     /**
      * Sample code: Grafana_ListByResourceGroup.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListSamples.java
index 4fe82f5eb584..6adf0742699b 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GrafanaListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_List.json
+     * x-ms-original-file: 2025-08-01/Grafana_List.json
      */
     /**
      * Sample code: Grafana_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaUpdateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaUpdateSamples.java
index 8a290f6072ff..abbf33c8e018 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaUpdateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/GrafanaUpdateSamples.java
@@ -30,7 +30,7 @@
  */
 public final class GrafanaUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Grafana_Update.json
+     * x-ms-original-file: 2025-08-01/Grafana_Update.json
      */
     /**
      * Sample code: Grafana_Update.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateSamples.java
index 4c1550479ec3..359c1e4179bd 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class IntegrationFabricsCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Create.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Create.json
      */
     /**
      * Sample code: IntegrationFabrics_Create.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsDeleteSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsDeleteSamples.java
index f46fec23905e..057d00a31cca 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsDeleteSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class IntegrationFabricsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Delete.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Delete.json
      */
     /**
      * Sample code: IntegrationFabrics_Delete.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetSamples.java
index b46b93e1f97f..df1105132b47 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class IntegrationFabricsGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Get.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Get.json
      */
     /**
      * Sample code: IntegrationFabrics_Get.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListSamples.java
index 9f04f7f71381..c185ce3ff3ca 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class IntegrationFabricsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_List.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_List.json
      */
     /**
      * Sample code: IntegrationFabrics_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsUpdateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsUpdateSamples.java
index 7f7fdf483ace..6923c4053e71 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsUpdateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsUpdateSamples.java
@@ -15,7 +15,7 @@
  */
 public final class IntegrationFabricsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/IntegrationFabrics_Update.json
+     * x-ms-original-file: 2025-08-01/IntegrationFabrics_Update.json
      */
     /**
      * Sample code: IntegrationFabrics_Update.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateSamples.java
index 585f8214d436..4a91277992b9 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class ManagedDashboardsCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Create.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Create.json
      */
     /**
      * Sample code: Dashboard_Create.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteSamples.java
index d7281f1a26c2..1ed8ea17e499 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedDashboardsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Delete.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Delete.json
      */
     /**
      * Sample code: Dashboard_Delete.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupSamples.java
index dda564ae7364..04619e86dd39 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedDashboardsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Get.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Get.json
      */
     /**
      * Sample code: Dashboard_Get.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupSamples.java
index 7e40178776d3..a16c66dc6b89 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedDashboardsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_ListByResourceGroup.json
+     * x-ms-original-file: 2025-08-01/Dashboard_ListByResourceGroup.json
      */
     /**
      * Sample code: Dashboard_ListByResourceGroup.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListSamples.java
index 32da9061f9d1..16883026c414 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedDashboardsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_List.json
+     * x-ms-original-file: 2025-08-01/Dashboard_List.json
      */
     /**
      * Sample code: Dashboard_ListByResourceGroup.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsUpdateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsUpdateSamples.java
index 9b2f2fe3f1d2..10f4862c14c0 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsUpdateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ManagedDashboardsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Dashboard_Update.json
+     * x-ms-original-file: 2025-08-01/Dashboard_Update.json
      */
     /**
      * Sample code: Dashboard_Update.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateSamples.java
index b161be4da931..79324013e19e 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ManagedPrivateEndpointsCreateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Create.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Create.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Create.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteSamples.java
index 65eeb96449d7..7e4e822c9081 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedPrivateEndpointsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Delete.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Delete.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Delete.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetSamples.java
index ac3ff9ee0f22..ed38c72398e3 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedPrivateEndpointsGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Get.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Get.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Get.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListSamples.java
index 4566cf2ae1ca..4819b45d2b73 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedPrivateEndpointsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_List.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_List.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshSamples.java
index d12768a8e103..b51843fd5b32 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagedPrivateEndpointsRefreshSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Refresh.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Refresh.json
      */
     /**
      * Sample code: ManagedPrivateEndpoint_Refresh.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsUpdateSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsUpdateSamples.java
index 82cf8c13b68f..d380cc9814d5 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsUpdateSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ManagedPrivateEndpointsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/ManagedPrivateEndpoints_Patch.json
+     * x-ms-original-file: 2025-08-01/ManagedPrivateEndpoints_Patch.json
      */
     /**
      * Sample code: ManagedPrivateEndpoints_Patch.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/OperationsListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/OperationsListSamples.java
index 298af23a6cfe..b77111f4408e 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/OperationsListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/OperationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/Operations_List.json
+     * x-ms-original-file: 2025-08-01/Operations_List.json
      */
     /**
      * Sample code: Operations_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsApproveSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsApproveSamples.java
index 3ac0c6e2bac1..55283a6d98a6 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsApproveSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsApproveSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateEndpointConnectionsApproveSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_Approve.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_Approve.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Approve.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsDeleteSamples.java
index 1cda7cf43ac7..5d12fb40480a 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_Delete.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_Delete.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Delete.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetSamples.java
index 126ce967d79c..b7af9b3353cc 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateEndpointConnectionsGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_Get.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_Get.json
      */
     /**
      * Sample code: PrivateEndpointConnections_Get.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListSamples.java
index ebe4010a13dd..321823cc98ff 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateEndpointConnectionsListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateEndpointConnections_List.json
+     * x-ms-original-file: 2025-08-01/PrivateEndpointConnections_List.json
      */
     /**
      * Sample code: PrivateEndpointConnections_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetSamples.java
index f93707d7e922..65b9a2aff0d3 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkResourcesGetSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateLinkResources_Get.json
+     * x-ms-original-file: 2025-08-01/PrivateLinkResources_Get.json
      */
     /**
      * Sample code: PrivateLinkResources_Get.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListSamples.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListSamples.java
index 8eedb148c136..c8fc3e38337f 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListSamples.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/samples/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkResourcesListSamples {
     /*
-     * x-ms-original-file: 2024-11-01-preview/PrivateLinkResources_List.json
+     * x-ms-original-file: 2025-08-01/PrivateLinkResources_List.json
      */
     /**
      * Sample code: PrivateLinkResources_List.
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/EnterpriseDetailsInnerTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/EnterpriseDetailsInnerTests.java
index b2e83833ac94..ec2052aa5169 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/EnterpriseDetailsInnerTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/EnterpriseDetailsInnerTests.java
@@ -14,21 +14,21 @@ public final class EnterpriseDetailsInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         EnterpriseDetailsInner model = BinaryData.fromString(
-            "{\"saasSubscriptionDetails\":{\"planId\":\"whybcib\",\"offerId\":\"vdcsitynn\",\"publisherId\":\"mdectehfiqscjey\",\"term\":{\"termUnit\":\"ezrkgqhcjrefo\",\"startDate\":\"2021-06-07T02:58Z\",\"endDate\":\"2021-10-26T09:37:04Z\"}},\"marketplaceTrialQuota\":{\"availablePromotion\":\"FreeTrial\",\"grafanaResourceId\":\"yvxyqjp\",\"trialStartAt\":\"2021-02-23T18:47:42Z\",\"trialEndAt\":\"2021-11-05T17:27:55Z\"}}")
+            "{\"saasSubscriptionDetails\":{\"planId\":\"acfta\",\"offerId\":\"h\",\"publisherId\":\"ltyfsop\",\"term\":{\"termUnit\":\"uesnzwdejbavo\",\"startDate\":\"2021-09-27T19:00:57Z\",\"endDate\":\"2021-03-31T13:31:51Z\"}},\"marketplaceTrialQuota\":{\"availablePromotion\":\"FreeTrial\",\"grafanaResourceId\":\"bqvudwxdndn\",\"trialStartAt\":\"2021-04-03T23:08:08Z\",\"trialEndAt\":\"2021-02-13T18:55:04Z\"}}")
             .toObject(EnterpriseDetailsInner.class);
-        Assertions.assertEquals("whybcib", model.saasSubscriptionDetails().planId());
-        Assertions.assertEquals("vdcsitynn", model.saasSubscriptionDetails().offerId());
-        Assertions.assertEquals("mdectehfiqscjey", model.saasSubscriptionDetails().publisherId());
-        Assertions.assertEquals("ezrkgqhcjrefo", model.saasSubscriptionDetails().term().termUnit());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-06-07T02:58Z"),
+        Assertions.assertEquals("acfta", model.saasSubscriptionDetails().planId());
+        Assertions.assertEquals("h", model.saasSubscriptionDetails().offerId());
+        Assertions.assertEquals("ltyfsop", model.saasSubscriptionDetails().publisherId());
+        Assertions.assertEquals("uesnzwdejbavo", model.saasSubscriptionDetails().term().termUnit());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-27T19:00:57Z"),
             model.saasSubscriptionDetails().term().startDate());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-26T09:37:04Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-03-31T13:31:51Z"),
             model.saasSubscriptionDetails().term().endDate());
         Assertions.assertEquals(AvailablePromotion.FREE_TRIAL, model.marketplaceTrialQuota().availablePromotion());
-        Assertions.assertEquals("yvxyqjp", model.marketplaceTrialQuota().grafanaResourceId());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-02-23T18:47:42Z"),
+        Assertions.assertEquals("bqvudwxdndn", model.marketplaceTrialQuota().grafanaResourceId());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-04-03T23:08:08Z"),
             model.marketplaceTrialQuota().trialStartAt());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-05T17:27:55Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-02-13T18:55:04Z"),
             model.marketplaceTrialQuota().trialEndAt());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginListResponseInnerTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginListResponseInnerTests.java
index f6d8bdfdd36e..c9f7b3f0daaf 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginListResponseInnerTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginListResponseInnerTests.java
@@ -12,8 +12,8 @@ public final class GrafanaAvailablePluginListResponseInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GrafanaAvailablePluginListResponseInner model = BinaryData.fromString(
-            "{\"value\":[{\"pluginId\":\"zydagfuaxbezyiuo\",\"name\":\"twhrdxwzywqsm\"},{\"pluginId\":\"ureximoryocfs\",\"name\":\"s\"},{\"pluginId\":\"ddystkiiuxhqy\",\"name\":\"xorrqnb\"},{\"pluginId\":\"czvyifq\",\"name\":\"kdvjsll\"}],\"nextLink\":\"vvdfwatkpnpul\"}")
+            "{\"value\":[{\"pluginId\":\"qsc\",\"name\":\"ypvhezrkg\",\"type\":\"c\",\"author\":\"efovgmk\"}],\"nextLink\":\"leyyvx\"}")
             .toObject(GrafanaAvailablePluginListResponseInner.class);
-        Assertions.assertEquals("vvdfwatkpnpul", model.nextLink());
+        Assertions.assertEquals("leyyvx", model.nextLink());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginTests.java
index d8ae2b57ae4b..b076c59b6911 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanaAvailablePluginTests.java
@@ -10,7 +10,9 @@
 public final class GrafanaAvailablePluginTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        GrafanaAvailablePlugin model = BinaryData.fromString("{\"pluginId\":\"xbczwtruwiqz\",\"name\":\"j\"}")
+        GrafanaAvailablePlugin model = BinaryData
+            .fromString(
+                "{\"pluginId\":\"jpkcattpng\",\"name\":\"rcczsqpjhvmd\",\"type\":\"v\",\"author\":\"sounqecanoaeu\"}")
             .toObject(GrafanaAvailablePlugin.class);
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasCheckEnterpriseDetailsWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasCheckEnterpriseDetailsWithResponseMockTests.java
index 89a707ac7e8f..895fd68846b3 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasCheckEnterpriseDetailsWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasCheckEnterpriseDetailsWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class GrafanasCheckEnterpriseDetailsWithResponseMockTests {
     @Test
     public void testCheckEnterpriseDetailsWithResponse() throws Exception {
         String responseStr
-            = "{\"saasSubscriptionDetails\":{\"planId\":\"gccymvaolpssl\",\"offerId\":\"fmmdnbbg\",\"publisherId\":\"pswiydmcwyh\",\"term\":{\"termUnit\":\"ss\",\"startDate\":\"2021-03-20T02:21:45Z\",\"endDate\":\"2021-10-15T22:28:47Z\"}},\"marketplaceTrialQuota\":{\"availablePromotion\":\"FreeTrial\",\"grafanaResourceId\":\"znud\",\"trialStartAt\":\"2021-05-14T14:21:36Z\",\"trialEndAt\":\"2021-09-27T09:43:19Z\"}}";
+            = "{\"saasSubscriptionDetails\":{\"planId\":\"fznudaodvxzb\",\"offerId\":\"blylpstdbh\",\"publisherId\":\"srzdzucerscdn\",\"term\":{\"termUnit\":\"vfiwjmygtdss\",\"startDate\":\"2021-07-17T08:24:42Z\",\"endDate\":\"2021-06-02T21:20:03Z\"}},\"marketplaceTrialQuota\":{\"availablePromotion\":\"FreeTrial\",\"grafanaResourceId\":\"ofz\",\"trialStartAt\":\"2021-06-08T10:58:30Z\",\"trialEndAt\":\"2021-02-21T22:13:10Z\"}}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,22 +32,22 @@ public void testCheckEnterpriseDetailsWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         EnterpriseDetails response = manager.grafanas()
-            .checkEnterpriseDetailsWithResponse("lbg", "cdui", com.azure.core.util.Context.NONE)
+            .checkEnterpriseDetailsWithResponse("zdxss", "dbzm", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("gccymvaolpssl", response.saasSubscriptionDetails().planId());
-        Assertions.assertEquals("fmmdnbbg", response.saasSubscriptionDetails().offerId());
-        Assertions.assertEquals("pswiydmcwyh", response.saasSubscriptionDetails().publisherId());
-        Assertions.assertEquals("ss", response.saasSubscriptionDetails().term().termUnit());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-20T02:21:45Z"),
+        Assertions.assertEquals("fznudaodvxzb", response.saasSubscriptionDetails().planId());
+        Assertions.assertEquals("blylpstdbh", response.saasSubscriptionDetails().offerId());
+        Assertions.assertEquals("srzdzucerscdn", response.saasSubscriptionDetails().publisherId());
+        Assertions.assertEquals("vfiwjmygtdss", response.saasSubscriptionDetails().term().termUnit());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-17T08:24:42Z"),
             response.saasSubscriptionDetails().term().startDate());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-15T22:28:47Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-02T21:20:03Z"),
             response.saasSubscriptionDetails().term().endDate());
         Assertions.assertEquals(AvailablePromotion.FREE_TRIAL, response.marketplaceTrialQuota().availablePromotion());
-        Assertions.assertEquals("znud", response.marketplaceTrialQuota().grafanaResourceId());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-14T14:21:36Z"),
+        Assertions.assertEquals("ofz", response.marketplaceTrialQuota().grafanaResourceId());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-08T10:58:30Z"),
             response.marketplaceTrialQuota().trialStartAt());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-27T09:43:19Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-02-21T22:13:10Z"),
             response.marketplaceTrialQuota().trialEndAt());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasDeleteMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasDeleteMockTests.java
index ebb798e9d4c9..0f7ee17aaafe 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasDeleteMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasDeleteMockTests.java
@@ -27,7 +27,7 @@ public void testDelete() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.grafanas().delete("vwpm", "taruoujmkcj", com.azure.core.util.Context.NONE);
+        manager.grafanas().delete("eh", "ndoygmifthnzdnd", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasFetchAvailablePluginsWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasFetchAvailablePluginsWithResponseMockTests.java
index 8363854fd3a1..934cf3a10415 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasFetchAvailablePluginsWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/GrafanasFetchAvailablePluginsWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class GrafanasFetchAvailablePluginsWithResponseMockTests {
     @Test
     public void testFetchAvailablePluginsWithResponse() throws Exception {
         String responseStr
-            = "{\"value\":[{\"pluginId\":\"zdzucerscdntnevf\",\"name\":\"jmygtdsslswtmwer\"},{\"pluginId\":\"fzp\",\"name\":\"semwabnet\"},{\"pluginId\":\"hszhedplvwiwu\",\"name\":\"wmbesldnkw\"},{\"pluginId\":\"pp\",\"name\":\"lcxog\"}],\"nextLink\":\"konzmnsik\"}";
+            = "{\"value\":[{\"pluginId\":\"tppjflcx\",\"name\":\"aokonzmnsik\",\"type\":\"kqze\",\"author\":\"kdltfzxmhhvhg\"},{\"pluginId\":\"eodkwobda\",\"name\":\"tibqdxbxwakb\",\"type\":\"qxn\",\"author\":\"kzgxhurip\"}],\"nextLink\":\"podxunkb\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,9 +31,9 @@ public void testFetchAvailablePluginsWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         GrafanaAvailablePluginListResponse response = manager.grafanas()
-            .fetchAvailablePluginsWithResponse("zbn", "blylpstdbh", com.azure.core.util.Context.NONE)
+            .fetchAvailablePluginsWithResponse("mwabnetshhszhedp", "vwiwubmwmbesld", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("konzmnsik", response.nextLink());
+        Assertions.assertEquals("podxunkb", response.nextLink());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateMockTests.java
index a77414fa110e..bc196cde34cc 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsCreateMockTests.java
@@ -25,7 +25,7 @@ public final class IntegrationFabricsCreateMockTests {
     @Test
     public void testCreate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"targetResourceId\":\"ow\",\"dataSourceResourceId\":\"przqlveu\",\"scenarios\":[\"pjmkhfxobbc\"]},\"location\":\"s\",\"tags\":{\"fgb\":\"riplrbpbewtg\",\"wxzvlvqhjkb\":\"c\",\"iebwwaloayqcgwrt\":\"gibtnm\",\"zg\":\"j\"},\"id\":\"yzm\",\"name\":\"txon\",\"type\":\"mtsavjcbpwxqp\"}";
+            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"targetResourceId\":\"obbc\",\"dataSourceResourceId\":\"s\",\"scenarios\":[\"riplrbpbewtg\",\"fgb\",\"c\",\"wxzvlvqhjkb\"]},\"location\":\"ibtnmxiebwwaloay\",\"tags\":{\"uzgwyzmhtx\":\"wrtz\",\"wxqpsrknftguvri\":\"ngmtsavjcb\"},\"id\":\"hprwmdyv\",\"name\":\"qtayri\",\"type\":\"wroyqbexrmcq\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -35,20 +35,20 @@ public void testCreate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         IntegrationFabric response = manager.integrationFabrics()
-            .define("xcug")
-            .withRegion("ni")
-            .withExistingGrafana("urqhaka", "hashsfwxosow")
-            .withTags(mapOf("cg", "fbkp"))
-            .withProperties(new IntegrationFabricProperties().withTargetResourceId("xdje")
-                .withDataSourceResourceId("pucwwfvovbvme")
-                .withScenarios(Arrays.asList("ivyhzceuojgjrwju", "iotwmcdytdxwit", "nrjawgqwg")))
+            .define("urqhaka")
+            .withRegion("rw")
+            .withExistingGrafana("bnbbeldawkz", "ali")
+            .withTags(mapOf("nrjawgqwg", "iotwmcdytdxwit", "klwndnhjdauwhv", "hniskxfbkpyc", "zbtd", "l"))
+            .withProperties(new IntegrationFabricProperties().withTargetResourceId("sfwxosowzxc")
+                .withDataSourceResourceId("i")
+                .withScenarios(Arrays.asList("oxdjebwpuc", "wfvovbv", "euecivyhzceuoj")))
             .create();
 
-        Assertions.assertEquals("s", response.location());
-        Assertions.assertEquals("riplrbpbewtg", response.tags().get("fgb"));
-        Assertions.assertEquals("ow", response.properties().targetResourceId());
-        Assertions.assertEquals("przqlveu", response.properties().dataSourceResourceId());
-        Assertions.assertEquals("pjmkhfxobbc", response.properties().scenarios().get(0));
+        Assertions.assertEquals("ibtnmxiebwwaloay", response.location());
+        Assertions.assertEquals("wrtz", response.tags().get("uzgwyzmhtx"));
+        Assertions.assertEquals("obbc", response.properties().targetResourceId());
+        Assertions.assertEquals("s", response.properties().dataSourceResourceId());
+        Assertions.assertEquals("riplrbpbewtg", response.properties().scenarios().get(0));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetWithResponseMockTests.java
index 2861ef2c80ad..6cb7046de107 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class IntegrationFabricsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Canceled\",\"targetResourceId\":\"dhbt\",\"dataSourceResourceId\":\"phywpnvj\",\"scenarios\":[\"nermcl\",\"plpho\",\"uscrpabgyepsb\",\"tazqugxywpmueefj\"]},\"location\":\"fqkquj\",\"tags\":{\"xtccmg\":\"uyonobglaoc\",\"wfudwpzntxhdzhl\":\"udxytlmoyrx\",\"hckfrlhrx\":\"qj\",\"ca\":\"bkyvp\"},\"id\":\"uzbpzkafku\",\"name\":\"b\",\"type\":\"rnwb\"}";
+            = "{\"properties\":{\"provisioningState\":\"Creating\",\"targetResourceId\":\"wpn\",\"dataSourceResourceId\":\"t\",\"scenarios\":[\"ermclfplphoxuscr\",\"abgy\"]},\"location\":\"sbj\",\"tags\":{\"kqujidsuyono\":\"qugxywpmueefjzwf\"},\"id\":\"glaocq\",\"name\":\"tcc\",\"type\":\"g\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,13 +31,13 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         IntegrationFabric response = manager.integrationFabrics()
-            .getWithResponse("cykvceo", "eil", "vnotyfjfcnj", com.azure.core.util.Context.NONE)
+            .getWithResponse("fcnj", "k", "nxdhbt", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("fqkquj", response.location());
-        Assertions.assertEquals("uyonobglaoc", response.tags().get("xtccmg"));
-        Assertions.assertEquals("dhbt", response.properties().targetResourceId());
-        Assertions.assertEquals("phywpnvj", response.properties().dataSourceResourceId());
-        Assertions.assertEquals("nermcl", response.properties().scenarios().get(0));
+        Assertions.assertEquals("sbj", response.location());
+        Assertions.assertEquals("qugxywpmueefjzwf", response.tags().get("kqujidsuyono"));
+        Assertions.assertEquals("wpn", response.properties().targetResourceId());
+        Assertions.assertEquals("t", response.properties().dataSourceResourceId());
+        Assertions.assertEquals("ermclfplphoxuscr", response.properties().scenarios().get(0));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListMockTests.java
index 9315b95146f8..530c60b51eca 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/IntegrationFabricsListMockTests.java
@@ -22,7 +22,7 @@ public final class IntegrationFabricsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Failed\",\"targetResourceId\":\"kv\",\"dataSourceResourceId\":\"elmqk\",\"scenarios\":[\"hvljuahaquh\",\"dhmdua\",\"aex\"]},\"location\":\"vfadmws\",\"tags\":{\"gomz\":\"gvxp\"},\"id\":\"fmisg\",\"name\":\"bnbbeldawkz\",\"type\":\"ali\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"NotSpecified\",\"targetResourceId\":\"ck\",\"dataSourceResourceId\":\"lhrxsbkyvpyc\",\"scenarios\":[\"z\",\"p\",\"kafkuwbcrnwbm\"]},\"location\":\"hseyvju\",\"tags\":{\"kdeemaofmxagkvtm\":\"slhs\",\"ahaquh\":\"lmqkrhahvlj\",\"aex\":\"dhmdua\"},\"id\":\"pvfadmwsrcr\",\"name\":\"vxpvgomz\",\"type\":\"fmisg\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,12 +32,12 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<IntegrationFabric> response
-            = manager.integrationFabrics().list("ehhseyvjusrts", "hspkdeemao", com.azure.core.util.Context.NONE);
+            = manager.integrationFabrics().list("udxytlmoyrx", "wfudwpzntxhdzhl", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("vfadmws", response.iterator().next().location());
-        Assertions.assertEquals("gvxp", response.iterator().next().tags().get("gomz"));
-        Assertions.assertEquals("kv", response.iterator().next().properties().targetResourceId());
-        Assertions.assertEquals("elmqk", response.iterator().next().properties().dataSourceResourceId());
-        Assertions.assertEquals("hvljuahaquh", response.iterator().next().properties().scenarios().get(0));
+        Assertions.assertEquals("hseyvju", response.iterator().next().location());
+        Assertions.assertEquals("slhs", response.iterator().next().tags().get("kdeemaofmxagkvtm"));
+        Assertions.assertEquals("ck", response.iterator().next().properties().targetResourceId());
+        Assertions.assertEquals("lhrxsbkyvpyc", response.iterator().next().properties().dataSourceResourceId());
+        Assertions.assertEquals("z", response.iterator().next().properties().scenarios().get(0));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateMockTests.java
index fb2d4c0afe76..967dcf927c30 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsCreateMockTests.java
@@ -23,7 +23,7 @@ public final class ManagedDashboardsCreateMockTests {
     @Test
     public void testCreate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Succeeded\"},\"location\":\"qmcbxvwvxyslqbhs\",\"tags\":{\"lmpewwwfbkr\":\"blytk\"},\"id\":\"rn\",\"name\":\"vshqjohxcr\",\"type\":\"bfovasrruvwbhsq\"}";
+            = "{\"properties\":{\"provisioningState\":\"Succeeded\"},\"location\":\"doqmcbxvwvxys\",\"tags\":{\"mpew\":\"hsfxoblytkb\",\"shqjohxcrsbf\":\"wfbkrvrns\"},\"id\":\"vasrruvwb\",\"name\":\"sqfsubcgjbirxb\",\"type\":\"ybsrfbjfdtwss\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,14 +33,14 @@ public void testCreate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ManagedDashboard response = manager.managedDashboards()
-            .define("opppcqeq")
-            .withRegion("ahzxctobgbk")
-            .withExistingResourceGroup("qrhhu")
-            .withTags(mapOf("grcfb", "izpost", "bpvjymjhx", "nrmfqjhhk", "n", "j", "ivkrtsw", "u"))
+            .define("ol")
+            .withRegion("xcto")
+            .withExistingResourceGroup("opppcqeq")
+            .withTags(mapOf("postmgrcfbunrm", "kdmoi", "ymjhxxjyngudivkr", "qjhhkxbpv"))
             .create();
 
-        Assertions.assertEquals("qmcbxvwvxyslqbhs", response.location());
-        Assertions.assertEquals("blytk", response.tags().get("lmpewwwfbkr"));
+        Assertions.assertEquals("doqmcbxvwvxys", response.location());
+        Assertions.assertEquals("hsfxoblytkb", response.tags().get("mpew"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteByResourceGroupWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteByResourceGroupWithResponseMockTests.java
index 3a520a427bc1..bada64ac1804 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteByResourceGroupWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsDeleteByResourceGroupWithResponseMockTests.java
@@ -28,7 +28,7 @@ public void testDeleteWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.managedDashboards()
-            .deleteByResourceGroupWithResponse("bsjyofdx", "uusdttouwa", com.azure.core.util.Context.NONE);
+            .deleteByResourceGroupWithResponse("jzuaejxdultskzbb", "dzumveekg", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupWithResponseMockTests.java
index c94ba88644ee..f32cc3df299a 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsGetByResourceGroupWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class ManagedDashboardsGetByResourceGroupWithResponseMockTests {
     @Test
     public void testGetByResourceGroupWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Creating\"},\"location\":\"mcqibycnojv\",\"tags\":{\"qsgzvahapj\":\"e\",\"zlmwlxkvugfhz\":\"zhpvgqzcjrvxd\",\"hnnpr\":\"vawjvzunlu\",\"ultskzbbtdz\":\"xipeilpjzuaejx\"},\"id\":\"mv\",\"name\":\"ekg\",\"type\":\"wozuhkf\"}";
+            = "{\"properties\":{\"provisioningState\":\"Updating\"},\"location\":\"vah\",\"tags\":{\"hpvgqz\":\"y\",\"vxdjzlmwlxkvugf\":\"j\"},\"id\":\"zovawjvz\",\"name\":\"nluthnnp\",\"type\":\"nxipeil\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetByResourceGroupWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ManagedDashboard response = manager.managedDashboards()
-            .getByResourceGroupWithResponse("rknftguvriuhprwm", "yvxqtayriwwroy", com.azure.core.util.Context.NONE)
+            .getByResourceGroupWithResponse("bycnojvkn", "e", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("mcqibycnojv", response.location());
-        Assertions.assertEquals("e", response.tags().get("qsgzvahapj"));
+        Assertions.assertEquals("vah", response.location());
+        Assertions.assertEquals("y", response.tags().get("hpvgqz"));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupMockTests.java
index 38e1fbf7fb3e..cf9b061bf4b8 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListByResourceGroupMockTests.java
@@ -22,7 +22,7 @@ public final class ManagedDashboardsListByResourceGroupMockTests {
     @Test
     public void testListByResourceGroup() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Canceled\"},\"location\":\"vbxwyjsflhh\",\"tags\":{\"joya\":\"lnjixisxya\"},\"id\":\"cslyjpk\",\"name\":\"idzyexznelixhnr\",\"type\":\"tfolhbnx\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleted\"},\"location\":\"ofd\",\"tags\":{\"ttouwaboekqvkel\":\"us\",\"xwyjsflhhc\":\"smv\",\"ixisxyawjoy\":\"aln\"},\"id\":\"qcslyjpkiid\",\"name\":\"yexz\",\"type\":\"eli\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,9 +32,9 @@ public void testListByResourceGroup() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<ManagedDashboard> response
-            = manager.managedDashboards().listByResourceGroup("oekqvk", com.azure.core.util.Context.NONE);
+            = manager.managedDashboards().listByResourceGroup("wozuhkf", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("vbxwyjsflhh", response.iterator().next().location());
-        Assertions.assertEquals("lnjixisxya", response.iterator().next().tags().get("joya"));
+        Assertions.assertEquals("ofd", response.iterator().next().location());
+        Assertions.assertEquals("us", response.iterator().next().tags().get("ttouwaboekqvkel"));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListMockTests.java
index 54528fcaed96..05745c1a1fec 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedDashboardsListMockTests.java
@@ -22,7 +22,7 @@ public final class ManagedDashboardsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\"},\"location\":\"ulppggdtpnapnyir\",\"tags\":{\"gylgqgitxmedjvcs\":\"hpigv\",\"rmgucnap\":\"ynqwwncwzzhxgk\"},\"id\":\"t\",\"name\":\"oellwp\",\"type\":\"fdygpfqbuaceopz\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Failed\"},\"location\":\"tfolhbnx\",\"tags\":{\"dtpnapnyiropuhp\":\"laulppg\",\"gqgitxmedjvcsl\":\"gvpgy\",\"wwncwzzhxgk\":\"n\",\"t\":\"rmgucnap\"},\"id\":\"oellwp\",\"name\":\"fdygpfqbuaceopz\",\"type\":\"qrhhu\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,7 +33,7 @@ public void testList() throws Exception {
 
         PagedIterable<ManagedDashboard> response = manager.managedDashboards().list(com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("ulppggdtpnapnyir", response.iterator().next().location());
-        Assertions.assertEquals("hpigv", response.iterator().next().tags().get("gylgqgitxmedjvcs"));
+        Assertions.assertEquals("tfolhbnx", response.iterator().next().location());
+        Assertions.assertEquals("laulppg", response.iterator().next().tags().get("dtpnapnyiropuhp"));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointConnectionStateTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointConnectionStateTests.java
index 8a83bd1e4324..232c87d2b154 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointConnectionStateTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointConnectionStateTests.java
@@ -11,7 +11,7 @@ public final class ManagedPrivateEndpointConnectionStateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedPrivateEndpointConnectionState model
-            = BinaryData.fromString("{\"status\":\"Pending\",\"description\":\"cwif\"}")
+            = BinaryData.fromString("{\"status\":\"Disconnected\",\"description\":\"uo\"}")
                 .toObject(ManagedPrivateEndpointConnectionState.class);
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelInnerTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelInnerTests.java
index 0dc9f8e6b9da..61c0a1e6b116 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelInnerTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelInnerTests.java
@@ -15,34 +15,34 @@ public final class ManagedPrivateEndpointModelInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedPrivateEndpointModelInner model = BinaryData.fromString(
-            "{\"properties\":{\"provisioningState\":\"Succeeded\",\"privateLinkResourceId\":\"yokacspkw\",\"privateLinkResourceRegion\":\"zdobpxjmflbvvnch\",\"groupIds\":[\"ciwwzjuqkhr\"],\"requestMessage\":\"jiwkuofoskghsau\",\"connectionState\":{\"status\":\"Approved\",\"description\":\"vxieduugidyj\"},\"privateLinkServiceUrl\":\"f\",\"privateLinkServicePrivateIP\":\"aos\"},\"location\":\"xc\",\"tags\":{\"vleggzfbuhfmvfax\":\"pclhocohslk\"},\"id\":\"ffeii\",\"name\":\"hl\",\"type\":\"m\"}")
+            "{\"properties\":{\"provisioningState\":\"NotSpecified\",\"privateLinkResourceId\":\"ltrpmopj\",\"privateLinkResourceRegion\":\"matuok\",\"groupIds\":[\"uiuaodsfcpkvxodp\"],\"requestMessage\":\"zmyzydagf\",\"connectionState\":{\"status\":\"Pending\",\"description\":\"zyiuokk\"},\"privateLinkServiceUrl\":\"hrdxwzywqsmbs\",\"privateLinkServicePrivateIP\":\"exim\"},\"location\":\"yocf\",\"tags\":{\"mddystkiiux\":\"s\",\"o\":\"qyud\"},\"id\":\"rq\",\"name\":\"b\",\"type\":\"oczvy\"}")
             .toObject(ManagedPrivateEndpointModelInner.class);
-        Assertions.assertEquals("xc", model.location());
-        Assertions.assertEquals("pclhocohslk", model.tags().get("vleggzfbuhfmvfax"));
-        Assertions.assertEquals("yokacspkw", model.privateLinkResourceId());
-        Assertions.assertEquals("zdobpxjmflbvvnch", model.privateLinkResourceRegion());
-        Assertions.assertEquals("ciwwzjuqkhr", model.groupIds().get(0));
-        Assertions.assertEquals("jiwkuofoskghsau", model.requestMessage());
-        Assertions.assertEquals("f", model.privateLinkServiceUrl());
+        Assertions.assertEquals("yocf", model.location());
+        Assertions.assertEquals("s", model.tags().get("mddystkiiux"));
+        Assertions.assertEquals("ltrpmopj", model.privateLinkResourceId());
+        Assertions.assertEquals("matuok", model.privateLinkResourceRegion());
+        Assertions.assertEquals("uiuaodsfcpkvxodp", model.groupIds().get(0));
+        Assertions.assertEquals("zmyzydagf", model.requestMessage());
+        Assertions.assertEquals("hrdxwzywqsmbs", model.privateLinkServiceUrl());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ManagedPrivateEndpointModelInner model = new ManagedPrivateEndpointModelInner().withLocation("xc")
-            .withTags(mapOf("vleggzfbuhfmvfax", "pclhocohslk"))
-            .withPrivateLinkResourceId("yokacspkw")
-            .withPrivateLinkResourceRegion("zdobpxjmflbvvnch")
-            .withGroupIds(Arrays.asList("ciwwzjuqkhr"))
-            .withRequestMessage("jiwkuofoskghsau")
-            .withPrivateLinkServiceUrl("f");
+        ManagedPrivateEndpointModelInner model = new ManagedPrivateEndpointModelInner().withLocation("yocf")
+            .withTags(mapOf("mddystkiiux", "s", "o", "qyud"))
+            .withPrivateLinkResourceId("ltrpmopj")
+            .withPrivateLinkResourceRegion("matuok")
+            .withGroupIds(Arrays.asList("uiuaodsfcpkvxodp"))
+            .withRequestMessage("zmyzydagf")
+            .withPrivateLinkServiceUrl("hrdxwzywqsmbs");
         model = BinaryData.fromObject(model).toObject(ManagedPrivateEndpointModelInner.class);
-        Assertions.assertEquals("xc", model.location());
-        Assertions.assertEquals("pclhocohslk", model.tags().get("vleggzfbuhfmvfax"));
-        Assertions.assertEquals("yokacspkw", model.privateLinkResourceId());
-        Assertions.assertEquals("zdobpxjmflbvvnch", model.privateLinkResourceRegion());
-        Assertions.assertEquals("ciwwzjuqkhr", model.groupIds().get(0));
-        Assertions.assertEquals("jiwkuofoskghsau", model.requestMessage());
-        Assertions.assertEquals("f", model.privateLinkServiceUrl());
+        Assertions.assertEquals("yocf", model.location());
+        Assertions.assertEquals("s", model.tags().get("mddystkiiux"));
+        Assertions.assertEquals("ltrpmopj", model.privateLinkResourceId());
+        Assertions.assertEquals("matuok", model.privateLinkResourceRegion());
+        Assertions.assertEquals("uiuaodsfcpkvxodp", model.groupIds().get(0));
+        Assertions.assertEquals("zmyzydagf", model.requestMessage());
+        Assertions.assertEquals("hrdxwzywqsmbs", model.privateLinkServiceUrl());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelListResponseTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelListResponseTests.java
index 01f7d3e0e89c..77fe701a3d65 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelListResponseTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelListResponseTests.java
@@ -12,15 +12,15 @@ public final class ManagedPrivateEndpointModelListResponseTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedPrivateEndpointModelListResponse model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"provisioningState\":\"Creating\",\"privateLinkResourceId\":\"injep\",\"privateLinkResourceRegion\":\"tmryw\",\"groupIds\":[\"oqftiyqzrnkcq\",\"yx\",\"whzlsicohoq\",\"nwvlryavwhheunmm\"],\"requestMessage\":\"gyxzk\",\"connectionState\":{\"status\":\"Disconnected\",\"description\":\"koklya\"},\"privateLinkServiceUrl\":\"conuqszfkbeype\",\"privateLinkServicePrivateIP\":\"mjmwvvjektcx\"},\"location\":\"nhwlrsffrzpwvl\",\"tags\":{\"kt\":\"gbiqylihkaet\"},\"id\":\"fcivfsnkym\",\"name\":\"ctq\",\"type\":\"jf\"}],\"nextLink\":\"brjcxe\"}")
+            "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleting\",\"privateLinkResourceId\":\"th\",\"privateLinkResourceRegion\":\"m\",\"groupIds\":[\"v\",\"hxmzsbbzoggig\"],\"requestMessage\":\"wburvjxxjnspydpt\",\"connectionState\":{\"status\":\"Approved\",\"description\":\"ou\"},\"privateLinkServiceUrl\":\"vudwtiukbldng\",\"privateLinkServicePrivateIP\":\"ocipazyxoeg\"},\"location\":\"g\",\"tags\":{\"yp\":\"iucgygevqzn\"},\"id\":\"rbpizc\",\"name\":\"r\",\"type\":\"j\"},{\"properties\":{\"provisioningState\":\"Failed\",\"privateLinkResourceId\":\"nfyhx\",\"privateLinkResourceRegion\":\"oejzi\",\"groupIds\":[\"fsj\",\"tgzfbishcbkh\",\"jdeyeamdpha\",\"alpbuxwgipwhon\"],\"requestMessage\":\"kgshwa\",\"connectionState\":{\"status\":\"Rejected\",\"description\":\"bin\"},\"privateLinkServiceUrl\":\"pu\",\"privateLinkServicePrivateIP\":\"mryw\"},\"location\":\"zoqftiyqzrnkcqvy\",\"tags\":{\"cohoq\":\"hzls\",\"hgyxzkonoc\":\"nwvlryavwhheunmm\",\"uconuqszfkbey\":\"koklya\"},\"id\":\"ewrmjmwvvjektc\",\"name\":\"senhwlrs\",\"type\":\"frzpwvlqdqgb\"}],\"nextLink\":\"ylihkaetckt\"}")
             .toObject(ManagedPrivateEndpointModelListResponse.class);
-        Assertions.assertEquals("nhwlrsffrzpwvl", model.value().get(0).location());
-        Assertions.assertEquals("gbiqylihkaet", model.value().get(0).tags().get("kt"));
-        Assertions.assertEquals("injep", model.value().get(0).privateLinkResourceId());
-        Assertions.assertEquals("tmryw", model.value().get(0).privateLinkResourceRegion());
-        Assertions.assertEquals("oqftiyqzrnkcq", model.value().get(0).groupIds().get(0));
-        Assertions.assertEquals("gyxzk", model.value().get(0).requestMessage());
-        Assertions.assertEquals("conuqszfkbeype", model.value().get(0).privateLinkServiceUrl());
-        Assertions.assertEquals("brjcxe", model.nextLink());
+        Assertions.assertEquals("g", model.value().get(0).location());
+        Assertions.assertEquals("iucgygevqzn", model.value().get(0).tags().get("yp"));
+        Assertions.assertEquals("th", model.value().get(0).privateLinkResourceId());
+        Assertions.assertEquals("m", model.value().get(0).privateLinkResourceRegion());
+        Assertions.assertEquals("v", model.value().get(0).groupIds().get(0));
+        Assertions.assertEquals("wburvjxxjnspydpt", model.value().get(0).requestMessage());
+        Assertions.assertEquals("vudwtiukbldng", model.value().get(0).privateLinkServiceUrl());
+        Assertions.assertEquals("ylihkaetckt", model.nextLink());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelPropertiesTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelPropertiesTests.java
index f9022220afb8..e2ebc6a1a616 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelPropertiesTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointModelPropertiesTests.java
@@ -13,28 +13,28 @@ public final class ManagedPrivateEndpointModelPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedPrivateEndpointModelProperties model = BinaryData.fromString(
-            "{\"provisioningState\":\"Succeeded\",\"privateLinkResourceId\":\"shxmzsbbzoggigrx\",\"privateLinkResourceRegion\":\"ur\",\"groupIds\":[\"xjnspy\",\"ptkoenkoukn\",\"udwtiukbl\"],\"requestMessage\":\"gkpocipazyxoe\",\"connectionState\":{\"status\":\"Pending\",\"description\":\"npiucgygevqznty\"},\"privateLinkServiceUrl\":\"rbpizc\",\"privateLinkServicePrivateIP\":\"qjsdpydnfyhxdeo\"}")
+            "{\"provisioningState\":\"Accepted\",\"privateLinkResourceId\":\"vkd\",\"privateLinkResourceRegion\":\"sllr\",\"groupIds\":[\"d\",\"watkpnpulexxb\",\"zwtruwiqzbqjvsov\"],\"requestMessage\":\"okacspk\",\"connectionState\":{\"status\":\"Disconnected\",\"description\":\"obpxjmflbvvn\"},\"privateLinkServiceUrl\":\"rkcciwwzjuqk\",\"privateLinkServicePrivateIP\":\"sa\"}")
             .toObject(ManagedPrivateEndpointModelProperties.class);
-        Assertions.assertEquals("shxmzsbbzoggigrx", model.privateLinkResourceId());
-        Assertions.assertEquals("ur", model.privateLinkResourceRegion());
-        Assertions.assertEquals("xjnspy", model.groupIds().get(0));
-        Assertions.assertEquals("gkpocipazyxoe", model.requestMessage());
-        Assertions.assertEquals("rbpizc", model.privateLinkServiceUrl());
+        Assertions.assertEquals("vkd", model.privateLinkResourceId());
+        Assertions.assertEquals("sllr", model.privateLinkResourceRegion());
+        Assertions.assertEquals("d", model.groupIds().get(0));
+        Assertions.assertEquals("okacspk", model.requestMessage());
+        Assertions.assertEquals("rkcciwwzjuqk", model.privateLinkServiceUrl());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ManagedPrivateEndpointModelProperties model
-            = new ManagedPrivateEndpointModelProperties().withPrivateLinkResourceId("shxmzsbbzoggigrx")
-                .withPrivateLinkResourceRegion("ur")
-                .withGroupIds(Arrays.asList("xjnspy", "ptkoenkoukn", "udwtiukbl"))
-                .withRequestMessage("gkpocipazyxoe")
-                .withPrivateLinkServiceUrl("rbpizc");
+            = new ManagedPrivateEndpointModelProperties().withPrivateLinkResourceId("vkd")
+                .withPrivateLinkResourceRegion("sllr")
+                .withGroupIds(Arrays.asList("d", "watkpnpulexxb", "zwtruwiqzbqjvsov"))
+                .withRequestMessage("okacspk")
+                .withPrivateLinkServiceUrl("rkcciwwzjuqk");
         model = BinaryData.fromObject(model).toObject(ManagedPrivateEndpointModelProperties.class);
-        Assertions.assertEquals("shxmzsbbzoggigrx", model.privateLinkResourceId());
-        Assertions.assertEquals("ur", model.privateLinkResourceRegion());
-        Assertions.assertEquals("xjnspy", model.groupIds().get(0));
-        Assertions.assertEquals("gkpocipazyxoe", model.requestMessage());
-        Assertions.assertEquals("rbpizc", model.privateLinkServiceUrl());
+        Assertions.assertEquals("vkd", model.privateLinkResourceId());
+        Assertions.assertEquals("sllr", model.privateLinkResourceRegion());
+        Assertions.assertEquals("d", model.groupIds().get(0));
+        Assertions.assertEquals("okacspk", model.requestMessage());
+        Assertions.assertEquals("rkcciwwzjuqk", model.privateLinkServiceUrl());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointUpdateParametersTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointUpdateParametersTests.java
index 4b01862c6361..776ff9d9a992 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointUpdateParametersTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointUpdateParametersTests.java
@@ -13,18 +13,18 @@
 public final class ManagedPrivateEndpointUpdateParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ManagedPrivateEndpointUpdateParameters model
-            = BinaryData.fromString("{\"tags\":{\"jdeyeamdpha\":\"tgzfbishcbkh\",\"wkgshwa\":\"alpbuxwgipwhon\"}}")
-                .toObject(ManagedPrivateEndpointUpdateParameters.class);
-        Assertions.assertEquals("tgzfbishcbkh", model.tags().get("jdeyeamdpha"));
+        ManagedPrivateEndpointUpdateParameters model = BinaryData.fromString(
+            "{\"tags\":{\"sauuimj\":\"kg\",\"rfbyaosvexcso\":\"vxieduugidyj\",\"vleggzfbuhfmvfax\":\"pclhocohslk\"}}")
+            .toObject(ManagedPrivateEndpointUpdateParameters.class);
+        Assertions.assertEquals("kg", model.tags().get("sauuimj"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ManagedPrivateEndpointUpdateParameters model = new ManagedPrivateEndpointUpdateParameters()
-            .withTags(mapOf("jdeyeamdpha", "tgzfbishcbkh", "wkgshwa", "alpbuxwgipwhon"));
+            .withTags(mapOf("sauuimj", "kg", "rfbyaosvexcso", "vxieduugidyj", "vleggzfbuhfmvfax", "pclhocohslk"));
         model = BinaryData.fromObject(model).toObject(ManagedPrivateEndpointUpdateParameters.class);
-        Assertions.assertEquals("tgzfbishcbkh", model.tags().get("jdeyeamdpha"));
+        Assertions.assertEquals("kg", model.tags().get("sauuimj"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateMockTests.java
index 902d680dd9e3..e2ef997d82bd 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsCreateMockTests.java
@@ -24,7 +24,7 @@ public final class ManagedPrivateEndpointsCreateMockTests {
     @Test
     public void testCreate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"privateLinkResourceId\":\"suwsyrsnds\",\"privateLinkResourceRegion\":\"g\",\"groupIds\":[\"vraeaeneq\",\"zar\"],\"requestMessage\":\"lquuijfqkacewii\",\"connectionState\":{\"status\":\"Approved\",\"description\":\"ji\"},\"privateLinkServiceUrl\":\"wifto\",\"privateLinkServicePrivateIP\":\"kvpuvksgplsaknyn\"},\"location\":\"ynl\",\"tags\":{\"ihleos\":\"uopxodlqiyntor\",\"yzrpzbchckqqzq\":\"swsrms\",\"ysuiizynkedya\":\"ox\",\"pyy\":\"rwyhqmibzyhwitsm\"},\"id\":\"pcdpumnz\",\"name\":\"mwzn\",\"type\":\"abikns\"}";
+            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"privateLinkResourceId\":\"zynkedya\",\"privateLinkResourceRegion\":\"wyhqmibzyhwits\",\"groupIds\":[\"yynpcdpumnzgmwz\"],\"requestMessage\":\"abikns\",\"connectionState\":{\"status\":\"Approved\",\"description\":\"xbldtlwwrlkdmtn\"},\"privateLinkServiceUrl\":\"ok\",\"privateLinkServicePrivateIP\":\"llxdyhgs\"},\"location\":\"cogjltdtbn\",\"tags\":{\"ocrkvcikh\":\"d\",\"qgxqquezikyw\":\"vpa\",\"lla\":\"gxk\"},\"id\":\"melwuipiccjz\",\"name\":\"z\",\"type\":\"v\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,24 +34,24 @@ public void testCreate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ManagedPrivateEndpointModel response = manager.managedPrivateEndpoints()
-            .define("qyib")
-            .withRegion("pqlpq")
-            .withExistingGrafana("i", "m")
-            .withTags(mapOf("btkuwhh", "iuqgbdbutauv", "koymkcd", "hykojoxafnndlpic"))
-            .withPrivateLinkResourceId("uszdtmhrkwof")
-            .withPrivateLinkResourceRegion("voqacpiexpbt")
-            .withGroupIds(Arrays.asList("bwoenwashrt"))
-            .withRequestMessage("kcnqxwbpo")
-            .withPrivateLinkServiceUrl("sipqii")
+            .define("h")
+            .withRegion("n")
+            .withExistingGrafana("hykojoxafnndlpic", "koymkcd")
+            .withTags(mapOf("jphuopxodlqi", "n"))
+            .withPrivateLinkResourceId("wdreqnovvqfovl")
+            .withPrivateLinkResourceRegion("ywsuwsy")
+            .withGroupIds(Arrays.asList("dsytgadgvr", "ea", "neqn"))
+            .withRequestMessage("rrwlquuijfqkace")
+            .withPrivateLinkServiceUrl("f")
             .create();
 
-        Assertions.assertEquals("ynl", response.location());
-        Assertions.assertEquals("uopxodlqiyntor", response.tags().get("ihleos"));
-        Assertions.assertEquals("suwsyrsnds", response.privateLinkResourceId());
-        Assertions.assertEquals("g", response.privateLinkResourceRegion());
-        Assertions.assertEquals("vraeaeneq", response.groupIds().get(0));
-        Assertions.assertEquals("lquuijfqkacewii", response.requestMessage());
-        Assertions.assertEquals("wifto", response.privateLinkServiceUrl());
+        Assertions.assertEquals("cogjltdtbn", response.location());
+        Assertions.assertEquals("d", response.tags().get("ocrkvcikh"));
+        Assertions.assertEquals("zynkedya", response.privateLinkResourceId());
+        Assertions.assertEquals("wyhqmibzyhwits", response.privateLinkResourceRegion());
+        Assertions.assertEquals("yynpcdpumnzgmwz", response.groupIds().get(0));
+        Assertions.assertEquals("abikns", response.requestMessage());
+        Assertions.assertEquals("ok", response.privateLinkServiceUrl());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteMockTests.java
index 34a8efb7fbbd..8754970a7e37 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsDeleteMockTests.java
@@ -28,7 +28,7 @@ public void testDelete() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.managedPrivateEndpoints()
-            .delete("obzdopcjwvnhdl", "wmgxcxrsl", "mutwuoe", com.azure.core.util.Context.NONE);
+            .delete("yhrfouyftaakcpw", "yzvqt", "nubexk", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetWithResponseMockTests.java
index 54a64e342434..1265cc06d001 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class ManagedPrivateEndpointsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Creating\",\"privateLinkResourceId\":\"tdum\",\"privateLinkResourceRegion\":\"p\",\"groupIds\":[\"bmnzbtbhjpgl\",\"fgohdneuelfphs\",\"yhtozfikdowwqu\",\"v\"],\"requestMessage\":\"xclvit\",\"connectionState\":{\"status\":\"Approved\",\"description\":\"nosggbhcoh\"},\"privateLinkServiceUrl\":\"dsjnka\",\"privateLinkServicePrivateIP\":\"utiiswacf\"},\"location\":\"dkzzewkfvhqcrail\",\"tags\":{\"wdmhdlxyjrxs\":\"ppfufl\"},\"id\":\"gafcnihgwqapnedg\",\"name\":\"bcvkcvqvpkeq\",\"type\":\"cvdrhvoodsot\"}";
+            = "{\"properties\":{\"provisioningState\":\"Creating\",\"privateLinkResourceId\":\"hsd\",\"privateLinkResourceRegion\":\"t\",\"groupIds\":[\"ikdowwquuvx\",\"xclvit\",\"hqzonosggbhcoh\"],\"requestMessage\":\"dsjnka\",\"connectionState\":{\"status\":\"Rejected\",\"description\":\"iswac\"},\"privateLinkServiceUrl\":\"gdkz\",\"privateLinkServicePrivateIP\":\"wkfvhqcrailvp\"},\"location\":\"pfuflrw\",\"tags\":{\"gafcnihgwqapnedg\":\"dlxyjrxs\",\"cvdrhvoodsot\":\"bcvkcvqvpkeq\",\"wmgxcxrsl\":\"obzdopcjwvnhdl\",\"rpkhjwn\":\"mutwuoe\"},\"id\":\"yqsluic\",\"name\":\"dggkzzlvmbmpa\",\"type\":\"modfvuefywsbpfvm\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,15 +31,15 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ManagedPrivateEndpointModel response = manager.managedPrivateEndpoints()
-            .getWithResponse("wlrbqtkoievseo", "gqrlltmuwla", "wzizxbmpgcjefuzm", com.azure.core.util.Context.NONE)
+            .getWithResponse("xe", "mnzb", "bhjpglkfgohdne", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("dkzzewkfvhqcrail", response.location());
-        Assertions.assertEquals("ppfufl", response.tags().get("wdmhdlxyjrxs"));
-        Assertions.assertEquals("tdum", response.privateLinkResourceId());
-        Assertions.assertEquals("p", response.privateLinkResourceRegion());
-        Assertions.assertEquals("bmnzbtbhjpgl", response.groupIds().get(0));
-        Assertions.assertEquals("xclvit", response.requestMessage());
-        Assertions.assertEquals("dsjnka", response.privateLinkServiceUrl());
+        Assertions.assertEquals("pfuflrw", response.location());
+        Assertions.assertEquals("dlxyjrxs", response.tags().get("gafcnihgwqapnedg"));
+        Assertions.assertEquals("hsd", response.privateLinkResourceId());
+        Assertions.assertEquals("t", response.privateLinkResourceRegion());
+        Assertions.assertEquals("ikdowwquuvx", response.groupIds().get(0));
+        Assertions.assertEquals("dsjnka", response.requestMessage());
+        Assertions.assertEquals("gdkz", response.privateLinkServiceUrl());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListMockTests.java
index f30942638b61..2af70daf06ff 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsListMockTests.java
@@ -22,7 +22,7 @@ public final class ManagedPrivateEndpointsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleting\",\"privateLinkResourceId\":\"zzlvmbmpaxmodfv\",\"privateLinkResourceRegion\":\"fy\",\"groupIds\":[\"pfvmwyhrfou\",\"ft\"],\"requestMessage\":\"kcpwiy\",\"connectionState\":{\"status\":\"Disconnected\",\"description\":\"nubexk\"},\"privateLinkServiceUrl\":\"ksmond\",\"privateLinkServicePrivateIP\":\"quxvypomgkop\"},\"location\":\"hojvpajqgxysmocm\",\"tags\":{\"apvhelxprgly\":\"qvmkcxo\"},\"id\":\"tddckcb\",\"name\":\"uejrjxgc\",\"type\":\"qibrhosxsdqrhzoy\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleting\",\"privateLinkResourceId\":\"v\",\"privateLinkResourceRegion\":\"jqg\",\"groupIds\":[\"mocmbqfqvmk\",\"xozap\"],\"requestMessage\":\"elxprglyatddck\",\"connectionState\":{\"status\":\"Approved\",\"description\":\"jrjxgciqibrhosx\"},\"privateLinkServiceUrl\":\"qrhzoymibmrqyib\",\"privateLinkServicePrivateIP\":\"wfluszdt\"},\"location\":\"rkwofyyvoqa\",\"tags\":{\"wbwo\":\"expbtg\",\"kcnqxwbpo\":\"nwashrtd\",\"aasipqi\":\"ulpiuj\"},\"id\":\"obyu\",\"name\":\"erpqlpqwcciuqg\",\"type\":\"dbutauvfbtkuwhh\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,14 +32,14 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<ManagedPrivateEndpointModel> response
-            = manager.managedPrivateEndpoints().list("rpkhjwn", "yqsluic", com.azure.core.util.Context.NONE);
+            = manager.managedPrivateEndpoints().list("zksmondj", "quxvypomgkop", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("hojvpajqgxysmocm", response.iterator().next().location());
-        Assertions.assertEquals("qvmkcxo", response.iterator().next().tags().get("apvhelxprgly"));
-        Assertions.assertEquals("zzlvmbmpaxmodfv", response.iterator().next().privateLinkResourceId());
-        Assertions.assertEquals("fy", response.iterator().next().privateLinkResourceRegion());
-        Assertions.assertEquals("pfvmwyhrfou", response.iterator().next().groupIds().get(0));
-        Assertions.assertEquals("kcpwiy", response.iterator().next().requestMessage());
-        Assertions.assertEquals("ksmond", response.iterator().next().privateLinkServiceUrl());
+        Assertions.assertEquals("rkwofyyvoqa", response.iterator().next().location());
+        Assertions.assertEquals("expbtg", response.iterator().next().tags().get("wbwo"));
+        Assertions.assertEquals("v", response.iterator().next().privateLinkResourceId());
+        Assertions.assertEquals("jqg", response.iterator().next().privateLinkResourceRegion());
+        Assertions.assertEquals("mocmbqfqvmk", response.iterator().next().groupIds().get(0));
+        Assertions.assertEquals("elxprglyatddck", response.iterator().next().requestMessage());
+        Assertions.assertEquals("qrhzoymibmrqyib", response.iterator().next().privateLinkServiceUrl());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshMockTests.java
index 328023ba81c2..1ebbb74ed821 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedPrivateEndpointsRefreshMockTests.java
@@ -27,7 +27,7 @@ public void testRefresh() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.managedPrivateEndpoints().refresh("gxhuriplbp", "dxunkbebxmubyyn", com.azure.core.util.Context.NONE);
+        manager.managedPrivateEndpoints().refresh("um", "rp", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedServiceIdentityTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedServiceIdentityTests.java
index 35fac1d1d54f..1dbc31f928f5 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedServiceIdentityTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ManagedServiceIdentityTests.java
@@ -16,7 +16,7 @@ public final class ManagedServiceIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedServiceIdentity model = BinaryData.fromString(
-            "{\"principalId\":\"lcuiywgqywgndr\",\"tenantId\":\"nhzgpphrcgyn\",\"type\":\"UserAssigned\",\"userAssignedIdentities\":{\"abcypmivk\":{\"principalId\":\"cfvmmco\",\"clientId\":\"sxlzevgbmqj\"}}}")
+            "{\"principalId\":\"u\",\"tenantId\":\"wgqyw\",\"type\":\"UserAssigned\",\"userAssignedIdentities\":{\"ecfvmm\":{\"principalId\":\"ynhz\",\"clientId\":\"phrcgyncoc\"},\"bcypmi\":{\"principalId\":\"ofsx\",\"clientId\":\"evgbmqjq\"},\"wnfnbacf\":{\"principalId\":\"w\",\"clientId\":\"uvcc\"}}}")
             .toObject(ManagedServiceIdentity.class);
         Assertions.assertEquals(ManagedServiceIdentityType.USER_ASSIGNED, model.type());
     }
@@ -24,7 +24,8 @@ public void testDeserialize() throws Exception {
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ManagedServiceIdentity model = new ManagedServiceIdentity().withType(ManagedServiceIdentityType.USER_ASSIGNED)
-            .withUserAssignedIdentities(mapOf("abcypmivk", new UserAssignedIdentity()));
+            .withUserAssignedIdentities(mapOf("ecfvmm", new UserAssignedIdentity(), "bcypmi",
+                new UserAssignedIdentity(), "wnfnbacf", new UserAssignedIdentity()));
         model = BinaryData.fromObject(model).toObject(ManagedServiceIdentity.class);
         Assertions.assertEquals(ManagedServiceIdentityType.USER_ASSIGNED, model.type());
     }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/MarketplaceTrialQuotaTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/MarketplaceTrialQuotaTests.java
index 04789fbc16ca..273304d22b32 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/MarketplaceTrialQuotaTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/MarketplaceTrialQuotaTests.java
@@ -14,11 +14,11 @@ public final class MarketplaceTrialQuotaTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         MarketplaceTrialQuota model = BinaryData.fromString(
-            "{\"availablePromotion\":\"None\",\"grafanaResourceId\":\"thfuiuaodsfcpkvx\",\"trialStartAt\":\"2021-07-31T05:00:25Z\",\"trialEndAt\":\"2021-06-07T12:26:40Z\"}")
+            "{\"availablePromotion\":\"None\",\"grafanaResourceId\":\"ynnaam\",\"trialStartAt\":\"2021-01-19T03:02:26Z\",\"trialEndAt\":\"2021-07-20T06:26:03Z\"}")
             .toObject(MarketplaceTrialQuota.class);
         Assertions.assertEquals(AvailablePromotion.NONE, model.availablePromotion());
-        Assertions.assertEquals("thfuiuaodsfcpkvx", model.grafanaResourceId());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-07-31T05:00:25Z"), model.trialStartAt());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-06-07T12:26:40Z"), model.trialEndAt());
+        Assertions.assertEquals("ynnaam", model.grafanaResourceId());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-19T03:02:26Z"), model.trialStartAt());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-20T06:26:03Z"), model.trialEndAt());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/OperationsListMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/OperationsListMockTests.java
index 49fd98ea7292..5bdf5cc30a14 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/OperationsListMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/OperationsListMockTests.java
@@ -21,7 +21,7 @@ public final class OperationsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"name\":\"uwutttxfvjrbi\",\"isDataAction\":true,\"display\":{\"provider\":\"pcyvahfnljkyqx\",\"resource\":\"uujqgidokgjljyo\",\"operation\":\"vcltbgsncgh\",\"description\":\"esz\"},\"origin\":\"user,system\",\"actionType\":\"Internal\"}]}";
+            = "{\"value\":[{\"name\":\"civfsnkymuctq\",\"isDataAction\":true,\"display\":{\"provider\":\"brjcxe\",\"resource\":\"uwutttxfvjrbi\",\"operation\":\"hxepcyvahfnlj\",\"description\":\"qxj\"},\"origin\":\"system\",\"actionType\":\"Internal\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
index 0db73a642900..5efd7b9a343b 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class PrivateEndpointConnectionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"zpuzycisp\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"hmgkbrpyy\",\"actionsRequired\":\"ibnuqqkpik\"},\"groupIds\":[\"gvtqagnbuynh\",\"jggmebfsiarbu\"],\"provisioningState\":\"Failed\"},\"id\":\"pnazzm\",\"name\":\"jrunmpxtt\",\"type\":\"bh\"}";
+            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"ec\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"ebfqkkrbm\",\"actionsRequired\":\"kgriwflzlfbx\"},\"groupIds\":[\"zycispn\",\"zahmgkbrpyydhibn\",\"qqkpikadrg\"],\"provisioningState\":\"Creating\"},\"id\":\"gnbuy\",\"name\":\"hijggme\",\"type\":\"fsiarbutr\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,13 +32,13 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateEndpointConnection response = manager.privateEndpointConnections()
-            .getWithResponse("htxfvgxbfsmxnehm", "vecxgodebfqkk", "bmpukgriwflz", com.azure.core.util.Context.NONE)
+            .getWithResponse("gidokgjljyoxgvcl", "bgsncghkjeszzhb", "jhtxfvgxbfsmxne", com.azure.core.util.Context.NONE)
             .getValue();
 
         Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
             response.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("hmgkbrpyy", response.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("ibnuqqkpik", response.privateLinkServiceConnectionState().actionsRequired());
-        Assertions.assertEquals("gvtqagnbuynh", response.groupIds().get(0));
+        Assertions.assertEquals("ebfqkkrbm", response.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("kgriwflzlfbx", response.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("zycispn", response.groupIds().get(0));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListMockTests.java
index 1950484f312c..c0c14a298e23 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateEndpointConnectionsListMockTests.java
@@ -23,7 +23,7 @@ public final class PrivateEndpointConnectionsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"yn\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"ybyxc\",\"actionsRequired\":\"clha\"},\"groupIds\":[\"babphlwrqlfk\",\"sthsu\"],\"provisioningState\":\"Deleting\"},\"id\":\"nyyazttbtwwrqpue\",\"name\":\"ckzywbiexzfeyue\",\"type\":\"xibxujwbhqwalm\"}]}";
+            = "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"bnlankxmyskpb\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"tkcxywnytnrsy\",\"actionsRequired\":\"qidybyx\"},\"groupIds\":[\"clha\",\"xdbabphlwr\",\"lfktsths\",\"cocmnyyaztt\"],\"provisioningState\":\"Succeeded\"},\"id\":\"rq\",\"name\":\"uedck\",\"type\":\"ywbiexzfeyueax\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,14 +32,15 @@ public void testList() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        PagedIterable<PrivateEndpointConnection> response = manager.privateEndpointConnections()
-            .list("bnlankxmyskpb", "enbtkcxywny", com.azure.core.util.Context.NONE);
+        PagedIterable<PrivateEndpointConnection> response
+            = manager.privateEndpointConnections().list("vpnazzm", "jrunmpxtt", com.azure.core.util.Context.NONE);
 
         Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.PENDING,
             response.iterator().next().privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("ybyxc", response.iterator().next().privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("clha",
+        Assertions.assertEquals("tkcxywnytnrsy",
+            response.iterator().next().privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("qidybyx",
             response.iterator().next().privateLinkServiceConnectionState().actionsRequired());
-        Assertions.assertEquals("babphlwrqlfk", response.iterator().next().groupIds().get(0));
+        Assertions.assertEquals("clha", response.iterator().next().groupIds().get(0));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetWithResponseMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetWithResponseMockTests.java
index a8aa5562240e..2dadc6ea77cc 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetWithResponseMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class PrivateLinkResourcesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Deleting\",\"groupId\":\"bpg\",\"requiredMembers\":[\"txhp\",\"xbzpfzab\"],\"requiredZoneNames\":[\"uhxwtctyqiklbbov\"]},\"id\":\"wzbhvgyugu\",\"name\":\"svmkfssxquk\",\"type\":\"fpl\"}";
+            = "{\"properties\":{\"provisioningState\":\"Updating\",\"groupId\":\"ncuxrhdwb\",\"requiredMembers\":[\"bniwdj\",\"wz\"],\"requiredZoneNames\":[\"bpg\",\"xytxhpzxbz\",\"fzab\"]},\"id\":\"cuh\",\"name\":\"wtctyqi\",\"type\":\"lbbovplw\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,9 +31,9 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateLinkResource response = manager.privateLinkResources()
-            .getWithResponse("zyoxaepdkzjan", "ux", "hdwbavxbniwdjs", com.azure.core.util.Context.NONE)
+            .getWithResponse("bxu", "wbhqwal", "uzyoxaep", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("uhxwtctyqiklbbov", response.requiredZoneNames().get(0));
+        Assertions.assertEquals("bpg", response.requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListMockTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListMockTests.java
index 97c41d663417..d8dddc656361 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListMockTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/PrivateLinkResourcesListMockTests.java
@@ -22,7 +22,7 @@ public final class PrivateLinkResourcesListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleting\",\"groupId\":\"wiyighxpkdw\",\"requiredMembers\":[\"iuebbaumny\",\"upedeojnabckhs\",\"txp\",\"ie\"],\"requiredZoneNames\":[\"hvpesapskrdqm\",\"jjdhtld\",\"kyzxuutk\"]},\"id\":\"ws\",\"name\":\"wsvlxotogtwrupqs\",\"type\":\"vnm\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleting\",\"groupId\":\"fssxqukkfplg\",\"requiredMembers\":[\"xnkjzkdesl\",\"vlopwiyighx\",\"kdwzbaiuebbaumny\",\"upedeojnabckhs\"],\"requiredZoneNames\":[\"psiebtfhvpes\",\"pskrdqmh\",\"jdhtldwkyzxu\",\"tkncwsc\"]},\"id\":\"vlxotogtwrupqsx\",\"name\":\"nmic\",\"type\":\"kvceoveilovnotyf\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,8 +32,8 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<PrivateLinkResource> response
-            = manager.privateLinkResources().list("mg", "xnkjzkdesl", com.azure.core.util.Context.NONE);
+            = manager.privateLinkResources().list("bhvgy", "gu", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("hvpesapskrdqm", response.iterator().next().requiredZoneNames().get(0));
+        Assertions.assertEquals("psiebtfhvpes", response.iterator().next().requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ResourceSkuTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ResourceSkuTests.java
index 7c912c64f13d..a7a16d95c134 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ResourceSkuTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/ResourceSkuTests.java
@@ -6,19 +6,23 @@
 
 import com.azure.core.util.BinaryData;
 import com.azure.resourcemanager.dashboard.models.ResourceSku;
+import com.azure.resourcemanager.dashboard.models.Size;
 import org.junit.jupiter.api.Assertions;
 
 public final class ResourceSkuTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ResourceSku model = BinaryData.fromString("{\"name\":\"oqfbowskanyk\"}").toObject(ResourceSku.class);
+        ResourceSku model
+            = BinaryData.fromString("{\"name\":\"oqfbowskanyk\",\"size\":\"X2\"}").toObject(ResourceSku.class);
         Assertions.assertEquals("oqfbowskanyk", model.name());
+        Assertions.assertEquals(Size.X2, model.size());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ResourceSku model = new ResourceSku().withName("oqfbowskanyk");
+        ResourceSku model = new ResourceSku().withName("oqfbowskanyk").withSize(Size.X2);
         model = BinaryData.fromObject(model).toObject(ResourceSku.class);
         Assertions.assertEquals("oqfbowskanyk", model.name());
+        Assertions.assertEquals(Size.X2, model.size());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SaasSubscriptionDetailsTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SaasSubscriptionDetailsTests.java
index 6b5ced59cf8b..914294ecbfda 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SaasSubscriptionDetailsTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SaasSubscriptionDetailsTests.java
@@ -13,13 +13,13 @@ public final class SaasSubscriptionDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SaasSubscriptionDetails model = BinaryData.fromString(
-            "{\"planId\":\"ngj\",\"offerId\":\"cczsq\",\"publisherId\":\"hvmdajvnysounq\",\"term\":{\"termUnit\":\"noae\",\"startDate\":\"2021-10-06T07:30:47Z\",\"endDate\":\"2021-12-02T06:25:29Z\"}}")
+            "{\"planId\":\"jugwdkcglhsl\",\"offerId\":\"jdyggdtji\",\"publisherId\":\"b\",\"term\":{\"termUnit\":\"fqweykhmene\",\"startDate\":\"2021-09-26T05:32:17Z\",\"endDate\":\"2021-10-31T01:47:04Z\"}}")
             .toObject(SaasSubscriptionDetails.class);
-        Assertions.assertEquals("ngj", model.planId());
-        Assertions.assertEquals("cczsq", model.offerId());
-        Assertions.assertEquals("hvmdajvnysounq", model.publisherId());
-        Assertions.assertEquals("noae", model.term().termUnit());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-06T07:30:47Z"), model.term().startDate());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-12-02T06:25:29Z"), model.term().endDate());
+        Assertions.assertEquals("jugwdkcglhsl", model.planId());
+        Assertions.assertEquals("jdyggdtji", model.offerId());
+        Assertions.assertEquals("b", model.publisherId());
+        Assertions.assertEquals("fqweykhmene", model.term().termUnit());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-26T05:32:17Z"), model.term().startDate());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-10-31T01:47:04Z"), model.term().endDate());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SubscriptionTermTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SubscriptionTermTests.java
index 4832e1afd2e7..b056751f02a5 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SubscriptionTermTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/SubscriptionTermTests.java
@@ -13,10 +13,10 @@ public final class SubscriptionTermTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubscriptionTerm model = BinaryData.fromString(
-            "{\"termUnit\":\"ltrpmopj\",\"startDate\":\"2021-03-14T07:19:34Z\",\"endDate\":\"2021-01-13T06:54:34Z\"}")
+            "{\"termUnit\":\"whybcib\",\"startDate\":\"2021-05-14T16:24:46Z\",\"endDate\":\"2021-01-31T06:13:45Z\"}")
             .toObject(SubscriptionTerm.class);
-        Assertions.assertEquals("ltrpmopj", model.termUnit());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-14T07:19:34Z"), model.startDate());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-01-13T06:54:34Z"), model.endDate());
+        Assertions.assertEquals("whybcib", model.termUnit());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-14T16:24:46Z"), model.startDate());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-31T06:13:45Z"), model.endDate());
     }
 }
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/UserAssignedIdentityTests.java b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/UserAssignedIdentityTests.java
index ecd2a592bc50..a075b398bf9f 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/UserAssignedIdentityTests.java
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/src/test/java/com/azure/resourcemanager/dashboard/generated/UserAssignedIdentityTests.java
@@ -11,7 +11,7 @@ public final class UserAssignedIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         UserAssignedIdentity model
-            = BinaryData.fromString("{\"principalId\":\"zuvccfwnfnbacfio\",\"clientId\":\"ebxetqgtzxdp\"}")
+            = BinaryData.fromString("{\"principalId\":\"nlebxetqgtzxd\",\"clientId\":\"qbqqwxr\"}")
                 .toObject(UserAssignedIdentity.class);
     }
 
diff --git a/sdk/dashboard/azure-resourcemanager-dashboard/tsp-location.yaml b/sdk/dashboard/azure-resourcemanager-dashboard/tsp-location.yaml
index c58ea0234aef..029cf892a234 100644
--- a/sdk/dashboard/azure-resourcemanager-dashboard/tsp-location.yaml
+++ b/sdk/dashboard/azure-resourcemanager-dashboard/tsp-location.yaml
@@ -1,4 +1,4 @@
 directory: specification/dashboard/Dashboard.Management
-commit: 05584a1019e75159b0dc70a6751afaa2c77868e6
+commit: b2965096067d6f8374b5485b0568fd36e7c9d099
 repo: Azure/azure-rest-api-specs
 additionalDirectories: 
diff --git a/sdk/databasewatcher/azure-resourcemanager-databasewatcher/pom.xml b/sdk/databasewatcher/azure-resourcemanager-databasewatcher/pom.xml
index f28b5af08b08..1cc9c3fa2654 100644
--- a/sdk/databasewatcher/azure-resourcemanager-databasewatcher/pom.xml
+++ b/sdk/databasewatcher/azure-resourcemanager-databasewatcher/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/databox/azure-resourcemanager-databox/pom.xml b/sdk/databox/azure-resourcemanager-databox/pom.xml
index 9ab7332f2236..e8fdbea23755 100644
--- a/sdk/databox/azure-resourcemanager-databox/pom.xml
+++ b/sdk/databox/azure-resourcemanager-databox/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml b/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml
index b143b71bc634..7e30b0e25e6d 100644
--- a/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml
+++ b/sdk/databoxedge/azure-resourcemanager-databoxedge/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/databricks/azure-resourcemanager-databricks/pom.xml b/sdk/databricks/azure-resourcemanager-databricks/pom.xml
index 3b6e99dc7bba..d744534b9729 100644
--- a/sdk/databricks/azure-resourcemanager-databricks/pom.xml
+++ b/sdk/databricks/azure-resourcemanager-databricks/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/datadog/azure-resourcemanager-datadog/pom.xml b/sdk/datadog/azure-resourcemanager-datadog/pom.xml
index f2d31f626643..c138c59683ca 100644
--- a/sdk/datadog/azure-resourcemanager-datadog/pom.xml
+++ b/sdk/datadog/azure-resourcemanager-datadog/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml b/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml
index 865ac94212de..903f9ac21a32 100644
--- a/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml
+++ b/sdk/datafactory/azure-resourcemanager-datafactory/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml
index 4dd5a1dc799c..ebff02af4fb7 100644
--- a/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml
+++ b/sdk/datalakeanalytics/azure-resourcemanager-datalakeanalytics/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml b/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml
index 94b5b362578a..6c002c730fa8 100644
--- a/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml
+++ b/sdk/datalakestore/azure-resourcemanager-datalakestore/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml b/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml
index 4edcc3e27d50..28659d8d58de 100644
--- a/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml
+++ b/sdk/datamigration/azure-resourcemanager-datamigration/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/dataprotection/azure-resourcemanager-dataprotection/CHANGELOG.md b/sdk/dataprotection/azure-resourcemanager-dataprotection/CHANGELOG.md
index e4fde07820f5..7dacc679846a 100644
--- a/sdk/dataprotection/azure-resourcemanager-dataprotection/CHANGELOG.md
+++ b/sdk/dataprotection/azure-resourcemanager-dataprotection/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Release History
 
-## 1.5.0 (2025-09-24)
+## 1.6.0-beta.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
+## 1.5.0 (2025-10-13)
 
 - Azure Resource Manager Data Protection client library for Java. This package contains Microsoft Azure SDK for Data Protection Management SDK. Open API 2.0 Specs for Azure Data Protection service. Package api-version 2025-07-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
diff --git a/sdk/dataprotection/azure-resourcemanager-dataprotection/pom.xml b/sdk/dataprotection/azure-resourcemanager-dataprotection/pom.xml
index 5fd6a52f0c6b..fd52d7c17c63 100644
--- a/sdk/dataprotection/azure-resourcemanager-dataprotection/pom.xml
+++ b/sdk/dataprotection/azure-resourcemanager-dataprotection/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-dataprotection</artifactId>
-  <version>1.5.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dataprotection;current} -->
+  <version>1.6.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-dataprotection;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Data Protection Management</name>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/defendereasm/azure-resourcemanager-defendereasm/pom.xml b/sdk/defendereasm/azure-resourcemanager-defendereasm/pom.xml
index 28836f789ff5..400ae075d7c9 100644
--- a/sdk/defendereasm/azure-resourcemanager-defendereasm/pom.xml
+++ b/sdk/defendereasm/azure-resourcemanager-defendereasm/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml b/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml
index 4a2a92597cb8..d832045aaac8 100644
--- a/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml
+++ b/sdk/delegatednetwork/azure-resourcemanager-delegatednetwork/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/dell/azure-resourcemanager-dell-storage/pom.xml b/sdk/dell/azure-resourcemanager-dell-storage/pom.xml
index 3c391d7db96f..99174032ed27 100644
--- a/sdk/dell/azure-resourcemanager-dell-storage/pom.xml
+++ b/sdk/dell/azure-resourcemanager-dell-storage/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/dependencymap/azure-resourcemanager-dependencymap/pom.xml b/sdk/dependencymap/azure-resourcemanager-dependencymap/pom.xml
index 254c59cfb75f..4f03d36b8334 100644
--- a/sdk/dependencymap/azure-resourcemanager-dependencymap/pom.xml
+++ b/sdk/dependencymap/azure-resourcemanager-dependencymap/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml b/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml
index 4653c9289307..0352ee9ff67e 100644
--- a/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml
+++ b/sdk/deploymentmanager/azure-resourcemanager-deploymentmanager/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/desktopvirtualization/azure-resourcemanager-desktopvirtualization/pom.xml b/sdk/desktopvirtualization/azure-resourcemanager-desktopvirtualization/pom.xml
index c237acd8ab4e..1107da40f408 100644
--- a/sdk/desktopvirtualization/azure-resourcemanager-desktopvirtualization/pom.xml
+++ b/sdk/desktopvirtualization/azure-resourcemanager-desktopvirtualization/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/devcenter/azure-developer-devcenter/pom.xml b/sdk/devcenter/azure-developer-devcenter/pom.xml
index 8151a009954c..ec4f10273191 100644
--- a/sdk/devcenter/azure-developer-devcenter/pom.xml
+++ b/sdk/devcenter/azure-developer-devcenter/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/devcenter/azure-resourcemanager-devcenter/pom.xml b/sdk/devcenter/azure-resourcemanager-devcenter/pom.xml
index 9934de236de8..2436e8759650 100644
--- a/sdk/devcenter/azure-resourcemanager-devcenter/pom.xml
+++ b/sdk/devcenter/azure-resourcemanager-devcenter/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/devhub/azure-resourcemanager-devhub/pom.xml b/sdk/devhub/azure-resourcemanager-devhub/pom.xml
index de5784fe1650..167836c55735 100644
--- a/sdk/devhub/azure-resourcemanager-devhub/pom.xml
+++ b/sdk/devhub/azure-resourcemanager-devhub/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
index 437ffc46aa46..567d1dee7ad9 100644
--- a/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
+++ b/sdk/deviceprovisioningservices/azure-resourcemanager-deviceprovisioningservices/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/pom.xml b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/pom.xml
index 29d102ace12f..b88251ea0734 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/pom.xml
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml b/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml
index 042123240906..d807d10b3bca 100644
--- a/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml
+++ b/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml b/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml
index a618e7a50ad7..e83739b75e10 100644
--- a/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml
+++ b/sdk/deviceupdate/azure-resourcemanager-deviceupdate/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/pom.xml b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/pom.xml
index cd1ee4fabf7b..f8408073048a 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/pom.xml
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml b/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml
index 2a7f3268edec..a7df3890305e 100644
--- a/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml
+++ b/sdk/devspaces/azure-resourcemanager-devspaces/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml b/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml
index be84d685a095..107132147f89 100644
--- a/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml
+++ b/sdk/devtestlabs/azure-resourcemanager-devtestlabs/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml
index 0852a0ba70b3..29b5cdd83e03 100644
--- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml
+++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
index 65bfebb73f84..0650150b371b 100644
--- a/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
+++ b/sdk/digitaltwins/azure-resourcemanager-digitaltwins/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/disconnectedoperations/azure-resourcemanager-disconnectedoperations/pom.xml b/sdk/disconnectedoperations/azure-resourcemanager-disconnectedoperations/pom.xml
index fe1e0cbbe6de..a514eec55b94 100644
--- a/sdk/disconnectedoperations/azure-resourcemanager-disconnectedoperations/pom.xml
+++ b/sdk/disconnectedoperations/azure-resourcemanager-disconnectedoperations/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/dnsresolver/azure-resourcemanager-dnsresolver/pom.xml b/sdk/dnsresolver/azure-resourcemanager-dnsresolver/pom.xml
index 95520348ab4f..caa61b5da077 100644
--- a/sdk/dnsresolver/azure-resourcemanager-dnsresolver/pom.xml
+++ b/sdk/dnsresolver/azure-resourcemanager-dnsresolver/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/README.md b/sdk/documentintelligence/azure-ai-documentintelligence/README.md
index 0560cb868133..618f51d0cac1 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/README.md
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/README.md
@@ -94,7 +94,7 @@ Authentication with AAD requires some initial setup:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/pom.xml b/sdk/documentintelligence/azure-ai-documentintelligence/pom.xml
index 971a3cfb55fc..6c5db03926ae 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/pom.xml
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/durabletask/azure-resourcemanager-durabletask/pom.xml b/sdk/durabletask/azure-resourcemanager-durabletask/pom.xml
index 8da5ab84b725..06b08d2279c6 100644
--- a/sdk/durabletask/azure-resourcemanager-durabletask/pom.xml
+++ b/sdk/durabletask/azure-resourcemanager-durabletask/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/dynatrace/azure-resourcemanager-dynatrace/pom.xml b/sdk/dynatrace/azure-resourcemanager-dynatrace/pom.xml
index a1cdb361e859..54ac3db9bb50 100644
--- a/sdk/dynatrace/azure-resourcemanager-dynatrace/pom.xml
+++ b/sdk/dynatrace/azure-resourcemanager-dynatrace/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/easm/azure-analytics-defender-easm/pom.xml b/sdk/easm/azure-analytics-defender-easm/pom.xml
index 0595f8838601..c076cd49ff3b 100644
--- a/sdk/easm/azure-analytics-defender-easm/pom.xml
+++ b/sdk/easm/azure-analytics-defender-easm/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml b/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml
index e8228ef990ef..2bfc60930b61 100644
--- a/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml
+++ b/sdk/edgeorder/azure-resourcemanager-edgeorder/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/edgezones/azure-resourcemanager-edgezones/pom.xml b/sdk/edgezones/azure-resourcemanager-edgezones/pom.xml
index 10329c1c24a8..8ca4afeded00 100644
--- a/sdk/edgezones/azure-resourcemanager-edgezones/pom.xml
+++ b/sdk/edgezones/azure-resourcemanager-edgezones/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/education/azure-resourcemanager-education/pom.xml b/sdk/education/azure-resourcemanager-education/pom.xml
index 507533318104..16dae66b9d9b 100644
--- a/sdk/education/azure-resourcemanager-education/pom.xml
+++ b/sdk/education/azure-resourcemanager-education/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/elastic/azure-resourcemanager-elastic/pom.xml b/sdk/elastic/azure-resourcemanager-elastic/pom.xml
index e51d2c265cda..77329fd1978e 100644
--- a/sdk/elastic/azure-resourcemanager-elastic/pom.xml
+++ b/sdk/elastic/azure-resourcemanager-elastic/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/elasticsan/azure-resourcemanager-elasticsan/pom.xml b/sdk/elasticsan/azure-resourcemanager-elasticsan/pom.xml
index 7cdb11770a2a..cc6339d0138e 100644
--- a/sdk/elasticsan/azure-resourcemanager-elasticsan/pom.xml
+++ b/sdk/elasticsan/azure-resourcemanager-elasticsan/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml
index aadbe780b4b7..9f86795a9cd5 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml
+++ b/sdk/eventgrid/azure-messaging-eventgrid-cloudnative-cloudevents/pom.xml
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/pom.xml
index 82c37c90d532..cb0b1c481162 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/pom.xml
+++ b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/pom.xml
@@ -71,7 +71,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml
index 7c1e5b8b3d28..2aa96b5c0023 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml
+++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml b/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml
index 381844b1759c..02116d12ba6c 100644
--- a/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml
+++ b/sdk/eventgrid/azure-resourcemanager-eventgrid/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
index 30929dcf4b48..995568ba5fcb 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml
index 9613861441e7..2547f5ce36fc 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml
index 9e1462bdab6e..31ccc2bdec34 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs-stress/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/README.md b/sdk/eventhubs/azure-messaging-eventhubs/README.md
index 4ea287673806..1986e42d0d1a 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/README.md
+++ b/sdk/eventhubs/azure-messaging-eventhubs/README.md
@@ -138,7 +138,7 @@ platform. First, add the package:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
index 9b54385b7040..df34aec32534 100644
--- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
+++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/eventhubs/version-overrides-matrix.json b/sdk/eventhubs/version-overrides-matrix.json
index c12c9653f38d..c04b2c263b50 100644
--- a/sdk/eventhubs/version-overrides-matrix.json
+++ b/sdk/eventhubs/version-overrides-matrix.json
@@ -3,7 +3,7 @@
     "Agent": {
       "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
     },
-    "JavaTestVersion": "1.21",
+    "JavaTestVersion": "1.25",
     "TestGoals": "surefire:test",
     "VersionOverride": [
       "reactor_2020",
diff --git a/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml b/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml
index e35d326fce60..136016c6a671 100644
--- a/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml
+++ b/sdk/extendedlocation/azure-resourcemanager-extendedlocation/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/fabric/azure-resourcemanager-fabric/pom.xml b/sdk/fabric/azure-resourcemanager-fabric/pom.xml
index ab70f00a2cc5..52d4ec21725d 100644
--- a/sdk/fabric/azure-resourcemanager-fabric/pom.xml
+++ b/sdk/fabric/azure-resourcemanager-fabric/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/face/azure-ai-vision-face/README.md b/sdk/face/azure-ai-vision-face/README.md
index 9093e22975d0..937949c27a29 100644
--- a/sdk/face/azure-ai-vision-face/README.md
+++ b/sdk/face/azure-ai-vision-face/README.md
@@ -95,7 +95,7 @@ To use the [DefaultAzureCredential][azure_sdk_java_default_azure_credential] typ
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/face/azure-ai-vision-face/pom.xml b/sdk/face/azure-ai-vision-face/pom.xml
index bba1d4d7016e..e2dbc988ad78 100644
--- a/sdk/face/azure-ai-vision-face/pom.xml
+++ b/sdk/face/azure-ai-vision-face/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/fluidrelay/azure-resourcemanager-fluidrelay/pom.xml b/sdk/fluidrelay/azure-resourcemanager-fluidrelay/pom.xml
index 33da7932f929..537164067cc0 100644
--- a/sdk/fluidrelay/azure-resourcemanager-fluidrelay/pom.xml
+++ b/sdk/fluidrelay/azure-resourcemanager-fluidrelay/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/README.md b/sdk/formrecognizer/azure-ai-formrecognizer/README.md
index 80ff42167223..94d64873686f 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/README.md
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/README.md
@@ -168,7 +168,7 @@ Authentication with AAD requires some initial setup:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
index 61db512b75be..8ff4de078969 100644
--- a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
+++ b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml b/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml
index 3fc15d44af3c..fe6bffc533a3 100644
--- a/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml
+++ b/sdk/frontdoor/azure-resourcemanager-frontdoor/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/graphservices/azure-resourcemanager-graphservices/pom.xml b/sdk/graphservices/azure-resourcemanager-graphservices/pom.xml
index 7b55a6992384..6dfa8d77f474 100644
--- a/sdk/graphservices/azure-resourcemanager-graphservices/pom.xml
+++ b/sdk/graphservices/azure-resourcemanager-graphservices/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml b/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml
index b9863cc896db..6de288f97a9a 100644
--- a/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml
+++ b/sdk/hanaonazure/azure-resourcemanager-hanaonazure/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/hardwaresecuritymodules/azure-resourcemanager-hardwaresecuritymodules/pom.xml b/sdk/hardwaresecuritymodules/azure-resourcemanager-hardwaresecuritymodules/pom.xml
index f959081d83aa..b89d88c2c5ad 100644
--- a/sdk/hardwaresecuritymodules/azure-resourcemanager-hardwaresecuritymodules/pom.xml
+++ b/sdk/hardwaresecuritymodules/azure-resourcemanager-hardwaresecuritymodules/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight-containers/pom.xml b/sdk/hdinsight/azure-resourcemanager-hdinsight-containers/pom.xml
index 0911087eca0d..0b7a2bd10baf 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight-containers/pom.xml
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight-containers/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/CHANGELOG.md b/sdk/hdinsight/azure-resourcemanager-hdinsight/CHANGELOG.md
index d593b25e85f4..45a934cb952e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/CHANGELOG.md
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.1.0-beta.3 (Unreleased)
+## 1.1.0-beta.4 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,23 @@
 
 ### Other Changes
 
+## 1.1.0-beta.3 (2025-10-15)
+
+- Azure Resource Manager HDInsight client library for Java. This package contains Microsoft Azure SDK for HDInsight Management SDK. HDInsight Management Client. Package tag package-2025-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+
+### Features Added
+
+* `models.EntraUserInfo` was added
+
+#### `models.UpdateGatewaySettingsParameters` was modified
+
+* `withRestAuthEntraUsers(java.util.List)` was added
+* `restAuthEntraUsers()` was added
+
+#### `models.GatewaySettings` was modified
+
+* `restAuthEntraUsers()` was added
+
 ## 1.1.0-beta.2 (2024-08-21)
 
 - Azure Resource Manager HDInsight client library for Java. This package contains Microsoft Azure SDK for HDInsight Management SDK. HDInsight Management Client. Package tag package-2024-08-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/README.md b/sdk/hdinsight/azure-resourcemanager-hdinsight/README.md
index 4f58d141f653..05d460f6b855 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/README.md
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager HDInsight client library for Java.
 
-This package contains Microsoft Azure SDK for HDInsight Management SDK. HDInsight Management Client. Package tag package-2024-08-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for HDInsight Management SDK. HDInsight Management Client. Package tag package-2025-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -52,7 +52,7 @@ Azure subscription ID can be configured via `AZURE_SUBSCRIPTION_ID` environment
 Assuming the use of the `DefaultAzureCredential` credential class, the client can be authenticated using the following code:
 
 ```java
-AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
+AzureProfile profile = new AzureProfile(AzureCloud.AZURE_PUBLIC_CLOUD);
 TokenCredential credential = new DefaultAzureCredentialBuilder()
     .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
     .build();
@@ -60,7 +60,7 @@ HDInsightManager manager = HDInsightManager
     .authenticate(credential, profile);
 ```
 
-The sample code assumes global Azure. Please change `AzureEnvironment.AZURE` variable if otherwise.
+The sample code assumes global Azure. Please change the `AzureCloud.AZURE_PUBLIC_CLOUD` variable if otherwise.
 
 See [Authentication][authenticate] for more options.
 
@@ -71,15 +71,15 @@ See [API design][design] for general introduction on design and key concepts on
 ## Examples
 
 ```java
-com.azure.resourcemanager.storage.models.StorageAccount storageAccount =
-    storageManager.storageAccounts().define(storageName)
-        .withRegion(REGION)
-        .withExistingResourceGroup(resourceGroupName)
-        .withSku(StorageAccountSkuType.STANDARD_LRS)
-        .withMinimumTlsVersion(MinimumTlsVersion.TLS1_0)
-        .withAccessFromAzureServices()
-        .withAccessFromAllNetworks()
-        .create();
+com.azure.resourcemanager.storage.models.StorageAccount storageAccount = storageManager.storageAccounts()
+    .define(storageName)
+    .withRegion(REGION)
+    .withExistingResourceGroup(resourceGroupName)
+    .withSku(StorageAccountSkuType.STANDARD_LRS)
+    .withMinimumTlsVersion(MinimumTlsVersion.TLS1_0)
+    .withAccessFromAzureServices()
+    .withAccessFromAllNetworks()
+    .create();
 
 BlobContainer blobContainer = storageManager.blobContainers()
     .defineContainer(containerName)
@@ -87,59 +87,52 @@ BlobContainer blobContainer = storageManager.blobContainers()
     .withPublicAccess(PublicAccess.NONE)
     .create();
 
-cluster = hdInsightManager.clusters()
-    .define(clusterName)
-    .withExistingResourceGroup(resourceGroupName)
-    .withRegion(REGION)
-    .withProperties(
-        new ClusterCreateProperties()
-            .withClusterVersion("4.0.3000.1")
-            .withOsType(OSType.LINUX)
-            .withClusterDefinition(
-                new ClusterDefinition()
-                    .withKind("SPARK")
+cluster
+    = hdInsightManager.clusters()
+        .define(clusterName)
+        .withExistingResourceGroup(resourceGroupName)
+        .withRegion(REGION)
+        .withProperties(
+            new ClusterCreateProperties().withClusterVersion("4.0.3000.1")
+                .withOsType(OSType.LINUX)
+                .withClusterDefinition(new ClusterDefinition().withKind("SPARK")
                     .withConfigurations(Collections.unmodifiableMap(clusterDefinition)))
-            .withComputeProfile(
-                new ComputeProfile()
-                    .withRoles(
-                        Arrays.asList(
-                            new Role().withName("headnode")
-                                .withTargetInstanceCount(2)
-                                .withHardwareProfile(new HardwareProfile().withVmSize("standard_e8_v3"))
-                                .withOsProfile(osProfile)
-                                .withEncryptDataDisks(false),
-                            new Role().withName("workernode")
-                                .withTargetInstanceCount(4)
-                                .withHardwareProfile(new HardwareProfile().withVmSize("standard_e8_v3"))
-                                .withOsProfile(osProfile)
-                                .withEncryptDataDisks(false),
-                            new Role().withName("zookeepernode")
-                                .withTargetInstanceCount(3)
-                                .withHardwareProfile(new HardwareProfile().withVmSize("standard_a2_v2"))
-                                .withOsProfile(osProfile)
-                                .withEncryptDataDisks(false)
-                        )))
-            .withTier(Tier.STANDARD)
-            .withEncryptionInTransitProperties(
-                new EncryptionInTransitProperties()
-                    .withIsEncryptionInTransitEnabled(false))
-            .withStorageProfile(
-                new StorageProfile()
-                    .withStorageaccounts(
-                        Arrays.asList(
-                            new StorageAccount()
-                                .withName(storageName + ".blob.core.windows.net")
-                                .withResourceId(storageAccount.id())
-                                .withContainer(blobContainer.name())
-                                .withIsDefault(true)
-                                .withKey(storageAccount.getKeys().iterator().next().value()))
-                    ))
-            .withMinSupportedTlsVersion("1.2")
-            .withComputeIsolationProperties(
-                new ComputeIsolationProperties()
-                    .withEnableComputeIsolation(false))
-    )
-    .create();
+                .withComputeProfile(
+                    new ComputeProfile()
+                        .withRoles(
+                            Arrays
+                                .asList(
+                                    new Role().withName("headnode")
+                                        .withTargetInstanceCount(2)
+                                        .withHardwareProfile(
+                                            new HardwareProfile().withVmSize("standard_e8_v3"))
+                                        .withOsProfile(osProfile)
+                                        .withEncryptDataDisks(false),
+                                    new Role().withName("workernode")
+                                        .withTargetInstanceCount(4)
+                                        .withHardwareProfile(
+                                            new HardwareProfile().withVmSize("standard_e8_v3"))
+                                        .withOsProfile(osProfile)
+                                        .withEncryptDataDisks(false),
+                                    new Role().withName("zookeepernode")
+                                        .withTargetInstanceCount(3)
+                                        .withHardwareProfile(
+                                            new HardwareProfile().withVmSize("standard_a2_v2"))
+                                        .withOsProfile(osProfile)
+                                        .withEncryptDataDisks(false))))
+                .withTier(Tier.STANDARD)
+                .withEncryptionInTransitProperties(
+                    new EncryptionInTransitProperties().withIsEncryptionInTransitEnabled(false))
+                .withStorageProfile(new StorageProfile().withStorageaccounts(
+                    Arrays.asList(new StorageAccount().withName(storageName + ".blob.core.windows.net")
+                        .withResourceId(storageAccount.id())
+                        .withContainer(blobContainer.name())
+                        .withIsDefault(true)
+                        .withKey(storageAccount.getKeys().iterator().next().value()))))
+                .withMinSupportedTlsVersion("1.2")
+                .withComputeIsolationProperties(
+                    new ComputeIsolationProperties().withEnableComputeIsolation(false)))
+        .create();
 ```
 [Code snippets and samples](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/hdinsight/azure-resourcemanager-hdinsight/SAMPLE.md)
 
@@ -171,5 +164,3 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
 [cg]: https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md
 [coc]: https://opensource.microsoft.com/codeofconduct/
 [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
-
-
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/SAMPLE.md b/sdk/hdinsight/azure-resourcemanager-hdinsight/SAMPLE.md
index 85dd5231896f..6355d85fea59 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/SAMPLE.md
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/SAMPLE.md
@@ -107,7 +107,7 @@ import java.util.Arrays;
 public final class ApplicationsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateApplication.json
      */
     /**
@@ -148,7 +148,7 @@ public final class ApplicationsCreateSamples {
 public final class ApplicationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeleteApplication.json
      */
     /**
@@ -172,7 +172,7 @@ public final class ApplicationsDeleteSamples {
 public final class ApplicationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetApplicationInProgress.json
      */
     /**
@@ -187,7 +187,7 @@ public final class ApplicationsGetSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetApplicationCreated.json
      */
     /**
@@ -211,7 +211,7 @@ public final class ApplicationsGetSamples {
 public final class ApplicationsGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetApplicationCreationAsyncOperationStatus.json
      */
     /**
@@ -236,7 +236,7 @@ public final class ApplicationsGetAzureAsyncOperationStatusSamples {
 public final class ApplicationsListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetAllApplications.json
      */
     /**
@@ -263,6 +263,7 @@ import com.azure.resourcemanager.hdinsight.models.AutoscaleTimeAndCapacity;
 import com.azure.resourcemanager.hdinsight.models.ClientGroupInfo;
 import com.azure.resourcemanager.hdinsight.models.ClusterCreateProperties;
 import com.azure.resourcemanager.hdinsight.models.ClusterDefinition;
+import com.azure.resourcemanager.hdinsight.models.ClusterIdentity;
 import com.azure.resourcemanager.hdinsight.models.ComputeIsolationProperties;
 import com.azure.resourcemanager.hdinsight.models.ComputeProfile;
 import com.azure.resourcemanager.hdinsight.models.DataDisksGroups;
@@ -275,9 +276,10 @@ import com.azure.resourcemanager.hdinsight.models.IpTag;
 import com.azure.resourcemanager.hdinsight.models.KafkaRestProperties;
 import com.azure.resourcemanager.hdinsight.models.LinuxOperatingSystemProfile;
 import com.azure.resourcemanager.hdinsight.models.NetworkProperties;
-import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.OSType;
+import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.PrivateLink;
+import com.azure.resourcemanager.hdinsight.models.ResourceIdentityType;
 import com.azure.resourcemanager.hdinsight.models.ResourceProviderConnection;
 import com.azure.resourcemanager.hdinsight.models.Role;
 import com.azure.resourcemanager.hdinsight.models.SecurityProfile;
@@ -286,6 +288,7 @@ import com.azure.resourcemanager.hdinsight.models.SshPublicKey;
 import com.azure.resourcemanager.hdinsight.models.StorageAccount;
 import com.azure.resourcemanager.hdinsight.models.StorageProfile;
 import com.azure.resourcemanager.hdinsight.models.Tier;
+import com.azure.resourcemanager.hdinsight.models.UserAssignedIdentity;
 import com.azure.resourcemanager.hdinsight.models.VirtualNetworkProfile;
 import java.io.IOException;
 import java.util.Arrays;
@@ -298,7 +301,7 @@ import java.util.Map;
 public final class ClustersCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopSshPassword.json
      */
     /**
@@ -353,7 +356,81 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * CreateHDInsightClusterWithADLSGen2Msi.json
+     */
+    /**
+     * Sample code: Create cluster with storage ADLSGen2 + MSI.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void createClusterWithStorageADLSGen2MSI(com.azure.resourcemanager.hdinsight.HDInsightManager manager)
+        throws IOException {
+        manager.clusters()
+            .define("cluster1")
+            .withExistingResourceGroup("rg1")
+            .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+            .withProperties(new ClusterCreateProperties().withClusterVersion("5.1")
+                .withOsType(OSType.LINUX)
+                .withTier(Tier.STANDARD)
+                .withClusterDefinition(new ClusterDefinition().withKind("Hadoop")
+                    .withConfigurations(SerializerFactory.createDefaultManagementSerializerAdapter()
+                        .deserialize(
+                            "{\"gateway\":{\"restAuthCredential.isEnabled\":true,\"restAuthCredential.password\":\"**********\",\"restAuthCredential.username\":\"admin\"}}",
+                            Object.class, SerializerEncoding.JSON)))
+                .withComputeProfile(new ComputeProfile().withRoles(Arrays.asList(new Role().withName("headnode")
+                    .withMinInstanceCount(1)
+                    .withTargetInstanceCount(2)
+                    .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                    .withOsProfile(new OsProfile().withLinuxOperatingSystemProfile(
+                        new LinuxOperatingSystemProfile().withUsername("sshuser").withPassword("fakeTokenPlaceholder")))
+                    .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                        .withSubnet(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                    .withScriptActions(Arrays.asList()),
+                    new Role().withName("workernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()),
+                    new Role().withName("zookeepernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()))))
+                .withStorageProfile(new StorageProfile().withStorageaccounts(Arrays.asList(new StorageAccount()
+                    .withName("mystorage.blob.core.windows.net")
+                    .withIsDefault(true)
+                    .withFileSystem("default")
+                    .withResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/mystorage")
+                    .withMsiResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi")))))
+            .withIdentity(new ClusterIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                .withUserAssignedIdentities(mapOf(
+                    "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi",
+                    new UserAssignedIdentity())))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateKafkaClusterWithKafkaRestProxy.json
      */
     /**
@@ -415,7 +492,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithAutoscaleConfig.json
      */
     /**
@@ -483,7 +560,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopSshPublicKey.json
      */
     /**
@@ -543,7 +620,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithAvailabilityZones.json
      */
     /**
@@ -600,7 +677,58 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * CreateHDInsightClusterWithEntraUser.json
+     */
+    /**
+     * Sample code: Create cluster with Entra User.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void createClusterWithEntraUser(com.azure.resourcemanager.hdinsight.HDInsightManager manager)
+        throws IOException {
+        manager.clusters()
+            .define("cluster1")
+            .withExistingResourceGroup("rg1")
+            .withProperties(new ClusterCreateProperties().withClusterVersion("5.1")
+                .withOsType(OSType.LINUX)
+                .withTier(Tier.STANDARD)
+                .withClusterDefinition(new ClusterDefinition().withKind("Hadoop")
+                    .withConfigurations(SerializerFactory.createDefaultManagementSerializerAdapter()
+                        .deserialize(
+                            "{\"gateway\":{\"restAuthCredential.isEnabled\":false,\"restAuthEntraUsers\":[{\"displayName\":\"displayName\",\"objectId\":\"00000000-0000-0000-0000-000000000000\",\"upn\":\"user@microsoft.com\"}]}}",
+                            Object.class, SerializerEncoding.JSON)))
+                .withComputeProfile(new ComputeProfile().withRoles(Arrays.asList(
+                    new Role().withName("headnode")
+                        .withTargetInstanceCount(2)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder"))),
+                    new Role().withName("workernode")
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder"))),
+                    new Role().withName("zookeepernode")
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder"))))))
+                .withStorageProfile(new StorageProfile()
+                    .withStorageaccounts(Arrays.asList(new StorageAccount().withName("mystorage.blob.core.windows.net")
+                        .withIsDefault(true)
+                        .withContainer("containername")
+                        .withKey("fakeTokenPlaceholder")
+                        .withEnableSecureChannel(true)))))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopAdlsGen2.json
      */
     /**
@@ -655,7 +783,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopSecureHadoop.json
      */
     /**
@@ -738,7 +866,81 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * CreateHDInsightClusterWithWasbMsi.json
+     */
+    /**
+     * Sample code: Create cluster with storage WASB + MSI.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void createClusterWithStorageWASBMSI(com.azure.resourcemanager.hdinsight.HDInsightManager manager)
+        throws IOException {
+        manager.clusters()
+            .define("cluster1")
+            .withExistingResourceGroup("rg1")
+            .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+            .withProperties(new ClusterCreateProperties().withClusterVersion("5.1")
+                .withOsType(OSType.LINUX)
+                .withTier(Tier.STANDARD)
+                .withClusterDefinition(new ClusterDefinition().withKind("Hadoop")
+                    .withConfigurations(SerializerFactory.createDefaultManagementSerializerAdapter()
+                        .deserialize(
+                            "{\"gateway\":{\"restAuthCredential.isEnabled\":true,\"restAuthCredential.password\":\"**********\",\"restAuthCredential.username\":\"admin\"}}",
+                            Object.class, SerializerEncoding.JSON)))
+                .withComputeProfile(new ComputeProfile().withRoles(Arrays.asList(new Role().withName("headnode")
+                    .withMinInstanceCount(1)
+                    .withTargetInstanceCount(2)
+                    .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                    .withOsProfile(new OsProfile().withLinuxOperatingSystemProfile(
+                        new LinuxOperatingSystemProfile().withUsername("sshuser").withPassword("fakeTokenPlaceholder")))
+                    .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                        .withSubnet(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                    .withScriptActions(Arrays.asList()),
+                    new Role().withName("workernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()),
+                    new Role().withName("zookeepernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()))))
+                .withStorageProfile(new StorageProfile().withStorageaccounts(Arrays.asList(new StorageAccount()
+                    .withName("mystorage.blob.core.windows.net")
+                    .withIsDefault(true)
+                    .withContainer("containername")
+                    .withResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/mystorage")
+                    .withMsiResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi")))))
+            .withIdentity(new ClusterIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                .withUserAssignedIdentities(mapOf(
+                    "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi",
+                    new UserAssignedIdentity())))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxSparkSshPassword.json
      */
     /**
@@ -787,7 +989,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithCustomNetworkProperties.json
      */
     /**
@@ -847,7 +1049,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithTLS12.json
      */
     /**
@@ -899,7 +1101,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithEncryptionAtHost.json
      */
     /**
@@ -951,7 +1153,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithEncryptionInTransit.json
      */
     /**
@@ -1004,7 +1206,7 @@ public final class ClustersCreateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithComputeIsolationProperties.json
      */
     /**
@@ -1078,7 +1280,7 @@ public final class ClustersCreateSamples {
 public final class ClustersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeleteLinuxHadoopCluster.json
      */
     /**
@@ -1105,7 +1307,7 @@ import java.util.Arrays;
 public final class ClustersExecuteScriptActionsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PostExecuteScriptAction.json
      */
     /**
@@ -1137,7 +1339,7 @@ public final class ClustersExecuteScriptActionsSamples {
 public final class ClustersGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetClusterCreatingAsyncOperationStatus.json
      */
     /**
@@ -1163,7 +1365,7 @@ public final class ClustersGetAzureAsyncOperationStatusSamples {
 public final class ClustersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopCluster.json
      */
     /**
@@ -1177,7 +1379,7 @@ public final class ClustersGetByResourceGroupSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxSparkCluster.json
      */
     /**
@@ -1200,7 +1402,7 @@ public final class ClustersGetByResourceGroupSamples {
 public final class ClustersGetGatewaySettingsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Clusters_GetGatewaySettings.json
      */
     /**
@@ -1223,7 +1425,7 @@ public final class ClustersGetGatewaySettingsSamples {
 public final class ClustersListSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopAllClusters.json
      */
     /**
@@ -1246,7 +1448,7 @@ public final class ClustersListSamples {
 public final class ClustersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopAllClustersInResourceGroup.json
      */
     /**
@@ -1273,7 +1475,7 @@ import com.azure.resourcemanager.hdinsight.models.RoleName;
 public final class ClustersResizeSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ResizeLinuxHadoopCluster.json
      */
     /**
@@ -1301,7 +1503,7 @@ import com.azure.resourcemanager.hdinsight.models.ClusterDiskEncryptionParameter
 public final class ClustersRotateDiskEncryptionKeySamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * RotateLinuxHadoopClusterDiskEncryptionKey.json
      */
     /**
@@ -1336,7 +1538,7 @@ import java.util.Map;
 public final class ClustersUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PatchLinuxHadoopCluster.json
      */
     /**
@@ -1353,7 +1555,7 @@ public final class ClustersUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PatchLinuxHadoopClusterWithSystemMSI.json
      */
     /**
@@ -1405,7 +1607,7 @@ import java.util.Arrays;
 public final class ClustersUpdateAutoScaleConfigurationSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableOrUpdateAutoScaleWithLoadBasedConfiguration.json
      */
     /**
@@ -1424,7 +1626,7 @@ public final class ClustersUpdateAutoScaleConfigurationSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableClusterAutoScale.json
      */
     /**
@@ -1441,7 +1643,7 @@ public final class ClustersUpdateAutoScaleConfigurationSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableOrUpdateAutoScaleWithScheduleBasedConfiguration.json
      */
     /**
@@ -1467,7 +1669,9 @@ public final class ClustersUpdateAutoScaleConfigurationSamples {
 ### Clusters_UpdateGatewaySettings
 
 ```java
+import com.azure.resourcemanager.hdinsight.models.EntraUserInfo;
 import com.azure.resourcemanager.hdinsight.models.UpdateGatewaySettingsParameters;
+import java.util.Arrays;
 
 /**
  * Samples for Clusters UpdateGatewaySettings.
@@ -1475,7 +1679,7 @@ import com.azure.resourcemanager.hdinsight.models.UpdateGatewaySettingsParameter
 public final class ClustersUpdateGatewaySettingsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Clusters_UpdateGatewaySettings_Enable.json
      */
     /**
@@ -1488,6 +1692,26 @@ public final class ClustersUpdateGatewaySettingsSamples {
             .updateGatewaySettings("rg1", "cluster1", new UpdateGatewaySettingsParameters(),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * HDI_Clusters_UpdateGatewaySettings_EntraUser.json
+     */
+    /**
+     * Sample code: Update Entra User In HDInsight.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void updateEntraUserInHDInsight(com.azure.resourcemanager.hdinsight.HDInsightManager manager) {
+        manager.clusters()
+            .updateGatewaySettings("rg1", "cluster1",
+                new UpdateGatewaySettingsParameters().withRestAuthEntraUsers(
+                    Arrays.asList(new EntraUserInfo().withObjectId("00000000-0000-0000-0000-000000000000")
+                        .withDisplayName("displayName")
+                        .withUpn("user@microsoft.com"))),
+                com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -1502,7 +1726,7 @@ import com.azure.resourcemanager.hdinsight.models.UpdateClusterIdentityCertifica
 public final class ClustersUpdateIdentityCertificateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Clusters_UpdateClusterIdentityCertificate.json
      */
     /**
@@ -1530,7 +1754,7 @@ public final class ClustersUpdateIdentityCertificateSamples {
 public final class ConfigurationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Configurations_Get.json
      */
     /**
@@ -1553,7 +1777,7 @@ public final class ConfigurationsGetSamples {
 public final class ConfigurationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Configurations_List.json
      */
     /**
@@ -1579,7 +1803,7 @@ import java.util.Map;
 public final class ConfigurationsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ChangeHttpConnectivityEnable.json
      */
     /**
@@ -1597,7 +1821,7 @@ public final class ConfigurationsUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ChangeHttpConnectivityDisable.json
      */
     /**
@@ -1636,7 +1860,7 @@ import com.azure.resourcemanager.hdinsight.models.Extension;
 public final class ExtensionsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/CreateExtension.
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/CreateExtension.
      * json
      */
     /**
@@ -1664,7 +1888,7 @@ public final class ExtensionsCreateSamples {
 public final class ExtensionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/DeleteExtension.
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/DeleteExtension.
      * json
      */
     /**
@@ -1687,7 +1911,7 @@ public final class ExtensionsDeleteSamples {
 public final class ExtensionsDisableAzureMonitorSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableLinuxClusterAzureMonitor.json
      */
     /**
@@ -1710,7 +1934,7 @@ public final class ExtensionsDisableAzureMonitorSamples {
 public final class ExtensionsDisableAzureMonitorAgentSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableLinuxClusterAzureMonitorAgent.json
      */
     /**
@@ -1733,7 +1957,7 @@ public final class ExtensionsDisableAzureMonitorAgentSamples {
 public final class ExtensionsDisableMonitoringSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableLinuxClusterMonitoring.json
      */
     /**
@@ -1758,7 +1982,7 @@ import com.azure.resourcemanager.hdinsight.models.AzureMonitorRequest;
 public final class ExtensionsEnableAzureMonitorSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableLinuxClusterAzureMonitor.json
      */
     /**
@@ -1787,7 +2011,7 @@ import com.azure.resourcemanager.hdinsight.models.AzureMonitorRequest;
 public final class ExtensionsEnableAzureMonitorAgentSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableLinuxClusterAzureMonitorAgent.json
      */
     /**
@@ -1816,7 +2040,7 @@ import com.azure.resourcemanager.hdinsight.models.ClusterMonitoringRequest;
 public final class ExtensionsEnableMonitoringSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableLinuxClusterMonitoring.json
      */
     /**
@@ -1843,7 +2067,7 @@ public final class ExtensionsEnableMonitoringSamples {
 public final class ExtensionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/GetExtension.
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/GetExtension.
      * json
      */
     /**
@@ -1866,7 +2090,7 @@ public final class ExtensionsGetSamples {
 public final class ExtensionsGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetExtensionCreationAsyncOperationStatus.json
      */
     /**
@@ -1891,7 +2115,7 @@ public final class ExtensionsGetAzureAsyncOperationStatusSamples {
 public final class ExtensionsGetAzureMonitorAgentStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxClusterAzureMonitorAgentStatus.json
      */
     /**
@@ -1915,7 +2139,7 @@ public final class ExtensionsGetAzureMonitorAgentStatusSamples {
 public final class ExtensionsGetAzureMonitorStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxClusterAzureMonitorStatus.json
      */
     /**
@@ -1938,7 +2162,7 @@ public final class ExtensionsGetAzureMonitorStatusSamples {
 public final class ExtensionsGetMonitoringStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxClusterMonitoringStatus.json
      */
     /**
@@ -1963,7 +2187,7 @@ import com.azure.resourcemanager.hdinsight.models.NameAvailabilityCheckRequestPa
 public final class LocationsCheckNameAvailabilitySamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_CheckClusterNameAvailability.json
      */
     /**
@@ -1990,7 +2214,7 @@ public final class LocationsCheckNameAvailabilitySamples {
 public final class LocationsGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_GetAsyncOperationStatus.json
      */
     /**
@@ -2015,7 +2239,7 @@ public final class LocationsGetAzureAsyncOperationStatusSamples {
 public final class LocationsGetCapabilitiesSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetHDInsightCapabilities.json
      */
     /**
@@ -2039,7 +2263,7 @@ public final class LocationsGetCapabilitiesSamples {
 public final class LocationsListBillingSpecsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_ListBillingSpecs.json
      */
     /**
@@ -2063,7 +2287,7 @@ public final class LocationsListBillingSpecsSamples {
 public final class LocationsListUsagesSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetHDInsightUsages.json
      */
     /**
@@ -2089,8 +2313,8 @@ import com.azure.resourcemanager.hdinsight.models.ClusterDefinition;
 import com.azure.resourcemanager.hdinsight.models.ComputeProfile;
 import com.azure.resourcemanager.hdinsight.models.HardwareProfile;
 import com.azure.resourcemanager.hdinsight.models.LinuxOperatingSystemProfile;
-import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.OSType;
+import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.Role;
 import com.azure.resourcemanager.hdinsight.models.StorageAccount;
 import com.azure.resourcemanager.hdinsight.models.StorageProfile;
@@ -2106,7 +2330,7 @@ import java.util.Map;
 public final class LocationsValidateClusterCreateRequestSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_ValidateClusterCreateRequest.json
      */
     /**
@@ -2191,7 +2415,7 @@ public final class LocationsValidateClusterCreateRequestSamples {
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ListHDInsightOperations.json
      */
     /**
@@ -2217,7 +2441,7 @@ import com.azure.resourcemanager.hdinsight.models.PrivateLinkServiceConnectionSt
 public final class PrivateEndpointConnectionsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ApprovePrivateEndpointConnection.json
      */
     /**
@@ -2248,7 +2472,7 @@ public final class PrivateEndpointConnectionsCreateOrUpdateSamples {
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeletePrivateEndpointConnection.json
      */
     /**
@@ -2274,7 +2498,7 @@ public final class PrivateEndpointConnectionsDeleteSamples {
 public final class PrivateEndpointConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetPrivateEndpointConnection.json
      */
     /**
@@ -2300,7 +2524,7 @@ public final class PrivateEndpointConnectionsGetSamples {
 public final class PrivateEndpointConnectionsListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetAllPrivateEndpointConnectionsInCluster.json
      */
     /**
@@ -2324,7 +2548,7 @@ public final class PrivateEndpointConnectionsListByClusterSamples {
 public final class PrivateLinkResourcesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetPrivateLinkResource.json
      */
     /**
@@ -2348,7 +2572,7 @@ public final class PrivateLinkResourcesGetSamples {
 public final class PrivateLinkResourcesListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetAllPrivateLinkResourcesInCluster.json
      */
     /**
@@ -2372,7 +2596,7 @@ public final class PrivateLinkResourcesListByClusterSamples {
 public final class ScriptActionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeleteScriptAction.json
      */
     /**
@@ -2396,7 +2620,7 @@ public final class ScriptActionsDeleteSamples {
 public final class ScriptActionsGetExecutionAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetScriptExecutionAsyncOperationStatus.json
      */
     /**
@@ -2422,7 +2646,7 @@ public final class ScriptActionsGetExecutionAsyncOperationStatusSamples {
 public final class ScriptActionsGetExecutionDetailSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetScriptActionById.json
      */
     /**
@@ -2447,7 +2671,7 @@ public final class ScriptActionsGetExecutionDetailSamples {
 public final class ScriptActionsListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopScriptAction.json
      */
     /**
@@ -2471,7 +2695,7 @@ public final class ScriptActionsListByClusterSamples {
 public final class ScriptExecutionHistoryListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetScriptExecutionHistory.json
      */
     /**
@@ -2494,7 +2718,7 @@ public final class ScriptExecutionHistoryListByClusterSamples {
 public final class ScriptExecutionHistoryPromoteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PromoteLinuxHadoopScriptAction.json
      */
     /**
@@ -2519,7 +2743,7 @@ public final class ScriptExecutionHistoryPromoteSamples {
 public final class VirtualMachinesGetAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetRestartHostsAsyncOperationStatus.json
      */
     /**
@@ -2545,7 +2769,7 @@ public final class VirtualMachinesGetAsyncOperationStatusSamples {
 public final class VirtualMachinesListHostsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetClusterVirtualMachines.json
      */
     /**
@@ -2570,7 +2794,7 @@ import java.util.Arrays;
 public final class VirtualMachinesRestartHostsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * RestartVirtualMachinesOperation.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml b/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml
index 2c46cc8cf1ca..6a327699015c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/pom.xml
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-hdinsight</artifactId>
-  <version>1.1.0-beta.3</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-hdinsight;current} -->
+  <version>1.1.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-hdinsight;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for HDInsight Management</name>
-  <description>This package contains Microsoft Azure SDK for HDInsight Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. HDInsight Management Client. Package tag package-2024-08-preview.</description>
+  <description>This package contains Microsoft Azure SDK for HDInsight Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. HDInsight Management Client. Package tag package-2025-01-preview.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -48,11 +48,6 @@
     <revapi.skip>true</revapi.skip>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-json</artifactId>
-      <version>1.5.0</version> <!-- {x-version-update;com.azure:azure-json;dependency} -->
-    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
@@ -72,9 +67,14 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-json</artifactId>
+      <version>1.5.0</version> <!-- {x-version-update;com.azure:azure-json;dependency} -->
+    </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-storage</artifactId>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/HDInsightManager.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/HDInsightManager.java
index 559cfc180130..0ccac7a50fde 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/HDInsightManager.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/HDInsightManager.java
@@ -11,17 +11,18 @@
 import com.azure.core.http.HttpPipelinePosition;
 import com.azure.core.http.policy.AddDatePolicy;
 import com.azure.core.http.policy.AddHeadersFromContextPolicy;
-import com.azure.core.http.policy.HttpLoggingPolicy;
+import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.core.http.policy.HttpLoggingPolicy;
 import com.azure.core.http.policy.HttpPipelinePolicy;
 import com.azure.core.http.policy.HttpPolicyProviders;
 import com.azure.core.http.policy.RequestIdPolicy;
 import com.azure.core.http.policy.RetryOptions;
 import com.azure.core.http.policy.RetryPolicy;
 import com.azure.core.http.policy.UserAgentPolicy;
-import com.azure.core.management.http.policy.ArmChallengeAuthenticationPolicy;
 import com.azure.core.management.profile.AzureProfile;
 import com.azure.core.util.Configuration;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.hdinsight.fluent.HDInsightManagementClient;
 import com.azure.resourcemanager.hdinsight.implementation.ApplicationsImpl;
@@ -51,6 +52,7 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -133,6 +135,9 @@ public static Configurable configure() {
      */
     public static final class Configurable {
         private static final ClientLogger LOGGER = new ClientLogger(Configurable.class);
+        private static final String SDK_VERSION = "version";
+        private static final Map<String, String> PROPERTIES
+            = CoreUtils.getProperties("azure-resourcemanager-hdinsight.properties");
 
         private HttpClient httpClient;
         private HttpLogOptions httpLogOptions;
@@ -240,12 +245,14 @@ public HDInsightManager authenticate(TokenCredential credential, AzureProfile pr
             Objects.requireNonNull(credential, "'credential' cannot be null.");
             Objects.requireNonNull(profile, "'profile' cannot be null.");
 
+            String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion");
+
             StringBuilder userAgentBuilder = new StringBuilder();
             userAgentBuilder.append("azsdk-java")
                 .append("-")
                 .append("com.azure.resourcemanager.hdinsight")
                 .append("/")
-                .append("1.1.0-beta.2");
+                .append(clientVersion);
             if (!Configuration.getGlobalConfiguration().get("AZURE_TELEMETRY_DISABLED", false)) {
                 userAgentBuilder.append(" (")
                     .append(Configuration.getGlobalConfiguration().get("java.version"))
@@ -278,7 +285,7 @@ public HDInsightManager authenticate(TokenCredential credential, AzureProfile pr
             HttpPolicyProviders.addBeforeRetryPolicies(policies);
             policies.add(retryPolicy);
             policies.add(new AddDatePolicy());
-            policies.add(new ArmChallengeAuthenticationPolicy(credential, scopes.toArray(new String[0])));
+            policies.add(new BearerTokenAuthenticationPolicy(credential, scopes.toArray(new String[0])));
             policies.addAll(this.policies.stream()
                 .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
                 .collect(Collectors.toList()));
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ApplicationInner.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ApplicationInner.java
index 1229fbdba932..edc96b386a88 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ApplicationInner.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ApplicationInner.java
@@ -40,9 +40,9 @@ public final class ApplicationInner extends ProxyResource {
     private SystemData systemData;
 
     /*
-     * Fully qualified resource Id for the resource.
+     * The type of the resource.
      */
-    private String id;
+    private String type;
 
     /*
      * The name of the resource.
@@ -50,9 +50,9 @@ public final class ApplicationInner extends ProxyResource {
     private String name;
 
     /*
-     * The type of the resource.
+     * Fully qualified resource Id for the resource.
      */
-    private String type;
+    private String id;
 
     /**
      * Creates an instance of ApplicationInner class.
@@ -130,13 +130,13 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the id property: Fully qualified resource Id for the resource.
+     * Get the type property: The type of the resource.
      * 
-     * @return the id value.
+     * @return the type value.
      */
     @Override
-    public String id() {
-        return this.id;
+    public String type() {
+        return this.type;
     }
 
     /**
@@ -150,13 +150,13 @@ public String name() {
     }
 
     /**
-     * Get the type property: The type of the resource.
+     * Get the id property: Fully qualified resource Id for the resource.
      * 
-     * @return the type value.
+     * @return the id value.
      */
     @Override
-    public String type() {
-        return this.type;
+    public String id() {
+        return this.id;
     }
 
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ClusterInner.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ClusterInner.java
index f5582673499b..c21dec690ee4 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ClusterInner.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/ClusterInner.java
@@ -47,9 +47,9 @@ public final class ClusterInner extends Resource {
     private SystemData systemData;
 
     /*
-     * Fully qualified resource Id for the resource.
+     * The type of the resource.
      */
-    private String id;
+    private String type;
 
     /*
      * The name of the resource.
@@ -57,9 +57,9 @@ public final class ClusterInner extends Resource {
     private String name;
 
     /*
-     * The type of the resource.
+     * Fully qualified resource Id for the resource.
      */
-    private String type;
+    private String id;
 
     /**
      * Creates an instance of ClusterInner class.
@@ -157,13 +157,13 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the id property: Fully qualified resource Id for the resource.
+     * Get the type property: The type of the resource.
      * 
-     * @return the id value.
+     * @return the type value.
      */
     @Override
-    public String id() {
-        return this.id;
+    public String type() {
+        return this.type;
     }
 
     /**
@@ -177,13 +177,13 @@ public String name() {
     }
 
     /**
-     * Get the type property: The type of the resource.
+     * Get the id property: Fully qualified resource Id for the resource.
      * 
-     * @return the type value.
+     * @return the id value.
      */
     @Override
-    public String type() {
-        return this.type;
+    public String id() {
+        return this.id;
     }
 
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/GatewaySettingsInner.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/GatewaySettingsInner.java
index 5d2660a5d1e1..0ca296cfe231 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/GatewaySettingsInner.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/GatewaySettingsInner.java
@@ -4,17 +4,19 @@
 
 package com.azure.resourcemanager.hdinsight.fluent.models;
 
-import com.azure.core.annotation.Immutable;
+import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.hdinsight.models.EntraUserInfo;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Gateway settings.
  */
-@Immutable
+@Fluent
 public final class GatewaySettingsInner implements JsonSerializable<GatewaySettingsInner> {
     /*
      * Indicates whether or not the gateway settings based authorization is enabled.
@@ -31,6 +33,11 @@ public final class GatewaySettingsInner implements JsonSerializable<GatewaySetti
      */
     private String password;
 
+    /*
+     * List of Entra users for gateway access.
+     */
+    private List<EntraUserInfo> restAuthEntraUsers;
+
     /**
      * Creates an instance of GatewaySettingsInner class.
      */
@@ -65,12 +72,35 @@ public String password() {
         return this.password;
     }
 
+    /**
+     * Get the restAuthEntraUsers property: List of Entra users for gateway access.
+     * 
+     * @return the restAuthEntraUsers value.
+     */
+    public List<EntraUserInfo> restAuthEntraUsers() {
+        return this.restAuthEntraUsers;
+    }
+
+    /**
+     * Set the restAuthEntraUsers property: List of Entra users for gateway access.
+     * 
+     * @param restAuthEntraUsers the restAuthEntraUsers value to set.
+     * @return the GatewaySettingsInner object itself.
+     */
+    public GatewaySettingsInner withRestAuthEntraUsers(List<EntraUserInfo> restAuthEntraUsers) {
+        this.restAuthEntraUsers = restAuthEntraUsers;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (restAuthEntraUsers() != null) {
+            restAuthEntraUsers().forEach(e -> e.validate());
+        }
     }
 
     /**
@@ -79,6 +109,8 @@ public void validate() {
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("restAuthEntraUsers", this.restAuthEntraUsers,
+            (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -103,6 +135,10 @@ public static GatewaySettingsInner fromJson(JsonReader jsonReader) throws IOExce
                     deserializedGatewaySettingsInner.username = reader.getString();
                 } else if ("restAuthCredential.password".equals(fieldName)) {
                     deserializedGatewaySettingsInner.password = reader.getString();
+                } else if ("restAuthEntraUsers".equals(fieldName)) {
+                    List<EntraUserInfo> restAuthEntraUsers
+                        = reader.readArray(reader1 -> EntraUserInfo.fromJson(reader1));
+                    deserializedGatewaySettingsInner.restAuthEntraUsers = restAuthEntraUsers;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateEndpointConnectionInner.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateEndpointConnectionInner.java
index 8827e268c813..fc797e70b6af 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateEndpointConnectionInner.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateEndpointConnectionInner.java
@@ -32,9 +32,9 @@ public final class PrivateEndpointConnectionInner extends ProxyResource {
     private SystemData systemData;
 
     /*
-     * Fully qualified resource Id for the resource.
+     * The type of the resource.
      */
-    private String id;
+    private String type;
 
     /*
      * The name of the resource.
@@ -42,9 +42,9 @@ public final class PrivateEndpointConnectionInner extends ProxyResource {
     private String name;
 
     /*
-     * The type of the resource.
+     * Fully qualified resource Id for the resource.
      */
-    private String type;
+    private String id;
 
     /**
      * Creates an instance of PrivateEndpointConnectionInner class.
@@ -71,13 +71,13 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the id property: Fully qualified resource Id for the resource.
+     * Get the type property: The type of the resource.
      * 
-     * @return the id value.
+     * @return the type value.
      */
     @Override
-    public String id() {
-        return this.id;
+    public String type() {
+        return this.type;
     }
 
     /**
@@ -91,13 +91,13 @@ public String name() {
     }
 
     /**
-     * Get the type property: The type of the resource.
+     * Get the id property: Fully qualified resource Id for the resource.
      * 
-     * @return the type value.
+     * @return the id value.
      */
     @Override
-    public String type() {
-        return this.type;
+    public String id() {
+        return this.id;
     }
 
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateLinkResourceInner.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateLinkResourceInner.java
index 49e9b4d24632..ca8c05fa1cbe 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateLinkResourceInner.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/PrivateLinkResourceInner.java
@@ -29,9 +29,9 @@ public final class PrivateLinkResourceInner extends ProxyResource {
     private SystemData systemData;
 
     /*
-     * Fully qualified resource Id for the resource.
+     * The type of the resource.
      */
-    private String id;
+    private String type;
 
     /*
      * The name of the resource.
@@ -39,9 +39,9 @@ public final class PrivateLinkResourceInner extends ProxyResource {
     private String name;
 
     /*
-     * The type of the resource.
+     * Fully qualified resource Id for the resource.
      */
-    private String type;
+    private String id;
 
     /**
      * Creates an instance of PrivateLinkResourceInner class.
@@ -68,13 +68,13 @@ public SystemData systemData() {
     }
 
     /**
-     * Get the id property: Fully qualified resource Id for the resource.
+     * Get the type property: The type of the resource.
      * 
-     * @return the id value.
+     * @return the type value.
      */
     @Override
-    public String id() {
-        return this.id;
+    public String type() {
+        return this.type;
     }
 
     /**
@@ -88,13 +88,13 @@ public String name() {
     }
 
     /**
-     * Get the type property: The type of the resource.
+     * Get the id property: Fully qualified resource Id for the resource.
      * 
-     * @return the type value.
+     * @return the id value.
      */
     @Override
-    public String type() {
-        return this.type;
+    public String id() {
+        return this.id;
     }
 
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/RuntimeScriptActionDetailInner.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/RuntimeScriptActionDetailInner.java
index 1a8adcd52635..1d7528484f2d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/RuntimeScriptActionDetailInner.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/fluent/models/RuntimeScriptActionDetailInner.java
@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.hdinsight.fluent.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
@@ -180,12 +181,28 @@ public RuntimeScriptActionDetailInner withRoles(List<String> roles) {
      */
     @Override
     public void validate() {
-        super.validate();
         if (executionSummary() != null) {
             executionSummary().forEach(e -> e.validate());
         }
+        if (name() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property name in model RuntimeScriptActionDetailInner"));
+        }
+        if (uri() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property uri in model RuntimeScriptActionDetailInner"));
+        }
+        if (roles() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property roles in model RuntimeScriptActionDetailInner"));
+        }
     }
 
+    private static final ClientLogger LOGGER = new ClientLogger(RuntimeScriptActionDetailInner.class);
+
     /**
      * {@inheritDoc}
      */
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ApplicationsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ApplicationsClientImpl.java
index 0d36ef860d3c..b9ed694d3e31 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ApplicationsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ApplicationsClientImpl.java
@@ -27,8 +27,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.hdinsight.fluent.ApplicationsClient;
@@ -69,7 +71,7 @@ public final class ApplicationsClientImpl implements ApplicationsClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientApplications")
     public interface ApplicationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications")
@@ -80,6 +82,15 @@ Mono<Response<ApplicationListResult>> listByCluster(@HostParam("$host") String e
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ApplicationListResult> listByClusterSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}")
         @ExpectedResponses({ 200 })
@@ -90,6 +101,16 @@ Mono<Response<ApplicationInner>> get(@HostParam("$host") String endpoint,
             @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ApplicationInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}")
         @ExpectedResponses({ 200 })
@@ -101,6 +122,17 @@ Mono<Response<Flux<ByteBuffer>>> create(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ApplicationInner parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ApplicationInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -111,6 +143,16 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}/azureasyncoperations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -121,6 +163,16 @@ Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatus(@HostPara
             @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
             @PathParam("operationId") String operationId, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/applications/{applicationName}/azureasyncoperations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AsyncOperationResultInner> getAzureAsyncOperationStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("applicationName") String applicationName, @QueryParam("api-version") String apiVersion,
+            @PathParam("operationId") String operationId, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -128,6 +180,14 @@ Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatus(@HostPara
         Mono<Response<ApplicationListResult>> listByClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ApplicationListResult> listByClusterNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -173,38 +233,15 @@ private Mono<PagedResponse<ApplicationInner>> listByClusterSinglePageAsync(Strin
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list cluster Applications along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return result of the request to list cluster Applications as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ApplicationInner>> listByClusterSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByCluster(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-                this.client.getApiVersion(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ApplicationInner> listByClusterAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -215,12 +252,34 @@ private Mono<PagedResponse<ApplicationInner>> listByClusterSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list cluster Applications as paginated response with {@link PagedFlux}.
+     * @return result of the request to list cluster Applications along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ApplicationInner> listByClusterAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ApplicationInner> listByClusterSinglePage(String resourceGroupName, String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ApplicationListResult> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                clusterName, this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -232,13 +291,35 @@ private PagedFlux<ApplicationInner> listByClusterAsync(String resourceGroupName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list cluster Applications as paginated response with {@link PagedFlux}.
+     * @return result of the request to list cluster Applications along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ApplicationInner> listByClusterAsync(String resourceGroupName, String clusterName,
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ApplicationInner> listByClusterSinglePage(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName, context),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink, context));
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ApplicationListResult> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                clusterName, this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -253,7 +334,8 @@ private PagedFlux<ApplicationInner> listByClusterAsync(String resourceGroupName,
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ApplicationInner> listByCluster(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePage(nextLink));
     }
 
     /**
@@ -270,7 +352,8 @@ public PagedIterable<ApplicationInner> listByCluster(String resourceGroupName, S
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ApplicationInner> listByCluster(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName, context),
+            nextLink -> listByClusterNextSinglePage(nextLink, context));
     }
 
     /**
@@ -314,47 +397,6 @@ private Mono<Response<ApplicationInner>> getWithResponseAsync(String resourceGro
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets properties of the specified application.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param applicationName The constant value for the application name.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return properties of the specified application along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ApplicationInner>> getWithResponseAsync(String resourceGroupName, String clusterName,
-        String applicationName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (applicationName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-            applicationName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets properties of the specified application.
      * 
@@ -387,7 +429,31 @@ private Mono<ApplicationInner> getAsync(String resourceGroupName, String cluster
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ApplicationInner> getWithResponse(String resourceGroupName, String clusterName,
         String applicationName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, applicationName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (applicationName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, applicationName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -460,43 +526,45 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param applicationName The constant value for the application name.
      * @param parameters The application create request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the HDInsight cluster application along with {@link Response} on successful completion of {@link Mono}.
+     * @return the HDInsight cluster application along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceGroupName, String clusterName,
-        String applicationName, ApplicationInner parameters, Context context) {
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName,
+        String applicationName, ApplicationInner parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (applicationName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.create(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, applicationName, this.client.getApiVersion(), parameters, accept, context);
+        return service.createSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, applicationName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -506,18 +574,46 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param applicationName The constant value for the application name.
      * @param parameters The application create request.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of the HDInsight cluster application.
+     * @return the HDInsight cluster application along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<ApplicationInner>, ApplicationInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, String applicationName, ApplicationInner parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, applicationName, parameters);
-        return this.client.<ApplicationInner, ApplicationInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ApplicationInner.class, ApplicationInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName,
+        String applicationName, ApplicationInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (applicationName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, applicationName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -527,7 +623,6 @@ private PollerFlux<PollResult<ApplicationInner>, ApplicationInner> beginCreateAs
      * @param clusterName The name of the cluster.
      * @param applicationName The constant value for the application name.
      * @param parameters The application create request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -535,12 +630,11 @@ private PollerFlux<PollResult<ApplicationInner>, ApplicationInner> beginCreateAs
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ApplicationInner>, ApplicationInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, String applicationName, ApplicationInner parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, String applicationName, ApplicationInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, applicationName, parameters, context);
+            = createWithResponseAsync(resourceGroupName, clusterName, applicationName, parameters);
         return this.client.<ApplicationInner, ApplicationInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ApplicationInner.class, ApplicationInner.class, context);
+            ApplicationInner.class, ApplicationInner.class, this.client.getContext());
     }
 
     /**
@@ -558,7 +652,9 @@ private PollerFlux<PollResult<ApplicationInner>, ApplicationInner> beginCreateAs
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationInner>, ApplicationInner> beginCreate(String resourceGroupName,
         String clusterName, String applicationName, ApplicationInner parameters) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, applicationName, parameters).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, applicationName, parameters);
+        return this.client.<ApplicationInner, ApplicationInner>getLroResult(response, ApplicationInner.class,
+            ApplicationInner.class, Context.NONE);
     }
 
     /**
@@ -577,8 +673,10 @@ public SyncPoller<PollResult<ApplicationInner>, ApplicationInner> beginCreate(St
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ApplicationInner>, ApplicationInner> beginCreate(String resourceGroupName,
         String clusterName, String applicationName, ApplicationInner parameters, Context context) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, applicationName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = createWithResponse(resourceGroupName, clusterName, applicationName, parameters, context);
+        return this.client.<ApplicationInner, ApplicationInner>getLroResult(response, ApplicationInner.class,
+            ApplicationInner.class, context);
     }
 
     /**
@@ -600,26 +698,6 @@ private Mono<ApplicationInner> createAsync(String resourceGroupName, String clus
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Creates applications for the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param applicationName The constant value for the application name.
-     * @param parameters The application create request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the HDInsight cluster application on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<ApplicationInner> createAsync(String resourceGroupName, String clusterName, String applicationName,
-        ApplicationInner parameters, Context context) {
-        return beginCreateAsync(resourceGroupName, clusterName, applicationName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Creates applications for the HDInsight cluster.
      * 
@@ -635,7 +713,7 @@ private Mono<ApplicationInner> createAsync(String resourceGroupName, String clus
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ApplicationInner create(String resourceGroupName, String clusterName, String applicationName,
         ApplicationInner parameters) {
-        return createAsync(resourceGroupName, clusterName, applicationName, parameters).block();
+        return beginCreate(resourceGroupName, clusterName, applicationName, parameters).getFinalResult();
     }
 
     /**
@@ -654,7 +732,7 @@ public ApplicationInner create(String resourceGroupName, String clusterName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ApplicationInner create(String resourceGroupName, String clusterName, String applicationName,
         ApplicationInner parameters, Context context) {
-        return createAsync(resourceGroupName, clusterName, applicationName, parameters, context).block();
+        return beginCreate(resourceGroupName, clusterName, applicationName, parameters, context).getFinalResult();
     }
 
     /**
@@ -703,38 +781,39 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param applicationName The constant value for the application name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String applicationName, Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String applicationName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (applicationName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, applicationName, this.client.getApiVersion(), accept, context);
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, applicationName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -743,18 +822,40 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param applicationName The constant value for the application name.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String applicationName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, applicationName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String applicationName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (applicationName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, applicationName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -763,7 +864,6 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param applicationName The constant value for the application name.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -771,12 +871,11 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String applicationName, Context context) {
-        context = this.client.mergeContext(context);
+        String applicationName) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, applicationName, context);
+            = deleteWithResponseAsync(resourceGroupName, clusterName, applicationName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -793,7 +892,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String applicationName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, applicationName).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, applicationName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -811,7 +911,8 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String applicationName, Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, applicationName, context).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, applicationName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -831,25 +932,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Deletes the specified application on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param applicationName The constant value for the application name.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String applicationName,
-        Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, applicationName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes the specified application on the HDInsight cluster.
      * 
@@ -862,7 +944,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String applicationName) {
-        deleteAsync(resourceGroupName, clusterName, applicationName).block();
+        beginDelete(resourceGroupName, clusterName, applicationName).getFinalResult();
     }
 
     /**
@@ -878,7 +960,7 @@ public void delete(String resourceGroupName, String clusterName, String applicat
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String applicationName, Context context) {
-        deleteAsync(resourceGroupName, clusterName, applicationName, context).block();
+        beginDelete(resourceGroupName, clusterName, applicationName, context).getFinalResult();
     }
 
     /**
@@ -926,50 +1008,6 @@ private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWi
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the async operation status.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param applicationName The constant value for the application name.
-     * @param operationId The long running operation id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the async operation status along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWithResponseAsync(
-        String resourceGroupName, String clusterName, String applicationName, String operationId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (applicationName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAzureAsyncOperationStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, applicationName, this.client.getApiVersion(), operationId, accept, context);
-    }
-
     /**
      * Gets the async operation status.
      * 
@@ -1005,8 +1043,35 @@ private Mono<AsyncOperationResultInner> getAzureAsyncOperationStatusAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AsyncOperationResultInner> getAzureAsyncOperationStatusWithResponse(String resourceGroupName,
         String clusterName, String applicationName, String operationId, Context context) {
-        return getAzureAsyncOperationStatusWithResponseAsync(resourceGroupName, clusterName, applicationName,
-            operationId, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (applicationName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter applicationName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAzureAsyncOperationStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, applicationName, this.client.getApiVersion(), operationId, accept, context);
     }
 
     /**
@@ -1055,6 +1120,33 @@ private Mono<PagedResponse<ApplicationInner>> listByClusterNextSinglePageAsync(S
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return result of the request to list cluster Applications along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ApplicationInner> listByClusterNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ApplicationListResult> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -1063,22 +1155,25 @@ private Mono<PagedResponse<ApplicationInner>> listByClusterNextSinglePageAsync(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list cluster Applications along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return result of the request to list cluster Applications along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ApplicationInner>> listByClusterNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<ApplicationInner> listByClusterNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByClusterNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ApplicationListResult> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(ApplicationsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClusterImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClusterImpl.java
index 1f51d2d6504f..90620cb66046 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClusterImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClusterImpl.java
@@ -258,6 +258,6 @@ public ClusterImpl withIdentity(ClusterIdentity identity) {
     }
 
     private boolean isInCreateMode() {
-        return this.innerModel().id() == null;
+        return this.innerModel() == null || this.innerModel().id() == null;
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClustersClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClustersClientImpl.java
index bccdbf1ef89b..c09fcc8ca4c9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClustersClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ClustersClientImpl.java
@@ -29,8 +29,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.hdinsight.fluent.ClustersClient;
@@ -80,7 +82,7 @@ public final class ClustersClientImpl implements ClustersClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientClusters")
     public interface ClustersService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
@@ -93,6 +95,17 @@ Mono<Response<Flux<ByteBuffer>>> create(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ClusterCreateParametersExtended parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ClusterCreateParametersExtended parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
         @ExpectedResponses({ 200 })
@@ -104,6 +117,17 @@ Mono<Response<ClusterInner>> update(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ClusterPatchParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterInner> updateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ClusterPatchParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -113,6 +137,15 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
         @ExpectedResponses({ 200 })
@@ -122,6 +155,15 @@ Mono<Response<ClusterInner>> getByResourceGroup(@HostParam("$host") String endpo
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterInner> getByResourceGroupSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters")
         @ExpectedResponses({ 200 })
@@ -131,6 +173,15 @@ Mono<Response<ClusterListResult>> listByResourceGroup(@HostParam("$host") String
             @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterListResult> listByResourceGroupSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/roles/{roleName}/resize")
         @ExpectedResponses({ 200, 202 })
@@ -142,6 +193,17 @@ Mono<Response<Flux<ByteBuffer>>> resize(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ClusterResizeParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/roles/{roleName}/resize")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> resizeSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("roleName") RoleName roleName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ClusterResizeParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/roles/{roleName}/autoscale")
         @ExpectedResponses({ 200, 202 })
@@ -153,6 +215,17 @@ Mono<Response<Flux<ByteBuffer>>> updateAutoScaleConfiguration(@HostParam("$host"
             @BodyParam("application/json") AutoscaleConfigurationUpdateParameter parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/roles/{roleName}/autoscale")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateAutoScaleConfigurationSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("roleName") RoleName roleName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") AutoscaleConfigurationUpdateParameter parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/clusters")
         @ExpectedResponses({ 200 })
@@ -161,6 +234,14 @@ Mono<Response<ClusterListResult>> list(@HostParam("$host") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/clusters")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterListResult> listSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/rotatediskencryptionkey")
         @ExpectedResponses({ 200, 202 })
@@ -172,6 +253,17 @@ Mono<Response<Flux<ByteBuffer>>> rotateDiskEncryptionKey(@HostParam("$host") Str
             @BodyParam("application/json") ClusterDiskEncryptionParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/rotatediskencryptionkey")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> rotateDiskEncryptionKeySync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ClusterDiskEncryptionParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/getGatewaySettings")
         @ExpectedResponses({ 200 })
@@ -181,6 +273,15 @@ Mono<Response<GatewaySettingsInner>> getGatewaySettings(@HostParam("$host") Stri
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/getGatewaySettings")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<GatewaySettingsInner> getGatewaySettingsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/updateGatewaySettings")
         @ExpectedResponses({ 200, 202 })
@@ -192,6 +293,17 @@ Mono<Response<Flux<ByteBuffer>>> updateGatewaySettings(@HostParam("$host") Strin
             @BodyParam("application/json") UpdateGatewaySettingsParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/updateGatewaySettings")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateGatewaySettingsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") UpdateGatewaySettingsParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/azureasyncoperations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -202,6 +314,16 @@ Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatus(@HostPara
             @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/azureasyncoperations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AsyncOperationResultInner> getAzureAsyncOperationStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/updateClusterIdentityCertificate")
         @ExpectedResponses({ 200, 202 })
@@ -213,6 +335,17 @@ Mono<Response<Flux<ByteBuffer>>> updateIdentityCertificate(@HostParam("$host") S
             @BodyParam("application/json") UpdateClusterIdentityCertificateParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/updateClusterIdentityCertificate")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateIdentityCertificateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") UpdateClusterIdentityCertificateParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/executeScriptActions")
         @ExpectedResponses({ 200, 202 })
@@ -225,6 +358,18 @@ Mono<Response<Flux<ByteBuffer>>> executeScriptActions(@HostParam("$host") String
             @BodyParam("application/json") ExecuteScriptActionParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/executeScriptActions")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(value = ManagementException.class, code = { 404 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> executeScriptActionsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ExecuteScriptActionParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -233,12 +378,27 @@ Mono<Response<ClusterListResult>> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterListResult> listByResourceGroupNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<ClusterListResult>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
             @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterListResult> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -288,39 +448,41 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster create request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the HDInsight cluster along with {@link Response} on successful completion of {@link Mono}.
+     * @return the HDInsight cluster along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceGroupName, String clusterName,
-        ClusterCreateParametersExtended parameters, Context context) {
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName,
+        ClusterCreateParametersExtended parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.create(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.createSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -329,17 +491,42 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster create request.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of the HDInsight cluster.
+     * @return the HDInsight cluster along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, ClusterCreateParametersExtended parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono = createWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<ClusterInner, ClusterInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ClusterInner.class, ClusterInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName,
+        ClusterCreateParametersExtended parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -348,7 +535,6 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(Stri
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster create request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -356,12 +542,10 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(Stri
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, ClusterCreateParametersExtended parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+        String clusterName, ClusterCreateParametersExtended parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono = createWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<ClusterInner, ClusterInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ClusterInner.class, ClusterInner.class, context);
+            ClusterInner.class, ClusterInner.class, this.client.getContext());
     }
 
     /**
@@ -378,7 +562,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(Stri
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreate(String resourceGroupName, String clusterName,
         ClusterCreateParametersExtended parameters) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<ClusterInner, ClusterInner>getLroResult(response, ClusterInner.class, ClusterInner.class,
+            Context.NONE);
     }
 
     /**
@@ -396,7 +582,9 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreate(String res
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreate(String resourceGroupName, String clusterName,
         ClusterCreateParametersExtended parameters, Context context) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<ClusterInner, ClusterInner>getLroResult(response, ClusterInner.class, ClusterInner.class,
+            context);
     }
 
     /**
@@ -417,25 +605,6 @@ private Mono<ClusterInner> createAsync(String resourceGroupName, String clusterN
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Creates a new HDInsight cluster with the specified parameters.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The cluster create request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the HDInsight cluster on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<ClusterInner> createAsync(String resourceGroupName, String clusterName,
-        ClusterCreateParametersExtended parameters, Context context) {
-        return beginCreateAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Creates a new HDInsight cluster with the specified parameters.
      * 
@@ -450,7 +619,7 @@ private Mono<ClusterInner> createAsync(String resourceGroupName, String clusterN
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ClusterInner create(String resourceGroupName, String clusterName,
         ClusterCreateParametersExtended parameters) {
-        return createAsync(resourceGroupName, clusterName, parameters).block();
+        return beginCreate(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -468,7 +637,7 @@ public ClusterInner create(String resourceGroupName, String clusterName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ClusterInner create(String resourceGroupName, String clusterName, ClusterCreateParametersExtended parameters,
         Context context) {
-        return createAsync(resourceGroupName, clusterName, parameters, context).block();
+        return beginCreate(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -512,47 +681,6 @@ private Mono<Response<ClusterInner>> updateWithResponseAsync(String resourceGrou
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Patch HDInsight cluster with the specified parameters.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The cluster patch request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the HDInsight cluster along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterInner>> updateWithResponseAsync(String resourceGroupName, String clusterName,
-        ClusterPatchParameters parameters, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
-        } else {
-            parameters.validate();
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.update(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), parameters, accept, context);
-    }
-
     /**
      * Patch HDInsight cluster with the specified parameters.
      * 
@@ -586,7 +714,33 @@ private Mono<ClusterInner> updateAsync(String resourceGroupName, String clusterN
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterInner> updateWithResponse(String resourceGroupName, String clusterName,
         ClusterPatchParameters parameters, Context context) {
-        return updateWithResponseAsync(resourceGroupName, clusterName, parameters, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -644,34 +798,34 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), accept, context);
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -679,16 +833,35 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -696,19 +869,16 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, context);
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -723,7 +893,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -740,7 +911,8 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, context).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -758,23 +930,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName) {
         return beginDeleteAsync(resourceGroupName, clusterName).last().flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Deletes the specified HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes the specified HDInsight cluster.
      * 
@@ -786,7 +941,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Con
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName) {
-        deleteAsync(resourceGroupName, clusterName).block();
+        beginDelete(resourceGroupName, clusterName).getFinalResult();
     }
 
     /**
@@ -801,7 +956,7 @@ public void delete(String resourceGroupName, String clusterName) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, Context context) {
-        deleteAsync(resourceGroupName, clusterName, context).block();
+        beginDelete(resourceGroupName, clusterName, context).getFinalResult();
     }
 
     /**
@@ -840,41 +995,6 @@ private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(String
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the specified cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified cluster along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the specified cluster.
      * 
@@ -905,7 +1025,27 @@ private Mono<ClusterInner> getByResourceGroupAsync(String resourceGroupName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterInner> getByResourceGroupWithResponse(String resourceGroupName, String clusterName,
         Context context) {
-        return getByResourceGroupWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getByResourceGroupSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -960,35 +1100,15 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupSinglePageAsync(Str
      * Lists the HDInsight clusters in a resource group.
      * 
      * @param resourceGroupName The name of the resource group.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the List Cluster operation response as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listByResourceGroupSinglePageAsync(String resourceGroupName,
-        Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-                this.client.getApiVersion(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupName) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -998,12 +1118,29 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response as paginated response with {@link PagedFlux}.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupName) {
-        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
-            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listByResourceGroupSinglePage(String resourceGroupName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getSubscriptionId(), resourceGroupName, this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1014,12 +1151,29 @@ private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupNam
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response as paginated response with {@link PagedFlux}.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupName, Context context) {
-        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName, context),
-            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listByResourceGroupSinglePage(String resourceGroupName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getSubscriptionId(), resourceGroupName, this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1033,7 +1187,8 @@ private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupNam
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> listByResourceGroup(String resourceGroupName) {
-        return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName));
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink));
     }
 
     /**
@@ -1048,7 +1203,8 @@ public PagedIterable<ClusterInner> listByResourceGroup(String resourceGroupName)
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> listByResourceGroup(String resourceGroupName, Context context) {
-        return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName, context));
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName, context),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink, context));
     }
 
     /**
@@ -1103,42 +1259,45 @@ private Mono<Response<Flux<ByteBuffer>>> resizeWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the resize operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> resizeWithResponseAsync(String resourceGroupName, String clusterName,
-        RoleName roleName, ClusterResizeParameters parameters, Context context) {
+    private Response<BinaryData> resizeWithResponse(String resourceGroupName, String clusterName, RoleName roleName,
+        ClusterResizeParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (roleName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.resize(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, roleName, this.client.getApiVersion(), parameters, accept, context);
+        return service.resizeSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, roleName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1148,18 +1307,46 @@ private Mono<Response<Flux<ByteBuffer>>> resizeWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the resize operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginResizeAsync(String resourceGroupName, String clusterName,
-        RoleName roleName, ClusterResizeParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = resizeWithResponseAsync(resourceGroupName, clusterName, roleName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> resizeWithResponse(String resourceGroupName, String clusterName, RoleName roleName,
+        ClusterResizeParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (roleName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.resizeSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, roleName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -1169,7 +1356,6 @@ private PollerFlux<PollResult<Void>, Void> beginResizeAsync(String resourceGroup
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the resize operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1177,12 +1363,11 @@ private PollerFlux<PollResult<Void>, Void> beginResizeAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginResizeAsync(String resourceGroupName, String clusterName,
-        RoleName roleName, ClusterResizeParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        RoleName roleName, ClusterResizeParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = resizeWithResponseAsync(resourceGroupName, clusterName, roleName, parameters, context);
+            = resizeWithResponseAsync(resourceGroupName, clusterName, roleName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1200,7 +1385,8 @@ private PollerFlux<PollResult<Void>, Void> beginResizeAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginResize(String resourceGroupName, String clusterName,
         RoleName roleName, ClusterResizeParameters parameters) {
-        return this.beginResizeAsync(resourceGroupName, clusterName, roleName, parameters).getSyncPoller();
+        Response<BinaryData> response = resizeWithResponse(resourceGroupName, clusterName, roleName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1216,29 +1402,12 @@ public SyncPoller<PollResult<Void>, Void> beginResize(String resourceGroupName,
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the {@link SyncPoller} for polling of long-running operation.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<PollResult<Void>, Void> beginResize(String resourceGroupName, String clusterName,
-        RoleName roleName, ClusterResizeParameters parameters, Context context) {
-        return this.beginResizeAsync(resourceGroupName, clusterName, roleName, parameters, context).getSyncPoller();
-    }
-
-    /**
-     * Resizes the specified HDInsight cluster to the specified size.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param roleName The constant value for the roleName.
-     * @param parameters The parameters for the resize operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> resizeAsync(String resourceGroupName, String clusterName, RoleName roleName,
-        ClusterResizeParameters parameters) {
-        return beginResizeAsync(resourceGroupName, clusterName, roleName, parameters).last()
-            .flatMap(this.client::getLroFinalResultOrError);
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginResize(String resourceGroupName, String clusterName,
+        RoleName roleName, ClusterResizeParameters parameters, Context context) {
+        Response<BinaryData> response
+            = resizeWithResponse(resourceGroupName, clusterName, roleName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1248,7 +1417,6 @@ private Mono<Void> resizeAsync(String resourceGroupName, String clusterName, Rol
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the resize operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1256,8 +1424,8 @@ private Mono<Void> resizeAsync(String resourceGroupName, String clusterName, Rol
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Void> resizeAsync(String resourceGroupName, String clusterName, RoleName roleName,
-        ClusterResizeParameters parameters, Context context) {
-        return beginResizeAsync(resourceGroupName, clusterName, roleName, parameters, context).last()
+        ClusterResizeParameters parameters) {
+        return beginResizeAsync(resourceGroupName, clusterName, roleName, parameters).last()
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
@@ -1275,7 +1443,7 @@ private Mono<Void> resizeAsync(String resourceGroupName, String clusterName, Rol
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void resize(String resourceGroupName, String clusterName, RoleName roleName,
         ClusterResizeParameters parameters) {
-        resizeAsync(resourceGroupName, clusterName, roleName, parameters).block();
+        beginResize(resourceGroupName, clusterName, roleName, parameters).getFinalResult();
     }
 
     /**
@@ -1293,7 +1461,7 @@ public void resize(String resourceGroupName, String clusterName, RoleName roleNa
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void resize(String resourceGroupName, String clusterName, RoleName roleName,
         ClusterResizeParameters parameters, Context context) {
-        resizeAsync(resourceGroupName, clusterName, roleName, parameters, context).block();
+        beginResize(resourceGroupName, clusterName, roleName, parameters, context).getFinalResult();
     }
 
     /**
@@ -1349,42 +1517,45 @@ private Mono<Response<Flux<ByteBuffer>>> updateAutoScaleConfigurationWithRespons
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the update autoscale configuration operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> updateAutoScaleConfigurationWithResponseAsync(String resourceGroupName,
-        String clusterName, RoleName roleName, AutoscaleConfigurationUpdateParameter parameters, Context context) {
+    private Response<BinaryData> updateAutoScaleConfigurationWithResponse(String resourceGroupName, String clusterName,
+        RoleName roleName, AutoscaleConfigurationUpdateParameter parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (roleName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.updateAutoScaleConfiguration(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, roleName, this.client.getApiVersion(), parameters, accept, context);
+        return service.updateAutoScaleConfigurationSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, roleName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1394,18 +1565,46 @@ private Mono<Response<Flux<ByteBuffer>>> updateAutoScaleConfigurationWithRespons
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the update autoscale configuration operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginUpdateAutoScaleConfigurationAsync(String resourceGroupName,
-        String clusterName, RoleName roleName, AutoscaleConfigurationUpdateParameter parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = updateAutoScaleConfigurationWithResponseAsync(resourceGroupName, clusterName, roleName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateAutoScaleConfigurationWithResponse(String resourceGroupName, String clusterName,
+        RoleName roleName, AutoscaleConfigurationUpdateParameter parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (roleName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter roleName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.updateAutoScaleConfigurationSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, roleName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -1415,7 +1614,6 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateAutoScaleConfigurationAsyn
      * @param clusterName The name of the cluster.
      * @param roleName The constant value for the roleName.
      * @param parameters The parameters for the update autoscale configuration operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1423,12 +1621,11 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateAutoScaleConfigurationAsyn
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginUpdateAutoScaleConfigurationAsync(String resourceGroupName,
-        String clusterName, RoleName roleName, AutoscaleConfigurationUpdateParameter parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono = updateAutoScaleConfigurationWithResponseAsync(resourceGroupName,
-            clusterName, roleName, parameters, context);
+        String clusterName, RoleName roleName, AutoscaleConfigurationUpdateParameter parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = updateAutoScaleConfigurationWithResponseAsync(resourceGroupName, clusterName, roleName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1446,8 +1643,9 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateAutoScaleConfigurationAsyn
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdateAutoScaleConfiguration(String resourceGroupName,
         String clusterName, RoleName roleName, AutoscaleConfigurationUpdateParameter parameters) {
-        return this.beginUpdateAutoScaleConfigurationAsync(resourceGroupName, clusterName, roleName, parameters)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = updateAutoScaleConfigurationWithResponse(resourceGroupName, clusterName, roleName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1466,9 +1664,9 @@ public SyncPoller<PollResult<Void>, Void> beginUpdateAutoScaleConfiguration(Stri
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdateAutoScaleConfiguration(String resourceGroupName,
         String clusterName, RoleName roleName, AutoscaleConfigurationUpdateParameter parameters, Context context) {
-        return this
-            .beginUpdateAutoScaleConfigurationAsync(resourceGroupName, clusterName, roleName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = updateAutoScaleConfigurationWithResponse(resourceGroupName, clusterName, roleName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1490,27 +1688,6 @@ private Mono<Void> updateAutoScaleConfigurationAsync(String resourceGroupName, S
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Updates the Autoscale Configuration for HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param roleName The constant value for the roleName.
-     * @param parameters The parameters for the update autoscale configuration operation.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> updateAutoScaleConfigurationAsync(String resourceGroupName, String clusterName,
-        RoleName roleName, AutoscaleConfigurationUpdateParameter parameters, Context context) {
-        return beginUpdateAutoScaleConfigurationAsync(resourceGroupName, clusterName, roleName, parameters, context)
-            .last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Updates the Autoscale Configuration for HDInsight cluster.
      * 
@@ -1525,7 +1702,7 @@ private Mono<Void> updateAutoScaleConfigurationAsync(String resourceGroupName, S
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void updateAutoScaleConfiguration(String resourceGroupName, String clusterName, RoleName roleName,
         AutoscaleConfigurationUpdateParameter parameters) {
-        updateAutoScaleConfigurationAsync(resourceGroupName, clusterName, roleName, parameters).block();
+        beginUpdateAutoScaleConfiguration(resourceGroupName, clusterName, roleName, parameters).getFinalResult();
     }
 
     /**
@@ -1543,7 +1720,8 @@ public void updateAutoScaleConfiguration(String resourceGroupName, String cluste
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void updateAutoScaleConfiguration(String resourceGroupName, String clusterName, RoleName roleName,
         AutoscaleConfigurationUpdateParameter parameters, Context context) {
-        updateAutoScaleConfigurationAsync(resourceGroupName, clusterName, roleName, parameters, context).block();
+        beginUpdateAutoScaleConfiguration(resourceGroupName, clusterName, roleName, parameters, context)
+            .getFinalResult();
     }
 
     /**
@@ -1576,30 +1754,13 @@ private Mono<PagedResponse<ClusterInner>> listSinglePageAsync() {
     /**
      * Lists all the HDInsight clusters under the subscription.
      * 
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the List Cluster operation response as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listSinglePageAsync(Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .list(this.client.getEndpoint(), this.client.getSubscriptionId(), this.client.getApiVersion(), accept,
-                context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ClusterInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -1607,11 +1768,25 @@ private Mono<PagedResponse<ClusterInner>> listSinglePageAsync(Context context) {
      * 
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response as paginated response with {@link PagedFlux}.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listAsync() {
-        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listSinglePage() {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterListResult> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1621,12 +1796,25 @@ private PagedFlux<ClusterInner> listAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response as paginated response with {@link PagedFlux}.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listAsync(Context context) {
-        return new PagedFlux<>(() -> listSinglePageAsync(context),
-            nextLink -> listNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listSinglePage(Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterListResult> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1638,7 +1826,7 @@ private PagedFlux<ClusterInner> listAsync(Context context) {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> list() {
-        return new PagedIterable<>(listAsync());
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listNextSinglePage(nextLink));
     }
 
     /**
@@ -1652,7 +1840,7 @@ public PagedIterable<ClusterInner> list() {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> list(Context context) {
-        return new PagedIterable<>(listAsync(context));
+        return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context));
     }
 
     /**
@@ -1703,39 +1891,41 @@ private Mono<Response<Flux<ByteBuffer>>> rotateDiskEncryptionKeyWithResponseAsyn
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The parameters for the disk encryption operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> rotateDiskEncryptionKeyWithResponseAsync(String resourceGroupName,
-        String clusterName, ClusterDiskEncryptionParameters parameters, Context context) {
+    private Response<BinaryData> rotateDiskEncryptionKeyWithResponse(String resourceGroupName, String clusterName,
+        ClusterDiskEncryptionParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.rotateDiskEncryptionKey(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.rotateDiskEncryptionKeySync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1744,18 +1934,42 @@ private Mono<Response<Flux<ByteBuffer>>> rotateDiskEncryptionKeyWithResponseAsyn
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The parameters for the disk encryption operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginRotateDiskEncryptionKeyAsync(String resourceGroupName,
-        String clusterName, ClusterDiskEncryptionParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = rotateDiskEncryptionKeyWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> rotateDiskEncryptionKeyWithResponse(String resourceGroupName, String clusterName,
+        ClusterDiskEncryptionParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.rotateDiskEncryptionKeySync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -1764,7 +1978,6 @@ private PollerFlux<PollResult<Void>, Void> beginRotateDiskEncryptionKeyAsync(Str
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The parameters for the disk encryption operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1772,12 +1985,11 @@ private PollerFlux<PollResult<Void>, Void> beginRotateDiskEncryptionKeyAsync(Str
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginRotateDiskEncryptionKeyAsync(String resourceGroupName,
-        String clusterName, ClusterDiskEncryptionParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, ClusterDiskEncryptionParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = rotateDiskEncryptionKeyWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+            = rotateDiskEncryptionKeyWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1794,7 +2006,8 @@ private PollerFlux<PollResult<Void>, Void> beginRotateDiskEncryptionKeyAsync(Str
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRotateDiskEncryptionKey(String resourceGroupName, String clusterName,
         ClusterDiskEncryptionParameters parameters) {
-        return this.beginRotateDiskEncryptionKeyAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = rotateDiskEncryptionKeyWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1812,8 +2025,9 @@ public SyncPoller<PollResult<Void>, Void> beginRotateDiskEncryptionKey(String re
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRotateDiskEncryptionKey(String resourceGroupName, String clusterName,
         ClusterDiskEncryptionParameters parameters, Context context) {
-        return this.beginRotateDiskEncryptionKeyAsync(resourceGroupName, clusterName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = rotateDiskEncryptionKeyWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1834,25 +2048,6 @@ private Mono<Void> rotateDiskEncryptionKeyAsync(String resourceGroupName, String
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Rotate disk encryption key of the specified HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The parameters for the disk encryption operation.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> rotateDiskEncryptionKeyAsync(String resourceGroupName, String clusterName,
-        ClusterDiskEncryptionParameters parameters, Context context) {
-        return beginRotateDiskEncryptionKeyAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Rotate disk encryption key of the specified HDInsight cluster.
      * 
@@ -1866,7 +2061,7 @@ private Mono<Void> rotateDiskEncryptionKeyAsync(String resourceGroupName, String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void rotateDiskEncryptionKey(String resourceGroupName, String clusterName,
         ClusterDiskEncryptionParameters parameters) {
-        rotateDiskEncryptionKeyAsync(resourceGroupName, clusterName, parameters).block();
+        beginRotateDiskEncryptionKey(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -1883,7 +2078,7 @@ public void rotateDiskEncryptionKey(String resourceGroupName, String clusterName
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void rotateDiskEncryptionKey(String resourceGroupName, String clusterName,
         ClusterDiskEncryptionParameters parameters, Context context) {
-        rotateDiskEncryptionKeyAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginRotateDiskEncryptionKey(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -1923,42 +2118,6 @@ private Mono<Response<GatewaySettingsInner>> getGatewaySettingsWithResponseAsync
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the gateway settings for the specified cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the gateway settings for the specified cluster along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<GatewaySettingsInner>> getGatewaySettingsWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getGatewaySettings(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the gateway settings for the specified cluster.
      * 
@@ -1989,7 +2148,27 @@ private Mono<GatewaySettingsInner> getGatewaySettingsAsync(String resourceGroupN
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<GatewaySettingsInner> getGatewaySettingsWithResponse(String resourceGroupName, String clusterName,
         Context context) {
-        return getGatewaySettingsWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getGatewaySettingsSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -2055,38 +2234,84 @@ private Mono<Response<Flux<ByteBuffer>>> updateGatewaySettingsWithResponseAsync(
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> updateGatewaySettingsWithResponseAsync(String resourceGroupName,
-        String clusterName, UpdateGatewaySettingsParameters parameters, Context context) {
+    private Response<BinaryData> updateGatewaySettingsWithResponse(String resourceGroupName, String clusterName,
+        UpdateGatewaySettingsParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.updateGatewaySettingsSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
+    }
+
+    /**
+     * Configures the gateway settings on the specified cluster.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param clusterName The name of the cluster.
+     * @param parameters The cluster configurations.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateGatewaySettingsWithResponse(String resourceGroupName, String clusterName,
+        UpdateGatewaySettingsParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.updateGatewaySettings(this.client.getEndpoint(), this.client.getSubscriptionId(),
+        return service.updateGatewaySettingsSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
             resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
@@ -2110,28 +2335,6 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateGatewaySettingsAsync(Strin
             this.client.getContext());
     }
 
-    /**
-     * Configures the gateway settings on the specified cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginUpdateGatewaySettingsAsync(String resourceGroupName,
-        String clusterName, UpdateGatewaySettingsParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = updateGatewaySettingsWithResponseAsync(resourceGroupName, clusterName, parameters, context);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
-    }
-
     /**
      * Configures the gateway settings on the specified cluster.
      * 
@@ -2146,7 +2349,8 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateGatewaySettingsAsync(Strin
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdateGatewaySettings(String resourceGroupName, String clusterName,
         UpdateGatewaySettingsParameters parameters) {
-        return this.beginUpdateGatewaySettingsAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = updateGatewaySettingsWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2164,8 +2368,9 @@ public SyncPoller<PollResult<Void>, Void> beginUpdateGatewaySettings(String reso
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdateGatewaySettings(String resourceGroupName, String clusterName,
         UpdateGatewaySettingsParameters parameters, Context context) {
-        return this.beginUpdateGatewaySettingsAsync(resourceGroupName, clusterName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = updateGatewaySettingsWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2186,25 +2391,6 @@ private Mono<Void> updateGatewaySettingsAsync(String resourceGroupName, String c
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Configures the gateway settings on the specified cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> updateGatewaySettingsAsync(String resourceGroupName, String clusterName,
-        UpdateGatewaySettingsParameters parameters, Context context) {
-        return beginUpdateGatewaySettingsAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Configures the gateway settings on the specified cluster.
      * 
@@ -2218,7 +2404,7 @@ private Mono<Void> updateGatewaySettingsAsync(String resourceGroupName, String c
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void updateGatewaySettings(String resourceGroupName, String clusterName,
         UpdateGatewaySettingsParameters parameters) {
-        updateGatewaySettingsAsync(resourceGroupName, clusterName, parameters).block();
+        beginUpdateGatewaySettings(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -2235,7 +2421,7 @@ public void updateGatewaySettings(String resourceGroupName, String clusterName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void updateGatewaySettings(String resourceGroupName, String clusterName,
         UpdateGatewaySettingsParameters parameters, Context context) {
-        updateGatewaySettingsAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginUpdateGatewaySettings(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -2278,45 +2464,6 @@ private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWi
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * The the async operation status.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param operationId The long running operation id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the azure async operation response along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWithResponseAsync(
-        String resourceGroupName, String clusterName, String operationId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAzureAsyncOperationStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), operationId, accept, context);
-    }
-
     /**
      * The the async operation status.
      * 
@@ -2350,8 +2497,31 @@ private Mono<AsyncOperationResultInner> getAzureAsyncOperationStatusAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AsyncOperationResultInner> getAzureAsyncOperationStatusWithResponse(String resourceGroupName,
         String clusterName, String operationId, Context context) {
-        return getAzureAsyncOperationStatusWithResponseAsync(resourceGroupName, clusterName, operationId, context)
-            .block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAzureAsyncOperationStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), operationId, accept, context);
     }
 
     /**
@@ -2420,39 +2590,41 @@ private Mono<Response<Flux<ByteBuffer>>> updateIdentityCertificateWithResponseAs
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> updateIdentityCertificateWithResponseAsync(String resourceGroupName,
-        String clusterName, UpdateClusterIdentityCertificateParameters parameters, Context context) {
+    private Response<BinaryData> updateIdentityCertificateWithResponse(String resourceGroupName, String clusterName,
+        UpdateClusterIdentityCertificateParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.updateIdentityCertificate(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.updateIdentityCertificateSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -2461,18 +2633,42 @@ private Mono<Response<Flux<ByteBuffer>>> updateIdentityCertificateWithResponseAs
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster configurations.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginUpdateIdentityCertificateAsync(String resourceGroupName,
-        String clusterName, UpdateClusterIdentityCertificateParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = updateIdentityCertificateWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateIdentityCertificateWithResponse(String resourceGroupName, String clusterName,
+        UpdateClusterIdentityCertificateParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.updateIdentityCertificateSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -2481,7 +2677,6 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateIdentityCertificateAsync(S
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2489,12 +2684,11 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateIdentityCertificateAsync(S
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginUpdateIdentityCertificateAsync(String resourceGroupName,
-        String clusterName, UpdateClusterIdentityCertificateParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, UpdateClusterIdentityCertificateParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = updateIdentityCertificateWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+            = updateIdentityCertificateWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2511,7 +2705,9 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateIdentityCertificateAsync(S
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdateIdentityCertificate(String resourceGroupName,
         String clusterName, UpdateClusterIdentityCertificateParameters parameters) {
-        return this.beginUpdateIdentityCertificateAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response
+            = updateIdentityCertificateWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2529,8 +2725,9 @@ public SyncPoller<PollResult<Void>, Void> beginUpdateIdentityCertificate(String
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdateIdentityCertificate(String resourceGroupName,
         String clusterName, UpdateClusterIdentityCertificateParameters parameters, Context context) {
-        return this.beginUpdateIdentityCertificateAsync(resourceGroupName, clusterName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = updateIdentityCertificateWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2551,25 +2748,6 @@ private Mono<Void> updateIdentityCertificateAsync(String resourceGroupName, Stri
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Updates the cluster identity certificate.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> updateIdentityCertificateAsync(String resourceGroupName, String clusterName,
-        UpdateClusterIdentityCertificateParameters parameters, Context context) {
-        return beginUpdateIdentityCertificateAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Updates the cluster identity certificate.
      * 
@@ -2583,7 +2761,7 @@ private Mono<Void> updateIdentityCertificateAsync(String resourceGroupName, Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void updateIdentityCertificate(String resourceGroupName, String clusterName,
         UpdateClusterIdentityCertificateParameters parameters) {
-        updateIdentityCertificateAsync(resourceGroupName, clusterName, parameters).block();
+        beginUpdateIdentityCertificate(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -2600,7 +2778,7 @@ public void updateIdentityCertificate(String resourceGroupName, String clusterNa
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void updateIdentityCertificate(String resourceGroupName, String clusterName,
         UpdateClusterIdentityCertificateParameters parameters, Context context) {
-        updateIdentityCertificateAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginUpdateIdentityCertificate(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -2652,40 +2830,42 @@ private Mono<Response<Flux<ByteBuffer>>> executeScriptActionsWithResponseAsync(S
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The parameters for executing script actions.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws ManagementException thrown if the request is rejected by server on status code 404.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> executeScriptActionsWithResponseAsync(String resourceGroupName,
-        String clusterName, ExecuteScriptActionParameters parameters, Context context) {
+    private Response<BinaryData> executeScriptActionsWithResponse(String resourceGroupName, String clusterName,
+        ExecuteScriptActionParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.executeScriptActions(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.executeScriptActionsSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -2694,19 +2874,43 @@ private Mono<Response<Flux<ByteBuffer>>> executeScriptActionsWithResponseAsync(S
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The parameters for executing script actions.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws ManagementException thrown if the request is rejected by server on status code 404.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginExecuteScriptActionsAsync(String resourceGroupName,
-        String clusterName, ExecuteScriptActionParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = executeScriptActionsWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> executeScriptActionsWithResponse(String resourceGroupName, String clusterName,
+        ExecuteScriptActionParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.executeScriptActionsSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -2715,7 +2919,6 @@ private PollerFlux<PollResult<Void>, Void> beginExecuteScriptActionsAsync(String
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The parameters for executing script actions.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws ManagementException thrown if the request is rejected by server on status code 404.
@@ -2724,12 +2927,11 @@ private PollerFlux<PollResult<Void>, Void> beginExecuteScriptActionsAsync(String
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginExecuteScriptActionsAsync(String resourceGroupName,
-        String clusterName, ExecuteScriptActionParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, ExecuteScriptActionParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = executeScriptActionsWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+            = executeScriptActionsWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2747,7 +2949,8 @@ private PollerFlux<PollResult<Void>, Void> beginExecuteScriptActionsAsync(String
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginExecuteScriptActions(String resourceGroupName, String clusterName,
         ExecuteScriptActionParameters parameters) {
-        return this.beginExecuteScriptActionsAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = executeScriptActionsWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2766,7 +2969,9 @@ public SyncPoller<PollResult<Void>, Void> beginExecuteScriptActions(String resou
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginExecuteScriptActions(String resourceGroupName, String clusterName,
         ExecuteScriptActionParameters parameters, Context context) {
-        return this.beginExecuteScriptActionsAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = executeScriptActionsWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2788,26 +2993,6 @@ private Mono<Void> executeScriptActionsAsync(String resourceGroupName, String cl
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Executes script actions on the specified HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The parameters for executing script actions.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws ManagementException thrown if the request is rejected by server on status code 404.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> executeScriptActionsAsync(String resourceGroupName, String clusterName,
-        ExecuteScriptActionParameters parameters, Context context) {
-        return beginExecuteScriptActionsAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Executes script actions on the specified HDInsight cluster.
      * 
@@ -2822,7 +3007,7 @@ private Mono<Void> executeScriptActionsAsync(String resourceGroupName, String cl
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void executeScriptActions(String resourceGroupName, String clusterName,
         ExecuteScriptActionParameters parameters) {
-        executeScriptActionsAsync(resourceGroupName, clusterName, parameters).block();
+        beginExecuteScriptActions(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -2840,7 +3025,7 @@ public void executeScriptActions(String resourceGroupName, String clusterName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void executeScriptActions(String resourceGroupName, String clusterName,
         ExecuteScriptActionParameters parameters, Context context) {
-        executeScriptActionsAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginExecuteScriptActions(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -2871,6 +3056,33 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupNextSinglePageAsync
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listByResourceGroupNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -2879,23 +3091,24 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupNextSinglePageAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listByResourceGroupNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<ClusterInner> listByResourceGroupNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ClusterListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -2924,6 +3137,33 @@ private Mono<PagedResponse<ClusterInner>> listNextSinglePageAsync(String nextLin
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterListResult> res
+            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -2932,22 +3172,24 @@ private Mono<PagedResponse<ClusterInner>> listNextSinglePageAsync(String nextLin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the List Cluster operation response along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the List Cluster operation response along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<ClusterInner> listNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ClusterListResult> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(ClustersClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ConfigurationsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ConfigurationsClientImpl.java
index 6b4d39ee8909..8d9d696c0643 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ConfigurationsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ConfigurationsClientImpl.java
@@ -22,8 +22,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.hdinsight.fluent.ConfigurationsClient;
@@ -63,7 +65,7 @@ public final class ConfigurationsClientImpl implements ConfigurationsClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientConfigurations")
     public interface ConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations")
@@ -74,6 +76,15 @@ Mono<Response<ClusterConfigurationsInner>> list(@HostParam("$host") String endpo
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterConfigurationsInner> listSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations/{configurationName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -85,6 +96,17 @@ Mono<Response<Flux<ByteBuffer>>> update(@HostParam("$host") String endpoint,
             @BodyParam("application/json") Map<String, String> parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations/{configurationName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("configurationName") String configurationName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") Map<String, String> parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations/{configurationName}")
         @ExpectedResponses({ 200 })
@@ -94,6 +116,16 @@ Mono<Response<Map<String, String>>> get(@HostParam("$host") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @PathParam("configurationName") String configurationName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/configurations/{configurationName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<Map<String, String>> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("configurationName") String configurationName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -132,42 +164,6 @@ private Mono<Response<ClusterConfigurationsInner>> listWithResponseAsync(String
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets all configuration information for an HDI cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all configuration information for an HDI cluster along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterConfigurationsInner>> listWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-            this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets all configuration information for an HDI cluster.
      * 
@@ -197,7 +193,27 @@ private Mono<ClusterConfigurationsInner> listAsync(String resourceGroupName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterConfigurationsInner> listWithResponse(String resourceGroupName, String clusterName,
         Context context) {
-        return listWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -269,41 +285,43 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param configurationName The name of the cluster configuration.
      * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName, String clusterName,
-        String configurationName, Map<String, String> parameters, Context context) {
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String clusterName,
+        String configurationName, Map<String, String> parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (configurationName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.update(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, configurationName, this.client.getApiVersion(), parameters, accept, context);
+        return service.updateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, configurationName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -314,18 +332,44 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param configurationName The name of the cluster configuration.
      * @param parameters The cluster configurations.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginUpdateAsync(String resourceGroupName, String clusterName,
-        String configurationName, Map<String, String> parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = updateWithResponseAsync(resourceGroupName, clusterName, configurationName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String clusterName,
+        String configurationName, Map<String, String> parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (configurationName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, configurationName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -336,7 +380,6 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateAsync(String resourceGroup
      * @param clusterName The name of the cluster.
      * @param configurationName The name of the cluster configuration.
      * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -344,12 +387,11 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginUpdateAsync(String resourceGroupName, String clusterName,
-        String configurationName, Map<String, String> parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String configurationName, Map<String, String> parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = updateWithResponseAsync(resourceGroupName, clusterName, configurationName, parameters, context);
+            = updateWithResponseAsync(resourceGroupName, clusterName, configurationName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -368,7 +410,9 @@ private PollerFlux<PollResult<Void>, Void> beginUpdateAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String clusterName,
         String configurationName, Map<String, String> parameters) {
-        return this.beginUpdateAsync(resourceGroupName, clusterName, configurationName, parameters).getSyncPoller();
+        Response<BinaryData> response
+            = updateWithResponse(resourceGroupName, clusterName, configurationName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -388,8 +432,9 @@ public SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpdate(String resourceGroupName, String clusterName,
         String configurationName, Map<String, String> parameters, Context context) {
-        return this.beginUpdateAsync(resourceGroupName, clusterName, configurationName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = updateWithResponse(resourceGroupName, clusterName, configurationName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -412,27 +457,6 @@ private Mono<Void> updateAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Configures the HTTP settings on the specified cluster. This API is deprecated, please use UpdateGatewaySettings
-     * in cluster endpoint instead.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param configurationName The name of the cluster configuration.
-     * @param parameters The cluster configurations.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> updateAsync(String resourceGroupName, String clusterName, String configurationName,
-        Map<String, String> parameters, Context context) {
-        return beginUpdateAsync(resourceGroupName, clusterName, configurationName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Configures the HTTP settings on the specified cluster. This API is deprecated, please use UpdateGatewaySettings
      * in cluster endpoint instead.
@@ -448,7 +472,7 @@ private Mono<Void> updateAsync(String resourceGroupName, String clusterName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void update(String resourceGroupName, String clusterName, String configurationName,
         Map<String, String> parameters) {
-        updateAsync(resourceGroupName, clusterName, configurationName, parameters).block();
+        beginUpdate(resourceGroupName, clusterName, configurationName, parameters).getFinalResult();
     }
 
     /**
@@ -467,7 +491,7 @@ public void update(String resourceGroupName, String clusterName, String configur
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void update(String resourceGroupName, String clusterName, String configurationName,
         Map<String, String> parameters, Context context) {
-        updateAsync(resourceGroupName, clusterName, configurationName, parameters, context).block();
+        beginUpdate(resourceGroupName, clusterName, configurationName, parameters, context).getFinalResult();
     }
 
     /**
@@ -512,48 +536,6 @@ private Mono<Response<Map<String, String>>> getWithResponseAsync(String resource
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * The configuration object for the specified cluster. This API is not recommended and might be removed in the
-     * future. Please consider using List configurations API instead.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param configurationName The name of the cluster configuration.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the configuration object for the specified configuration for the specified cluster along with
-     * {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Map<String, String>>> getWithResponseAsync(String resourceGroupName, String clusterName,
-        String configurationName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (configurationName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-            configurationName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * The configuration object for the specified cluster. This API is not recommended and might be removed in the
      * future. Please consider using List configurations API instead.
@@ -590,7 +572,31 @@ private Mono<Map<String, String>> getAsync(String resourceGroupName, String clus
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<Map<String, String>> getWithResponse(String resourceGroupName, String clusterName,
         String configurationName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, configurationName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (configurationName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, configurationName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -609,4 +615,6 @@ public Response<Map<String, String>> getWithResponse(String resourceGroupName, S
     public Map<String, String> get(String resourceGroupName, String clusterName, String configurationName) {
         return getWithResponse(resourceGroupName, clusterName, configurationName, Context.NONE).getValue();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(ConfigurationsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ExtensionsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ExtensionsClientImpl.java
index 5a488968e88d..1571f6c59c0d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ExtensionsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ExtensionsClientImpl.java
@@ -23,8 +23,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.hdinsight.fluent.ExtensionsClient;
@@ -68,7 +70,7 @@ public final class ExtensionsClientImpl implements ExtensionsClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientExtensions")
     public interface ExtensionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/clustermonitoring")
@@ -81,6 +83,17 @@ Mono<Response<Flux<ByteBuffer>>> enableMonitoring(@HostParam("$host") String end
             @BodyParam("application/json") ClusterMonitoringRequest parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/clustermonitoring")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> enableMonitoringSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ClusterMonitoringRequest parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/clustermonitoring")
         @ExpectedResponses({ 200 })
@@ -90,6 +103,15 @@ Mono<Response<ClusterMonitoringResponseInner>> getMonitoringStatus(@HostParam("$
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/clustermonitoring")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterMonitoringResponseInner> getMonitoringStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/clustermonitoring")
         @ExpectedResponses({ 200, 202, 204 })
@@ -99,6 +121,15 @@ Mono<Response<Flux<ByteBuffer>>> disableMonitoring(@HostParam("$host") String en
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/clustermonitoring")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> disableMonitoringSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitor")
         @ExpectedResponses({ 200, 202 })
@@ -109,6 +140,16 @@ Mono<Response<Flux<ByteBuffer>>> enableAzureMonitor(@HostParam("$host") String e
             @QueryParam("api-version") String apiVersion, @BodyParam("application/json") AzureMonitorRequest parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitor")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> enableAzureMonitorSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @BodyParam("application/json") AzureMonitorRequest parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitor")
         @ExpectedResponses({ 200 })
@@ -118,6 +159,15 @@ Mono<Response<AzureMonitorResponseInner>> getAzureMonitorStatus(@HostParam("$hos
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitor")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AzureMonitorResponseInner> getAzureMonitorStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitor")
         @ExpectedResponses({ 200, 202, 204 })
@@ -127,6 +177,15 @@ Mono<Response<Flux<ByteBuffer>>> disableAzureMonitor(@HostParam("$host") String
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitor")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> disableAzureMonitorSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitorAgent")
         @ExpectedResponses({ 200, 202 })
@@ -137,6 +196,16 @@ Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorAgent(@HostParam("$host") Str
             @QueryParam("api-version") String apiVersion, @BodyParam("application/json") AzureMonitorRequest parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitorAgent")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> enableAzureMonitorAgentSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @BodyParam("application/json") AzureMonitorRequest parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitorAgent")
         @ExpectedResponses({ 200 })
@@ -146,6 +215,15 @@ Mono<Response<AzureMonitorResponseInner>> getAzureMonitorAgentStatus(@HostParam(
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitorAgent")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AzureMonitorResponseInner> getAzureMonitorAgentStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitorAgent")
         @ExpectedResponses({ 200, 202, 204 })
@@ -155,6 +233,15 @@ Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorAgent(@HostParam("$host") St
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/azureMonitorAgent")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> disableAzureMonitorAgentSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}")
         @ExpectedResponses({ 200, 202 })
@@ -165,6 +252,16 @@ Mono<Response<Flux<ByteBuffer>>> create(@HostParam("$host") String endpoint,
             @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
             @BodyParam("application/json") Extension parameters, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") Extension parameters, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}")
         @ExpectedResponses({ 200 })
@@ -175,6 +272,16 @@ Mono<Response<ClusterMonitoringResponseInner>> get(@HostParam("$host") String en
             @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterMonitoringResponseInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -185,6 +292,16 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}/azureAsyncOperations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -194,6 +311,16 @@ Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatus(@HostPara
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
             @PathParam("operationId") String operationId, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/extensions/{extensionName}/azureAsyncOperations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AsyncOperationResultInner> getAzureAsyncOperationStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("extensionName") String extensionName, @QueryParam("api-version") String apiVersion,
+            @PathParam("operationId") String operationId, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -243,39 +370,41 @@ private Mono<Response<Flux<ByteBuffer>>> enableMonitoringWithResponseAsync(Strin
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Operations Management Suite (OMS) workspace parameters.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> enableMonitoringWithResponseAsync(String resourceGroupName,
-        String clusterName, ClusterMonitoringRequest parameters, Context context) {
+    private Response<BinaryData> enableMonitoringWithResponse(String resourceGroupName, String clusterName,
+        ClusterMonitoringRequest parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.enableMonitoring(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.enableMonitoringSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -284,18 +413,42 @@ private Mono<Response<Flux<ByteBuffer>>> enableMonitoringWithResponseAsync(Strin
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Operations Management Suite (OMS) workspace parameters.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginEnableMonitoringAsync(String resourceGroupName, String clusterName,
-        ClusterMonitoringRequest parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = enableMonitoringWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> enableMonitoringWithResponse(String resourceGroupName, String clusterName,
+        ClusterMonitoringRequest parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.enableMonitoringSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -304,7 +457,6 @@ private PollerFlux<PollResult<Void>, Void> beginEnableMonitoringAsync(String res
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Operations Management Suite (OMS) workspace parameters.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -312,12 +464,11 @@ private PollerFlux<PollResult<Void>, Void> beginEnableMonitoringAsync(String res
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginEnableMonitoringAsync(String resourceGroupName, String clusterName,
-        ClusterMonitoringRequest parameters, Context context) {
-        context = this.client.mergeContext(context);
+        ClusterMonitoringRequest parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = enableMonitoringWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+            = enableMonitoringWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -334,7 +485,8 @@ private PollerFlux<PollResult<Void>, Void> beginEnableMonitoringAsync(String res
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginEnableMonitoring(String resourceGroupName, String clusterName,
         ClusterMonitoringRequest parameters) {
-        return this.beginEnableMonitoringAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = enableMonitoringWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -352,7 +504,9 @@ public SyncPoller<PollResult<Void>, Void> beginEnableMonitoring(String resourceG
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginEnableMonitoring(String resourceGroupName, String clusterName,
         ClusterMonitoringRequest parameters, Context context) {
-        return this.beginEnableMonitoringAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = enableMonitoringWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -373,25 +527,6 @@ private Mono<Void> enableMonitoringAsync(String resourceGroupName, String cluste
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Enables the Operations Management Suite (OMS) on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The Operations Management Suite (OMS) workspace parameters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> enableMonitoringAsync(String resourceGroupName, String clusterName,
-        ClusterMonitoringRequest parameters, Context context) {
-        return beginEnableMonitoringAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Enables the Operations Management Suite (OMS) on the HDInsight cluster.
      * 
@@ -404,7 +539,7 @@ private Mono<Void> enableMonitoringAsync(String resourceGroupName, String cluste
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void enableMonitoring(String resourceGroupName, String clusterName, ClusterMonitoringRequest parameters) {
-        enableMonitoringAsync(resourceGroupName, clusterName, parameters).block();
+        beginEnableMonitoring(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -421,7 +556,7 @@ public void enableMonitoring(String resourceGroupName, String clusterName, Clust
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void enableMonitoring(String resourceGroupName, String clusterName, ClusterMonitoringRequest parameters,
         Context context) {
-        enableMonitoringAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginEnableMonitoring(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -461,42 +596,6 @@ public void enableMonitoring(String resourceGroupName, String clusterName, Clust
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the status of Operations Management Suite (OMS) on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of Operations Management Suite (OMS) on the HDInsight cluster along with {@link Response} on
-     * successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterMonitoringResponseInner>>
-        getMonitoringStatusWithResponseAsync(String resourceGroupName, String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getMonitoringStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the status of Operations Management Suite (OMS) on the HDInsight cluster.
      * 
@@ -529,7 +628,27 @@ private Mono<ClusterMonitoringResponseInner> getMonitoringStatusAsync(String res
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterMonitoringResponseInner> getMonitoringStatusWithResponse(String resourceGroupName,
         String clusterName, Context context) {
-        return getMonitoringStatusWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getMonitoringStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -588,34 +707,34 @@ private Mono<Response<Flux<ByteBuffer>>> disableMonitoringWithResponseAsync(Stri
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> disableMonitoringWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
+    private Response<BinaryData> disableMonitoringWithResponse(String resourceGroupName, String clusterName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.disableMonitoring(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), accept, context);
+        return service.disableMonitoringSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -623,17 +742,36 @@ private Mono<Response<Flux<ByteBuffer>>> disableMonitoringWithResponseAsync(Stri
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDisableMonitoringAsync(String resourceGroupName,
-        String clusterName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = disableMonitoringWithResponseAsync(resourceGroupName, clusterName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> disableMonitoringWithResponse(String resourceGroupName, String clusterName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.disableMonitoringSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -641,20 +779,17 @@ private PollerFlux<PollResult<Void>, Void> beginDisableMonitoringAsync(String re
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDisableMonitoringAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = disableMonitoringWithResponseAsync(resourceGroupName, clusterName, context);
+    private PollerFlux<PollResult<Void>, Void> beginDisableMonitoringAsync(String resourceGroupName,
+        String clusterName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = disableMonitoringWithResponseAsync(resourceGroupName, clusterName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -669,7 +804,8 @@ private PollerFlux<PollResult<Void>, Void> beginDisableMonitoringAsync(String re
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDisableMonitoring(String resourceGroupName, String clusterName) {
-        return this.beginDisableMonitoringAsync(resourceGroupName, clusterName).getSyncPoller();
+        Response<BinaryData> response = disableMonitoringWithResponse(resourceGroupName, clusterName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -686,7 +822,8 @@ public SyncPoller<PollResult<Void>, Void> beginDisableMonitoring(String resource
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDisableMonitoring(String resourceGroupName, String clusterName,
         Context context) {
-        return this.beginDisableMonitoringAsync(resourceGroupName, clusterName, context).getSyncPoller();
+        Response<BinaryData> response = disableMonitoringWithResponse(resourceGroupName, clusterName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -705,23 +842,6 @@ private Mono<Void> disableMonitoringAsync(String resourceGroupName, String clust
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Disables the Operations Management Suite (OMS) on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> disableMonitoringAsync(String resourceGroupName, String clusterName, Context context) {
-        return beginDisableMonitoringAsync(resourceGroupName, clusterName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Disables the Operations Management Suite (OMS) on the HDInsight cluster.
      * 
@@ -733,7 +853,7 @@ private Mono<Void> disableMonitoringAsync(String resourceGroupName, String clust
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void disableMonitoring(String resourceGroupName, String clusterName) {
-        disableMonitoringAsync(resourceGroupName, clusterName).block();
+        beginDisableMonitoring(resourceGroupName, clusterName).getFinalResult();
     }
 
     /**
@@ -748,7 +868,7 @@ public void disableMonitoring(String resourceGroupName, String clusterName) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void disableMonitoring(String resourceGroupName, String clusterName, Context context) {
-        disableMonitoringAsync(resourceGroupName, clusterName, context).block();
+        beginDisableMonitoring(resourceGroupName, clusterName, context).getFinalResult();
     }
 
     /**
@@ -799,39 +919,41 @@ private Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorWithResponseAsync(Str
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Log Analytics workspace parameters.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorWithResponseAsync(String resourceGroupName,
-        String clusterName, AzureMonitorRequest parameters, Context context) {
+    private Response<BinaryData> enableAzureMonitorWithResponse(String resourceGroupName, String clusterName,
+        AzureMonitorRequest parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.enableAzureMonitor(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.enableAzureMonitorSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -840,18 +962,42 @@ private Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorWithResponseAsync(Str
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Log Analytics workspace parameters.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAsync(String resourceGroupName,
-        String clusterName, AzureMonitorRequest parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = enableAzureMonitorWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> enableAzureMonitorWithResponse(String resourceGroupName, String clusterName,
+        AzureMonitorRequest parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.enableAzureMonitorSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -860,7 +1006,6 @@ private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAsync(String r
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Log Analytics workspace parameters.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -868,12 +1013,11 @@ private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAsync(String r
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAsync(String resourceGroupName,
-        String clusterName, AzureMonitorRequest parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, AzureMonitorRequest parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = enableAzureMonitorWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+            = enableAzureMonitorWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -890,7 +1034,8 @@ private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAsync(String r
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginEnableAzureMonitor(String resourceGroupName, String clusterName,
         AzureMonitorRequest parameters) {
-        return this.beginEnableAzureMonitorAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = enableAzureMonitorWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -908,7 +1053,9 @@ public SyncPoller<PollResult<Void>, Void> beginEnableAzureMonitor(String resourc
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginEnableAzureMonitor(String resourceGroupName, String clusterName,
         AzureMonitorRequest parameters, Context context) {
-        return this.beginEnableAzureMonitorAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = enableAzureMonitorWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -929,25 +1076,6 @@ private Mono<Void> enableAzureMonitorAsync(String resourceGroupName, String clus
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Enables the Azure Monitor on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The Log Analytics workspace parameters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> enableAzureMonitorAsync(String resourceGroupName, String clusterName,
-        AzureMonitorRequest parameters, Context context) {
-        return beginEnableAzureMonitorAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Enables the Azure Monitor on the HDInsight cluster.
      * 
@@ -960,7 +1088,7 @@ private Mono<Void> enableAzureMonitorAsync(String resourceGroupName, String clus
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void enableAzureMonitor(String resourceGroupName, String clusterName, AzureMonitorRequest parameters) {
-        enableAzureMonitorAsync(resourceGroupName, clusterName, parameters).block();
+        beginEnableAzureMonitor(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -977,7 +1105,7 @@ public void enableAzureMonitor(String resourceGroupName, String clusterName, Azu
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void enableAzureMonitor(String resourceGroupName, String clusterName, AzureMonitorRequest parameters,
         Context context) {
-        enableAzureMonitorAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginEnableAzureMonitor(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -1017,42 +1145,6 @@ private Mono<Response<AzureMonitorResponseInner>> getAzureMonitorStatusWithRespo
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the status of Azure Monitor on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of Azure Monitor on the HDInsight cluster along with {@link Response} on successful completion
-     * of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AzureMonitorResponseInner>> getAzureMonitorStatusWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAzureMonitorStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the status of Azure Monitor on the HDInsight cluster.
      * 
@@ -1083,7 +1175,27 @@ private Mono<AzureMonitorResponseInner> getAzureMonitorStatusAsync(String resour
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AzureMonitorResponseInner> getAzureMonitorStatusWithResponse(String resourceGroupName,
         String clusterName, Context context) {
-        return getAzureMonitorStatusWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAzureMonitorStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -1142,34 +1254,34 @@ private Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorWithResponseAsync(St
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
+    private Response<BinaryData> disableAzureMonitorWithResponse(String resourceGroupName, String clusterName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.disableAzureMonitor(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
+        return service.disableAzureMonitorSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -1177,17 +1289,36 @@ private Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorWithResponseAsync(St
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAsync(String resourceGroupName,
-        String clusterName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = disableAzureMonitorWithResponseAsync(resourceGroupName, clusterName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> disableAzureMonitorWithResponse(String resourceGroupName, String clusterName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.disableAzureMonitorSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -1195,7 +1326,6 @@ private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAsync(String
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1203,12 +1333,10 @@ private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAsync(String
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = disableAzureMonitorWithResponseAsync(resourceGroupName, clusterName, context);
+        String clusterName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = disableAzureMonitorWithResponseAsync(resourceGroupName, clusterName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1223,7 +1351,8 @@ private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAsync(String
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDisableAzureMonitor(String resourceGroupName, String clusterName) {
-        return this.beginDisableAzureMonitorAsync(resourceGroupName, clusterName).getSyncPoller();
+        Response<BinaryData> response = disableAzureMonitorWithResponse(resourceGroupName, clusterName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1240,7 +1369,8 @@ public SyncPoller<PollResult<Void>, Void> beginDisableAzureMonitor(String resour
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDisableAzureMonitor(String resourceGroupName, String clusterName,
         Context context) {
-        return this.beginDisableAzureMonitorAsync(resourceGroupName, clusterName, context).getSyncPoller();
+        Response<BinaryData> response = disableAzureMonitorWithResponse(resourceGroupName, clusterName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1259,23 +1389,6 @@ private Mono<Void> disableAzureMonitorAsync(String resourceGroupName, String clu
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Disables the Azure Monitor on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> disableAzureMonitorAsync(String resourceGroupName, String clusterName, Context context) {
-        return beginDisableAzureMonitorAsync(resourceGroupName, clusterName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Disables the Azure Monitor on the HDInsight cluster.
      * 
@@ -1287,7 +1400,7 @@ private Mono<Void> disableAzureMonitorAsync(String resourceGroupName, String clu
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void disableAzureMonitor(String resourceGroupName, String clusterName) {
-        disableAzureMonitorAsync(resourceGroupName, clusterName).block();
+        beginDisableAzureMonitor(resourceGroupName, clusterName).getFinalResult();
     }
 
     /**
@@ -1302,7 +1415,7 @@ public void disableAzureMonitor(String resourceGroupName, String clusterName) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void disableAzureMonitor(String resourceGroupName, String clusterName, Context context) {
-        disableAzureMonitorAsync(resourceGroupName, clusterName, context).block();
+        beginDisableAzureMonitor(resourceGroupName, clusterName, context).getFinalResult();
     }
 
     /**
@@ -1353,39 +1466,41 @@ private Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorAgentWithResponseAsyn
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Log Analytics workspace parameters.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorAgentWithResponseAsync(String resourceGroupName,
-        String clusterName, AzureMonitorRequest parameters, Context context) {
+    private Response<BinaryData> enableAzureMonitorAgentWithResponse(String resourceGroupName, String clusterName,
+        AzureMonitorRequest parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.enableAzureMonitorAgent(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
+        return service.enableAzureMonitorAgentSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1394,18 +1509,42 @@ private Mono<Response<Flux<ByteBuffer>>> enableAzureMonitorAgentWithResponseAsyn
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Log Analytics workspace parameters.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAgentAsync(String resourceGroupName,
-        String clusterName, AzureMonitorRequest parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = enableAzureMonitorAgentWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> enableAzureMonitorAgentWithResponse(String resourceGroupName, String clusterName,
+        AzureMonitorRequest parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.enableAzureMonitorAgentSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -1414,7 +1553,6 @@ private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAgentAsync(Str
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param parameters The Log Analytics workspace parameters.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1422,12 +1560,11 @@ private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAgentAsync(Str
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAgentAsync(String resourceGroupName,
-        String clusterName, AzureMonitorRequest parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, AzureMonitorRequest parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = enableAzureMonitorAgentWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+            = enableAzureMonitorAgentWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1444,7 +1581,8 @@ private PollerFlux<PollResult<Void>, Void> beginEnableAzureMonitorAgentAsync(Str
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginEnableAzureMonitorAgent(String resourceGroupName, String clusterName,
         AzureMonitorRequest parameters) {
-        return this.beginEnableAzureMonitorAgentAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = enableAzureMonitorAgentWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1462,8 +1600,9 @@ public SyncPoller<PollResult<Void>, Void> beginEnableAzureMonitorAgent(String re
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginEnableAzureMonitorAgent(String resourceGroupName, String clusterName,
         AzureMonitorRequest parameters, Context context) {
-        return this.beginEnableAzureMonitorAgentAsync(resourceGroupName, clusterName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = enableAzureMonitorAgentWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1484,25 +1623,6 @@ private Mono<Void> enableAzureMonitorAgentAsync(String resourceGroupName, String
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Enables the Azure Monitor Agent on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param parameters The Log Analytics workspace parameters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> enableAzureMonitorAgentAsync(String resourceGroupName, String clusterName,
-        AzureMonitorRequest parameters, Context context) {
-        return beginEnableAzureMonitorAgentAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Enables the Azure Monitor Agent on the HDInsight cluster.
      * 
@@ -1515,7 +1635,7 @@ private Mono<Void> enableAzureMonitorAgentAsync(String resourceGroupName, String
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void enableAzureMonitorAgent(String resourceGroupName, String clusterName, AzureMonitorRequest parameters) {
-        enableAzureMonitorAgentAsync(resourceGroupName, clusterName, parameters).block();
+        beginEnableAzureMonitorAgent(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -1532,7 +1652,7 @@ public void enableAzureMonitorAgent(String resourceGroupName, String clusterName
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void enableAzureMonitorAgent(String resourceGroupName, String clusterName, AzureMonitorRequest parameters,
         Context context) {
-        enableAzureMonitorAgentAsync(resourceGroupName, clusterName, parameters, context).block();
+        beginEnableAzureMonitorAgent(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -1572,42 +1692,6 @@ public void enableAzureMonitorAgent(String resourceGroupName, String clusterName
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the status of Azure Monitor Agent on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of Azure Monitor Agent on the HDInsight cluster along with {@link Response} on successful
-     * completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AzureMonitorResponseInner>>
-        getAzureMonitorAgentStatusWithResponseAsync(String resourceGroupName, String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAzureMonitorAgentStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the status of Azure Monitor Agent on the HDInsight cluster.
      * 
@@ -1639,7 +1723,27 @@ private Mono<AzureMonitorResponseInner> getAzureMonitorAgentStatusAsync(String r
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AzureMonitorResponseInner> getAzureMonitorAgentStatusWithResponse(String resourceGroupName,
         String clusterName, Context context) {
-        return getAzureMonitorAgentStatusWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAzureMonitorAgentStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -1698,34 +1802,34 @@ private Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorAgentWithResponseAsy
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorAgentWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
+    private Response<BinaryData> disableAzureMonitorAgentWithResponse(String resourceGroupName, String clusterName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.disableAzureMonitorAgent(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
+        return service.disableAzureMonitorAgentSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -1733,18 +1837,36 @@ private Mono<Response<Flux<ByteBuffer>>> disableAzureMonitorAgentWithResponseAsy
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAgentAsync(String resourceGroupName,
-        String clusterName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = disableAzureMonitorAgentWithResponseAsync(resourceGroupName, clusterName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> disableAzureMonitorAgentWithResponse(String resourceGroupName, String clusterName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.disableAzureMonitorAgentSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -1752,7 +1874,6 @@ private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAgentAsync(St
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1760,12 +1881,11 @@ private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAgentAsync(St
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAgentAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = disableAzureMonitorAgentWithResponseAsync(resourceGroupName, clusterName, context);
+            = disableAzureMonitorAgentWithResponseAsync(resourceGroupName, clusterName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1781,7 +1901,8 @@ private PollerFlux<PollResult<Void>, Void> beginDisableAzureMonitorAgentAsync(St
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDisableAzureMonitorAgent(String resourceGroupName,
         String clusterName) {
-        return this.beginDisableAzureMonitorAgentAsync(resourceGroupName, clusterName).getSyncPoller();
+        Response<BinaryData> response = disableAzureMonitorAgentWithResponse(resourceGroupName, clusterName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1798,7 +1919,8 @@ public SyncPoller<PollResult<Void>, Void> beginDisableAzureMonitorAgent(String r
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDisableAzureMonitorAgent(String resourceGroupName,
         String clusterName, Context context) {
-        return this.beginDisableAzureMonitorAgentAsync(resourceGroupName, clusterName, context).getSyncPoller();
+        Response<BinaryData> response = disableAzureMonitorAgentWithResponse(resourceGroupName, clusterName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1817,23 +1939,6 @@ private Mono<Void> disableAzureMonitorAgentAsync(String resourceGroupName, Strin
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Disables the Azure Monitor Agent on the HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> disableAzureMonitorAgentAsync(String resourceGroupName, String clusterName, Context context) {
-        return beginDisableAzureMonitorAgentAsync(resourceGroupName, clusterName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Disables the Azure Monitor Agent on the HDInsight cluster.
      * 
@@ -1845,7 +1950,7 @@ private Mono<Void> disableAzureMonitorAgentAsync(String resourceGroupName, Strin
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void disableAzureMonitorAgent(String resourceGroupName, String clusterName) {
-        disableAzureMonitorAgentAsync(resourceGroupName, clusterName).block();
+        beginDisableAzureMonitorAgent(resourceGroupName, clusterName).getFinalResult();
     }
 
     /**
@@ -1860,7 +1965,7 @@ public void disableAzureMonitorAgent(String resourceGroupName, String clusterNam
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void disableAzureMonitorAgent(String resourceGroupName, String clusterName, Context context) {
-        disableAzureMonitorAgentAsync(resourceGroupName, clusterName, context).block();
+        beginDisableAzureMonitorAgent(resourceGroupName, clusterName, context).getFinalResult();
     }
 
     /**
@@ -1916,42 +2021,45 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param extensionName The name of the cluster extension.
      * @param parameters The cluster extensions create request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceGroupName, String clusterName,
-        String extensionName, Extension parameters, Context context) {
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName, String extensionName,
+        Extension parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (extensionName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.create(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, extensionName, this.client.getApiVersion(), parameters, accept, context);
+        return service.createSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, extensionName, this.client.getApiVersion(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1961,18 +2069,46 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @param clusterName The name of the cluster.
      * @param extensionName The name of the cluster extension.
      * @param parameters The cluster extensions create request.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginCreateAsync(String resourceGroupName, String clusterName,
-        String extensionName, Extension parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, extensionName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName, String extensionName,
+        Extension parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (extensionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, extensionName, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -1982,7 +2118,6 @@ private PollerFlux<PollResult<Void>, Void> beginCreateAsync(String resourceGroup
      * @param clusterName The name of the cluster.
      * @param extensionName The name of the cluster extension.
      * @param parameters The cluster extensions create request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1990,12 +2125,11 @@ private PollerFlux<PollResult<Void>, Void> beginCreateAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginCreateAsync(String resourceGroupName, String clusterName,
-        String extensionName, Extension parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String extensionName, Extension parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, extensionName, parameters, context);
+            = createWithResponseAsync(resourceGroupName, clusterName, extensionName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2013,7 +2147,8 @@ private PollerFlux<PollResult<Void>, Void> beginCreateAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginCreate(String resourceGroupName, String clusterName,
         String extensionName, Extension parameters) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, extensionName, parameters).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, extensionName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2032,8 +2167,9 @@ public SyncPoller<PollResult<Void>, Void> beginCreate(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginCreate(String resourceGroupName, String clusterName,
         String extensionName, Extension parameters, Context context) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, extensionName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = createWithResponse(resourceGroupName, clusterName, extensionName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2055,26 +2191,6 @@ private Mono<Void> createAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Creates an HDInsight cluster extension.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param extensionName The name of the cluster extension.
-     * @param parameters The cluster extensions create request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> createAsync(String resourceGroupName, String clusterName, String extensionName,
-        Extension parameters, Context context) {
-        return beginCreateAsync(resourceGroupName, clusterName, extensionName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Creates an HDInsight cluster extension.
      * 
@@ -2088,7 +2204,7 @@ private Mono<Void> createAsync(String resourceGroupName, String clusterName, Str
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void create(String resourceGroupName, String clusterName, String extensionName, Extension parameters) {
-        createAsync(resourceGroupName, clusterName, extensionName, parameters).block();
+        beginCreate(resourceGroupName, clusterName, extensionName, parameters).getFinalResult();
     }
 
     /**
@@ -2106,7 +2222,7 @@ public void create(String resourceGroupName, String clusterName, String extensio
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void create(String resourceGroupName, String clusterName, String extensionName, Extension parameters,
         Context context) {
-        createAsync(resourceGroupName, clusterName, extensionName, parameters, context).block();
+        beginCreate(resourceGroupName, clusterName, extensionName, parameters, context).getFinalResult();
     }
 
     /**
@@ -2149,46 +2265,6 @@ private Mono<Response<ClusterMonitoringResponseInner>> getWithResponseAsync(Stri
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the extension properties for the specified HDInsight cluster extension.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param extensionName The name of the cluster extension.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the extension properties for the specified HDInsight cluster extension along with {@link Response} on
-     * successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterMonitoringResponseInner>> getWithResponseAsync(String resourceGroupName,
-        String clusterName, String extensionName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (extensionName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-            extensionName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the extension properties for the specified HDInsight cluster extension.
      * 
@@ -2223,7 +2299,31 @@ private Mono<ClusterMonitoringResponseInner> getAsync(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterMonitoringResponseInner> getWithResponse(String resourceGroupName, String clusterName,
         String extensionName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, extensionName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (extensionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, extensionName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -2287,37 +2387,39 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param extensionName The name of the cluster extension.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String extensionName, Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String extensionName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (extensionName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, extensionName, this.client.getApiVersion(), accept, context);
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, extensionName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -2326,17 +2428,40 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param extensionName The name of the cluster extension.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String extensionName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, extensionName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, String extensionName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (extensionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, extensionName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -2345,7 +2470,6 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param extensionName The name of the cluster extension.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2353,12 +2477,10 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String extensionName, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, extensionName, context);
+        String extensionName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, extensionName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2375,7 +2497,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String extensionName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, extensionName).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, extensionName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2393,7 +2516,8 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String extensionName, Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, extensionName, context).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, extensionName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2413,25 +2537,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Deletes the specified extension for HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param extensionName The name of the cluster extension.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String extensionName,
-        Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, extensionName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes the specified extension for HDInsight cluster.
      * 
@@ -2444,7 +2549,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String extensionName) {
-        deleteAsync(resourceGroupName, clusterName, extensionName).block();
+        beginDelete(resourceGroupName, clusterName, extensionName).getFinalResult();
     }
 
     /**
@@ -2460,7 +2565,7 @@ public void delete(String resourceGroupName, String clusterName, String extensio
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String extensionName, Context context) {
-        deleteAsync(resourceGroupName, clusterName, extensionName, context).block();
+        beginDelete(resourceGroupName, clusterName, extensionName, context).getFinalResult();
     }
 
     /**
@@ -2507,49 +2612,6 @@ private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWi
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the async operation status.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param extensionName The name of the cluster extension.
-     * @param operationId The long running operation id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the async operation status along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWithResponseAsync(
-        String resourceGroupName, String clusterName, String extensionName, String operationId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (extensionName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAzureAsyncOperationStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, extensionName, this.client.getApiVersion(), operationId, accept, context);
-    }
-
     /**
      * Gets the async operation status.
      * 
@@ -2585,8 +2647,35 @@ private Mono<AsyncOperationResultInner> getAzureAsyncOperationStatusAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AsyncOperationResultInner> getAzureAsyncOperationStatusWithResponse(String resourceGroupName,
         String clusterName, String extensionName, String operationId, Context context) {
-        return getAzureAsyncOperationStatusWithResponseAsync(resourceGroupName, clusterName, extensionName, operationId,
-            context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (extensionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter extensionName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAzureAsyncOperationStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, extensionName, this.client.getApiVersion(), operationId, accept, context);
     }
 
     /**
@@ -2607,4 +2696,6 @@ public AsyncOperationResultInner getAzureAsyncOperationStatus(String resourceGro
         return getAzureAsyncOperationStatusWithResponse(resourceGroupName, clusterName, extensionName, operationId,
             Context.NONE).getValue();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(ExtensionsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/GatewaySettingsImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/GatewaySettingsImpl.java
index e6d499545b9e..621a0d8e5821 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/GatewaySettingsImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/GatewaySettingsImpl.java
@@ -5,7 +5,10 @@
 package com.azure.resourcemanager.hdinsight.implementation;
 
 import com.azure.resourcemanager.hdinsight.fluent.models.GatewaySettingsInner;
+import com.azure.resourcemanager.hdinsight.models.EntraUserInfo;
 import com.azure.resourcemanager.hdinsight.models.GatewaySettings;
+import java.util.Collections;
+import java.util.List;
 
 public final class GatewaySettingsImpl implements GatewaySettings {
     private GatewaySettingsInner innerObject;
@@ -30,6 +33,15 @@ public String password() {
         return this.innerModel().password();
     }
 
+    public List<EntraUserInfo> restAuthEntraUsers() {
+        List<EntraUserInfo> inner = this.innerModel().restAuthEntraUsers();
+        if (inner != null) {
+            return Collections.unmodifiableList(inner);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
     public GatewaySettingsInner innerModel() {
         return this.innerObject;
     }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/HDInsightManagementClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/HDInsightManagementClientImpl.java
index cabbc74d7e56..3e579414a66d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/HDInsightManagementClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/HDInsightManagementClientImpl.java
@@ -13,14 +13,17 @@
 import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.exception.ManagementError;
 import com.azure.core.management.exception.ManagementException;
-import com.azure.core.management.polling.PollerFactory;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.management.polling.PollerFactory;
+import com.azure.core.management.polling.SyncPollerFactory;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.AsyncPollResponse;
 import com.azure.core.util.polling.LongRunningOperationStatus;
 import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
 import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.core.util.serializer.SerializerEncoding;
 import com.azure.resourcemanager.hdinsight.fluent.ApplicationsClient;
@@ -307,7 +310,7 @@ public VirtualMachinesClient getVirtualMachines() {
         this.defaultPollInterval = defaultPollInterval;
         this.subscriptionId = subscriptionId;
         this.endpoint = endpoint;
-        this.apiVersion = "2024-08-01-preview";
+        this.apiVersion = "2025-01-15-preview";
         this.applications = new ApplicationsClientImpl(this);
         this.clusters = new ClustersClientImpl(this);
         this.configurations = new ConfigurationsClientImpl(this);
@@ -358,6 +361,23 @@ public <T, U> PollerFlux<PollResult<T>, U> getLroResult(Mono<Response<Flux<ByteB
             defaultPollInterval, activationResponse, context);
     }
 
+    /**
+     * Gets long running operation result.
+     * 
+     * @param activationResponse the response of activation operation.
+     * @param pollResultType type of poll result.
+     * @param finalResultType type of final result.
+     * @param context the context shared by all requests.
+     * @param <T> type of poll result.
+     * @param <U> type of final result.
+     * @return SyncPoller for poll result and final result.
+     */
+    public <T, U> SyncPoller<PollResult<T>, U> getLroResult(Response<BinaryData> activationResponse,
+        Type pollResultType, Type finalResultType, Context context) {
+        return SyncPollerFactory.create(serializerAdapter, httpPipeline, pollResultType, finalResultType,
+            defaultPollInterval, () -> activationResponse, context);
+    }
+
     /**
      * Gets the final result, or an error, based on last async poll response.
      * 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/LocationsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/LocationsClientImpl.java
index 788d74f63db7..15b712413df0 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/LocationsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/LocationsClientImpl.java
@@ -23,6 +23,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.hdinsight.fluent.LocationsClient;
 import com.azure.resourcemanager.hdinsight.fluent.models.AsyncOperationResultInner;
 import com.azure.resourcemanager.hdinsight.fluent.models.BillingResponseListResultInner;
@@ -64,7 +65,7 @@ public final class LocationsClientImpl implements LocationsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientLocations")
     public interface LocationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/capabilities")
@@ -74,6 +75,14 @@ Mono<Response<CapabilitiesResultInner>> getCapabilities(@HostParam("$host") Stri
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/capabilities")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<CapabilitiesResultInner> getCapabilitiesSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/usages")
         @ExpectedResponses({ 200 })
@@ -82,6 +91,14 @@ Mono<Response<UsagesListResultInner>> listUsages(@HostParam("$host") String endp
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/usages")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<UsagesListResultInner> listUsagesSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/billingSpecs")
         @ExpectedResponses({ 200 })
@@ -90,6 +107,14 @@ Mono<Response<BillingResponseListResultInner>> listBillingSpecs(@HostParam("$hos
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/billingSpecs")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BillingResponseListResultInner> listBillingSpecsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/azureasyncoperations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -99,6 +124,15 @@ Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatus(@HostPara
             @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/azureasyncoperations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AsyncOperationResultInner> getAzureAsyncOperationStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
+            @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/checkNameAvailability")
         @ExpectedResponses({ 200 })
@@ -109,6 +143,16 @@ Mono<Response<NameAvailabilityCheckResultInner>> checkNameAvailability(@HostPara
             @BodyParam("application/json") NameAvailabilityCheckRequestParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/checkNameAvailability")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<NameAvailabilityCheckResultInner> checkNameAvailabilitySync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") NameAvailabilityCheckRequestParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/validateCreateRequest")
         @ExpectedResponses({ 200 })
@@ -118,6 +162,16 @@ Mono<Response<ClusterCreateValidationResultInner>> validateClusterCreateRequest(
             @PathParam("location") String location, @QueryParam("api-version") String apiVersion,
             @BodyParam("application/json") ClusterCreateRequestValidationParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/providers/Microsoft.HDInsight/locations/{location}/validateCreateRequest")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterCreateValidationResultInner> validateClusterCreateRequestSync(
+            @HostParam("$host") String endpoint, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") ClusterCreateRequestValidationParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -150,36 +204,6 @@ private Mono<Response<CapabilitiesResultInner>> getCapabilitiesWithResponseAsync
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the capabilities for the specified location.
-     * 
-     * @param location The Azure location (region) for which to make the request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the capabilities for the specified location along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<CapabilitiesResultInner>> getCapabilitiesWithResponseAsync(String location, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getCapabilities(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
-            this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the capabilities for the specified location.
      * 
@@ -206,7 +230,23 @@ private Mono<CapabilitiesResultInner> getCapabilitiesAsync(String location) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<CapabilitiesResultInner> getCapabilitiesWithResponse(String location, Context context) {
-        return getCapabilitiesWithResponseAsync(location, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getCapabilitiesSync(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
+            this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -253,36 +293,6 @@ private Mono<Response<UsagesListResultInner>> listUsagesWithResponseAsync(String
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Lists the usages for the specified location.
-     * 
-     * @param location The Azure location (region) for which to make the request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response for the operation to get regional usages for a subscription along with {@link Response} on
-     * successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<UsagesListResultInner>> listUsagesWithResponseAsync(String location, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listUsages(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
-            this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Lists the usages for the specified location.
      * 
@@ -310,7 +320,23 @@ private Mono<UsagesListResultInner> listUsagesAsync(String location) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<UsagesListResultInner> listUsagesWithResponse(String location, Context context) {
-        return listUsagesWithResponseAsync(location, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listUsagesSync(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
+            this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -357,37 +383,6 @@ private Mono<Response<BillingResponseListResultInner>> listBillingSpecsWithRespo
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Lists the billingSpecs for the specified subscription and location.
-     * 
-     * @param location The Azure location (region) for which to make the request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response for the operation to get regional billingSpecs for a subscription along with
-     * {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<BillingResponseListResultInner>> listBillingSpecsWithResponseAsync(String location,
-        Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listBillingSpecs(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
-            this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Lists the billingSpecs for the specified subscription and location.
      * 
@@ -416,7 +411,23 @@ private Mono<BillingResponseListResultInner> listBillingSpecsAsync(String locati
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<BillingResponseListResultInner> listBillingSpecsWithResponse(String location, Context context) {
-        return listBillingSpecsWithResponseAsync(location, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listBillingSpecsSync(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
+            this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -467,40 +478,6 @@ private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWi
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Get the async operation status.
-     * 
-     * @param location The Azure location (region) for which to make the request.
-     * @param operationId The long running operation id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the async operation status along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AsyncOperationResultInner>> getAzureAsyncOperationStatusWithResponseAsync(String location,
-        String operationId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAzureAsyncOperationStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            location, this.client.getApiVersion(), operationId, accept, context);
-    }
-
     /**
      * Get the async operation status.
      * 
@@ -531,7 +508,27 @@ private Mono<AsyncOperationResultInner> getAzureAsyncOperationStatusAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AsyncOperationResultInner> getAzureAsyncOperationStatusWithResponse(String location,
         String operationId, Context context) {
-        return getAzureAsyncOperationStatusWithResponseAsync(location, operationId, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAzureAsyncOperationStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            location, this.client.getApiVersion(), operationId, accept, context);
     }
 
     /**
@@ -586,43 +583,6 @@ private Mono<Response<NameAvailabilityCheckResultInner>> checkNameAvailabilityWi
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Check the cluster name is available or not.
-     * 
-     * @param location The Azure location (region) for which to make the request.
-     * @param parameters The parameters parameter.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response spec of checking name availability along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<NameAvailabilityCheckResultInner>> checkNameAvailabilityWithResponseAsync(String location,
-        NameAvailabilityCheckRequestParameters parameters, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
-        } else {
-            parameters.validate();
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.checkNameAvailability(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
-            this.client.getApiVersion(), parameters, accept, context);
-    }
-
     /**
      * Check the cluster name is available or not.
      * 
@@ -654,7 +614,29 @@ private Mono<NameAvailabilityCheckResultInner> checkNameAvailabilityAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<NameAvailabilityCheckResultInner> checkNameAvailabilityWithResponse(String location,
         NameAvailabilityCheckRequestParameters parameters, Context context) {
-        return checkNameAvailabilityWithResponseAsync(location, parameters, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.checkNameAvailabilitySync(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
+            this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -710,43 +692,6 @@ private Mono<Response<ClusterCreateValidationResultInner>> validateClusterCreate
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Validate the cluster create request spec is valid or not.
-     * 
-     * @param location The Azure location (region) for which to make the request.
-     * @param parameters The parameters parameter.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of cluster create request validation along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterCreateValidationResultInner>> validateClusterCreateRequestWithResponseAsync(
-        String location, ClusterCreateRequestValidationParameters parameters, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
-        } else {
-            parameters.validate();
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.validateClusterCreateRequest(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            location, this.client.getApiVersion(), parameters, accept, context);
-    }
-
     /**
      * Validate the cluster create request spec is valid or not.
      * 
@@ -778,7 +723,29 @@ private Mono<ClusterCreateValidationResultInner> validateClusterCreateRequestAsy
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterCreateValidationResultInner> validateClusterCreateRequestWithResponse(String location,
         ClusterCreateRequestValidationParameters parameters, Context context) {
-        return validateClusterCreateRequestWithResponseAsync(location, parameters, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.validateClusterCreateRequestSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            location, this.client.getApiVersion(), parameters, accept, context);
     }
 
     /**
@@ -796,4 +763,6 @@ public ClusterCreateValidationResultInner validateClusterCreateRequest(String lo
         ClusterCreateRequestValidationParameters parameters) {
         return validateClusterCreateRequestWithResponse(location, parameters, Context.NONE).getValue();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(LocationsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/OperationsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/OperationsClientImpl.java
index e1cc7b2da1dd..683db6e5d0a4 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/OperationsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/OperationsClientImpl.java
@@ -25,6 +25,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.hdinsight.fluent.OperationsClient;
 import com.azure.resourcemanager.hdinsight.fluent.models.OperationInner;
 import com.azure.resourcemanager.hdinsight.models.OperationListResult;
@@ -60,7 +61,7 @@ public final class OperationsClientImpl implements OperationsClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientOperations")
     public interface OperationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/providers/Microsoft.HDInsight/operations")
@@ -69,12 +70,26 @@ public interface OperationsService {
         Mono<Response<OperationListResult>> list(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/providers/Microsoft.HDInsight/operations")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<OperationListResult> listSync(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<OperationListResult>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
             @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<OperationListResult> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -103,24 +118,13 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync() {
     /**
      * Lists all of the available HDInsight REST API operations.
      * 
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list HDInsight operations along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return result of the request to list HDInsight operations as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.list(this.client.getEndpoint(), this.client.getApiVersion(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<OperationInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -128,11 +132,20 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context)
      * 
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list HDInsight operations as paginated response with {@link PagedFlux}.
+     * @return result of the request to list HDInsight operations along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<OperationInner> listAsync() {
-        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<OperationInner> listSinglePage() {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<OperationListResult> res
+            = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -142,12 +155,20 @@ private PagedFlux<OperationInner> listAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list HDInsight operations as paginated response with {@link PagedFlux}.
+     * @return result of the request to list HDInsight operations along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<OperationInner> listAsync(Context context) {
-        return new PagedFlux<>(() -> listSinglePageAsync(context),
-            nextLink -> listNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<OperationInner> listSinglePage(Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<OperationListResult> res
+            = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -159,7 +180,7 @@ private PagedFlux<OperationInner> listAsync(Context context) {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<OperationInner> list() {
-        return new PagedIterable<>(listAsync());
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listNextSinglePage(nextLink));
     }
 
     /**
@@ -173,7 +194,7 @@ public PagedIterable<OperationInner> list() {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<OperationInner> list(Context context) {
-        return new PagedIterable<>(listAsync(context));
+        return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context));
     }
 
     /**
@@ -202,6 +223,33 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return result of the request to list HDInsight operations along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<OperationInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<OperationListResult> res
+            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -210,22 +258,24 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list HDInsight operations along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return result of the request to list HDInsight operations along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<OperationInner> listNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<OperationListResult> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(OperationsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateEndpointConnectionsClientImpl.java
index c7302916e585..1046b53e177f 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -27,8 +27,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.hdinsight.fluent.PrivateEndpointConnectionsClient;
@@ -68,7 +70,7 @@ public final class PrivateEndpointConnectionsClientImpl implements PrivateEndpoi
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientPrivateEndpointConnections")
     public interface PrivateEndpointConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections")
@@ -79,6 +81,15 @@ Mono<Response<PrivateEndpointConnectionListResult>> listByCluster(@HostParam("$h
             @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
             @PathParam("clusterName") String clusterName, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateEndpointConnectionListResult> listByClusterSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("clusterName") String clusterName, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200, 201 })
@@ -91,6 +102,18 @@ Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpo
             @BodyParam("application/json") PrivateEndpointConnectionInner parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createOrUpdateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("clusterName") String clusterName,
+            @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
+            @BodyParam("application/json") PrivateEndpointConnectionInner parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200 })
@@ -102,6 +125,17 @@ Mono<Response<PrivateEndpointConnectionInner>> get(@HostParam("$host") String en
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateEndpointConnectionInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("clusterName") String clusterName,
+            @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -113,6 +147,17 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("clusterName") String clusterName,
+            @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -120,6 +165,14 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
         Mono<Response<PrivateEndpointConnectionListResult>> listByClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateEndpointConnectionListResult> listByClusterNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -165,38 +218,15 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listByClusterSingleP
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list private endpoint connections response along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return the list private endpoint connections response as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<PrivateEndpointConnectionInner>> listByClusterSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByCluster(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-                this.client.getApiVersion(), clusterName, accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<PrivateEndpointConnectionInner> listByClusterAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -207,12 +237,35 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listByClusterSingleP
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list private endpoint connections response as paginated response with {@link PagedFlux}.
+     * @return the list private endpoint connections response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<PrivateEndpointConnectionInner> listByClusterAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateEndpointConnectionInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateEndpointConnectionListResult> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                this.client.getApiVersion(), clusterName, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -224,13 +277,35 @@ private PagedFlux<PrivateEndpointConnectionInner> listByClusterAsync(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list private endpoint connections response as paginated response with {@link PagedFlux}.
+     * @return the list private endpoint connections response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<PrivateEndpointConnectionInner> listByClusterAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName, context),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateEndpointConnectionInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateEndpointConnectionListResult> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                this.client.getApiVersion(), clusterName, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -245,7 +320,8 @@ private PagedFlux<PrivateEndpointConnectionInner> listByClusterAsync(String reso
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateEndpointConnectionInner> listByCluster(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePage(nextLink));
     }
 
     /**
@@ -262,7 +338,8 @@ public PagedIterable<PrivateEndpointConnectionInner> listByCluster(String resour
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateEndpointConnectionInner> listByCluster(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName, context),
+            nextLink -> listByClusterNextSinglePage(nextLink, context));
     }
 
     /**
@@ -319,44 +396,46 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
      * @param clusterName The name of the cluster.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
      * @param parameters The private endpoint connection create or update request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private endpoint connection along with {@link Response} on successful completion of {@link Mono}.
+     * @return the private endpoint connection along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
-        String clusterName, String privateEndpointConnectionName, PrivateEndpointConnectionInner parameters,
-        Context context) {
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName, PrivateEndpointConnectionInner parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (privateEndpointConnectionName == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter privateEndpointConnectionName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, parameters, accept, context);
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, parameters, accept, Context.NONE);
     }
 
     /**
@@ -366,20 +445,47 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
      * @param clusterName The name of the cluster.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
      * @param parameters The private endpoint connection create or update request.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of the private endpoint connection.
+     * @return the private endpoint connection along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>
-        beginCreateOrUpdateAsync(String resourceGroupName, String clusterName, String privateEndpointConnectionName,
-            PrivateEndpointConnectionInner parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, clusterName,
-            privateEndpointConnectionName, parameters);
-        return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(mono,
-            this.client.getHttpPipeline(), PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName, PrivateEndpointConnectionInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (privateEndpointConnectionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, parameters, accept, context);
     }
 
     /**
@@ -389,7 +495,6 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
      * @param clusterName The name of the cluster.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
      * @param parameters The private endpoint connection create or update request.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -398,13 +503,12 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner>
         beginCreateOrUpdateAsync(String resourceGroupName, String clusterName, String privateEndpointConnectionName,
-            PrivateEndpointConnectionInner parameters, Context context) {
-        context = this.client.mergeContext(context);
+            PrivateEndpointConnectionInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono = createOrUpdateWithResponseAsync(resourceGroupName, clusterName,
-            privateEndpointConnectionName, parameters, context);
+            privateEndpointConnectionName, parameters);
         return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(mono,
             this.client.getHttpPipeline(), PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -423,8 +527,10 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
     public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, String privateEndpointConnectionName,
         PrivateEndpointConnectionInner parameters) {
-        return this.beginCreateOrUpdateAsync(resourceGroupName, clusterName, privateEndpointConnectionName, parameters)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = createOrUpdateWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, parameters);
+        return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(response,
+            PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class, Context.NONE);
     }
 
     /**
@@ -444,10 +550,10 @@ public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointCon
     public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner> beginCreateOrUpdate(
         String resourceGroupName, String clusterName, String privateEndpointConnectionName,
         PrivateEndpointConnectionInner parameters, Context context) {
-        return this
-            .beginCreateOrUpdateAsync(resourceGroupName, clusterName, privateEndpointConnectionName, parameters,
-                context)
-            .getSyncPoller();
+        Response<BinaryData> response = createOrUpdateWithResponse(resourceGroupName, clusterName,
+            privateEndpointConnectionName, parameters, context);
+        return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(response,
+            PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class, context);
     }
 
     /**
@@ -470,26 +576,6 @@ private Mono<PrivateEndpointConnectionInner> createOrUpdateAsync(String resource
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Approve or reject a private endpoint connection manually.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param privateEndpointConnectionName The name of the private endpoint connection.
-     * @param parameters The private endpoint connection create or update request.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private endpoint connection on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PrivateEndpointConnectionInner> createOrUpdateAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, PrivateEndpointConnectionInner parameters, Context context) {
-        return beginCreateOrUpdateAsync(resourceGroupName, clusterName, privateEndpointConnectionName, parameters,
-            context).last().flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Approve or reject a private endpoint connection manually.
      * 
@@ -505,7 +591,8 @@ private Mono<PrivateEndpointConnectionInner> createOrUpdateAsync(String resource
     @ServiceMethod(returns = ReturnType.SINGLE)
     public PrivateEndpointConnectionInner createOrUpdate(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, PrivateEndpointConnectionInner parameters) {
-        return createOrUpdateAsync(resourceGroupName, clusterName, privateEndpointConnectionName, parameters).block();
+        return beginCreateOrUpdate(resourceGroupName, clusterName, privateEndpointConnectionName, parameters)
+            .getFinalResult();
     }
 
     /**
@@ -524,8 +611,8 @@ public PrivateEndpointConnectionInner createOrUpdate(String resourceGroupName, S
     @ServiceMethod(returns = ReturnType.SINGLE)
     public PrivateEndpointConnectionInner createOrUpdate(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, PrivateEndpointConnectionInner parameters, Context context) {
-        return createOrUpdateAsync(resourceGroupName, clusterName, privateEndpointConnectionName, parameters, context)
-            .block();
+        return beginCreateOrUpdate(resourceGroupName, clusterName, privateEndpointConnectionName, parameters, context)
+            .getFinalResult();
     }
 
     /**
@@ -570,47 +657,6 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(Stri
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the specific private endpoint connection.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param privateEndpointConnectionName The name of the private endpoint connection.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specific private endpoint connection along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(String resourceGroupName,
-        String clusterName, String privateEndpointConnectionName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (privateEndpointConnectionName == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter privateEndpointConnectionName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, accept, context);
-    }
-
     /**
      * Gets the specific private endpoint connection.
      * 
@@ -644,7 +690,32 @@ private Mono<PrivateEndpointConnectionInner> getAsync(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<PrivateEndpointConnectionInner> getWithResponse(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (privateEndpointConnectionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, accept, context);
     }
 
     /**
@@ -711,38 +782,40 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (privateEndpointConnectionName == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter privateEndpointConnectionName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, accept, context);
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, accept, Context.NONE);
     }
 
     /**
@@ -751,18 +824,41 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (privateEndpointConnectionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, privateEndpointConnectionName, accept, context);
     }
 
     /**
@@ -771,7 +867,6 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param privateEndpointConnectionName The name of the private endpoint connection.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -779,12 +874,11 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, Context context) {
-        context = this.client.mergeContext(context);
+        String privateEndpointConnectionName) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context);
+            = deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -801,7 +895,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName).getSyncPoller();
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -819,8 +915,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -840,25 +937,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Deletes the specific private endpoint connection.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param privateEndpointConnectionName The name of the private endpoint connection.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String privateEndpointConnectionName,
-        Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes the specific private endpoint connection.
      * 
@@ -871,7 +949,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
-        deleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName).block();
+        beginDelete(resourceGroupName, clusterName, privateEndpointConnectionName).getFinalResult();
     }
 
     /**
@@ -888,7 +966,7 @@ public void delete(String resourceGroupName, String clusterName, String privateE
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName,
         Context context) {
-        deleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
+        beginDelete(resourceGroupName, clusterName, privateEndpointConnectionName, context).getFinalResult();
     }
 
     /**
@@ -918,6 +996,33 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listByClusterNextSin
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list private endpoint connections response along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateEndpointConnectionInner> listByClusterNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateEndpointConnectionListResult> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -926,23 +1031,26 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listByClusterNextSin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list private endpoint connections response along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return the list private endpoint connections response along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<PrivateEndpointConnectionInner>> listByClusterNextSinglePageAsync(String nextLink,
+    private PagedResponse<PrivateEndpointConnectionInner> listByClusterNextSinglePage(String nextLink,
         Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByClusterNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<PrivateEndpointConnectionListResult> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(PrivateEndpointConnectionsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateLinkResourcesClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateLinkResourcesClientImpl.java
index 79a176c3e827..f92fb0755f96 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateLinkResourcesClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/PrivateLinkResourcesClientImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.hdinsight.fluent.PrivateLinkResourcesClient;
 import com.azure.resourcemanager.hdinsight.fluent.models.PrivateLinkResourceInner;
 import com.azure.resourcemanager.hdinsight.fluent.models.PrivateLinkResourceListResultInner;
@@ -56,7 +57,7 @@ public final class PrivateLinkResourcesClientImpl implements PrivateLinkResource
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientPrivateLinkResources")
     public interface PrivateLinkResourcesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateLinkResources")
@@ -67,6 +68,15 @@ Mono<Response<PrivateLinkResourceListResultInner>> listByCluster(@HostParam("$ho
             @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
             @PathParam("clusterName") String clusterName, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateLinkResources")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateLinkResourceListResultInner> listByClusterSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("clusterName") String clusterName, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateLinkResources/{privateLinkResourceName}")
         @ExpectedResponses({ 200 })
@@ -77,6 +87,17 @@ Mono<Response<PrivateLinkResourceInner>> get(@HostParam("$host") String endpoint
             @PathParam("clusterName") String clusterName,
             @PathParam("privateLinkResourceName") String privateLinkResourceName, @HeaderParam("Accept") String accept,
             Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/privateLinkResources/{privateLinkResourceName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateLinkResourceInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("clusterName") String clusterName,
+            @PathParam("privateLinkResourceName") String privateLinkResourceName, @HeaderParam("Accept") String accept,
+            Context context);
     }
 
     /**
@@ -114,41 +135,6 @@ private Mono<Response<PrivateLinkResourceListResultInner>> listByClusterWithResp
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Lists the private link resources in a HDInsight cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of private link resources along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<PrivateLinkResourceListResultInner>> listByClusterWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByCluster(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            this.client.getApiVersion(), clusterName, accept, context);
-    }
-
     /**
      * Lists the private link resources in a HDInsight cluster.
      * 
@@ -179,7 +165,27 @@ private Mono<PrivateLinkResourceListResultInner> listByClusterAsync(String resou
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<PrivateLinkResourceListResultInner> listByClusterWithResponse(String resourceGroupName,
         String clusterName, Context context) {
-        return listByClusterWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, accept, context);
     }
 
     /**
@@ -237,46 +243,6 @@ private Mono<Response<PrivateLinkResourceInner>> getWithResponseAsync(String res
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the specific private link resource.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param privateLinkResourceName The name of the private link resource.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specific private link resource along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<PrivateLinkResourceInner>> getWithResponseAsync(String resourceGroupName, String clusterName,
-        String privateLinkResourceName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (privateLinkResourceName == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter privateLinkResourceName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            this.client.getApiVersion(), clusterName, privateLinkResourceName, accept, context);
-    }
-
     /**
      * Gets the specific private link resource.
      * 
@@ -310,7 +276,31 @@ private Mono<PrivateLinkResourceInner> getAsync(String resourceGroupName, String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<PrivateLinkResourceInner> getWithResponse(String resourceGroupName, String clusterName,
         String privateLinkResourceName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, privateLinkResourceName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (privateLinkResourceName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter privateLinkResourceName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            this.client.getApiVersion(), clusterName, privateLinkResourceName, accept, context);
     }
 
     /**
@@ -328,4 +318,6 @@ public Response<PrivateLinkResourceInner> getWithResponse(String resourceGroupNa
     public PrivateLinkResourceInner get(String resourceGroupName, String clusterName, String privateLinkResourceName) {
         return getWithResponse(resourceGroupName, clusterName, privateLinkResourceName, Context.NONE).getValue();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(PrivateLinkResourcesClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptActionsClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptActionsClientImpl.java
index 66043502cf17..e98d1375be46 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptActionsClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptActionsClientImpl.java
@@ -26,6 +26,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.hdinsight.fluent.ScriptActionsClient;
 import com.azure.resourcemanager.hdinsight.fluent.models.AsyncOperationResultInner;
 import com.azure.resourcemanager.hdinsight.fluent.models.RuntimeScriptActionDetailInner;
@@ -62,7 +63,7 @@ public final class ScriptActionsClientImpl implements ScriptActionsClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientScriptActions")
     public interface ScriptActionsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptActions/{scriptName}")
@@ -74,6 +75,16 @@ Mono<Response<Void>> delete(@HostParam("$host") String endpoint,
             @PathParam("scriptName") String scriptName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptActions/{scriptName}")
+        @ExpectedResponses({ 200, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<Void> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("scriptName") String scriptName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptActions")
         @ExpectedResponses({ 200 })
@@ -83,6 +94,15 @@ Mono<Response<ScriptActionsList>> listByCluster(@HostParam("$host") String endpo
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptActions")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ScriptActionsList> listByClusterSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptExecutionHistory/{scriptExecutionId}")
         @ExpectedResponses({ 200 })
@@ -93,6 +113,16 @@ Mono<Response<RuntimeScriptActionDetailInner>> getExecutionDetail(@HostParam("$h
             @PathParam("scriptExecutionId") String scriptExecutionId, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptExecutionHistory/{scriptExecutionId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<RuntimeScriptActionDetailInner> getExecutionDetailSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("scriptExecutionId") String scriptExecutionId, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/executeScriptActions/azureasyncoperations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -103,6 +133,16 @@ Mono<Response<AsyncOperationResultInner>> getExecutionAsyncOperationStatus(@Host
             @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/executeScriptActions/azureasyncoperations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AsyncOperationResultInner> getExecutionAsyncOperationStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -110,6 +150,14 @@ Mono<Response<AsyncOperationResultInner>> getExecutionAsyncOperationStatus(@Host
         Mono<Response<ScriptActionsList>> listByClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ScriptActionsList> listByClusterNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -151,45 +199,6 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Deletes a specified persisted script action of the cluster.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param scriptName The name of the script.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String scriptName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (scriptName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter scriptName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, scriptName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Deletes a specified persisted script action of the cluster.
      * 
@@ -221,7 +230,31 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<Void> deleteWithResponse(String resourceGroupName, String clusterName, String scriptName,
         Context context) {
-        return deleteWithResponseAsync(resourceGroupName, clusterName, scriptName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (scriptName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter scriptName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, scriptName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -282,38 +315,15 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterSingleP
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the persisted script action for the cluster along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the persisted script action for the cluster as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByCluster(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-                this.client.getApiVersion(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -324,12 +334,35 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterSingleP
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the persisted script action for the cluster as paginated response with {@link PagedFlux}.
+     * @return the persisted script action for the cluster along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ScriptActionsList> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                clusterName, this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -341,13 +374,35 @@ private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the persisted script action for the cluster as paginated response with {@link PagedFlux}.
+     * @return the persisted script action for the cluster along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName, context),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ScriptActionsList> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                clusterName, this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -362,7 +417,8 @@ private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String reso
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<RuntimeScriptActionDetailInner> listByCluster(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePage(nextLink));
     }
 
     /**
@@ -379,7 +435,8 @@ public PagedIterable<RuntimeScriptActionDetailInner> listByCluster(String resour
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<RuntimeScriptActionDetailInner> listByCluster(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName, context),
+            nextLink -> listByClusterNextSinglePage(nextLink, context));
     }
 
     /**
@@ -424,47 +481,6 @@ private Mono<Response<RuntimeScriptActionDetailInner>> getExecutionDetailWithRes
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the script execution detail for the given script execution ID.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param scriptExecutionId The script execution Id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the script execution detail for the given script execution ID along with {@link Response} on successful
-     * completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<RuntimeScriptActionDetailInner>> getExecutionDetailWithResponseAsync(String resourceGroupName,
-        String clusterName, String scriptExecutionId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (scriptExecutionId == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter scriptExecutionId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getExecutionDetail(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, scriptExecutionId, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets the script execution detail for the given script execution ID.
      * 
@@ -498,7 +514,31 @@ private Mono<RuntimeScriptActionDetailInner> getExecutionDetailAsync(String reso
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<RuntimeScriptActionDetailInner> getExecutionDetailWithResponse(String resourceGroupName,
         String clusterName, String scriptExecutionId, Context context) {
-        return getExecutionDetailWithResponseAsync(resourceGroupName, clusterName, scriptExecutionId, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (scriptExecutionId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter scriptExecutionId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getExecutionDetailSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, scriptExecutionId, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -560,46 +600,6 @@ private Mono<Response<AsyncOperationResultInner>> getExecutionAsyncOperationStat
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the async operation status of execution operation.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param operationId The long running operation id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the async operation status of execution operation along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AsyncOperationResultInner>> getExecutionAsyncOperationStatusWithResponseAsync(
-        String resourceGroupName, String clusterName, String operationId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getExecutionAsyncOperationStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), operationId, accept, context);
-    }
-
     /**
      * Gets the async operation status of execution operation.
      * 
@@ -633,8 +633,31 @@ private Mono<AsyncOperationResultInner> getExecutionAsyncOperationStatusAsync(St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AsyncOperationResultInner> getExecutionAsyncOperationStatusWithResponse(String resourceGroupName,
         String clusterName, String operationId, Context context) {
-        return getExecutionAsyncOperationStatusWithResponseAsync(resourceGroupName, clusterName, operationId, context)
-            .block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getExecutionAsyncOperationStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), operationId, accept, context);
     }
 
     /**
@@ -682,6 +705,33 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterNextSin
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the persisted script action for the cluster along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ScriptActionsList> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -690,23 +740,26 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterNextSin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the persisted script action for the cluster along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the persisted script action for the cluster along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterNextSinglePageAsync(String nextLink,
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterNextSinglePage(String nextLink,
         Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByClusterNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ScriptActionsList> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(ScriptActionsClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptExecutionHistoriesClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptExecutionHistoriesClientImpl.java
index 301f485df0b8..04c2f47379a8 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptExecutionHistoriesClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/ScriptExecutionHistoriesClientImpl.java
@@ -26,6 +26,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.hdinsight.fluent.ScriptExecutionHistoriesClient;
 import com.azure.resourcemanager.hdinsight.fluent.models.RuntimeScriptActionDetailInner;
 import com.azure.resourcemanager.hdinsight.models.ScriptActionExecutionHistoryList;
@@ -61,7 +62,7 @@ public final class ScriptExecutionHistoriesClientImpl implements ScriptExecution
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientScriptExecutionHistories")
     public interface ScriptExecutionHistoriesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptExecutionHistory")
@@ -72,6 +73,15 @@ Mono<Response<ScriptActionExecutionHistoryList>> listByCluster(@HostParam("$host
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptExecutionHistory")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ScriptActionExecutionHistoryList> listByClusterSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptExecutionHistory/{scriptExecutionId}/promote")
         @ExpectedResponses({ 200 })
@@ -82,6 +92,16 @@ Mono<Response<Void>> promote(@HostParam("$host") String endpoint,
             @PathParam("scriptExecutionId") String scriptExecutionId, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/scriptExecutionHistory/{scriptExecutionId}/promote")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<Void> promoteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("scriptExecutionId") String scriptExecutionId, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -89,6 +109,14 @@ Mono<Response<Void>> promote(@HostParam("$host") String endpoint,
         Mono<Response<ScriptActionExecutionHistoryList>> listByClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ScriptActionExecutionHistoryList> listByClusterNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -134,38 +162,15 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterSingleP
      * 
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list script execution history response along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the list script execution history response as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByCluster(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-                this.client.getApiVersion(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -176,12 +181,35 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterSingleP
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list script execution history response as paginated response with {@link PagedFlux}.
+     * @return the list script execution history response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ScriptActionExecutionHistoryList> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                clusterName, this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -193,13 +221,35 @@ private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list script execution history response as paginated response with {@link PagedFlux}.
+     * @return the list script execution history response along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName, context),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ScriptActionExecutionHistoryList> res
+            = service.listByClusterSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                clusterName, this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -214,7 +264,8 @@ private PagedFlux<RuntimeScriptActionDetailInner> listByClusterAsync(String reso
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<RuntimeScriptActionDetailInner> listByCluster(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePage(nextLink));
     }
 
     /**
@@ -231,7 +282,8 @@ public PagedIterable<RuntimeScriptActionDetailInner> listByCluster(String resour
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<RuntimeScriptActionDetailInner> listByCluster(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName, context),
+            nextLink -> listByClusterNextSinglePage(nextLink, context));
     }
 
     /**
@@ -274,46 +326,6 @@ private Mono<Response<Void>> promoteWithResponseAsync(String resourceGroupName,
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Promotes the specified ad-hoc script execution to a persisted script.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param scriptExecutionId The script execution Id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Void>> promoteWithResponseAsync(String resourceGroupName, String clusterName,
-        String scriptExecutionId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (scriptExecutionId == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter scriptExecutionId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.promote(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, scriptExecutionId, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Promotes the specified ad-hoc script execution to a persisted script.
      * 
@@ -346,7 +358,31 @@ private Mono<Void> promoteAsync(String resourceGroupName, String clusterName, St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<Void> promoteWithResponse(String resourceGroupName, String clusterName, String scriptExecutionId,
         Context context) {
-        return promoteWithResponseAsync(resourceGroupName, clusterName, scriptExecutionId, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (scriptExecutionId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter scriptExecutionId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.promoteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, scriptExecutionId, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -391,6 +427,33 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterNextSin
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list script execution history response along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ScriptActionExecutionHistoryList> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -399,23 +462,26 @@ private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterNextSin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the list script execution history response along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the list script execution history response along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<RuntimeScriptActionDetailInner>> listByClusterNextSinglePageAsync(String nextLink,
+    private PagedResponse<RuntimeScriptActionDetailInner> listByClusterNextSinglePage(String nextLink,
         Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByClusterNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ScriptActionExecutionHistoryList> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(ScriptExecutionHistoriesClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/VirtualMachinesClientImpl.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/VirtualMachinesClientImpl.java
index 88160d61f824..8ad09c0b94a8 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/VirtualMachinesClientImpl.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/implementation/VirtualMachinesClientImpl.java
@@ -22,8 +22,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.hdinsight.fluent.VirtualMachinesClient;
@@ -64,7 +66,7 @@ public final class VirtualMachinesClientImpl implements VirtualMachinesClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "HDInsightManagementC")
+    @ServiceInterface(name = "HDInsightManagementClientVirtualMachines")
     public interface VirtualMachinesService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/listHosts")
@@ -75,6 +77,15 @@ Mono<Response<List<HostInfoInner>>> listHosts(@HostParam("$host") String endpoin
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/listHosts")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<List<HostInfoInner>> listHostsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/restartHosts")
         @ExpectedResponses({ 200, 202 })
@@ -85,6 +96,16 @@ Mono<Response<Flux<ByteBuffer>>> restartHosts(@HostParam("$host") String endpoin
             @QueryParam("api-version") String apiVersion, @BodyParam("application/json") List<String> hosts,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/restartHosts")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> restartHostsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @BodyParam("application/json") List<String> hosts,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/restartHosts/azureasyncoperations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -94,6 +115,16 @@ Mono<Response<AsyncOperationResultInner>> getAsyncOperationStatus(@HostParam("$h
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HDInsight/clusters/{clusterName}/restartHosts/azureasyncoperations/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AsyncOperationResultInner> getAsyncOperationStatusSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -132,42 +163,6 @@ private Mono<Response<List<HostInfoInner>>> listHostsWithResponseAsync(String re
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Lists the HDInsight clusters hosts.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list cluster hosts along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<List<HostInfoInner>>> listHostsWithResponseAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listHosts(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Lists the HDInsight clusters hosts.
      * 
@@ -198,7 +193,27 @@ private Mono<List<HostInfoInner>> listHostsAsync(String resourceGroupName, Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<List<HostInfoInner>> listHostsWithResponse(String resourceGroupName, String clusterName,
         Context context) {
-        return listHostsWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listHostsSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -261,37 +276,38 @@ private Mono<Response<Flux<ByteBuffer>>> restartHostsWithResponseAsync(String re
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param hosts The list of hosts to restart.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> restartHostsWithResponseAsync(String resourceGroupName, String clusterName,
-        List<String> hosts, Context context) {
+    private Response<BinaryData> restartHostsWithResponse(String resourceGroupName, String clusterName,
+        List<String> hosts) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (hosts == null) {
-            return Mono.error(new IllegalArgumentException("Parameter hosts is required and cannot be null."));
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter hosts is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.restartHosts(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, this.client.getApiVersion(), hosts, accept, context);
+        return service.restartHostsSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), hosts, accept, Context.NONE);
     }
 
     /**
@@ -300,17 +316,39 @@ private Mono<Response<Flux<ByteBuffer>>> restartHostsWithResponseAsync(String re
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param hosts The list of hosts to restart.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginRestartHostsAsync(String resourceGroupName, String clusterName,
-        List<String> hosts) {
-        Mono<Response<Flux<ByteBuffer>>> mono = restartHostsWithResponseAsync(resourceGroupName, clusterName, hosts);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> restartHostsWithResponse(String resourceGroupName, String clusterName,
+        List<String> hosts, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (hosts == null) {
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter hosts is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.restartHostsSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, this.client.getApiVersion(), hosts, accept, context);
     }
 
     /**
@@ -319,7 +357,6 @@ private PollerFlux<PollResult<Void>, Void> beginRestartHostsAsync(String resourc
      * @param resourceGroupName The name of the resource group.
      * @param clusterName The name of the cluster.
      * @param hosts The list of hosts to restart.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -327,12 +364,10 @@ private PollerFlux<PollResult<Void>, Void> beginRestartHostsAsync(String resourc
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginRestartHostsAsync(String resourceGroupName, String clusterName,
-        List<String> hosts, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = restartHostsWithResponseAsync(resourceGroupName, clusterName, hosts, context);
+        List<String> hosts) {
+        Mono<Response<Flux<ByteBuffer>>> mono = restartHostsWithResponseAsync(resourceGroupName, clusterName, hosts);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -349,7 +384,8 @@ private PollerFlux<PollResult<Void>, Void> beginRestartHostsAsync(String resourc
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRestartHosts(String resourceGroupName, String clusterName,
         List<String> hosts) {
-        return this.beginRestartHostsAsync(resourceGroupName, clusterName, hosts).getSyncPoller();
+        Response<BinaryData> response = restartHostsWithResponse(resourceGroupName, clusterName, hosts);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -367,7 +403,8 @@ public SyncPoller<PollResult<Void>, Void> beginRestartHosts(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginRestartHosts(String resourceGroupName, String clusterName,
         List<String> hosts, Context context) {
-        return this.beginRestartHostsAsync(resourceGroupName, clusterName, hosts, context).getSyncPoller();
+        Response<BinaryData> response = restartHostsWithResponse(resourceGroupName, clusterName, hosts, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -387,25 +424,6 @@ private Mono<Void> restartHostsAsync(String resourceGroupName, String clusterNam
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Restarts the specified HDInsight cluster hosts.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param hosts The list of hosts to restart.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> restartHostsAsync(String resourceGroupName, String clusterName, List<String> hosts,
-        Context context) {
-        return beginRestartHostsAsync(resourceGroupName, clusterName, hosts, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Restarts the specified HDInsight cluster hosts.
      * 
@@ -418,7 +436,7 @@ private Mono<Void> restartHostsAsync(String resourceGroupName, String clusterNam
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void restartHosts(String resourceGroupName, String clusterName, List<String> hosts) {
-        restartHostsAsync(resourceGroupName, clusterName, hosts).block();
+        beginRestartHosts(resourceGroupName, clusterName, hosts).getFinalResult();
     }
 
     /**
@@ -434,7 +452,7 @@ public void restartHosts(String resourceGroupName, String clusterName, List<Stri
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void restartHosts(String resourceGroupName, String clusterName, List<String> hosts, Context context) {
-        restartHostsAsync(resourceGroupName, clusterName, hosts, context).block();
+        beginRestartHosts(resourceGroupName, clusterName, hosts, context).getFinalResult();
     }
 
     /**
@@ -477,45 +495,6 @@ private Mono<Response<AsyncOperationResultInner>> getAsyncOperationStatusWithRes
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the async operation status.
-     * 
-     * @param resourceGroupName The name of the resource group.
-     * @param clusterName The name of the cluster.
-     * @param operationId The long running operation id.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the async operation status along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AsyncOperationResultInner>> getAsyncOperationStatusWithResponseAsync(String resourceGroupName,
-        String clusterName, String operationId, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getAsyncOperationStatus(this.client.getEndpoint(), this.client.getSubscriptionId(),
-            resourceGroupName, clusterName, this.client.getApiVersion(), operationId, accept, context);
-    }
-
     /**
      * Gets the async operation status.
      * 
@@ -549,7 +528,31 @@ private Mono<AsyncOperationResultInner> getAsyncOperationStatusAsync(String reso
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AsyncOperationResultInner> getAsyncOperationStatusWithResponse(String resourceGroupName,
         String clusterName, String operationId, Context context) {
-        return getAsyncOperationStatusWithResponseAsync(resourceGroupName, clusterName, operationId, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getAsyncOperationStatusSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, clusterName, this.client.getApiVersion(), operationId, accept, context);
     }
 
     /**
@@ -569,4 +572,6 @@ public AsyncOperationResultInner getAsyncOperationStatus(String resourceGroupNam
         return getAsyncOperationStatusWithResponse(resourceGroupName, clusterName, operationId, Context.NONE)
             .getValue();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(VirtualMachinesClientImpl.class);
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/Cluster.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/Cluster.java
index e94bd89d0358..71edfcbed411 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/Cluster.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/Cluster.java
@@ -289,9 +289,11 @@ interface WithTags {
          */
         interface WithIdentity {
             /**
-             * Specifies the identity property: The identity of the cluster, if configured..
+             * Specifies the identity property: The identity of the cluster, if configured. Setting this property will
+             * override the existing identity configuration of the cluster..
              * 
-             * @param identity The identity of the cluster, if configured.
+             * @param identity The identity of the cluster, if configured. Setting this property will override the
+             * existing identity configuration of the cluster.
              * @return the next definition stage.
              */
             Update withIdentity(ClusterIdentity identity);
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterCreateRequestValidationParameters.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterCreateRequestValidationParameters.java
index 3fca98cc0330..dba9dae13ed6 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterCreateRequestValidationParameters.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterCreateRequestValidationParameters.java
@@ -175,7 +175,12 @@ public ClusterCreateRequestValidationParameters withIdentity(ClusterIdentity ide
      */
     @Override
     public void validate() {
-        super.validate();
+        if (properties() != null) {
+            properties().validate();
+        }
+        if (identity() != null) {
+            identity().validate();
+        }
     }
 
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterDefinition.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterDefinition.java
index 302e3adafb17..1928543be9f8 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterDefinition.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterDefinition.java
@@ -141,7 +141,9 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("kind", this.kind);
         jsonWriter.writeMapField("componentVersion", this.componentVersion,
             (writer, element) -> writer.writeString(element));
-        jsonWriter.writeUntypedField("configurations", this.configurations);
+        if (this.configurations != null) {
+            jsonWriter.writeUntypedField("configurations", this.configurations);
+        }
         return jsonWriter.writeEndObject();
     }
 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterPatchParameters.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterPatchParameters.java
index 66c02f87d781..b92d66c6c00b 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterPatchParameters.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/ClusterPatchParameters.java
@@ -23,7 +23,8 @@ public final class ClusterPatchParameters implements JsonSerializable<ClusterPat
     private Map<String, String> tags;
 
     /*
-     * The identity of the cluster, if configured.
+     * The identity of the cluster, if configured. Setting this property will override the existing identity
+     * configuration of the cluster.
      */
     private ClusterIdentity identity;
 
@@ -54,7 +55,8 @@ public ClusterPatchParameters withTags(Map<String, String> tags) {
     }
 
     /**
-     * Get the identity property: The identity of the cluster, if configured.
+     * Get the identity property: The identity of the cluster, if configured. Setting this property will override the
+     * existing identity configuration of the cluster.
      * 
      * @return the identity value.
      */
@@ -63,7 +65,8 @@ public ClusterIdentity identity() {
     }
 
     /**
-     * Set the identity property: The identity of the cluster, if configured.
+     * Set the identity property: The identity of the cluster, if configured. Setting this property will override the
+     * existing identity configuration of the cluster.
      * 
      * @param identity the identity value to set.
      * @return the ClusterPatchParameters object itself.
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/EntraUserInfo.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/EntraUserInfo.java
new file mode 100644
index 000000000000..5b41e0de243f
--- /dev/null
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/EntraUserInfo.java
@@ -0,0 +1,152 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.hdinsight.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Details of an Entra user for gateway access.
+ */
+@Fluent
+public final class EntraUserInfo implements JsonSerializable<EntraUserInfo> {
+    /*
+     * The unique object ID of the Entra user or client ID of the enterprise applications.
+     */
+    private String objectId;
+
+    /*
+     * The display name of the Entra user.
+     */
+    private String displayName;
+
+    /*
+     * The User Principal Name (UPN) of the Entra user. It may be empty in certain cases, such as for enterprise
+     * applications.
+     */
+    private String upn;
+
+    /**
+     * Creates an instance of EntraUserInfo class.
+     */
+    public EntraUserInfo() {
+    }
+
+    /**
+     * Get the objectId property: The unique object ID of the Entra user or client ID of the enterprise applications.
+     * 
+     * @return the objectId value.
+     */
+    public String objectId() {
+        return this.objectId;
+    }
+
+    /**
+     * Set the objectId property: The unique object ID of the Entra user or client ID of the enterprise applications.
+     * 
+     * @param objectId the objectId value to set.
+     * @return the EntraUserInfo object itself.
+     */
+    public EntraUserInfo withObjectId(String objectId) {
+        this.objectId = objectId;
+        return this;
+    }
+
+    /**
+     * Get the displayName property: The display name of the Entra user.
+     * 
+     * @return the displayName value.
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the displayName property: The display name of the Entra user.
+     * 
+     * @param displayName the displayName value to set.
+     * @return the EntraUserInfo object itself.
+     */
+    public EntraUserInfo withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the upn property: The User Principal Name (UPN) of the Entra user. It may be empty in certain cases, such as
+     * for enterprise applications.
+     * 
+     * @return the upn value.
+     */
+    public String upn() {
+        return this.upn;
+    }
+
+    /**
+     * Set the upn property: The User Principal Name (UPN) of the Entra user. It may be empty in certain cases, such as
+     * for enterprise applications.
+     * 
+     * @param upn the upn value to set.
+     * @return the EntraUserInfo object itself.
+     */
+    public EntraUserInfo withUpn(String upn) {
+        this.upn = upn;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("objectId", this.objectId);
+        jsonWriter.writeStringField("displayName", this.displayName);
+        jsonWriter.writeStringField("upn", this.upn);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of EntraUserInfo from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of EntraUserInfo if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the EntraUserInfo.
+     */
+    public static EntraUserInfo fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            EntraUserInfo deserializedEntraUserInfo = new EntraUserInfo();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("objectId".equals(fieldName)) {
+                    deserializedEntraUserInfo.objectId = reader.getString();
+                } else if ("displayName".equals(fieldName)) {
+                    deserializedEntraUserInfo.displayName = reader.getString();
+                } else if ("upn".equals(fieldName)) {
+                    deserializedEntraUserInfo.upn = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedEntraUserInfo;
+        });
+    }
+}
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/GatewaySettings.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/GatewaySettings.java
index 883a8a7c0d39..5cd14eef63d2 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/GatewaySettings.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/GatewaySettings.java
@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.hdinsight.models;
 
 import com.azure.resourcemanager.hdinsight.fluent.models.GatewaySettingsInner;
+import java.util.List;
 
 /**
  * An immutable client-side representation of GatewaySettings.
@@ -32,6 +33,13 @@ public interface GatewaySettings {
      */
     String password();
 
+    /**
+     * Gets the restAuthEntraUsers property: List of Entra users for gateway access.
+     * 
+     * @return the restAuthEntraUsers value.
+     */
+    List<EntraUserInfo> restAuthEntraUsers();
+
     /**
      * Gets the inner com.azure.resourcemanager.hdinsight.fluent.models.GatewaySettingsInner object.
      * 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/UpdateGatewaySettingsParameters.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/UpdateGatewaySettingsParameters.java
index 10a2044b96bf..1f6e68c56caa 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/UpdateGatewaySettingsParameters.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/java/com/azure/resourcemanager/hdinsight/models/UpdateGatewaySettingsParameters.java
@@ -10,9 +10,10 @@
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import java.io.IOException;
+import java.util.List;
 
 /**
- * The update gateway settings request parameters.
+ * The update gateway settings request parameters. Note either basic or entra user should be provided at a time.
  */
 @Fluent
 public final class UpdateGatewaySettingsParameters implements JsonSerializable<UpdateGatewaySettingsParameters> {
@@ -31,6 +32,11 @@ public final class UpdateGatewaySettingsParameters implements JsonSerializable<U
      */
     private String password;
 
+    /*
+     * List of Entra users for gateway access.
+     */
+    private List<EntraUserInfo> restAuthEntraUsers;
+
     /**
      * Creates an instance of UpdateGatewaySettingsParameters class.
      */
@@ -99,12 +105,35 @@ public UpdateGatewaySettingsParameters withPassword(String password) {
         return this;
     }
 
+    /**
+     * Get the restAuthEntraUsers property: List of Entra users for gateway access.
+     * 
+     * @return the restAuthEntraUsers value.
+     */
+    public List<EntraUserInfo> restAuthEntraUsers() {
+        return this.restAuthEntraUsers;
+    }
+
+    /**
+     * Set the restAuthEntraUsers property: List of Entra users for gateway access.
+     * 
+     * @param restAuthEntraUsers the restAuthEntraUsers value to set.
+     * @return the UpdateGatewaySettingsParameters object itself.
+     */
+    public UpdateGatewaySettingsParameters withRestAuthEntraUsers(List<EntraUserInfo> restAuthEntraUsers) {
+        this.restAuthEntraUsers = restAuthEntraUsers;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
     public void validate() {
+        if (restAuthEntraUsers() != null) {
+            restAuthEntraUsers().forEach(e -> e.validate());
+        }
     }
 
     /**
@@ -116,6 +145,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeBooleanField("restAuthCredential.isEnabled", this.isCredentialEnabled);
         jsonWriter.writeStringField("restAuthCredential.username", this.username);
         jsonWriter.writeStringField("restAuthCredential.password", this.password);
+        jsonWriter.writeArrayField("restAuthEntraUsers", this.restAuthEntraUsers,
+            (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -142,6 +173,10 @@ public static UpdateGatewaySettingsParameters fromJson(JsonReader jsonReader) th
                     deserializedUpdateGatewaySettingsParameters.username = reader.getString();
                 } else if ("restAuthCredential.password".equals(fieldName)) {
                     deserializedUpdateGatewaySettingsParameters.password = reader.getString();
+                } else if ("restAuthEntraUsers".equals(fieldName)) {
+                    List<EntraUserInfo> restAuthEntraUsers
+                        = reader.readArray(reader1 -> EntraUserInfo.fromJson(reader1));
+                    deserializedUpdateGatewaySettingsParameters.restAuthEntraUsers = restAuthEntraUsers;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/resources/azure-mixedreality-remoterendering.properties b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/resources/azure-resourcemanager-hdinsight.properties
similarity index 50%
rename from sdk/remoterendering/azure-mixedreality-remoterendering/src/main/resources/azure-mixedreality-remoterendering.properties
rename to sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/resources/azure-resourcemanager-hdinsight.properties
index ca812989b4f2..defbd48204e4 100644
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/resources/azure-mixedreality-remoterendering.properties
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/main/resources/azure-resourcemanager-hdinsight.properties
@@ -1,2 +1 @@
-name=${project.artifactId}
 version=${project.version}
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsCreateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsCreateSamples.java
index be523a349601..c8825a704597 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsCreateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsCreateSamples.java
@@ -18,7 +18,7 @@
 public final class ApplicationsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateApplication.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteSamples.java
index 407f95ce3b35..eb722d26a406 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeleteApplication.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetAzureAsyncOperationStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetAzureAsyncOperationStatusSamples.java
index 5873b2596d2b..d9f3b7b39737 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetAzureAsyncOperationStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetAzureAsyncOperationStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationsGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetApplicationCreationAsyncOperationStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetSamples.java
index 87ef586a660d..099ffbaadc07 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetApplicationInProgress.json
      */
     /**
@@ -25,7 +25,7 @@ public static void getApplicationOnHDInsightClusterCreationInProgress(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetApplicationCreated.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsListByClusterSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsListByClusterSamples.java
index 7b683dd0aae9..87f6cc0d8ceb 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsListByClusterSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationsListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetAllApplications.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersCreateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersCreateSamples.java
index f7eef7340e65..38c87133cf14 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersCreateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersCreateSamples.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.hdinsight.models.ClientGroupInfo;
 import com.azure.resourcemanager.hdinsight.models.ClusterCreateProperties;
 import com.azure.resourcemanager.hdinsight.models.ClusterDefinition;
+import com.azure.resourcemanager.hdinsight.models.ClusterIdentity;
 import com.azure.resourcemanager.hdinsight.models.ComputeIsolationProperties;
 import com.azure.resourcemanager.hdinsight.models.ComputeProfile;
 import com.azure.resourcemanager.hdinsight.models.DataDisksGroups;
@@ -25,9 +26,10 @@
 import com.azure.resourcemanager.hdinsight.models.KafkaRestProperties;
 import com.azure.resourcemanager.hdinsight.models.LinuxOperatingSystemProfile;
 import com.azure.resourcemanager.hdinsight.models.NetworkProperties;
-import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.OSType;
+import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.PrivateLink;
+import com.azure.resourcemanager.hdinsight.models.ResourceIdentityType;
 import com.azure.resourcemanager.hdinsight.models.ResourceProviderConnection;
 import com.azure.resourcemanager.hdinsight.models.Role;
 import com.azure.resourcemanager.hdinsight.models.SecurityProfile;
@@ -36,6 +38,7 @@
 import com.azure.resourcemanager.hdinsight.models.StorageAccount;
 import com.azure.resourcemanager.hdinsight.models.StorageProfile;
 import com.azure.resourcemanager.hdinsight.models.Tier;
+import com.azure.resourcemanager.hdinsight.models.UserAssignedIdentity;
 import com.azure.resourcemanager.hdinsight.models.VirtualNetworkProfile;
 import java.io.IOException;
 import java.util.Arrays;
@@ -48,7 +51,7 @@
 public final class ClustersCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopSshPassword.json
      */
     /**
@@ -103,7 +106,81 @@ public static void createHadoopOnLinuxClusterWithSSHPassword(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * CreateHDInsightClusterWithADLSGen2Msi.json
+     */
+    /**
+     * Sample code: Create cluster with storage ADLSGen2 + MSI.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void createClusterWithStorageADLSGen2MSI(com.azure.resourcemanager.hdinsight.HDInsightManager manager)
+        throws IOException {
+        manager.clusters()
+            .define("cluster1")
+            .withExistingResourceGroup("rg1")
+            .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+            .withProperties(new ClusterCreateProperties().withClusterVersion("5.1")
+                .withOsType(OSType.LINUX)
+                .withTier(Tier.STANDARD)
+                .withClusterDefinition(new ClusterDefinition().withKind("Hadoop")
+                    .withConfigurations(SerializerFactory.createDefaultManagementSerializerAdapter()
+                        .deserialize(
+                            "{\"gateway\":{\"restAuthCredential.isEnabled\":true,\"restAuthCredential.password\":\"**********\",\"restAuthCredential.username\":\"admin\"}}",
+                            Object.class, SerializerEncoding.JSON)))
+                .withComputeProfile(new ComputeProfile().withRoles(Arrays.asList(new Role().withName("headnode")
+                    .withMinInstanceCount(1)
+                    .withTargetInstanceCount(2)
+                    .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                    .withOsProfile(new OsProfile().withLinuxOperatingSystemProfile(
+                        new LinuxOperatingSystemProfile().withUsername("sshuser").withPassword("fakeTokenPlaceholder")))
+                    .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                        .withSubnet(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                    .withScriptActions(Arrays.asList()),
+                    new Role().withName("workernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()),
+                    new Role().withName("zookeepernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()))))
+                .withStorageProfile(new StorageProfile().withStorageaccounts(Arrays.asList(new StorageAccount()
+                    .withName("mystorage.blob.core.windows.net")
+                    .withIsDefault(true)
+                    .withFileSystem("default")
+                    .withResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/mystorage")
+                    .withMsiResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi")))))
+            .withIdentity(new ClusterIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                .withUserAssignedIdentities(mapOf(
+                    "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi",
+                    new UserAssignedIdentity())))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateKafkaClusterWithKafkaRestProxy.json
      */
     /**
@@ -165,7 +242,7 @@ public static void createKafkaClusterWithKafkaRestProxy(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithAutoscaleConfig.json
      */
     /**
@@ -233,7 +310,7 @@ public static void createHDInsightClusterWithAutoscaleConfiguration(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopSshPublicKey.json
      */
     /**
@@ -293,7 +370,7 @@ public static void createHadoopOnLinuxClusterWithSSHPublicKey(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithAvailabilityZones.json
      */
     /**
@@ -350,7 +427,58 @@ public static void createClusterWithAvailabilityZones(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * CreateHDInsightClusterWithEntraUser.json
+     */
+    /**
+     * Sample code: Create cluster with Entra User.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void createClusterWithEntraUser(com.azure.resourcemanager.hdinsight.HDInsightManager manager)
+        throws IOException {
+        manager.clusters()
+            .define("cluster1")
+            .withExistingResourceGroup("rg1")
+            .withProperties(new ClusterCreateProperties().withClusterVersion("5.1")
+                .withOsType(OSType.LINUX)
+                .withTier(Tier.STANDARD)
+                .withClusterDefinition(new ClusterDefinition().withKind("Hadoop")
+                    .withConfigurations(SerializerFactory.createDefaultManagementSerializerAdapter()
+                        .deserialize(
+                            "{\"gateway\":{\"restAuthCredential.isEnabled\":false,\"restAuthEntraUsers\":[{\"displayName\":\"displayName\",\"objectId\":\"00000000-0000-0000-0000-000000000000\",\"upn\":\"user@microsoft.com\"}]}}",
+                            Object.class, SerializerEncoding.JSON)))
+                .withComputeProfile(new ComputeProfile().withRoles(Arrays.asList(
+                    new Role().withName("headnode")
+                        .withTargetInstanceCount(2)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder"))),
+                    new Role().withName("workernode")
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder"))),
+                    new Role().withName("zookeepernode")
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder"))))))
+                .withStorageProfile(new StorageProfile()
+                    .withStorageaccounts(Arrays.asList(new StorageAccount().withName("mystorage.blob.core.windows.net")
+                        .withIsDefault(true)
+                        .withContainer("containername")
+                        .withKey("fakeTokenPlaceholder")
+                        .withEnableSecureChannel(true)))))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopAdlsGen2.json
      */
     /**
@@ -405,7 +533,7 @@ public static void createHadoopClusterWithAzureDataLakeStorageGen2(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxHadoopSecureHadoop.json
      */
     /**
@@ -488,7 +616,81 @@ public static void createSecureHadoopCluster(com.azure.resourcemanager.hdinsight
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * CreateHDInsightClusterWithWasbMsi.json
+     */
+    /**
+     * Sample code: Create cluster with storage WASB + MSI.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void createClusterWithStorageWASBMSI(com.azure.resourcemanager.hdinsight.HDInsightManager manager)
+        throws IOException {
+        manager.clusters()
+            .define("cluster1")
+            .withExistingResourceGroup("rg1")
+            .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+            .withProperties(new ClusterCreateProperties().withClusterVersion("5.1")
+                .withOsType(OSType.LINUX)
+                .withTier(Tier.STANDARD)
+                .withClusterDefinition(new ClusterDefinition().withKind("Hadoop")
+                    .withConfigurations(SerializerFactory.createDefaultManagementSerializerAdapter()
+                        .deserialize(
+                            "{\"gateway\":{\"restAuthCredential.isEnabled\":true,\"restAuthCredential.password\":\"**********\",\"restAuthCredential.username\":\"admin\"}}",
+                            Object.class, SerializerEncoding.JSON)))
+                .withComputeProfile(new ComputeProfile().withRoles(Arrays.asList(new Role().withName("headnode")
+                    .withMinInstanceCount(1)
+                    .withTargetInstanceCount(2)
+                    .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                    .withOsProfile(new OsProfile().withLinuxOperatingSystemProfile(
+                        new LinuxOperatingSystemProfile().withUsername("sshuser").withPassword("fakeTokenPlaceholder")))
+                    .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                        .withSubnet(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                    .withScriptActions(Arrays.asList()),
+                    new Role().withName("workernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()),
+                    new Role().withName("zookeepernode")
+                        .withMinInstanceCount(1)
+                        .withTargetInstanceCount(3)
+                        .withHardwareProfile(new HardwareProfile().withVmSize("Standard_E8_V3"))
+                        .withOsProfile(new OsProfile()
+                            .withLinuxOperatingSystemProfile(new LinuxOperatingSystemProfile().withUsername("sshuser")
+                                .withPassword("fakeTokenPlaceholder")))
+                        .withVirtualNetworkProfile(new VirtualNetworkProfile().withId(
+                            "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname")
+                            .withSubnet(
+                                "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnetname/subnets/vnetsubnet"))
+                        .withScriptActions(Arrays.asList()))))
+                .withStorageProfile(new StorageProfile().withStorageaccounts(Arrays.asList(new StorageAccount()
+                    .withName("mystorage.blob.core.windows.net")
+                    .withIsDefault(true)
+                    .withContainer("containername")
+                    .withResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/mystorage")
+                    .withMsiResourceId(
+                        "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi")))))
+            .withIdentity(new ClusterIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                .withUserAssignedIdentities(mapOf(
+                    "/subscriptions/subId/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/msi",
+                    new UserAssignedIdentity())))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateLinuxSparkSshPassword.json
      */
     /**
@@ -537,7 +739,7 @@ public static void createSparkOnLinuxClusterWithSSHPassword(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithCustomNetworkProperties.json
      */
     /**
@@ -597,7 +799,7 @@ public static void createClusterWithNetworkProperties(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithTLS12.json
      */
     /**
@@ -649,7 +851,7 @@ public static void createClusterWithTLS12(com.azure.resourcemanager.hdinsight.HD
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithEncryptionAtHost.json
      */
     /**
@@ -701,7 +903,7 @@ public static void createClusterWithEncryptionAtHost(com.azure.resourcemanager.h
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithEncryptionInTransit.json
      */
     /**
@@ -754,7 +956,7 @@ public static void createClusterWithEncryptionInTransit(
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * CreateHDInsightClusterWithComputeIsolationProperties.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteSamples.java
index 86cda3de46a2..1820ba1ce8df 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ClustersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeleteLinuxHadoopCluster.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsSamples.java
index 4e3dc9b27663..2dbdf48b8ef8 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsSamples.java
@@ -14,7 +14,7 @@
 public final class ClustersExecuteScriptActionsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PostExecuteScriptAction.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetAzureAsyncOperationStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetAzureAsyncOperationStatusSamples.java
index 99b26552d620..e53dde5640d1 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetAzureAsyncOperationStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetAzureAsyncOperationStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ClustersGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetClusterCreatingAsyncOperationStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetByResourceGroupSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetByResourceGroupSamples.java
index 97ee97495921..3f97fc97f1b1 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetByResourceGroupSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ClustersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopCluster.json
      */
     /**
@@ -24,7 +24,7 @@ public static void getHadoopOnLinuxCluster(com.azure.resourcemanager.hdinsight.H
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxSparkCluster.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetGatewaySettingsSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetGatewaySettingsSamples.java
index 1366d560458c..463766b6ebc5 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetGatewaySettingsSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersGetGatewaySettingsSamples.java
@@ -10,7 +10,7 @@
 public final class ClustersGetGatewaySettingsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Clusters_GetGatewaySettings.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListByResourceGroupSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListByResourceGroupSamples.java
index 9cf662ca3b1a..0f853c46d4bf 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListByResourceGroupSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ClustersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopAllClustersInResourceGroup.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListSamples.java
index b90dac511fad..30e1bdf3bc34 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersListSamples.java
@@ -10,7 +10,7 @@
 public final class ClustersListSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopAllClusters.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeSamples.java
index 007d25d500bb..9ef4d436df63 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeSamples.java
@@ -13,7 +13,7 @@
 public final class ClustersResizeSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ResizeLinuxHadoopCluster.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersRotateDiskEncryptionKeySamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersRotateDiskEncryptionKeySamples.java
index fa829dd6c460..9ad6a9569c92 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersRotateDiskEncryptionKeySamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersRotateDiskEncryptionKeySamples.java
@@ -12,7 +12,7 @@
 public final class ClustersRotateDiskEncryptionKeySamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * RotateLinuxHadoopClusterDiskEncryptionKey.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationSamples.java
index be8a6a8063a2..fd302c3eda3a 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationSamples.java
@@ -20,7 +20,7 @@
 public final class ClustersUpdateAutoScaleConfigurationSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableOrUpdateAutoScaleWithLoadBasedConfiguration.json
      */
     /**
@@ -39,7 +39,7 @@ public static void enableOrUpdateAutoscaleWithTheLoadBasedConfigurationForHDInsi
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableClusterAutoScale.json
      */
     /**
@@ -56,7 +56,7 @@ public static void enableOrUpdateAutoscaleWithTheLoadBasedConfigurationForHDInsi
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableOrUpdateAutoScaleWithScheduleBasedConfiguration.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateGatewaySettingsSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateGatewaySettingsSamples.java
index 4ac6229c7e3e..4e96a75fa635 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateGatewaySettingsSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateGatewaySettingsSamples.java
@@ -4,7 +4,9 @@
 
 package com.azure.resourcemanager.hdinsight.generated;
 
+import com.azure.resourcemanager.hdinsight.models.EntraUserInfo;
 import com.azure.resourcemanager.hdinsight.models.UpdateGatewaySettingsParameters;
+import java.util.Arrays;
 
 /**
  * Samples for Clusters UpdateGatewaySettings.
@@ -12,7 +14,7 @@
 public final class ClustersUpdateGatewaySettingsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Clusters_UpdateGatewaySettings_Enable.json
      */
     /**
@@ -25,4 +27,24 @@ public static void enableHTTPConnectivity(com.azure.resourcemanager.hdinsight.HD
             .updateGatewaySettings("rg1", "cluster1", new UpdateGatewaySettingsParameters(),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file:
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
+     * HDI_Clusters_UpdateGatewaySettings_EntraUser.json
+     */
+    /**
+     * Sample code: Update Entra User In HDInsight.
+     * 
+     * @param manager Entry point to HDInsightManager.
+     */
+    public static void updateEntraUserInHDInsight(com.azure.resourcemanager.hdinsight.HDInsightManager manager) {
+        manager.clusters()
+            .updateGatewaySettings("rg1", "cluster1",
+                new UpdateGatewaySettingsParameters().withRestAuthEntraUsers(
+                    Arrays.asList(new EntraUserInfo().withObjectId("00000000-0000-0000-0000-000000000000")
+                        .withDisplayName("displayName")
+                        .withUpn("user@microsoft.com"))),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateIdentityCertificateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateIdentityCertificateSamples.java
index 766522a59fc4..a645d4448749 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateIdentityCertificateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateIdentityCertificateSamples.java
@@ -12,7 +12,7 @@
 public final class ClustersUpdateIdentityCertificateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Clusters_UpdateClusterIdentityCertificate.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateSamples.java
index 540ad597b825..b41615100422 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateSamples.java
@@ -16,7 +16,7 @@
 public final class ClustersUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PatchLinuxHadoopCluster.json
      */
     /**
@@ -33,7 +33,7 @@ public static void patchHDInsightLinuxClusters(com.azure.resourcemanager.hdinsig
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PatchLinuxHadoopClusterWithSystemMSI.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetSamples.java
index 786e369f9f59..56d8d1dae8c1 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ConfigurationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Configurations_Get.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListSamples.java
index 6f749f147f0d..5e52ca4305b4 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListSamples.java
@@ -10,7 +10,7 @@
 public final class ConfigurationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Configurations_List.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateSamples.java
index 730bf9a351e7..17ffa4ea7575 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class ConfigurationsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ChangeHttpConnectivityEnable.json
      */
     /**
@@ -31,7 +31,7 @@ public static void enableHTTPConnectivity(com.azure.resourcemanager.hdinsight.HD
 
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ChangeHttpConnectivityDisable.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsCreateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsCreateSamples.java
index 6a83dae0165e..c4cae301b393 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsCreateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsCreateSamples.java
@@ -12,7 +12,7 @@
 public final class ExtensionsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/CreateExtension.
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/CreateExtension.
      * json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteSamples.java
index 6568c4cd9976..bc5c7aa6e72c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/DeleteExtension.
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/DeleteExtension.
      * json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentSamples.java
index 92b4bef6ceca..39b2699da9f0 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsDisableAzureMonitorAgentSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableLinuxClusterAzureMonitorAgent.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorSamples.java
index 3f1af93ac7e5..b3dd77f3edc1 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsDisableAzureMonitorSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableLinuxClusterAzureMonitor.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringSamples.java
index fd946c33b2b5..3928c730f665 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsDisableMonitoringSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DisableLinuxClusterMonitoring.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorAgentSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorAgentSamples.java
index 9099ad04f992..a204261f2007 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorAgentSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorAgentSamples.java
@@ -12,7 +12,7 @@
 public final class ExtensionsEnableAzureMonitorAgentSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableLinuxClusterAzureMonitorAgent.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorSamples.java
index 1e8a39e45e5d..0056e0ebdc08 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableAzureMonitorSamples.java
@@ -12,7 +12,7 @@
 public final class ExtensionsEnableAzureMonitorSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableLinuxClusterAzureMonitor.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableMonitoringSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableMonitoringSamples.java
index 8276b3cec65b..8b79b5b745e2 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableMonitoringSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsEnableMonitoringSamples.java
@@ -12,7 +12,7 @@
 public final class ExtensionsEnableMonitoringSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * EnableLinuxClusterMonitoring.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureAsyncOperationStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureAsyncOperationStatusSamples.java
index 984b36c912c5..e8116cad65b3 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureAsyncOperationStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureAsyncOperationStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetExtensionCreationAsyncOperationStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusSamples.java
index 71fa64fe4be6..626939a89741 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsGetAzureMonitorAgentStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxClusterAzureMonitorAgentStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusSamples.java
index 1124405765f1..490931f623a6 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsGetAzureMonitorStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxClusterAzureMonitorStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusSamples.java
index 601cb4819b0c..cf2ff5bc0a5e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsGetMonitoringStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxClusterMonitoringStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetSamples.java
index 187159c926b7..caefa88ee2e9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ExtensionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/GetExtension.
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/GetExtension.
      * json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilitySamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilitySamples.java
index c394869d2a57..f10f92e7e804 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilitySamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilitySamples.java
@@ -12,7 +12,7 @@
 public final class LocationsCheckNameAvailabilitySamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_CheckClusterNameAvailability.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetAzureAsyncOperationStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetAzureAsyncOperationStatusSamples.java
index 48f6475c0c42..d86ca240049a 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetAzureAsyncOperationStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetAzureAsyncOperationStatusSamples.java
@@ -10,7 +10,7 @@
 public final class LocationsGetAzureAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_GetAsyncOperationStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesSamples.java
index 39ff57a528f2..069ffa569c74 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesSamples.java
@@ -10,7 +10,7 @@
 public final class LocationsGetCapabilitiesSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetHDInsightCapabilities.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsSamples.java
index 412b2502a727..b144b4116d7e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsSamples.java
@@ -10,7 +10,7 @@
 public final class LocationsListBillingSpecsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_ListBillingSpecs.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesSamples.java
index 854bf5ab7252..d872f08129cc 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesSamples.java
@@ -10,7 +10,7 @@
 public final class LocationsListUsagesSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetHDInsightUsages.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsValidateClusterCreateRequestSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsValidateClusterCreateRequestSamples.java
index 98aa7bcd2010..1335db5ef7fa 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsValidateClusterCreateRequestSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/LocationsValidateClusterCreateRequestSamples.java
@@ -12,8 +12,8 @@
 import com.azure.resourcemanager.hdinsight.models.ComputeProfile;
 import com.azure.resourcemanager.hdinsight.models.HardwareProfile;
 import com.azure.resourcemanager.hdinsight.models.LinuxOperatingSystemProfile;
-import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.OSType;
+import com.azure.resourcemanager.hdinsight.models.OsProfile;
 import com.azure.resourcemanager.hdinsight.models.Role;
 import com.azure.resourcemanager.hdinsight.models.StorageAccount;
 import com.azure.resourcemanager.hdinsight.models.StorageProfile;
@@ -29,7 +29,7 @@
 public final class LocationsValidateClusterCreateRequestSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * HDI_Locations_ValidateClusterCreateRequest.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/OperationsListSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/OperationsListSamples.java
index d365891d7db9..49eb182edee4 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/OperationsListSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/OperationsListSamples.java
@@ -10,7 +10,7 @@
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ListHDInsightOperations.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java
index 8e0f9c9c4f20..38f4fa6f2c01 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class PrivateEndpointConnectionsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * ApprovePrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteSamples.java
index e4671ec1cc64..0a84defb05ce 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeletePrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetSamples.java
index 690984985b2b..f611cf383a5e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetPrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterSamples.java
index f88b4534f387..a0cec4dda949 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetAllPrivateEndpointConnectionsInCluster.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetSamples.java
index 37b6ca2a2df6..0b00c344d600 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkResourcesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetPrivateLinkResource.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterSamples.java
index e097f28e66d6..dc8475d43a5c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkResourcesListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetAllPrivateLinkResourcesInCluster.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteSamples.java
index 8d9e1adf34ad..5634d76dd552 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ScriptActionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * DeleteScriptAction.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionAsyncOperationStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionAsyncOperationStatusSamples.java
index 0f3a107bc2a9..7c3f0d4f2712 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionAsyncOperationStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionAsyncOperationStatusSamples.java
@@ -10,7 +10,7 @@
 public final class ScriptActionsGetExecutionAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetScriptExecutionAsyncOperationStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailSamples.java
index eb682fb4c8ca..0b405a044278 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailSamples.java
@@ -10,7 +10,7 @@
 public final class ScriptActionsGetExecutionDetailSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetScriptActionById.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterSamples.java
index 8b8b40193329..e3cf2eaf1822 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class ScriptActionsListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetLinuxHadoopScriptAction.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryListByClusterSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryListByClusterSamples.java
index 3922a2b29d25..8988e0c6fc96 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryListByClusterSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class ScriptExecutionHistoryListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetScriptExecutionHistory.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryPromoteSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryPromoteSamples.java
index 868303c519ae..88caab01b91d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryPromoteSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoryPromoteSamples.java
@@ -10,7 +10,7 @@
 public final class ScriptExecutionHistoryPromoteSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * PromoteLinuxHadoopScriptAction.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesGetAsyncOperationStatusSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesGetAsyncOperationStatusSamples.java
index d6de1eea46a8..8dd39ec45bb3 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesGetAsyncOperationStatusSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesGetAsyncOperationStatusSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualMachinesGetAsyncOperationStatusSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetRestartHostsAsyncOperationStatus.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesListHostsSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesListHostsSamples.java
index d2422eeff9f8..6d2ff5cde57d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesListHostsSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesListHostsSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualMachinesListHostsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * GetClusterVirtualMachines.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsSamples.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsSamples.java
index cc4a7486b377..855eb7fbc97b 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsSamples.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/samples/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsSamples.java
@@ -12,7 +12,7 @@
 public final class VirtualMachinesRestartHostsSamples {
     /*
      * x-ms-original-file:
-     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2024-08-01-preview/examples/
+     * specification/hdinsight/resource-manager/Microsoft.HDInsight/preview/2025-01-15-preview/examples/
      * RestartVirtualMachinesOperation.json
      */
     /**
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/HDInsightManagerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/HDInsightManagerTests.java
index c6ff568e71db..a9ffe599ecd3 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/HDInsightManagerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/HDInsightManagerTests.java
@@ -35,6 +35,7 @@
 import com.azure.resourcemanager.storage.models.PublicAccess;
 import com.azure.resourcemanager.storage.models.StorageAccountSkuType;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -87,6 +88,7 @@ protected void afterTest() {
         }
     }
 
+    @Disabled("No sufficient core to create the cluster resource")
     @Test
     @LiveOnly
     public void testCreateCluster() {
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AaddsResourceDetailsTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AaddsResourceDetailsTests.java
index 30c832c77879..da2fdeab400b 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AaddsResourceDetailsTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AaddsResourceDetailsTests.java
@@ -12,33 +12,33 @@ public final class AaddsResourceDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AaddsResourceDetails model = BinaryData.fromString(
-            "{\"domainName\":\"gzslesjcbhernnti\",\"initialSyncComplete\":false,\"ldapsEnabled\":false,\"ldapsPublicCertificateInBase64\":\"bquwrbehw\",\"resourceId\":\"o\",\"subnetId\":\"uffkmrqemvvh\",\"tenantId\":\"tdrjfutacoebj\"}")
+            "{\"domainName\":\"mhrixkwmyijejve\",\"initialSyncComplete\":true,\"ldapsEnabled\":false,\"ldapsPublicCertificateInBase64\":\"aixexccbdreaxh\",\"resourceId\":\"xdrrvqahqkghtp\",\"subnetId\":\"jnhyjsvf\",\"tenantId\":\"xzb\"}")
             .toObject(AaddsResourceDetails.class);
-        Assertions.assertEquals("gzslesjcbhernnti", model.domainName());
-        Assertions.assertEquals(false, model.initialSyncComplete());
-        Assertions.assertEquals(false, model.ldapsEnabled());
-        Assertions.assertEquals("bquwrbehw", model.ldapsPublicCertificateInBase64());
-        Assertions.assertEquals("o", model.resourceId());
-        Assertions.assertEquals("uffkmrqemvvh", model.subnetId());
-        Assertions.assertEquals("tdrjfutacoebj", model.tenantId());
+        Assertions.assertEquals("mhrixkwmyijejve", model.domainName());
+        Assertions.assertTrue(model.initialSyncComplete());
+        Assertions.assertFalse(model.ldapsEnabled());
+        Assertions.assertEquals("aixexccbdreaxh", model.ldapsPublicCertificateInBase64());
+        Assertions.assertEquals("xdrrvqahqkghtp", model.resourceId());
+        Assertions.assertEquals("jnhyjsvf", model.subnetId());
+        Assertions.assertEquals("xzb", model.tenantId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AaddsResourceDetails model = new AaddsResourceDetails().withDomainName("gzslesjcbhernnti")
-            .withInitialSyncComplete(false)
+        AaddsResourceDetails model = new AaddsResourceDetails().withDomainName("mhrixkwmyijejve")
+            .withInitialSyncComplete(true)
             .withLdapsEnabled(false)
-            .withLdapsPublicCertificateInBase64("bquwrbehw")
-            .withResourceId("o")
-            .withSubnetId("uffkmrqemvvh")
-            .withTenantId("tdrjfutacoebj");
+            .withLdapsPublicCertificateInBase64("aixexccbdreaxh")
+            .withResourceId("xdrrvqahqkghtp")
+            .withSubnetId("jnhyjsvf")
+            .withTenantId("xzb");
         model = BinaryData.fromObject(model).toObject(AaddsResourceDetails.class);
-        Assertions.assertEquals("gzslesjcbhernnti", model.domainName());
-        Assertions.assertEquals(false, model.initialSyncComplete());
-        Assertions.assertEquals(false, model.ldapsEnabled());
-        Assertions.assertEquals("bquwrbehw", model.ldapsPublicCertificateInBase64());
-        Assertions.assertEquals("o", model.resourceId());
-        Assertions.assertEquals("uffkmrqemvvh", model.subnetId());
-        Assertions.assertEquals("tdrjfutacoebj", model.tenantId());
+        Assertions.assertEquals("mhrixkwmyijejve", model.domainName());
+        Assertions.assertTrue(model.initialSyncComplete());
+        Assertions.assertFalse(model.ldapsEnabled());
+        Assertions.assertEquals("aixexccbdreaxh", model.ldapsPublicCertificateInBase64());
+        Assertions.assertEquals("xdrrvqahqkghtp", model.resourceId());
+        Assertions.assertEquals("jnhyjsvf", model.subnetId());
+        Assertions.assertEquals("xzb", model.tenantId());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationGetHttpsEndpointTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationGetHttpsEndpointTests.java
index b26b9525647d..b4bcb790f2b9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationGetHttpsEndpointTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationGetHttpsEndpointTests.java
@@ -19,7 +19,7 @@ public void testDeserialize() throws Exception {
         Assertions.assertEquals(981492544, model.destinationPort());
         Assertions.assertEquals("clhocohsl", model.privateIpAddress());
         Assertions.assertEquals("vleggzfbuhfmvfax", model.subDomainSuffix());
-        Assertions.assertEquals(true, model.disableGatewayAuth());
+        Assertions.assertTrue(model.disableGatewayAuth());
     }
 
     @org.junit.jupiter.api.Test
@@ -35,6 +35,6 @@ public void testSerialize() throws Exception {
         Assertions.assertEquals(981492544, model.destinationPort());
         Assertions.assertEquals("clhocohsl", model.privateIpAddress());
         Assertions.assertEquals("vleggzfbuhfmvfax", model.subDomainSuffix());
-        Assertions.assertEquals(true, model.disableGatewayAuth());
+        Assertions.assertTrue(model.disableGatewayAuth());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteMockTests.java
index 422f3ed8302b..401e3d2c809c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ApplicationsDeleteMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,9 @@ public void testDelete() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.applications().delete("baxk", "eytu", "lbfjkwr", com.azure.core.util.Context.NONE);
+        manager.applications().delete("xfyqonmpqoxwdo", "dbxiqx", "iiqbi", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorResponseInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorResponseInnerTests.java
index d58c167a7b29..e3c8a44976ff 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorResponseInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorResponseInnerTests.java
@@ -17,30 +17,34 @@ public final class AzureMonitorResponseInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AzureMonitorResponseInner model = BinaryData.fromString(
-            "{\"clusterMonitoringEnabled\":false,\"workspaceId\":\"dtlwwrlkd\",\"selectedConfigurations\":{\"configurationVersion\":\"cvokotllxdyhg\",\"globalConfigurations\":{\"hadoocrk\":\"cogjltdtbn\",\"amqgxqquezikyw\":\"cikhnv\"},\"tableList\":[{\"name\":\"allatmelwuipic\"},{\"name\":\"zkzivgvvcnay\"}]}}")
+            "{\"clusterMonitoringEnabled\":false,\"workspaceId\":\"lkdmtncvokotllxd\",\"selectedConfigurations\":{\"configurationVersion\":\"syocogjltdtbnnha\",\"globalConfigurations\":{\"amqgxqquezikyw\":\"crkvcikhnv\",\"lla\":\"gxk\",\"z\":\"melwuipiccjz\"},\"tableList\":[{\"name\":\"vc\"},{\"name\":\"y\"},{\"name\":\"yrnxxmueedn\"}]}}")
             .toObject(AzureMonitorResponseInner.class);
-        Assertions.assertEquals(false, model.clusterMonitoringEnabled());
-        Assertions.assertEquals("dtlwwrlkd", model.workspaceId());
-        Assertions.assertEquals("cvokotllxdyhg", model.selectedConfigurations().configurationVersion());
-        Assertions.assertEquals("cogjltdtbn", model.selectedConfigurations().globalConfigurations().get("hadoocrk"));
-        Assertions.assertEquals("allatmelwuipic", model.selectedConfigurations().tableList().get(0).name());
+        Assertions.assertFalse(model.clusterMonitoringEnabled());
+        Assertions.assertEquals("lkdmtncvokotllxd", model.workspaceId());
+        Assertions.assertEquals("syocogjltdtbnnha", model.selectedConfigurations().configurationVersion());
+        Assertions.assertEquals("crkvcikhnv",
+            model.selectedConfigurations().globalConfigurations().get("amqgxqquezikyw"));
+        Assertions.assertEquals("vc", model.selectedConfigurations().tableList().get(0).name());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AzureMonitorResponseInner model = new AzureMonitorResponseInner().withClusterMonitoringEnabled(false)
-            .withWorkspaceId("dtlwwrlkd")
-            .withSelectedConfigurations(
-                new AzureMonitorSelectedConfigurations().withConfigurationVersion("cvokotllxdyhg")
-                    .withGlobalConfigurations(mapOf("hadoocrk", "cogjltdtbn", "amqgxqquezikyw", "cikhnv"))
-                    .withTableList(Arrays.asList(new AzureMonitorTableConfiguration().withName("allatmelwuipic"),
-                        new AzureMonitorTableConfiguration().withName("zkzivgvvcnay"))));
+        AzureMonitorResponseInner model
+            = new AzureMonitorResponseInner().withClusterMonitoringEnabled(false)
+                .withWorkspaceId("lkdmtncvokotllxd")
+                .withSelectedConfigurations(new AzureMonitorSelectedConfigurations()
+                    .withConfigurationVersion("syocogjltdtbnnha")
+                    .withGlobalConfigurations(mapOf("amqgxqquezikyw", "crkvcikhnv", "lla", "gxk", "z", "melwuipiccjz"))
+                    .withTableList(Arrays.asList(new AzureMonitorTableConfiguration().withName("vc"),
+                        new AzureMonitorTableConfiguration().withName("y"),
+                        new AzureMonitorTableConfiguration().withName("yrnxxmueedn"))));
         model = BinaryData.fromObject(model).toObject(AzureMonitorResponseInner.class);
-        Assertions.assertEquals(false, model.clusterMonitoringEnabled());
-        Assertions.assertEquals("dtlwwrlkd", model.workspaceId());
-        Assertions.assertEquals("cvokotllxdyhg", model.selectedConfigurations().configurationVersion());
-        Assertions.assertEquals("cogjltdtbn", model.selectedConfigurations().globalConfigurations().get("hadoocrk"));
-        Assertions.assertEquals("allatmelwuipic", model.selectedConfigurations().tableList().get(0).name());
+        Assertions.assertFalse(model.clusterMonitoringEnabled());
+        Assertions.assertEquals("lkdmtncvokotllxd", model.workspaceId());
+        Assertions.assertEquals("syocogjltdtbnnha", model.selectedConfigurations().configurationVersion());
+        Assertions.assertEquals("crkvcikhnv",
+            model.selectedConfigurations().globalConfigurations().get("amqgxqquezikyw"));
+        Assertions.assertEquals("vc", model.selectedConfigurations().tableList().get(0).name());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorSelectedConfigurationsTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorSelectedConfigurationsTests.java
index b32a58a68106..19342a7098c9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorSelectedConfigurationsTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorSelectedConfigurationsTests.java
@@ -16,26 +16,23 @@ public final class AzureMonitorSelectedConfigurationsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AzureMonitorSelectedConfigurations model = BinaryData.fromString(
-            "{\"configurationVersion\":\"odlqiyntor\",\"globalConfigurations\":{\"yzrpzbchckqqzq\":\"leosjswsrms\",\"ysuiizynkedya\":\"ox\"},\"tableList\":[{\"name\":\"hqmibzyhwit\"},{\"name\":\"ypyynpcdpumnzg\"},{\"name\":\"z\"},{\"name\":\"abikns\"}]}")
+            "{\"configurationVersion\":\"lyzrpzbchckqqzqi\",\"globalConfigurations\":{\"rwyhqmibzyhwitsm\":\"ysuiizynkedya\",\"pcdpumnz\":\"pyy\"},\"tableList\":[{\"name\":\"nmabik\"}]}")
             .toObject(AzureMonitorSelectedConfigurations.class);
-        Assertions.assertEquals("odlqiyntor", model.configurationVersion());
-        Assertions.assertEquals("leosjswsrms", model.globalConfigurations().get("yzrpzbchckqqzq"));
-        Assertions.assertEquals("hqmibzyhwit", model.tableList().get(0).name());
+        Assertions.assertEquals("lyzrpzbchckqqzqi", model.configurationVersion());
+        Assertions.assertEquals("ysuiizynkedya", model.globalConfigurations().get("rwyhqmibzyhwitsm"));
+        Assertions.assertEquals("nmabik", model.tableList().get(0).name());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         AzureMonitorSelectedConfigurations model
-            = new AzureMonitorSelectedConfigurations().withConfigurationVersion("odlqiyntor")
-                .withGlobalConfigurations(mapOf("yzrpzbchckqqzq", "leosjswsrms", "ysuiizynkedya", "ox"))
-                .withTableList(Arrays.asList(new AzureMonitorTableConfiguration().withName("hqmibzyhwit"),
-                    new AzureMonitorTableConfiguration().withName("ypyynpcdpumnzg"),
-                    new AzureMonitorTableConfiguration().withName("z"),
-                    new AzureMonitorTableConfiguration().withName("abikns")));
+            = new AzureMonitorSelectedConfigurations().withConfigurationVersion("lyzrpzbchckqqzqi")
+                .withGlobalConfigurations(mapOf("rwyhqmibzyhwitsm", "ysuiizynkedya", "pcdpumnz", "pyy"))
+                .withTableList(Arrays.asList(new AzureMonitorTableConfiguration().withName("nmabik")));
         model = BinaryData.fromObject(model).toObject(AzureMonitorSelectedConfigurations.class);
-        Assertions.assertEquals("odlqiyntor", model.configurationVersion());
-        Assertions.assertEquals("leosjswsrms", model.globalConfigurations().get("yzrpzbchckqqzq"));
-        Assertions.assertEquals("hqmibzyhwit", model.tableList().get(0).name());
+        Assertions.assertEquals("lyzrpzbchckqqzqi", model.configurationVersion());
+        Assertions.assertEquals("ysuiizynkedya", model.globalConfigurations().get("rwyhqmibzyhwitsm"));
+        Assertions.assertEquals("nmabik", model.tableList().get(0).name());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorTableConfigurationTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorTableConfigurationTests.java
index d0cb8b0b234b..55ef0aa990b2 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorTableConfigurationTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/AzureMonitorTableConfigurationTests.java
@@ -12,14 +12,14 @@ public final class AzureMonitorTableConfigurationTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AzureMonitorTableConfiguration model
-            = BinaryData.fromString("{\"name\":\"gj\"}").toObject(AzureMonitorTableConfiguration.class);
-        Assertions.assertEquals("gj", model.name());
+            = BinaryData.fromString("{\"name\":\"orgjhxbldt\"}").toObject(AzureMonitorTableConfiguration.class);
+        Assertions.assertEquals("orgjhxbldt", model.name());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AzureMonitorTableConfiguration model = new AzureMonitorTableConfiguration().withName("gj");
+        AzureMonitorTableConfiguration model = new AzureMonitorTableConfiguration().withName("orgjhxbldt");
         model = BinaryData.fromObject(model).toObject(AzureMonitorTableConfiguration.class);
-        Assertions.assertEquals("gj", model.name());
+        Assertions.assertEquals("orgjhxbldt", model.name());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingMetersTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingMetersTests.java
index fef31be95fa0..b3f541fa6dcf 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingMetersTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingMetersTests.java
@@ -11,21 +11,21 @@
 public final class BillingMetersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        BillingMeters model
-            = BinaryData.fromString("{\"meterParameter\":\"fqntcyp\",\"meter\":\"jv\",\"unit\":\"imwkslircizj\"}")
-                .toObject(BillingMeters.class);
-        Assertions.assertEquals("fqntcyp", model.meterParameter());
-        Assertions.assertEquals("jv", model.meter());
-        Assertions.assertEquals("imwkslircizj", model.unit());
+        BillingMeters model = BinaryData
+            .fromString("{\"meterParameter\":\"ljagrqmqhl\",\"meter\":\"riiiojnalghfkv\",\"unit\":\"sexso\"}")
+            .toObject(BillingMeters.class);
+        Assertions.assertEquals("ljagrqmqhl", model.meterParameter());
+        Assertions.assertEquals("riiiojnalghfkv", model.meter());
+        Assertions.assertEquals("sexso", model.unit());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         BillingMeters model
-            = new BillingMeters().withMeterParameter("fqntcyp").withMeter("jv").withUnit("imwkslircizj");
+            = new BillingMeters().withMeterParameter("ljagrqmqhl").withMeter("riiiojnalghfkv").withUnit("sexso");
         model = BinaryData.fromObject(model).toObject(BillingMeters.class);
-        Assertions.assertEquals("fqntcyp", model.meterParameter());
-        Assertions.assertEquals("jv", model.meter());
-        Assertions.assertEquals("imwkslircizj", model.unit());
+        Assertions.assertEquals("ljagrqmqhl", model.meterParameter());
+        Assertions.assertEquals("riiiojnalghfkv", model.meter());
+        Assertions.assertEquals("sexso", model.unit());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResourcesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResourcesTests.java
index a637cab8fcf2..42d4e9061df8 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResourcesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResourcesTests.java
@@ -16,38 +16,39 @@ public final class BillingResourcesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BillingResources model = BinaryData.fromString(
-            "{\"region\":\"fcluyov\",\"billingMeters\":[{\"meterParameter\":\"kfezzxscyhwz\",\"meter\":\"irujbz\",\"unit\":\"mvzzbtdcqvp\"},{\"meterParameter\":\"yujviylwdshfssn\",\"meter\":\"gy\",\"unit\":\"rymsgaojfmw\"},{\"meterParameter\":\"otmrfhir\",\"meter\":\"ymoxoftpipiwyczu\",\"unit\":\"a\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"lihhyuspskasdvlm\",\"sku\":\"dgzxulucvpamrsr\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"xurisjnhnyt\",\"sku\":\"fq\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"mrhublwpc\",\"sku\":\"utr\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"auutpwoqhihe\",\"sku\":\"g\",\"tier\":\"Premium\"}]}")
+            "{\"region\":\"pgvmpipaslthaqfx\",\"billingMeters\":[{\"meterParameter\":\"u\",\"meter\":\"bdsrez\",\"unit\":\"rhneuyowq\"},{\"meterParameter\":\"wyt\",\"meter\":\"ib\",\"unit\":\"cgpik\"},{\"meterParameter\":\"imejzanl\",\"meter\":\"xi\",\"unit\":\"rmbzo\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"xrjqcirgzpfrlazs\",\"sku\":\"nwoiind\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"jylwbtlhflsj\",\"sku\":\"hszfjvfb\",\"tier\":\"Premium\"}]}")
             .toObject(BillingResources.class);
-        Assertions.assertEquals("fcluyov", model.region());
-        Assertions.assertEquals("kfezzxscyhwz", model.billingMeters().get(0).meterParameter());
-        Assertions.assertEquals("irujbz", model.billingMeters().get(0).meter());
-        Assertions.assertEquals("mvzzbtdcqvp", model.billingMeters().get(0).unit());
-        Assertions.assertEquals("lihhyuspskasdvlm", model.diskBillingMeters().get(0).diskRpMeter());
-        Assertions.assertEquals("dgzxulucvpamrsr", model.diskBillingMeters().get(0).sku());
-        Assertions.assertEquals(Tier.PREMIUM, model.diskBillingMeters().get(0).tier());
+        Assertions.assertEquals("pgvmpipaslthaqfx", model.region());
+        Assertions.assertEquals("u", model.billingMeters().get(0).meterParameter());
+        Assertions.assertEquals("bdsrez", model.billingMeters().get(0).meter());
+        Assertions.assertEquals("rhneuyowq", model.billingMeters().get(0).unit());
+        Assertions.assertEquals("xrjqcirgzpfrlazs", model.diskBillingMeters().get(0).diskRpMeter());
+        Assertions.assertEquals("nwoiind", model.diskBillingMeters().get(0).sku());
+        Assertions.assertEquals(Tier.STANDARD, model.diskBillingMeters().get(0).tier());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BillingResources model = new BillingResources().withRegion("fcluyov")
-            .withBillingMeters(Arrays.asList(
-                new BillingMeters().withMeterParameter("kfezzxscyhwz").withMeter("irujbz").withUnit("mvzzbtdcqvp"),
-                new BillingMeters().withMeterParameter("yujviylwdshfssn").withMeter("gy").withUnit("rymsgaojfmw"),
-                new BillingMeters().withMeterParameter("otmrfhir").withMeter("ymoxoftpipiwyczu").withUnit("a")))
-            .withDiskBillingMeters(Arrays.asList(
-                new DiskBillingMeters().withDiskRpMeter("lihhyuspskasdvlm")
-                    .withSku("dgzxulucvpamrsr")
-                    .withTier(Tier.PREMIUM),
-                new DiskBillingMeters().withDiskRpMeter("xurisjnhnyt").withSku("fq").withTier(Tier.PREMIUM),
-                new DiskBillingMeters().withDiskRpMeter("mrhublwpc").withSku("utr").withTier(Tier.STANDARD),
-                new DiskBillingMeters().withDiskRpMeter("auutpwoqhihe").withSku("g").withTier(Tier.PREMIUM)));
+        BillingResources model
+            = new BillingResources().withRegion("pgvmpipaslthaqfx")
+                .withBillingMeters(Arrays.asList(
+                    new BillingMeters().withMeterParameter("u").withMeter("bdsrez").withUnit("rhneuyowq"),
+                    new BillingMeters().withMeterParameter("wyt").withMeter("ib").withUnit("cgpik"),
+                    new BillingMeters().withMeterParameter("imejzanl").withMeter("xi").withUnit("rmbzo")))
+                .withDiskBillingMeters(Arrays.asList(new DiskBillingMeters()
+                    .withDiskRpMeter("xrjqcirgzpfrlazs")
+                    .withSku("nwoiind")
+                    .withTier(Tier.STANDARD),
+                    new DiskBillingMeters().withDiskRpMeter("jylwbtlhflsj")
+                        .withSku("hszfjvfb")
+                        .withTier(Tier.PREMIUM)));
         model = BinaryData.fromObject(model).toObject(BillingResources.class);
-        Assertions.assertEquals("fcluyov", model.region());
-        Assertions.assertEquals("kfezzxscyhwz", model.billingMeters().get(0).meterParameter());
-        Assertions.assertEquals("irujbz", model.billingMeters().get(0).meter());
-        Assertions.assertEquals("mvzzbtdcqvp", model.billingMeters().get(0).unit());
-        Assertions.assertEquals("lihhyuspskasdvlm", model.diskBillingMeters().get(0).diskRpMeter());
-        Assertions.assertEquals("dgzxulucvpamrsr", model.diskBillingMeters().get(0).sku());
-        Assertions.assertEquals(Tier.PREMIUM, model.diskBillingMeters().get(0).tier());
+        Assertions.assertEquals("pgvmpipaslthaqfx", model.region());
+        Assertions.assertEquals("u", model.billingMeters().get(0).meterParameter());
+        Assertions.assertEquals("bdsrez", model.billingMeters().get(0).meter());
+        Assertions.assertEquals("rhneuyowq", model.billingMeters().get(0).unit());
+        Assertions.assertEquals("xrjqcirgzpfrlazs", model.diskBillingMeters().get(0).diskRpMeter());
+        Assertions.assertEquals("nwoiind", model.diskBillingMeters().get(0).sku());
+        Assertions.assertEquals(Tier.STANDARD, model.diskBillingMeters().get(0).tier());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResponseListResultInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResponseListResultInnerTests.java
index e2b5e415d671..6f7167757129 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResponseListResultInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/BillingResponseListResultInnerTests.java
@@ -20,163 +20,68 @@ public final class BillingResponseListResultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BillingResponseListResultInner model = BinaryData.fromString(
-            "{\"vmSizes\":[\"fdwoyuhh\",\"iuiefozbhdmsm\"],\"vmSizesWithEncryptionAtHost\":[\"qhoftrmaequiah\",\"icslfaoq\"],\"vmSizeFilters\":[{\"filterMode\":\"Recommend\",\"regions\":[\"alnswhccsphk\",\"ivwitqscywugg\"],\"clusterFlavors\":[\"uhczbwemh\",\"i\"],\"nodeTypes\":[\"rgzdwmsweyp\"],\"clusterVersions\":[\"xggicccnxqhuexmk\",\"tlstvlzywem\",\"zrncsdt\",\"lusiy\"],\"osType\":[\"Linux\",\"Linux\",\"Windows\",\"Windows\"],\"vmSizes\":[\"sl\",\"eadcygqukyhejhz\"],\"espApplied\":\"xgfpelolppv\",\"computeIsolationSupported\":\"r\"},{\"filterMode\":\"Exclude\",\"regions\":[\"zraehtwd\",\"r\",\"tswiby\"],\"clusterFlavors\":[\"l\"],\"nodeTypes\":[\"hfwpracstwit\",\"khevxccedc\",\"nmdyodnwzxl\",\"jc\"],\"clusterVersions\":[\"ltiugcxnavv\"],\"osType\":[\"Linux\"],\"vmSizes\":[\"qunyowxwlmdjr\"],\"espApplied\":\"fgbvfvpdbo\",\"computeIsolationSupported\":\"cizsjqlhkrribdei\"},{\"filterMode\":\"Default\",\"regions\":[\"kghv\"],\"clusterFlavors\":[\"zwmk\",\"efajpj\",\"rwkq\"],\"nodeTypes\":[\"gbijtjivfx\",\"sjabibs\"],\"clusterVersions\":[\"awfsdjpvkvpbjxbk\",\"bzkdvn\",\"jabudurgkakmo\"],\"osType\":[\"Windows\",\"Windows\"],\"vmSizes\":[\"ffhmouwqlgzr\",\"zeeyebi\",\"ikayuhqlbjbsybb\"],\"espApplied\":\"r\",\"computeIsolationSupported\":\"ldgmfpgvmpip\"},{\"filterMode\":\"Exclude\",\"regions\":[\"aqfxss\"],\"clusterFlavors\":[\"twbdsrezpdrhn\"],\"nodeTypes\":[\"owqkdwytisi\",\"ircgpikpz\",\"mejzanlfzxia\",\"rmbzo\"],\"clusterVersions\":[\"i\",\"rjqc\"],\"osType\":[\"Windows\",\"Windows\"],\"vmSizes\":[\"lazszrn\",\"oiindfpwpjy\",\"wbtlhflsjcdh\"],\"espApplied\":\"fjvfbgofeljagr\",\"computeIsolationSupported\":\"qhl\"}],\"vmSizeProperties\":[{\"name\":\"iiojnal\",\"cores\":524245347,\"dataDiskStorageTier\":\"vtvsexsowueluq\",\"label\":\"ahhxvrh\",\"maxDataDiskCount\":9171909100636996860,\"memoryInMb\":4157804500338386814,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":7214299945919733789,\"webWorkerResourceDiskSizeInMb\":2856222414032375851},{\"name\":\"xhqxujxukndxdigr\",\"cores\":1599924393,\"dataDiskStorageTier\":\"fzdm\",\"label\":\"qtfihwhbotzinga\",\"maxDataDiskCount\":2353170453764663846,\"memoryInMb\":449816124137860976,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":8200061235460803535,\"webWorkerResourceDiskSizeInMb\":7279242451300460541},{\"name\":\"dkfw\",\"cores\":2014780251,\"dataDiskStorageTier\":\"vtbvkayh\",\"label\":\"nvyq\",\"maxDataDiskCount\":2949816427464265295,\"memoryInMb\":1497619530378227200,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":941265626595578709,\"webWorkerResourceDiskSizeInMb\":2780468814645606920},{\"name\":\"vvsccyajguq\",\"cores\":1811586286,\"dataDiskStorageTier\":\"gzlvdnkfxu\",\"label\":\"mdwzrmuhapfcqdps\",\"maxDataDiskCount\":1717467823158981449,\"memoryInMb\":3875353793969101932,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":5946523647295808209,\"webWorkerResourceDiskSizeInMb\":3613891103592609366}],\"billingResources\":[{\"region\":\"ypql\",\"billingMeters\":[{\"meterParameter\":\"kerqwkyh\",\"meter\":\"bopgxedkowepbqp\",\"unit\":\"fkbw\"},{\"meterParameter\":\"snjvcdwxlpqekftn\",\"meter\":\"tjsyin\",\"unit\":\"fq\"},{\"meterParameter\":\"mtdh\",\"meter\":\"dvypgikdgsz\",\"unit\":\"kbir\"},{\"meterParameter\":\"uzhlhkjoqrv\",\"meter\":\"aatjinrvgoupmfi\",\"unit\":\"fggjioolvr\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"tkkgllqwjy\",\"sku\":\"jayvblmhv\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"bxvvyhg\",\"sku\":\"pbyrqufegxu\",\"tier\":\"Standard\"}]},{\"region\":\"bnhlmc\",\"billingMeters\":[{\"meterParameter\":\"ngitvgbmhrixkwm\",\"meter\":\"jejveg\",\"unit\":\"bpnaixexccbdre\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"exdrrvqahqkg\",\"sku\":\"pwijnhy\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"ycxzbfvoo\",\"sku\":\"rvmtgjq\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"s\",\"sku\":\"on\",\"tier\":\"Premium\"}]},{\"region\":\"gfipnsxk\",\"billingMeters\":[{\"meterParameter\":\"ekrrjr\",\"meter\":\"fxtsgum\",\"unit\":\"glikkxwslolb\"},{\"meterParameter\":\"vuzlm\",\"meter\":\"elfk\",\"unit\":\"plcrpwjxeznoig\"},{\"meterParameter\":\"njwmwkpnbsazejj\",\"meter\":\"kagfhsxtt\",\"unit\":\"gzxnfaazpxdtnk\"},{\"meterParameter\":\"kqjjlwuenvrkp\",\"meter\":\"uaibrebqaaysj\",\"unit\":\"xqtnq\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"lwfffi\",\"sku\":\"pjpqqmtedltmmji\",\"tier\":\"Standard\"}]},{\"region\":\"zphv\",\"billingMeters\":[{\"meterParameter\":\"qncygupkvi\",\"meter\":\"dscwxqupevzhf\",\"unit\":\"otxhojujby\"},{\"meterParameter\":\"lmcuvhixb\",\"meter\":\"yfwnylr\",\"unit\":\"o\"},{\"meterParameter\":\"ttpkiwkkbnujrywv\",\"meter\":\"lbfpncurd\",\"unit\":\"wiithtywub\"},{\"meterParameter\":\"bihwqknfdnt\",\"meter\":\"chrdgoihxumwcto\",\"unit\":\"zj\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"fdlwg\",\"sku\":\"tsbwtovvtgse\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"iufxqknpir\",\"sku\":\"epttwqmsniff\",\"tier\":\"Premium\"}]}]}")
+            "{\"vmSizes\":[\"wabm\",\"oefki\"],\"vmSizesWithEncryptionAtHost\":[\"tpuqujmq\",\"gkfbtndoaong\",\"jcntuj\"],\"vmSizeFilters\":[{\"filterMode\":\"Exclude\",\"regions\":[\"twwaezkojvdcpzf\",\"qouicybxarzgsz\",\"foxciq\",\"p\"],\"clusterFlavors\":[\"amcio\",\"hkh\"],\"nodeTypes\":[\"khnzbonlw\",\"toego\",\"dwbwhkszzcmrvexz\",\"vbtqgsfraoyzk\"],\"clusterVersions\":[\"tlmngu\"],\"osType\":[\"Windows\",\"Windows\"],\"vmSizes\":[\"syuuximerq\",\"obwyznkb\",\"kutwpf\",\"pagmhrskdsnf\"],\"espApplied\":\"doakgtdlmkkzevdl\",\"computeIsolationSupported\":\"wpusdsttwvogv\"}],\"vmSizeProperties\":[{\"name\":\"dcngqqmoakufgmj\",\"cores\":349751254,\"dataDiskStorageTier\":\"dgrtwaenuuzkopbm\",\"label\":\"rfdwoyu\",\"maxDataDiskCount\":4568735292262817818,\"memoryInMb\":3459177326935122788,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":6074773218082221902,\"webWorkerResourceDiskSizeInMb\":4135226248111903185},{\"name\":\"zqhof\",\"cores\":1813126235,\"dataDiskStorageTier\":\"equi\",\"label\":\"xicslfao\",\"maxDataDiskCount\":8310123876106634171,\"memoryInMb\":2494227720059523553,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":4772469373607782969,\"webWorkerResourceDiskSizeInMb\":9111708836032441220},{\"name\":\"hka\",\"cores\":2029124466,\"dataDiskStorageTier\":\"tqscywug\",\"label\":\"oluhczbwemh\",\"maxDataDiskCount\":861506686210387635,\"memoryInMb\":2312516572905893398,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":3711551930232886433,\"webWorkerResourceDiskSizeInMb\":3553034048925104478},{\"name\":\"dxggicccnxqhuexm\",\"cores\":735026566,\"dataDiskStorageTier\":\"stvlzywemhzrnc\",\"label\":\"tclusiypbsfgy\",\"maxDataDiskCount\":7838664702645676425,\"memoryInMb\":9132015277397116650,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":1362554750636902661,\"webWorkerResourceDiskSizeInMb\":3695850185212160621}],\"billingResources\":[{\"region\":\"zis\",\"billingMeters\":[{\"meterParameter\":\"elolppvksrpqvuj\",\"meter\":\"aehtwd\",\"unit\":\"ftswibyrcdlbhsh\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"acstwityk\",\"sku\":\"vxccedcp\",\"tier\":\"Premium\"}]}]}")
             .toObject(BillingResponseListResultInner.class);
-        Assertions.assertEquals("fdwoyuhh", model.vmSizes().get(0));
-        Assertions.assertEquals("qhoftrmaequiah", model.vmSizesWithEncryptionAtHost().get(0));
-        Assertions.assertEquals(FilterMode.RECOMMEND, model.vmSizeFilters().get(0).filterMode());
-        Assertions.assertEquals("alnswhccsphk", model.vmSizeFilters().get(0).regions().get(0));
-        Assertions.assertEquals("uhczbwemh", model.vmSizeFilters().get(0).clusterFlavors().get(0));
-        Assertions.assertEquals("rgzdwmsweyp", model.vmSizeFilters().get(0).nodeTypes().get(0));
-        Assertions.assertEquals("xggicccnxqhuexmk", model.vmSizeFilters().get(0).clusterVersions().get(0));
-        Assertions.assertEquals(OSType.LINUX, model.vmSizeFilters().get(0).osType().get(0));
-        Assertions.assertEquals("sl", model.vmSizeFilters().get(0).vmSizes().get(0));
-        Assertions.assertEquals("xgfpelolppv", model.vmSizeFilters().get(0).espApplied());
-        Assertions.assertEquals("r", model.vmSizeFilters().get(0).computeIsolationSupported());
-        Assertions.assertEquals("ypql", model.billingResources().get(0).region());
-        Assertions.assertEquals("kerqwkyh", model.billingResources().get(0).billingMeters().get(0).meterParameter());
-        Assertions.assertEquals("bopgxedkowepbqp", model.billingResources().get(0).billingMeters().get(0).meter());
-        Assertions.assertEquals("fkbw", model.billingResources().get(0).billingMeters().get(0).unit());
-        Assertions.assertEquals("tkkgllqwjy", model.billingResources().get(0).diskBillingMeters().get(0).diskRpMeter());
-        Assertions.assertEquals("jayvblmhv", model.billingResources().get(0).diskBillingMeters().get(0).sku());
-        Assertions.assertEquals(Tier.STANDARD, model.billingResources().get(0).diskBillingMeters().get(0).tier());
+        Assertions.assertEquals("wabm", model.vmSizes().get(0));
+        Assertions.assertEquals("tpuqujmq", model.vmSizesWithEncryptionAtHost().get(0));
+        Assertions.assertEquals(FilterMode.EXCLUDE, model.vmSizeFilters().get(0).filterMode());
+        Assertions.assertEquals("twwaezkojvdcpzf", model.vmSizeFilters().get(0).regions().get(0));
+        Assertions.assertEquals("amcio", model.vmSizeFilters().get(0).clusterFlavors().get(0));
+        Assertions.assertEquals("khnzbonlw", model.vmSizeFilters().get(0).nodeTypes().get(0));
+        Assertions.assertEquals("tlmngu", model.vmSizeFilters().get(0).clusterVersions().get(0));
+        Assertions.assertEquals(OSType.WINDOWS, model.vmSizeFilters().get(0).osType().get(0));
+        Assertions.assertEquals("syuuximerq", model.vmSizeFilters().get(0).vmSizes().get(0));
+        Assertions.assertEquals("doakgtdlmkkzevdl", model.vmSizeFilters().get(0).espApplied());
+        Assertions.assertEquals("wpusdsttwvogv", model.vmSizeFilters().get(0).computeIsolationSupported());
+        Assertions.assertEquals("zis", model.billingResources().get(0).region());
+        Assertions.assertEquals("elolppvksrpqvuj",
+            model.billingResources().get(0).billingMeters().get(0).meterParameter());
+        Assertions.assertEquals("aehtwd", model.billingResources().get(0).billingMeters().get(0).meter());
+        Assertions.assertEquals("ftswibyrcdlbhsh", model.billingResources().get(0).billingMeters().get(0).unit());
+        Assertions.assertEquals("acstwityk", model.billingResources().get(0).diskBillingMeters().get(0).diskRpMeter());
+        Assertions.assertEquals("vxccedcp", model.billingResources().get(0).diskBillingMeters().get(0).sku());
+        Assertions.assertEquals(Tier.PREMIUM, model.billingResources().get(0).diskBillingMeters().get(0).tier());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BillingResponseListResultInner model
-            = new BillingResponseListResultInner().withVmSizes(Arrays.asList("fdwoyuhh", "iuiefozbhdmsm"))
-                .withVmSizesWithEncryptionAtHost(Arrays.asList("qhoftrmaequiah", "icslfaoq"))
-                .withVmSizeFilters(
-                    Arrays
-                        .asList(
-                            new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.RECOMMEND)
-                                .withRegions(Arrays.asList("alnswhccsphk", "ivwitqscywugg"))
-                                .withClusterFlavors(Arrays.asList("uhczbwemh", "i"))
-                                .withNodeTypes(Arrays.asList("rgzdwmsweyp"))
-                                .withClusterVersions(
-                                    Arrays.asList("xggicccnxqhuexmk", "tlstvlzywem", "zrncsdt", "lusiy"))
-                                .withOsType(Arrays.asList(OSType.LINUX, OSType.LINUX, OSType.WINDOWS, OSType.WINDOWS))
-                                .withVmSizes(Arrays.asList("sl", "eadcygqukyhejhz"))
-                                .withEspApplied("xgfpelolppv")
-                                .withComputeIsolationSupported("r"),
-                            new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.EXCLUDE)
-                                .withRegions(Arrays.asList("zraehtwd", "r", "tswiby"))
-                                .withClusterFlavors(Arrays.asList("l"))
-                                .withNodeTypes(Arrays.asList("hfwpracstwit", "khevxccedc", "nmdyodnwzxl", "jc"))
-                                .withClusterVersions(Arrays.asList("ltiugcxnavv"))
-                                .withOsType(Arrays.asList(OSType.LINUX))
-                                .withVmSizes(Arrays.asList("qunyowxwlmdjr"))
-                                .withEspApplied("fgbvfvpdbo")
-                                .withComputeIsolationSupported("cizsjqlhkrribdei"),
-                            new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.DEFAULT)
-                                .withRegions(Arrays.asList("kghv"))
-                                .withClusterFlavors(Arrays.asList("zwmk", "efajpj", "rwkq"))
-                                .withNodeTypes(Arrays.asList("gbijtjivfx", "sjabibs"))
-                                .withClusterVersions(Arrays.asList("awfsdjpvkvpbjxbk", "bzkdvn", "jabudurgkakmo"))
-                                .withOsType(Arrays.asList(OSType.WINDOWS, OSType.WINDOWS))
-                                .withVmSizes(Arrays.asList("ffhmouwqlgzr", "zeeyebi", "ikayuhqlbjbsybb"))
-                                .withEspApplied("r")
-                                .withComputeIsolationSupported("ldgmfpgvmpip"),
-                            new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.EXCLUDE)
-                                .withRegions(Arrays.asList("aqfxss"))
-                                .withClusterFlavors(Arrays.asList("twbdsrezpdrhn"))
-                                .withNodeTypes(Arrays.asList("owqkdwytisi", "ircgpikpz", "mejzanlfzxia", "rmbzo"))
-                                .withClusterVersions(Arrays.asList("i", "rjqc"))
-                                .withOsType(Arrays.asList(OSType.WINDOWS, OSType.WINDOWS))
-                                .withVmSizes(Arrays.asList("lazszrn", "oiindfpwpjy", "wbtlhflsjcdh"))
-                                .withEspApplied("fjvfbgofeljagr")
-                                .withComputeIsolationSupported("qhl")))
-                .withBillingResources(Arrays.asList(
-                    new BillingResources().withRegion("ypql")
-                        .withBillingMeters(Arrays.asList(new BillingMeters()
-                            .withMeterParameter("kerqwkyh")
-                            .withMeter("bopgxedkowepbqp")
-                            .withUnit("fkbw"),
-                            new BillingMeters().withMeterParameter("snjvcdwxlpqekftn")
-                                .withMeter("tjsyin")
-                                .withUnit("fq"),
-                            new BillingMeters().withMeterParameter("mtdh").withMeter("dvypgikdgsz").withUnit("kbir"),
-                            new BillingMeters()
-                                .withMeterParameter("uzhlhkjoqrv")
-                                .withMeter("aatjinrvgoupmfi")
-                                .withUnit("fggjioolvr")))
-                        .withDiskBillingMeters(Arrays.asList(
-                            new DiskBillingMeters().withDiskRpMeter("tkkgllqwjy")
-                                .withSku("jayvblmhv")
-                                .withTier(Tier.STANDARD),
-                            new DiskBillingMeters()
-                                .withDiskRpMeter("bxvvyhg")
-                                .withSku("pbyrqufegxu")
-                                .withTier(Tier.STANDARD))),
-                    new BillingResources().withRegion("bnhlmc")
-                        .withBillingMeters(Arrays
-                            .asList(new BillingMeters().withMeterParameter("ngitvgbmhrixkwm")
-                                .withMeter("jejveg")
-                                .withUnit("bpnaixexccbdre")))
-                        .withDiskBillingMeters(Arrays.asList(new DiskBillingMeters()
-                            .withDiskRpMeter("exdrrvqahqkg")
-                            .withSku("pwijnhy")
-                            .withTier(Tier.STANDARD),
-                            new DiskBillingMeters()
-                                .withDiskRpMeter("ycxzbfvoo")
-                                .withSku("rvmtgjq")
-                                .withTier(Tier.STANDARD),
-                            new DiskBillingMeters().withDiskRpMeter("s").withSku("on").withTier(Tier.PREMIUM))),
-                    new BillingResources().withRegion("gfipnsxk")
-                        .withBillingMeters(Arrays.asList(new BillingMeters()
-                            .withMeterParameter("ekrrjr")
-                            .withMeter("fxtsgum")
-                            .withUnit("glikkxwslolb"),
-                            new BillingMeters().withMeterParameter("vuzlm")
-                                .withMeter("elfk")
-                                .withUnit("plcrpwjxeznoig"),
-                            new BillingMeters().withMeterParameter("njwmwkpnbsazejj")
-                                .withMeter("kagfhsxtt")
-                                .withUnit("gzxnfaazpxdtnk"),
-                            new BillingMeters().withMeterParameter("kqjjlwuenvrkp")
-                                .withMeter("uaibrebqaaysj")
-                                .withUnit("xqtnq")))
-                        .withDiskBillingMeters(Arrays.asList(new DiskBillingMeters().withDiskRpMeter("lwfffi")
-                            .withSku("pjpqqmtedltmmji")
-                            .withTier(Tier.STANDARD))),
-                    new BillingResources().withRegion("zphv")
-                        .withBillingMeters(Arrays.asList(
-                            new BillingMeters().withMeterParameter("qncygupkvi")
-                                .withMeter("dscwxqupevzhf")
-                                .withUnit("otxhojujby"),
-                            new BillingMeters().withMeterParameter("lmcuvhixb").withMeter("yfwnylr").withUnit("o"),
-                            new BillingMeters().withMeterParameter("ttpkiwkkbnujrywv")
-                                .withMeter("lbfpncurd")
-                                .withUnit("wiithtywub"),
-                            new BillingMeters().withMeterParameter("bihwqknfdnt")
-                                .withMeter("chrdgoihxumwcto")
-                                .withUnit("zj")))
-                        .withDiskBillingMeters(Arrays.asList(
-                            new DiskBillingMeters().withDiskRpMeter("fdlwg")
-                                .withSku("tsbwtovvtgse")
-                                .withTier(Tier.STANDARD),
-                            new DiskBillingMeters().withDiskRpMeter("iufxqknpir")
-                                .withSku("epttwqmsniff")
-                                .withTier(Tier.PREMIUM)))));
+        BillingResponseListResultInner model = new BillingResponseListResultInner()
+            .withVmSizes(Arrays.asList("wabm", "oefki"))
+            .withVmSizesWithEncryptionAtHost(Arrays.asList("tpuqujmq", "gkfbtndoaong", "jcntuj"))
+            .withVmSizeFilters(Arrays.asList(new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.EXCLUDE)
+                .withRegions(Arrays.asList("twwaezkojvdcpzf", "qouicybxarzgsz", "foxciq", "p"))
+                .withClusterFlavors(Arrays.asList("amcio", "hkh"))
+                .withNodeTypes(Arrays.asList("khnzbonlw", "toego", "dwbwhkszzcmrvexz", "vbtqgsfraoyzk"))
+                .withClusterVersions(Arrays.asList("tlmngu"))
+                .withOsType(Arrays.asList(OSType.WINDOWS, OSType.WINDOWS))
+                .withVmSizes(Arrays.asList("syuuximerq", "obwyznkb", "kutwpf", "pagmhrskdsnf"))
+                .withEspApplied("doakgtdlmkkzevdl")
+                .withComputeIsolationSupported("wpusdsttwvogv")))
+            .withBillingResources(Arrays.asList(new BillingResources().withRegion("zis")
+                .withBillingMeters(Arrays.asList(new BillingMeters().withMeterParameter("elolppvksrpqvuj")
+                    .withMeter("aehtwd")
+                    .withUnit("ftswibyrcdlbhsh")))
+                .withDiskBillingMeters(Arrays.asList(
+                    new DiskBillingMeters().withDiskRpMeter("acstwityk").withSku("vxccedcp").withTier(Tier.PREMIUM)))));
         model = BinaryData.fromObject(model).toObject(BillingResponseListResultInner.class);
-        Assertions.assertEquals("fdwoyuhh", model.vmSizes().get(0));
-        Assertions.assertEquals("qhoftrmaequiah", model.vmSizesWithEncryptionAtHost().get(0));
-        Assertions.assertEquals(FilterMode.RECOMMEND, model.vmSizeFilters().get(0).filterMode());
-        Assertions.assertEquals("alnswhccsphk", model.vmSizeFilters().get(0).regions().get(0));
-        Assertions.assertEquals("uhczbwemh", model.vmSizeFilters().get(0).clusterFlavors().get(0));
-        Assertions.assertEquals("rgzdwmsweyp", model.vmSizeFilters().get(0).nodeTypes().get(0));
-        Assertions.assertEquals("xggicccnxqhuexmk", model.vmSizeFilters().get(0).clusterVersions().get(0));
-        Assertions.assertEquals(OSType.LINUX, model.vmSizeFilters().get(0).osType().get(0));
-        Assertions.assertEquals("sl", model.vmSizeFilters().get(0).vmSizes().get(0));
-        Assertions.assertEquals("xgfpelolppv", model.vmSizeFilters().get(0).espApplied());
-        Assertions.assertEquals("r", model.vmSizeFilters().get(0).computeIsolationSupported());
-        Assertions.assertEquals("ypql", model.billingResources().get(0).region());
-        Assertions.assertEquals("kerqwkyh", model.billingResources().get(0).billingMeters().get(0).meterParameter());
-        Assertions.assertEquals("bopgxedkowepbqp", model.billingResources().get(0).billingMeters().get(0).meter());
-        Assertions.assertEquals("fkbw", model.billingResources().get(0).billingMeters().get(0).unit());
-        Assertions.assertEquals("tkkgllqwjy", model.billingResources().get(0).diskBillingMeters().get(0).diskRpMeter());
-        Assertions.assertEquals("jayvblmhv", model.billingResources().get(0).diskBillingMeters().get(0).sku());
-        Assertions.assertEquals(Tier.STANDARD, model.billingResources().get(0).diskBillingMeters().get(0).tier());
+        Assertions.assertEquals("wabm", model.vmSizes().get(0));
+        Assertions.assertEquals("tpuqujmq", model.vmSizesWithEncryptionAtHost().get(0));
+        Assertions.assertEquals(FilterMode.EXCLUDE, model.vmSizeFilters().get(0).filterMode());
+        Assertions.assertEquals("twwaezkojvdcpzf", model.vmSizeFilters().get(0).regions().get(0));
+        Assertions.assertEquals("amcio", model.vmSizeFilters().get(0).clusterFlavors().get(0));
+        Assertions.assertEquals("khnzbonlw", model.vmSizeFilters().get(0).nodeTypes().get(0));
+        Assertions.assertEquals("tlmngu", model.vmSizeFilters().get(0).clusterVersions().get(0));
+        Assertions.assertEquals(OSType.WINDOWS, model.vmSizeFilters().get(0).osType().get(0));
+        Assertions.assertEquals("syuuximerq", model.vmSizeFilters().get(0).vmSizes().get(0));
+        Assertions.assertEquals("doakgtdlmkkzevdl", model.vmSizeFilters().get(0).espApplied());
+        Assertions.assertEquals("wpusdsttwvogv", model.vmSizeFilters().get(0).computeIsolationSupported());
+        Assertions.assertEquals("zis", model.billingResources().get(0).region());
+        Assertions.assertEquals("elolppvksrpqvuj",
+            model.billingResources().get(0).billingMeters().get(0).meterParameter());
+        Assertions.assertEquals("aehtwd", model.billingResources().get(0).billingMeters().get(0).meter());
+        Assertions.assertEquals("ftswibyrcdlbhsh", model.billingResources().get(0).billingMeters().get(0).unit());
+        Assertions.assertEquals("acstwityk", model.billingResources().get(0).diskBillingMeters().get(0).diskRpMeter());
+        Assertions.assertEquals("vxccedcp", model.billingResources().get(0).diskBillingMeters().get(0).sku());
+        Assertions.assertEquals(Tier.PREMIUM, model.billingResources().get(0).diskBillingMeters().get(0).tier());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/CapabilitiesResultInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/CapabilitiesResultInnerTests.java
index 88186ca8368c..d0d93d405c5c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/CapabilitiesResultInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/CapabilitiesResultInnerTests.java
@@ -7,8 +7,8 @@
 import com.azure.core.util.BinaryData;
 import com.azure.resourcemanager.hdinsight.fluent.models.CapabilitiesResultInner;
 import com.azure.resourcemanager.hdinsight.models.RegionsCapability;
-import com.azure.resourcemanager.hdinsight.models.VersionsCapability;
 import com.azure.resourcemanager.hdinsight.models.VersionSpec;
+import com.azure.resourcemanager.hdinsight.models.VersionsCapability;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -18,74 +18,48 @@ public final class CapabilitiesResultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CapabilitiesResultInner model = BinaryData.fromString(
-            "{\"versions\":{\"a\":{\"available\":[{\"friendlyName\":\"alm\",\"displayName\":\"tdaaygdvwvg\",\"isDefault\":true,\"componentVersions\":{\"udxepxgyqagv\":\"wxrt\"}},{\"friendlyName\":\"mnpkukghimdblxg\",\"displayName\":\"mfnjh\",\"isDefault\":false,\"componentVersions\":{\"fkzikfj\":\"szkkfoqre\",\"wczelpci\":\"wneaiv\"}},{\"friendlyName\":\"lsfeaenwabfatkld\",\"displayName\":\"bjhwuaan\",\"isDefault\":false,\"componentVersions\":{\"oulpjrv\":\"ph\",\"rvimjwosytxitcsk\":\"ag\",\"hlyfjhdgqgg\":\"cktqumiekkezzi\",\"qfatpxllrxcyjm\":\"bdunygaeqid\"}}]},\"d\":{\"available\":[{\"friendlyName\":\"arm\",\"displayName\":\"dmjsjqb\",\"isDefault\":true,\"componentVersions\":{\"duhpk\":\"xrwlyc\"}},{\"friendlyName\":\"gymare\",\"displayName\":\"ajxq\",\"isDefault\":false,\"componentVersions\":{\"ofwq\":\"ycubeddgs\"}},{\"friendlyName\":\"qal\",\"displayName\":\"mnjijpxacqqudf\",\"isDefault\":true,\"componentVersions\":{\"m\":\"aaabjyvayff\"}},{\"friendlyName\":\"rtuzqogs\",\"displayName\":\"nevfdnw\",\"isDefault\":false,\"componentVersions\":{\"bjudpfrxtrthzv\":\"zsyyceuzso\",\"qbrqubpaxhexiili\":\"ytdw\",\"q\":\"pdtii\"}}]}},\"regions\":{\"nwxuqlcvydyp\":{\"available\":[\"r\",\"zfgs\",\"uyfxrxxleptramxj\",\"zwl\"]},\"ggkfpagaowpul\":{\"available\":[\"ooaojkniodkooebw\",\"ujhemmsbvdkcrodt\",\"infwjlfltkacjve\",\"kdlfoa\"]},\"nqicvinvkjjxdxrb\":{\"available\":[\"lyls\",\"xkqjnsjervt\",\"agxsdszuemps\",\"zkfzbeyv\"]}},\"features\":[\"zclewyhmlw\",\"aztz\"],\"quota\":{\"coresUsed\":4977542958455551003,\"maxCoresAllowed\":9013966511894256740,\"regionalQuotas\":[{\"regionName\":\"qwhxxbuyqaxzfeqz\",\"coresUsed\":5894027165628852811,\"coresAvailable\":344862766670091820}]}}")
+            "{\"versions\":{\"zikhl\":{\"available\":[{\"friendlyName\":\"gdv\",\"displayName\":\"gpiohgwxrtfudxe\",\"isDefault\":true,\"componentVersions\":{\"himdbl\":\"agvrvmnpkuk\",\"hfjx\":\"gwimfn\"}},{\"friendlyName\":\"szkkfoqre\",\"displayName\":\"kzikfjawneaivxwc\",\"isDefault\":true,\"componentVersions\":{\"eae\":\"irels\"}},{\"friendlyName\":\"abfatkl\",\"displayName\":\"xbjhwuaanozjosph\",\"isDefault\":false,\"componentVersions\":{\"mjwosytx\":\"jrvxaglrv\",\"fcktqumiekke\":\"tcs\"}}]}},\"regions\":{\"su\":{\"available\":[\"gqggebdunygae\",\"idb\",\"fatpxllrxcyjmoa\"]},\"wdmjsjqbjhhyx\":{\"available\":[\"m\"]},\"ubeddg\":{\"available\":[\"lyc\",\"duhpk\",\"kgymareqnajxqug\",\"hky\"]},\"i\":{\"available\":[\"fwqmzqalkrmn\"]}},\"features\":[\"acqqudfnbyxbaaab\",\"yvayffimrzr\",\"uzqogsexnevf\"],\"quota\":{\"coresUsed\":2199712032932609839,\"maxCoresAllowed\":6087640790509225024,\"regionalQuotas\":[{\"regionName\":\"yceuzsoib\",\"coresUsed\":9173200843253449543,\"coresAvailable\":2021331363267121666},{\"regionName\":\"rthzvaytdwkqbrqu\",\"coresUsed\":3218198386643086892,\"coresAvailable\":5967113662628227205},{\"regionName\":\"i\",\"coresUsed\":5279167733168748347,\"coresAvailable\":1235148045143348499},{\"regionName\":\"r\",\"coresUsed\":233619173932499743,\"coresAvailable\":3812395507646425429}]}}")
             .toObject(CapabilitiesResultInner.class);
-        Assertions.assertEquals("alm", model.versions().get("a").available().get(0).friendlyName());
-        Assertions.assertEquals("tdaaygdvwvg", model.versions().get("a").available().get(0).displayName());
-        Assertions.assertEquals(true, model.versions().get("a").available().get(0).isDefault());
-        Assertions.assertEquals("wxrt",
-            model.versions().get("a").available().get(0).componentVersions().get("udxepxgyqagv"));
-        Assertions.assertEquals("r", model.regions().get("nwxuqlcvydyp").available().get(0));
-        Assertions.assertEquals("zclewyhmlw", model.features().get(0));
+        Assertions.assertEquals("gdv", model.versions().get("zikhl").available().get(0).friendlyName());
+        Assertions.assertEquals("gpiohgwxrtfudxe", model.versions().get("zikhl").available().get(0).displayName());
+        Assertions.assertTrue(model.versions().get("zikhl").available().get(0).isDefault());
+        Assertions.assertEquals("agvrvmnpkuk",
+            model.versions().get("zikhl").available().get(0).componentVersions().get("himdbl"));
+        Assertions.assertEquals("gqggebdunygae", model.regions().get("su").available().get(0));
+        Assertions.assertEquals("acqqudfnbyxbaaab", model.features().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CapabilitiesResultInner model
-            = new CapabilitiesResultInner()
-                .withVersions(
-                    mapOf("a",
-                        new VersionsCapability().withAvailable(Arrays.asList(
-                            new VersionSpec().withFriendlyName("alm")
-                                .withDisplayName("tdaaygdvwvg")
-                                .withIsDefault(true)
-                                .withComponentVersions(mapOf("udxepxgyqagv", "wxrt")),
-                            new VersionSpec().withFriendlyName("mnpkukghimdblxg")
-                                .withDisplayName("mfnjh")
-                                .withIsDefault(false)
-                                .withComponentVersions(mapOf("fkzikfj", "szkkfoqre", "wczelpci", "wneaiv")),
-                            new VersionSpec().withFriendlyName("lsfeaenwabfatkld")
-                                .withDisplayName("bjhwuaan")
-                                .withIsDefault(false)
-                                .withComponentVersions(mapOf("oulpjrv", "ph", "rvimjwosytxitcsk", "ag", "hlyfjhdgqgg",
-                                    "cktqumiekkezzi", "qfatpxllrxcyjm", "bdunygaeqid")))),
-                        "d",
-                        new VersionsCapability()
-                            .withAvailable(Arrays.asList(
-                                new VersionSpec().withFriendlyName("arm")
-                                    .withDisplayName("dmjsjqb")
-                                    .withIsDefault(true)
-                                    .withComponentVersions(mapOf("duhpk", "xrwlyc")),
-                                new VersionSpec().withFriendlyName("gymare")
-                                    .withDisplayName("ajxq")
-                                    .withIsDefault(false)
-                                    .withComponentVersions(mapOf("ofwq", "ycubeddgs")),
-                                new VersionSpec().withFriendlyName("qal")
-                                    .withDisplayName("mnjijpxacqqudf")
-                                    .withIsDefault(true)
-                                    .withComponentVersions(mapOf("m", "aaabjyvayff")),
-                                new VersionSpec().withFriendlyName("rtuzqogs")
-                                    .withDisplayName("nevfdnw")
-                                    .withIsDefault(false)
-                                    .withComponentVersions(mapOf("bjudpfrxtrthzv", "zsyyceuzso", "qbrqubpaxhexiili",
-                                        "ytdw", "q", "pdtii"))))))
-                .withRegions(mapOf("nwxuqlcvydyp",
-                    new RegionsCapability().withAvailable(Arrays.asList("r", "zfgs", "uyfxrxxleptramxj", "zwl")),
-                    "ggkfpagaowpul",
-                    new RegionsCapability().withAvailable(
-                        Arrays.asList("ooaojkniodkooebw", "ujhemmsbvdkcrodt", "infwjlfltkacjve", "kdlfoa")),
-                    "nqicvinvkjjxdxrb",
-                    new RegionsCapability()
-                        .withAvailable(Arrays.asList("lyls", "xkqjnsjervt", "agxsdszuemps", "zkfzbeyv"))))
-                .withFeatures(Arrays.asList("zclewyhmlw", "aztz"));
+        CapabilitiesResultInner model = new CapabilitiesResultInner()
+            .withVersions(mapOf("zikhl",
+                new VersionsCapability().withAvailable(Arrays.asList(
+                    new VersionSpec().withFriendlyName("gdv")
+                        .withDisplayName("gpiohgwxrtfudxe")
+                        .withIsDefault(true)
+                        .withComponentVersions(mapOf("himdbl", "agvrvmnpkuk", "hfjx", "gwimfn")),
+                    new VersionSpec().withFriendlyName("szkkfoqre")
+                        .withDisplayName("kzikfjawneaivxwc")
+                        .withIsDefault(true)
+                        .withComponentVersions(mapOf("eae", "irels")),
+                    new VersionSpec().withFriendlyName("abfatkl")
+                        .withDisplayName("xbjhwuaanozjosph")
+                        .withIsDefault(false)
+                        .withComponentVersions(mapOf("mjwosytx", "jrvxaglrv", "fcktqumiekke", "tcs"))))))
+            .withRegions(mapOf("su",
+                new RegionsCapability().withAvailable(Arrays.asList("gqggebdunygae", "idb", "fatpxllrxcyjmoa")),
+                "wdmjsjqbjhhyx", new RegionsCapability().withAvailable(Arrays.asList("m")), "ubeddg",
+                new RegionsCapability().withAvailable(Arrays.asList("lyc", "duhpk", "kgymareqnajxqug", "hky")), "i",
+                new RegionsCapability().withAvailable(Arrays.asList("fwqmzqalkrmn"))))
+            .withFeatures(Arrays.asList("acqqudfnbyxbaaab", "yvayffimrzr", "uzqogsexnevf"));
         model = BinaryData.fromObject(model).toObject(CapabilitiesResultInner.class);
-        Assertions.assertEquals("alm", model.versions().get("a").available().get(0).friendlyName());
-        Assertions.assertEquals("tdaaygdvwvg", model.versions().get("a").available().get(0).displayName());
-        Assertions.assertEquals(true, model.versions().get("a").available().get(0).isDefault());
-        Assertions.assertEquals("wxrt",
-            model.versions().get("a").available().get(0).componentVersions().get("udxepxgyqagv"));
-        Assertions.assertEquals("r", model.regions().get("nwxuqlcvydyp").available().get(0));
-        Assertions.assertEquals("zclewyhmlw", model.features().get(0));
+        Assertions.assertEquals("gdv", model.versions().get("zikhl").available().get(0).friendlyName());
+        Assertions.assertEquals("gpiohgwxrtfudxe", model.versions().get("zikhl").available().get(0).displayName());
+        Assertions.assertTrue(model.versions().get("zikhl").available().get(0).isDefault());
+        Assertions.assertEquals("agvrvmnpkuk",
+            model.versions().get("zikhl").available().get(0).componentVersions().get("himdbl"));
+        Assertions.assertEquals("gqggebdunygae", model.regions().get("su").available().get(0));
+        Assertions.assertEquals("acqqudfnbyxbaaab", model.features().get(0));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterConfigurationsInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterConfigurationsInnerTests.java
index 6570c6aa1522..83dbe6226961 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterConfigurationsInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterConfigurationsInnerTests.java
@@ -14,18 +14,18 @@ public final class ClusterConfigurationsInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ClusterConfigurationsInner model = BinaryData.fromString(
-            "{\"configurations\":{\"lpichk\":{\"bdbutauvf\":\"qlpqwcciuq\",\"afnn\":\"tkuwhhmhykojo\"},\"qnzarrwl\":{\"novvqfovljxy\":\"mkcdyhbpkkpwdre\",\"tgadgvraeaen\":\"suwsyrsnds\"}}}")
+            "{\"configurations\":{\"bpkkpwdre\":{\"pichkoymkcdy\":\"nd\"},\"iipfpubj\":{\"syrsndsytgadgvra\":\"ovvqfovljxywsu\",\"uu\":\"aeneqnzarrwl\",\"e\":\"jfqka\"}}}")
             .toObject(ClusterConfigurationsInner.class);
-        Assertions.assertEquals("qlpqwcciuq", model.configurations().get("lpichk").get("bdbutauvf"));
+        Assertions.assertEquals("nd", model.configurations().get("bpkkpwdre").get("pichkoymkcdy"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ClusterConfigurationsInner model = new ClusterConfigurationsInner()
-            .withConfigurations(mapOf("lpichk", mapOf("bdbutauvf", "qlpqwcciuq", "afnn", "tkuwhhmhykojo"), "qnzarrwl",
-                mapOf("novvqfovljxy", "mkcdyhbpkkpwdre", "tgadgvraeaen", "suwsyrsnds")));
+        ClusterConfigurationsInner model
+            = new ClusterConfigurationsInner().withConfigurations(mapOf("bpkkpwdre", mapOf("pichkoymkcdy", "nd"),
+                "iipfpubj", mapOf("syrsndsytgadgvra", "ovvqfovljxywsu", "uu", "aeneqnzarrwl", "e", "jfqka")));
         model = BinaryData.fromObject(model).toObject(ClusterConfigurationsInner.class);
-        Assertions.assertEquals("qlpqwcciuq", model.configurations().get("lpichk").get("bdbutauvf"));
+        Assertions.assertEquals("nd", model.configurations().get("bpkkpwdre").get("pichkoymkcdy"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterMonitoringResponseInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterMonitoringResponseInnerTests.java
index 253d9a5e24c1..2bb971642189 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterMonitoringResponseInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClusterMonitoringResponseInnerTests.java
@@ -12,18 +12,18 @@ public final class ClusterMonitoringResponseInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ClusterMonitoringResponseInner model
-            = BinaryData.fromString("{\"clusterMonitoringEnabled\":false,\"workspaceId\":\"fpubjibwwi\"}")
+            = BinaryData.fromString("{\"clusterMonitoringEnabled\":false,\"workspaceId\":\"jphuopxodlqi\"}")
                 .toObject(ClusterMonitoringResponseInner.class);
-        Assertions.assertEquals(false, model.clusterMonitoringEnabled());
-        Assertions.assertEquals("fpubjibwwi", model.workspaceId());
+        Assertions.assertFalse(model.clusterMonitoringEnabled());
+        Assertions.assertEquals("jphuopxodlqi", model.workspaceId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ClusterMonitoringResponseInner model
-            = new ClusterMonitoringResponseInner().withClusterMonitoringEnabled(false).withWorkspaceId("fpubjibwwi");
+            = new ClusterMonitoringResponseInner().withClusterMonitoringEnabled(false).withWorkspaceId("jphuopxodlqi");
         model = BinaryData.fromObject(model).toObject(ClusterMonitoringResponseInner.class);
-        Assertions.assertEquals(false, model.clusterMonitoringEnabled());
-        Assertions.assertEquals("fpubjibwwi", model.workspaceId());
+        Assertions.assertFalse(model.clusterMonitoringEnabled());
+        Assertions.assertEquals("jphuopxodlqi", model.workspaceId());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteMockTests.java
index e5f5ebe57eb9..26616e1791f6 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersDeleteMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,9 @@ public void testDelete() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.clusters().delete("hzjqatucoige", "xncnwfe", com.azure.core.util.Context.NONE);
+        manager.clusters().delete("izvu", "mmkjsvthnwpztek", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsMockTests.java
index cc4d54f21e59..562c88103b39 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersExecuteScriptActionsMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.ExecuteScriptActionParameters;
@@ -28,23 +28,19 @@ public void testExecuteScriptActions() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.clusters()
-            .executeScriptActions("hsrrryejylmbkz", "dnigrfihot",
+            .executeScriptActions("yrneizjcpeo", "khnmgbrou",
                 new ExecuteScriptActionParameters().withScriptActions(Arrays.asList(
-                    new RuntimeScriptAction().withName("lpxuzzjgnrefq")
-                        .withUri("hqo")
-                        .withParameters("ihiqakydiw")
-                        .withRoles(Arrays.asList("rkwpzdqtvhcspod", "qaxsipietgbebjf", "lbmoichd")),
-                    new RuntimeScriptAction().withName("iqsowsaaelc")
-                        .withUri("ttcjuhplrvkmjc")
-                        .withParameters("jvlgfggcvkyyliz")
-                        .withRoles(Arrays.asList("bjpsfxsfuztlvtm")),
-                    new RuntimeScriptAction().withName("koveof")
-                        .withUri("zrvjfnmjmvlwyzgi")
-                        .withParameters("kujrllfojui")
-                        .withRoles(Arrays.asList("puuyjucejik"))))
+                    new RuntimeScriptAction().withName("bhfhpfpazjzoy")
+                        .withUri("jxhpdulontacn")
+                        .withParameters("w")
+                        .withRoles(Arrays.asList("htuevrhrljy", "ogwxhnsduugwb", "reur")),
+                    new RuntimeScriptAction().withName("htkln")
+                        .withUri("nafvvkyfedev")
+                        .withParameters("oslc")
+                        .withRoles(Arrays.asList("y", "okkhminq", "ymc"))))
                     .withPersistOnSuccess(true),
                 com.azure.core.util.Context.NONE);
 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeMockTests.java
index f5e693ac363a..f02e2c66e918 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersResizeMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.ClusterResizeParameters;
@@ -27,11 +27,11 @@ public void testResize() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.clusters()
-            .resize("dxxewuninv", "db", RoleName.WORKERNODE,
-                new ClusterResizeParameters().withTargetInstanceCount(1594166889), com.azure.core.util.Context.NONE);
+            .resize("esfuught", "qfecjxeygtuhx", RoleName.WORKERNODE,
+                new ClusterResizeParameters().withTargetInstanceCount(1045251485), com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationMockTests.java
index 41102a62ee90..04745ce5b770 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ClustersUpdateAutoScaleConfigurationMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.Autoscale;
@@ -34,25 +34,27 @@ public void testUpdateAutoScaleConfiguration() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.clusters()
-            .updateAutoScaleConfiguration("dtvqe", "rqctmxxdtdd", RoleName.WORKERNODE,
+            .updateAutoScaleConfiguration("uewmrswnjlxuzrhw", "usxjbaqehg", RoleName.WORKERNODE,
                 new AutoscaleConfigurationUpdateParameter()
                     .withAutoscale(
                         new Autoscale()
-                            .withCapacity(new AutoscaleCapacity().withMinInstanceCount(1948227960)
-                                .withMaxInstanceCount(1691518178))
+                            .withCapacity(new AutoscaleCapacity().withMinInstanceCount(1306458114)
+                                .withMaxInstanceCount(1128032057))
                             .withRecurrence(
-                                new AutoscaleRecurrence().withTimeZone("tznapxbannovv")
+                                new AutoscaleRecurrence().withTimeZone("coi")
                                     .withSchedule(Arrays.asList(
                                         new AutoscaleSchedule()
-                                            .withDays(Arrays.asList(DaysOfWeek.FRIDAY, DaysOfWeek.SATURDAY,
+                                            .withDays(Arrays.asList(DaysOfWeek.MONDAY, DaysOfWeek.MONDAY,
                                                 DaysOfWeek.SATURDAY))
                                             .withTimeAndCapacity(new AutoscaleTimeAndCapacity()),
                                         new AutoscaleSchedule()
-                                            .withDays(Arrays.asList(DaysOfWeek.WEDNESDAY, DaysOfWeek.SUNDAY,
-                                                DaysOfWeek.MONDAY, DaysOfWeek.SATURDAY))
+                                            .withDays(Arrays.asList(DaysOfWeek.WEDNESDAY, DaysOfWeek.THURSDAY,
+                                                DaysOfWeek.FRIDAY))
+                                            .withTimeAndCapacity(new AutoscaleTimeAndCapacity()),
+                                        new AutoscaleSchedule().withDays(Arrays.asList(DaysOfWeek.THURSDAY))
                                             .withTimeAndCapacity(new AutoscaleTimeAndCapacity()))))),
                 com.azure.core.util.Context.NONE);
 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ComputeIsolationPropertiesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ComputeIsolationPropertiesTests.java
index 8faecb3de0d0..af68f70d1174 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ComputeIsolationPropertiesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ComputeIsolationPropertiesTests.java
@@ -14,7 +14,7 @@ public void testDeserialize() throws Exception {
         ComputeIsolationProperties model
             = BinaryData.fromString("{\"enableComputeIsolation\":true,\"hostSku\":\"dhxujznbmpo\"}")
                 .toObject(ComputeIsolationProperties.class);
-        Assertions.assertEquals(true, model.enableComputeIsolation());
+        Assertions.assertTrue(model.enableComputeIsolation());
         Assertions.assertEquals("dhxujznbmpo", model.hostSku());
     }
 
@@ -23,7 +23,7 @@ public void testSerialize() throws Exception {
         ComputeIsolationProperties model
             = new ComputeIsolationProperties().withEnableComputeIsolation(true).withHostSku("dhxujznbmpo");
         model = BinaryData.fromObject(model).toObject(ComputeIsolationProperties.class);
-        Assertions.assertEquals(true, model.enableComputeIsolation());
+        Assertions.assertTrue(model.enableComputeIsolation());
         Assertions.assertEquals("dhxujznbmpo", model.hostSku());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetWithResponseMockTests.java
index bcdbe23c8392..beedc5ccbcc4 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsGetWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -20,19 +20,19 @@
 public final class ConfigurationsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
-        String responseStr = "{\"ikjcjcazt\":\"kkum\",\"comlikytwvczc\":\"wsnsqowx\",\"ve\":\"wka\"}";
+        String responseStr = "{\"n\":\"oclu\",\"jk\":\"qmemc\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         Map<String, String> response = manager.configurations()
-            .getWithResponse("rhpw", "gddeimaw", "o", com.azure.core.util.Context.NONE)
+            .getWithResponse("glrocuy", "lw", "hmem", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("kkum", response.get("ikjcjcazt"));
+        Assertions.assertEquals("oclu", response.get("n"));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListWithResponseMockTests.java
index b76d6b7990b8..3c062398aaca 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsListWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.ClusterConfigurations;
@@ -21,19 +21,19 @@ public final class ConfigurationsListWithResponseMockTests {
     @Test
     public void testListWithResponse() throws Exception {
         String responseStr
-            = "{\"configurations\":{\"uvqejosovyrrle\":{\"pedwqsl\":\"whqjjyslurlpshhk\",\"ndcbrwi\":\"rhmpqvwwsk\"}}}";
+            = "{\"configurations\":{\"d\":{\"xuqibsxtkcudf\":\"olhbhlvb\",\"siowlkjxnqpv\":\"sfar\",\"tmhqykiz\":\"gf\"},\"kxxpvbrd\":{\"luqvoxmycjimryv\":\"aoaf\",\"wpbmzgwesydsxwef\":\"gc\",\"eallklmtkhlo\":\"hecbvopwndyq\"}}}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ClusterConfigurations response = manager.configurations()
-            .listWithResponse("plkeuachtomflryt", "wfpfmdgycx", com.azure.core.util.Context.NONE)
+            .listWithResponse("r", "moucsofldpuviyfc", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("whqjjyslurlpshhk", response.configurations().get("uvqejosovyrrle").get("pedwqsl"));
+        Assertions.assertEquals("olhbhlvb", response.configurations().get("d").get("xuqibsxtkcudf"));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateMockTests.java
index e4a6f9bb64a3..b2733ed38079 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ConfigurationsUpdateMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -27,11 +27,10 @@ public void testUpdate() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.configurations()
-            .update("esi", "uqtljqobbpih", "hcecybmrqbr",
-                mapOf("s", "bmpxdlvykfrexc", "xog", "qwjksghudgz", "rkmdyom", "ggsvoujkxibdaf", "dy", "xfbvfb"),
+            .update("jmzsyzfh", "tlhikcyychun", "jlpjrtwszhv", mapOf("bfdpyflubhv", "icphvtrrmhw"),
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DimensionTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DimensionTests.java
index 218a0bb7d333..272c4b6745a7 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DimensionTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DimensionTests.java
@@ -12,24 +12,24 @@ public final class DimensionTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         Dimension model = BinaryData.fromString(
-            "{\"name\":\"gg\",\"displayName\":\"pijrajcivmmghf\",\"internalName\":\"iwrxgkn\",\"toBeExportedForShoebox\":false}")
+            "{\"name\":\"prafwgckhoc\",\"displayName\":\"d\",\"internalName\":\"fwafqrouda\",\"toBeExportedForShoebox\":true}")
             .toObject(Dimension.class);
-        Assertions.assertEquals("gg", model.name());
-        Assertions.assertEquals("pijrajcivmmghf", model.displayName());
-        Assertions.assertEquals("iwrxgkn", model.internalName());
-        Assertions.assertEquals(false, model.toBeExportedForShoebox());
+        Assertions.assertEquals("prafwgckhoc", model.name());
+        Assertions.assertEquals("d", model.displayName());
+        Assertions.assertEquals("fwafqrouda", model.internalName());
+        Assertions.assertTrue(model.toBeExportedForShoebox());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        Dimension model = new Dimension().withName("gg")
-            .withDisplayName("pijrajcivmmghf")
-            .withInternalName("iwrxgkn")
-            .withToBeExportedForShoebox(false);
+        Dimension model = new Dimension().withName("prafwgckhoc")
+            .withDisplayName("d")
+            .withInternalName("fwafqrouda")
+            .withToBeExportedForShoebox(true);
         model = BinaryData.fromObject(model).toObject(Dimension.class);
-        Assertions.assertEquals("gg", model.name());
-        Assertions.assertEquals("pijrajcivmmghf", model.displayName());
-        Assertions.assertEquals("iwrxgkn", model.internalName());
-        Assertions.assertEquals(false, model.toBeExportedForShoebox());
+        Assertions.assertEquals("prafwgckhoc", model.name());
+        Assertions.assertEquals("d", model.displayName());
+        Assertions.assertEquals("fwafqrouda", model.internalName());
+        Assertions.assertTrue(model.toBeExportedForShoebox());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DiskBillingMetersTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DiskBillingMetersTests.java
index f6b37c9a1bad..02c609512a1d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DiskBillingMetersTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/DiskBillingMetersTests.java
@@ -13,20 +13,20 @@ public final class DiskBillingMetersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DiskBillingMeters model
-            = BinaryData.fromString("{\"diskRpMeter\":\"ydfce\",\"sku\":\"vlhv\",\"tier\":\"Premium\"}")
+            = BinaryData.fromString("{\"diskRpMeter\":\"el\",\"sku\":\"hhahhxvrhmzkwpjg\",\"tier\":\"Premium\"}")
                 .toObject(DiskBillingMeters.class);
-        Assertions.assertEquals("ydfce", model.diskRpMeter());
-        Assertions.assertEquals("vlhv", model.sku());
+        Assertions.assertEquals("el", model.diskRpMeter());
+        Assertions.assertEquals("hhahhxvrhmzkwpjg", model.sku());
         Assertions.assertEquals(Tier.PREMIUM, model.tier());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         DiskBillingMeters model
-            = new DiskBillingMeters().withDiskRpMeter("ydfce").withSku("vlhv").withTier(Tier.PREMIUM);
+            = new DiskBillingMeters().withDiskRpMeter("el").withSku("hhahhxvrhmzkwpjg").withTier(Tier.PREMIUM);
         model = BinaryData.fromObject(model).toObject(DiskBillingMeters.class);
-        Assertions.assertEquals("ydfce", model.diskRpMeter());
-        Assertions.assertEquals("vlhv", model.sku());
+        Assertions.assertEquals("el", model.diskRpMeter());
+        Assertions.assertEquals("hhahhxvrhmzkwpjg", model.sku());
         Assertions.assertEquals(Tier.PREMIUM, model.tier());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EncryptionInTransitPropertiesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EncryptionInTransitPropertiesTests.java
index 8d76d150533d..6b1252feff93 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EncryptionInTransitPropertiesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EncryptionInTransitPropertiesTests.java
@@ -13,7 +13,7 @@ public final class EncryptionInTransitPropertiesTests {
     public void testDeserialize() throws Exception {
         EncryptionInTransitProperties model = BinaryData.fromString("{\"isEncryptionInTransitEnabled\":false}")
             .toObject(EncryptionInTransitProperties.class);
-        Assertions.assertEquals(false, model.isEncryptionInTransitEnabled());
+        Assertions.assertFalse(model.isEncryptionInTransitEnabled());
     }
 
     @org.junit.jupiter.api.Test
@@ -21,6 +21,6 @@ public void testSerialize() throws Exception {
         EncryptionInTransitProperties model
             = new EncryptionInTransitProperties().withIsEncryptionInTransitEnabled(false);
         model = BinaryData.fromObject(model).toObject(EncryptionInTransitProperties.class);
-        Assertions.assertEquals(false, model.isEncryptionInTransitEnabled());
+        Assertions.assertFalse(model.isEncryptionInTransitEnabled());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EntraUserInfoTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EntraUserInfoTests.java
new file mode 100644
index 000000000000..8989373909f6
--- /dev/null
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/EntraUserInfoTests.java
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.hdinsight.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.hdinsight.models.EntraUserInfo;
+import org.junit.jupiter.api.Assertions;
+
+public final class EntraUserInfoTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        EntraUserInfo model
+            = BinaryData.fromString("{\"objectId\":\"tkcnqxwb\",\"displayName\":\"kulpiujwaasi\",\"upn\":\"i\"}")
+                .toObject(EntraUserInfo.class);
+        Assertions.assertEquals("tkcnqxwb", model.objectId());
+        Assertions.assertEquals("kulpiujwaasi", model.displayName());
+        Assertions.assertEquals("i", model.upn());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        EntraUserInfo model = new EntraUserInfo().withObjectId("tkcnqxwb").withDisplayName("kulpiujwaasi").withUpn("i");
+        model = BinaryData.fromObject(model).toObject(EntraUserInfo.class);
+        Assertions.assertEquals("tkcnqxwb", model.objectId());
+        Assertions.assertEquals("kulpiujwaasi", model.displayName());
+        Assertions.assertEquals("i", model.upn());
+    }
+}
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExecuteScriptActionParametersTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExecuteScriptActionParametersTests.java
index 3f84874b861e..e4c4350003d2 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExecuteScriptActionParametersTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExecuteScriptActionParametersTests.java
@@ -14,32 +14,40 @@ public final class ExecuteScriptActionParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExecuteScriptActionParameters model = BinaryData.fromString(
-            "{\"scriptActions\":[{\"name\":\"ddjib\",\"uri\":\"bxv\",\"parameters\":\"itvtzeexavo\",\"roles\":[\"fglecdmdqbwp\",\"pqtgsfjac\"],\"applicationName\":\"lhhxudbxvodhtnsi\"},{\"name\":\"ud\",\"uri\":\"z\",\"parameters\":\"es\",\"roles\":[\"dlpagzrcxfail\",\"f\"],\"applicationName\":\"m\"}],\"persistOnSuccess\":true}")
+            "{\"scriptActions\":[{\"name\":\"mfblcqcuubg\",\"uri\":\"ibrta\",\"parameters\":\"etttwgdslqxihhr\",\"roles\":[\"oi\",\"qseypxiutcxa\",\"zhyrpeto\"],\"applicationName\":\"bjoxs\"},{\"name\":\"hvnh\",\"uri\":\"abrqnkkzj\",\"parameters\":\"b\",\"roles\":[\"gaehvvibrxjjst\",\"qbeitpkxztmoob\",\"lftidgfcwqmpim\",\"qxzhem\"],\"applicationName\":\"h\"},{\"name\":\"hujswtwkozzwcul\",\"uri\":\"bawpfajnjwltlwt\",\"parameters\":\"guk\",\"roles\":[\"lhsnvkcdmx\",\"rpoaimlnwi\"],\"applicationName\":\"omylwea\"},{\"name\":\"ulcsethwwnpj\",\"uri\":\"l\",\"parameters\":\"swpchwahfbousn\",\"roles\":[\"pgfewetwlyx\",\"ncxykxhdjhlimm\"],\"applicationName\":\"x\"}],\"persistOnSuccess\":false}")
             .toObject(ExecuteScriptActionParameters.class);
-        Assertions.assertEquals("ddjib", model.scriptActions().get(0).name());
-        Assertions.assertEquals("bxv", model.scriptActions().get(0).uri());
-        Assertions.assertEquals("itvtzeexavo", model.scriptActions().get(0).parameters());
-        Assertions.assertEquals("fglecdmdqbwp", model.scriptActions().get(0).roles().get(0));
-        Assertions.assertEquals(true, model.persistOnSuccess());
+        Assertions.assertEquals("mfblcqcuubg", model.scriptActions().get(0).name());
+        Assertions.assertEquals("ibrta", model.scriptActions().get(0).uri());
+        Assertions.assertEquals("etttwgdslqxihhr", model.scriptActions().get(0).parameters());
+        Assertions.assertEquals("oi", model.scriptActions().get(0).roles().get(0));
+        Assertions.assertFalse(model.persistOnSuccess());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ExecuteScriptActionParameters model = new ExecuteScriptActionParameters().withScriptActions(Arrays.asList(
-            new RuntimeScriptAction().withName("ddjib")
-                .withUri("bxv")
-                .withParameters("itvtzeexavo")
-                .withRoles(Arrays.asList("fglecdmdqbwp", "pqtgsfjac")),
-            new RuntimeScriptAction().withName("ud")
-                .withUri("z")
-                .withParameters("es")
-                .withRoles(Arrays.asList("dlpagzrcxfail", "f"))))
-            .withPersistOnSuccess(true);
+            new RuntimeScriptAction().withName("mfblcqcuubg")
+                .withUri("ibrta")
+                .withParameters("etttwgdslqxihhr")
+                .withRoles(Arrays.asList("oi", "qseypxiutcxa", "zhyrpeto")),
+            new RuntimeScriptAction().withName("hvnh")
+                .withUri("abrqnkkzj")
+                .withParameters("b")
+                .withRoles(Arrays.asList("gaehvvibrxjjst", "qbeitpkxztmoob", "lftidgfcwqmpim", "qxzhem")),
+            new RuntimeScriptAction().withName("hujswtwkozzwcul")
+                .withUri("bawpfajnjwltlwt")
+                .withParameters("guk")
+                .withRoles(Arrays.asList("lhsnvkcdmx", "rpoaimlnwi")),
+            new RuntimeScriptAction().withName("ulcsethwwnpj")
+                .withUri("l")
+                .withParameters("swpchwahfbousn")
+                .withRoles(Arrays.asList("pgfewetwlyx", "ncxykxhdjhlimm"))))
+            .withPersistOnSuccess(false);
         model = BinaryData.fromObject(model).toObject(ExecuteScriptActionParameters.class);
-        Assertions.assertEquals("ddjib", model.scriptActions().get(0).name());
-        Assertions.assertEquals("bxv", model.scriptActions().get(0).uri());
-        Assertions.assertEquals("itvtzeexavo", model.scriptActions().get(0).parameters());
-        Assertions.assertEquals("fglecdmdqbwp", model.scriptActions().get(0).roles().get(0));
-        Assertions.assertEquals(true, model.persistOnSuccess());
+        Assertions.assertEquals("mfblcqcuubg", model.scriptActions().get(0).name());
+        Assertions.assertEquals("ibrta", model.scriptActions().get(0).uri());
+        Assertions.assertEquals("etttwgdslqxihhr", model.scriptActions().get(0).parameters());
+        Assertions.assertEquals("oi", model.scriptActions().get(0).roles().get(0));
+        Assertions.assertFalse(model.persistOnSuccess());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteMockTests.java
index 0849467c463f..8b790bc52258 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDeleteMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,9 @@ public void testDelete() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.extensions().delete("luzvxnq", "hrpq", "df", com.azure.core.util.Context.NONE);
+        manager.extensions().delete("tdigsxcdglj", "lkeuac", "tomflrytswfpf", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentMockTests.java
index c4986986e988..9eb25071d695 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorAgentMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,10 @@ public void testDisableAzureMonitorAgent() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.extensions().disableAzureMonitorAgent("psmgo", "guamlj", com.azure.core.util.Context.NONE);
+        manager.extensions()
+            .disableAzureMonitorAgent("hcsrlzknmzl", "nrupdwvnphcnzqtp", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorMockTests.java
index 47f19828c17d..ead5ee4675be 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableAzureMonitorMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,9 @@ public void testDisableAzureMonitor() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.extensions().disableAzureMonitor("gygqwah", "iul", com.azure.core.util.Context.NONE);
+        manager.extensions().disableAzureMonitor("lxrzvhqjwtr", "tgvgzp", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringMockTests.java
index cbf6ce3f42be..4ab70fe5bb0d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsDisableMonitoringMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,9 @@ public void testDisableMonitoring() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.extensions().disableMonitoring("klelssxb", "ycsxzu", com.azure.core.util.Context.NONE);
+        manager.extensions().disableMonitoring("lbmoichd", "pnfpubntnbat", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusWithResponseMockTests.java
index d6bfe11af499..ff9b696ba66c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorAgentStatusWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.AzureMonitorResponse;
@@ -21,23 +21,23 @@ public final class ExtensionsGetAzureMonitorAgentStatusWithResponseMockTests {
     @Test
     public void testGetAzureMonitorAgentStatusWithResponse() throws Exception {
         String responseStr
-            = "{\"clusterMonitoringEnabled\":false,\"workspaceId\":\"oknssqyzqedikdf\",\"selectedConfigurations\":{\"configurationVersion\":\"iqmrjgeihfqlggw\",\"globalConfigurations\":{\"mgtvlj\":\"zcxmjpbyep\",\"yfqi\":\"rc\",\"ui\":\"gxhnpomyqwcabv\",\"augmrmfjlr\":\"eeyaswl\"},\"tableList\":[{\"name\":\"aukhfkvcisiz\"},{\"name\":\"a\"},{\"name\":\"sx\"},{\"name\":\"uivedwcgyeewxeiq\"}]}}";
+            = "{\"clusterMonitoringEnabled\":false,\"workspaceId\":\"ozusgz\",\"selectedConfigurations\":{\"configurationVersion\":\"snnjzfpafolpym\",\"globalConfigurations\":{\"dphtv\":\"xqzragp\"},\"tableList\":[{\"name\":\"jvlej\"}]}}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AzureMonitorResponse response = manager.extensions()
-            .getAzureMonitorAgentStatusWithResponse("mhbrbqgvg", "vpbbt", com.azure.core.util.Context.NONE)
+            .getAzureMonitorAgentStatusWithResponse("chl", "mltx", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals(false, response.clusterMonitoringEnabled());
-        Assertions.assertEquals("oknssqyzqedikdf", response.workspaceId());
-        Assertions.assertEquals("iqmrjgeihfqlggw", response.selectedConfigurations().configurationVersion());
-        Assertions.assertEquals("zcxmjpbyep", response.selectedConfigurations().globalConfigurations().get("mgtvlj"));
-        Assertions.assertEquals("aukhfkvcisiz", response.selectedConfigurations().tableList().get(0).name());
+        Assertions.assertFalse(response.clusterMonitoringEnabled());
+        Assertions.assertEquals("ozusgz", response.workspaceId());
+        Assertions.assertEquals("snnjzfpafolpym", response.selectedConfigurations().configurationVersion());
+        Assertions.assertEquals("xqzragp", response.selectedConfigurations().globalConfigurations().get("dphtv"));
+        Assertions.assertEquals("jvlej", response.selectedConfigurations().tableList().get(0).name());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusWithResponseMockTests.java
index 2b564566b760..c68d7483911a 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetAzureMonitorStatusWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.AzureMonitorResponse;
@@ -21,23 +21,23 @@ public final class ExtensionsGetAzureMonitorStatusWithResponseMockTests {
     @Test
     public void testGetAzureMonitorStatusWithResponse() throws Exception {
         String responseStr
-            = "{\"clusterMonitoringEnabled\":true,\"workspaceId\":\"khvuhxepmrutz\",\"selectedConfigurations\":{\"configurationVersion\":\"aobn\",\"globalConfigurations\":{\"ywart\":\"jdjltymkmvgui\",\"j\":\"pphkixkykxds\",\"kkflrmymyincqlhr\":\"emmucfxh\"},\"tableList\":[{\"name\":\"lmiiiovg\"},{\"name\":\"gxuugqkctotio\"},{\"name\":\"xteqdptjgwdtg\"},{\"name\":\"ranblwphqlkccu\"}]}}";
+            = "{\"clusterMonitoringEnabled\":true,\"workspaceId\":\"agb\",\"selectedConfigurations\":{\"configurationVersion\":\"qlvh\",\"globalConfigurations\":{\"i\":\"veo\",\"z\":\"rvjfnmjmvlw\",\"lfojuidjp\":\"iblkujr\",\"ovvtzejetjkln\":\"uyjucejikzo\"},\"tableList\":[{\"name\":\"juzkdbqz\"}]}}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AzureMonitorResponse response = manager.extensions()
-            .getAzureMonitorStatusWithResponse("fsxzecp", "xw", com.azure.core.util.Context.NONE)
+            .getAzureMonitorStatusWithResponse("jpsfxsfu", "tl", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals(true, response.clusterMonitoringEnabled());
-        Assertions.assertEquals("khvuhxepmrutz", response.workspaceId());
-        Assertions.assertEquals("aobn", response.selectedConfigurations().configurationVersion());
-        Assertions.assertEquals("jdjltymkmvgui", response.selectedConfigurations().globalConfigurations().get("ywart"));
-        Assertions.assertEquals("lmiiiovg", response.selectedConfigurations().tableList().get(0).name());
+        Assertions.assertTrue(response.clusterMonitoringEnabled());
+        Assertions.assertEquals("agb", response.workspaceId());
+        Assertions.assertEquals("qlvh", response.selectedConfigurations().configurationVersion());
+        Assertions.assertEquals("veo", response.selectedConfigurations().globalConfigurations().get("i"));
+        Assertions.assertEquals("juzkdbqz", response.selectedConfigurations().tableList().get(0).name());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusWithResponseMockTests.java
index 43e192fdc62d..bcda3c52665c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetMonitoringStatusWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.ClusterMonitoringResponse;
@@ -20,20 +20,20 @@
 public final class ExtensionsGetMonitoringStatusWithResponseMockTests {
     @Test
     public void testGetMonitoringStatusWithResponse() throws Exception {
-        String responseStr = "{\"clusterMonitoringEnabled\":true,\"workspaceId\":\"eeczgfbu\"}";
+        String responseStr = "{\"clusterMonitoringEnabled\":true,\"workspaceId\":\"gbebjf\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ClusterMonitoringResponse response = manager.extensions()
-            .getMonitoringStatusWithResponse("sggux", "eml", com.azure.core.util.Context.NONE)
+            .getMonitoringStatusWithResponse("iwfbrkwpzdqtvhcs", "odaqaxsi", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals(true, response.clusterMonitoringEnabled());
-        Assertions.assertEquals("eeczgfbu", response.workspaceId());
+        Assertions.assertTrue(response.clusterMonitoringEnabled());
+        Assertions.assertEquals("gbebjf", response.workspaceId());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetWithResponseMockTests.java
index 69ce5dca3f02..2ac5c1c31275 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ExtensionsGetWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.ClusterMonitoringResponse;
@@ -20,20 +20,20 @@
 public final class ExtensionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
-        String responseStr = "{\"clusterMonitoringEnabled\":true,\"workspaceId\":\"hvyoma\"}";
+        String responseStr = "{\"clusterMonitoringEnabled\":true,\"workspaceId\":\"spzhzmtksjc\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ClusterMonitoringResponse response = manager.extensions()
-            .getWithResponse("xcy", "hkgmnsg", "pxycphdr", com.azure.core.util.Context.NONE)
+            .getWithResponse("wvmzegjonfhjir", "gdn", "z", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals(true, response.clusterMonitoringEnabled());
-        Assertions.assertEquals("hvyoma", response.workspaceId());
+        Assertions.assertTrue(response.clusterMonitoringEnabled());
+        Assertions.assertEquals("spzhzmtksjc", response.workspaceId());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationPropertiesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationPropertiesTests.java
index de4f3702526c..4f9117967a2c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationPropertiesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationPropertiesTests.java
@@ -16,7 +16,7 @@ public void testDeserialize() throws Exception {
         IpConfigurationProperties model = BinaryData.fromString(
             "{\"provisioningState\":\"Deleting\",\"primary\":false,\"privateIPAddress\":\"yq\",\"privateIPAllocationMethod\":\"dynamic\",\"subnet\":{\"id\":\"j\"}}")
             .toObject(IpConfigurationProperties.class);
-        Assertions.assertEquals(false, model.primary());
+        Assertions.assertFalse(model.primary());
         Assertions.assertEquals("yq", model.privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.DYNAMIC, model.privateIpAllocationMethod());
         Assertions.assertEquals("j", model.subnet().id());
@@ -29,7 +29,7 @@ public void testSerialize() throws Exception {
             .withPrivateIpAllocationMethod(PrivateIpAllocationMethod.DYNAMIC)
             .withSubnet(new ResourceId().withId("j"));
         model = BinaryData.fromObject(model).toObject(IpConfigurationProperties.class);
-        Assertions.assertEquals(false, model.primary());
+        Assertions.assertFalse(model.primary());
         Assertions.assertEquals("yq", model.privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.DYNAMIC, model.privateIpAllocationMethod());
         Assertions.assertEquals("j", model.subnet().id());
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationTests.java
index 497924249753..8e78fc97370d 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/IpConfigurationTests.java
@@ -17,7 +17,7 @@ public void testDeserialize() throws Exception {
             "{\"id\":\"tvfcivfsn\",\"name\":\"ymuctqhjfbebrj\",\"type\":\"erfuwuttt\",\"properties\":{\"provisioningState\":\"Failed\",\"primary\":true,\"privateIPAddress\":\"rp\",\"privateIPAllocationMethod\":\"static\",\"subnet\":{\"id\":\"yva\"}}}")
             .toObject(IpConfiguration.class);
         Assertions.assertEquals("ymuctqhjfbebrj", model.name());
-        Assertions.assertEquals(true, model.primary());
+        Assertions.assertTrue(model.primary());
         Assertions.assertEquals("rp", model.privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.STATIC, model.privateIpAllocationMethod());
         Assertions.assertEquals("yva", model.subnet().id());
@@ -32,7 +32,7 @@ public void testSerialize() throws Exception {
             .withSubnet(new ResourceId().withId("yva"));
         model = BinaryData.fromObject(model).toObject(IpConfiguration.class);
         Assertions.assertEquals("ymuctqhjfbebrj", model.name());
-        Assertions.assertEquals(true, model.primary());
+        Assertions.assertTrue(model.primary());
         Assertions.assertEquals("rp", model.privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.STATIC, model.privateIpAllocationMethod());
         Assertions.assertEquals("yva", model.subnet().id());
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocalizedNameTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocalizedNameTests.java
index 434e70e8f90c..82a9216ec0d2 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocalizedNameTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocalizedNameTests.java
@@ -11,17 +11,17 @@
 public final class LocalizedNameTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        LocalizedName model = BinaryData.fromString("{\"value\":\"rdgrtw\",\"localizedValue\":\"nuuzkopbm\"}")
+        LocalizedName model = BinaryData.fromString("{\"value\":\"juetaebur\",\"localizedValue\":\"dmovsm\"}")
             .toObject(LocalizedName.class);
-        Assertions.assertEquals("rdgrtw", model.value());
-        Assertions.assertEquals("nuuzkopbm", model.localizedValue());
+        Assertions.assertEquals("juetaebur", model.value());
+        Assertions.assertEquals("dmovsm", model.localizedValue());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        LocalizedName model = new LocalizedName().withValue("rdgrtw").withLocalizedValue("nuuzkopbm");
+        LocalizedName model = new LocalizedName().withValue("juetaebur").withLocalizedValue("dmovsm");
         model = BinaryData.fromObject(model).toObject(LocalizedName.class);
-        Assertions.assertEquals("rdgrtw", model.value());
-        Assertions.assertEquals("nuuzkopbm", model.localizedValue());
+        Assertions.assertEquals("juetaebur", model.value());
+        Assertions.assertEquals("dmovsm", model.localizedValue());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilityWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilityWithResponseMockTests.java
index 2eb82a6012fc..a857866999c6 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilityWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsCheckNameAvailabilityWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.NameAvailabilityCheckRequestParameters;
@@ -21,21 +21,21 @@
 public final class LocationsCheckNameAvailabilityWithResponseMockTests {
     @Test
     public void testCheckNameAvailabilityWithResponse() throws Exception {
-        String responseStr = "{\"nameAvailable\":true,\"reason\":\"rrslblxydkx\",\"message\":\"vvbxiwkgfbqljnq\"}";
+        String responseStr = "{\"nameAvailable\":true,\"reason\":\"rtywi\",\"message\":\"mhlaku\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         NameAvailabilityCheckResult response = manager.locations()
-            .checkNameAvailabilityWithResponse("sczuejdtxptlghwz",
-                new NameAvailabilityCheckRequestParameters().withName("mewjjstliuhq").withType("moaiancz"),
+            .checkNameAvailabilityWithResponse("a",
+                new NameAvailabilityCheckRequestParameters().withName("xtczhupeuknijd").withType("yespydjfbocyv"),
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals(true, response.nameAvailable());
+        Assertions.assertTrue(response.nameAvailable());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesWithResponseMockTests.java
index 9f18449877fd..f3051a5ccbb1 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsGetCapabilitiesWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.CapabilitiesResult;
@@ -21,27 +21,25 @@ public final class LocationsGetCapabilitiesWithResponseMockTests {
     @Test
     public void testGetCapabilitiesWithResponse() throws Exception {
         String responseStr
-            = "{\"versions\":{\"oyueayfbpcmsp\":{\"available\":[{\"friendlyName\":\"qbnqbpizxqltgrdo\",\"displayName\":\"pxrxvbfihwu\",\"isDefault\":true,\"componentVersions\":{\"rblmli\":\"fsrb\"}},{\"friendlyName\":\"xihspnxwq\",\"displayName\":\"nepzwakls\",\"isDefault\":true,\"componentVersions\":{\"sgl\":\"qagwwrxaomz\",\"jadhqoawj\":\"rczezkhhlt\"}}]},\"fiqwoy\":{\"available\":[{\"friendlyName\":\"rueqthwm\",\"displayName\":\"mbscbbx\",\"isDefault\":true,\"componentVersions\":{\"dbwdpyqyybxubmdn\":\"iidlop\",\"acigel\":\"fcbqwremjela\",\"pwbeonr\":\"ohdbvqvwzkj\"}},{\"friendlyName\":\"wzdqybxceakxcpts\",\"displayName\":\"fyiaseqch\",\"isDefault\":true,\"componentVersions\":{\"kiuemv\":\"razisg\",\"klinhmdptysprq\":\"nbwzohmnrxxbso\",\"pli\":\"gnzxojpslsvj\"}}]},\"cxneh\":{\"available\":[{\"friendlyName\":\"pcohhoucqpqojx\",\"displayName\":\"zrzdcgd\",\"isDefault\":false,\"componentVersions\":{\"ljhznamtuatmzwcj\":\"ibcawetzqddtjw\",\"tjzmi\":\"nc\",\"ebwgga\":\"vgbgatzuuvbxng\",\"oqza\":\"ttzlswvajqfutlx\"}},{\"friendlyName\":\"nwqrjzfrgqh\",\"displayName\":\"hcmbuocnjrohmbp\",\"isDefault\":false,\"componentVersions\":{\"vkfkmr\":\"meblyd\"}}]}},\"regions\":{\"gvvpasek\":{\"available\":[\"dlfp\",\"apucygvo\",\"vyuns\",\"xlghieegj\"]},\"mjnlexwhcb\":{\"available\":[\"uxantuygdhgaqipi\",\"piwrqofu\",\"o\"]}},\"features\":[\"bke\",\"hu\"],\"quota\":{\"coresUsed\":5032005553771086807,\"maxCoresAllowed\":5825591327077815588,\"regionalQuotas\":[{\"regionName\":\"ntqpbr\",\"coresUsed\":7453365577501286272,\"coresAvailable\":5915975308764094349},{\"regionName\":\"kg\",\"coresUsed\":3170849573195747250,\"coresAvailable\":5670456401736991740},{\"regionName\":\"cvcrrp\",\"coresUsed\":5679636640607196195,\"coresAvailable\":1765568550536459632}]}}";
+            = "{\"versions\":{\"ddpqt\":{\"available\":[{\"friendlyName\":\"pihehce\",\"displayName\":\"bmrqbrjbbmp\",\"isDefault\":false,\"componentVersions\":{\"hud\":\"kfrexcrseqwjks\"}},{\"friendlyName\":\"hxogjggsvoujkxi\",\"displayName\":\"afhrkmdyomk\",\"isDefault\":false,\"componentVersions\":{\"pwpgddei\":\"bhdyir\",\"muikjcjcaztbws\":\"awzovgkk\"}},{\"friendlyName\":\"qowxwcom\",\"displayName\":\"kytwvcz\",\"isDefault\":false,\"componentVersions\":{\"xt\":\"cvejyfdvlvhbwrn\"}}]},\"vteo\":{\"available\":[{\"friendlyName\":\"mnaoy\",\"displayName\":\"kcoeqswank\",\"isDefault\":true,\"componentVersions\":{\"rlktgjcsggu\":\"hdroznnh\",\"zgfbukklelssx\":\"hemlwywaee\",\"jks\":\"lycsxz\",\"oewbid\":\"lsmdesqplpvmjc\"}}]},\"iiiovgqcgxuugq\":{\"available\":[{\"friendlyName\":\"piudeugfsxzecpa\",\"displayName\":\"kufykhvu\",\"isDefault\":false,\"componentVersions\":{\"jltymkmvguihy\":\"rutznabaobnsluj\",\"phkixkykxdssjpe\":\"arts\",\"rmymyincqlhr\":\"mucfxhikkf\",\"sl\":\"s\"}}]}},\"regions\":{\"hqlkccuzgygqwaho\":{\"available\":[\"iowlxteqdptj\",\"wdtgukranblw\"]},\"mhbrbqgvg\":{\"available\":[\"wgniipr\",\"lvawuwzdufypivls\",\"bjpmcubk\",\"ifoxxkubvphav\"]},\"wfiwzcxmj\":{\"available\":[\"bbttefjo\",\"nssqyzqed\",\"kdfrdbiqmrjgeihf\",\"lg\"]},\"fjlrxwtoauk\":{\"available\":[\"ephmgtvljvrcmyfq\",\"pgxh\",\"pomyqwcabvnuile\",\"yaswlpaugmr\"]}},\"features\":[\"vcisiz\"],\"quota\":{\"coresUsed\":3070657287286069217,\"maxCoresAllowed\":2996980592511322774,\"regionalQuotas\":[{\"regionName\":\"vedwcgyeewx\",\"coresUsed\":6124367728048997773,\"coresAvailable\":2080947935687298140},{\"regionName\":\"omguamlj\",\"coresUsed\":89407002480372975,\"coresAvailable\":5798228186879436561},{\"regionName\":\"zgaufcshhvn\",\"coresUsed\":2190540767152653017,\"coresAvailable\":7283254554944912845},{\"regionName\":\"pqanxrjkix\",\"coresUsed\":3357915863387443370,\"coresAvailable\":6541184818779379216}]}}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CapabilitiesResult response = manager.locations()
-            .getCapabilitiesWithResponse("rdcoxnbkkj", com.azure.core.util.Context.NONE)
+            .getCapabilitiesWithResponse("yrrleaesinuqt", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("qbnqbpizxqltgrdo",
-            response.versions().get("oyueayfbpcmsp").available().get(0).friendlyName());
-        Assertions.assertEquals("pxrxvbfihwu",
-            response.versions().get("oyueayfbpcmsp").available().get(0).displayName());
-        Assertions.assertEquals(true, response.versions().get("oyueayfbpcmsp").available().get(0).isDefault());
-        Assertions.assertEquals("fsrb",
-            response.versions().get("oyueayfbpcmsp").available().get(0).componentVersions().get("rblmli"));
-        Assertions.assertEquals("dlfp", response.regions().get("gvvpasek").available().get(0));
-        Assertions.assertEquals("bke", response.features().get(0));
+        Assertions.assertEquals("pihehce", response.versions().get("ddpqt").available().get(0).friendlyName());
+        Assertions.assertEquals("bmrqbrjbbmp", response.versions().get("ddpqt").available().get(0).displayName());
+        Assertions.assertFalse(response.versions().get("ddpqt").available().get(0).isDefault());
+        Assertions.assertEquals("kfrexcrseqwjks",
+            response.versions().get("ddpqt").available().get(0).componentVersions().get("hud"));
+        Assertions.assertEquals("iowlxteqdptj", response.regions().get("hqlkccuzgygqwaho").available().get(0));
+        Assertions.assertEquals("vcisiz", response.features().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsWithResponseMockTests.java
index 2b780d4e99b4..3dd235b73a62 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListBillingSpecsWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.BillingResponseListResult;
@@ -24,36 +24,37 @@ public final class LocationsListBillingSpecsWithResponseMockTests {
     @Test
     public void testListBillingSpecsWithResponse() throws Exception {
         String responseStr
-            = "{\"vmSizes\":[\"gbrt\",\"uiaclkiexhajlfn\"],\"vmSizesWithEncryptionAtHost\":[\"qfyuttd\",\"ygbpvnwswmt\",\"k\"],\"vmSizeFilters\":[{\"filterMode\":\"Default\",\"regions\":[\"wxjlmec\",\"og\"],\"clusterFlavors\":[\"yvneeza\",\"fg\",\"tmoqqtlffhzb\",\"rkjjjavfqnvhnq\"],\"nodeTypes\":[\"dogiyetesyp\",\"idbz\",\"jhqt\"],\"clusterVersions\":[\"vnynkb\",\"etnjuhpsprkz\",\"aupia\",\"cxnafbwqrooh\"],\"osType\":[\"Linux\",\"Windows\",\"Linux\"],\"vmSizes\":[\"urjtumghi\"],\"espApplied\":\"ve\",\"computeIsolationSupported\":\"slclblyjxltbsju\"},{\"filterMode\":\"Default\",\"regions\":[\"xigc\"],\"clusterFlavors\":[\"xu\",\"pbezqccydrtceu\",\"d\",\"kkyihzt\"],\"nodeTypes\":[\"mgqzgwldoyc\"],\"clusterVersions\":[\"lcecfeh\",\"waoaguhi\",\"qllizstac\",\"jvhrweft\"],\"osType\":[\"Linux\",\"Windows\",\"Linux\",\"Windows\"],\"vmSizes\":[\"s\"],\"espApplied\":\"aepwamcxtcz\",\"computeIsolationSupported\":\"peuknijd\"}],\"vmSizeProperties\":[{\"name\":\"spyd\",\"cores\":170648646,\"dataDiskStorageTier\":\"c\",\"label\":\"hhulrtywikdm\",\"maxDataDiskCount\":8125875686859497328,\"memoryInMb\":8589946500530915839,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":1422437735145461244,\"webWorkerResourceDiskSizeInMb\":4631933065455269635},{\"name\":\"mxu\",\"cores\":665007263,\"dataDiskStorageTier\":\"yjq\",\"label\":\"kfnozoeoqbvj\",\"maxDataDiskCount\":1136473991978940820,\"memoryInMb\":3118293287303219985,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":2962662676791309250,\"webWorkerResourceDiskSizeInMb\":2279733952870508149},{\"name\":\"ymxbulpzealb\",\"cores\":204967420,\"dataDiskStorageTier\":\"ojwyvf\",\"label\":\"btsuahxs\",\"maxDataDiskCount\":3253463579939415002,\"memoryInMb\":6128823487295073104,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":5228689904808376707,\"webWorkerResourceDiskSizeInMb\":1482066446768394569},{\"name\":\"npxqwodi\",\"cores\":1160303234,\"dataDiskStorageTier\":\"cjrmmua\",\"label\":\"ibvjogjonmcy\",\"maxDataDiskCount\":6735107623298340704,\"memoryInMb\":9033210529539978303,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":5845997176249673648,\"webWorkerResourceDiskSizeInMb\":4142402580801552647}],\"billingResources\":[{\"region\":\"oldtvevboclzhz\",\"billingMeters\":[{\"meterParameter\":\"uxgvttxpnr\",\"meter\":\"zaamrdixtrekid\",\"unit\":\"yskbruff\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"k\",\"sku\":\"tvlxhrpqh\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"couqehb\",\"sku\":\"cdsziryrand\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"blto\",\"sku\":\"mkfqlwxldy\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"ygaolnjpnnb\",\"sku\":\"ksibjgsjjxx\",\"tier\":\"Standard\"}]},{\"region\":\"nadzyq\",\"billingMeters\":[{\"meterParameter\":\"iv\",\"meter\":\"nbm\",\"unit\":\"bjijkgqxnh\"},{\"meterParameter\":\"keznjaujvaa\",\"meter\":\"ggiycwkdtaawxwf\",\"unit\":\"aumrrqmbzmqkrat\"},{\"meterParameter\":\"xwbjs\",\"meter\":\"birkfpksokdg\",\"unit\":\"ewijymrhbguz\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"ewnf\",\"sku\":\"hhhqosm\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"utycyarnroohguab\",\"sku\":\"ghktdpy\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"oeocnhzqrott\",\"sku\":\"cfyjzp\",\"tier\":\"Standard\"},{\"diskRpMeter\":\"ohapqinfsz\",\"sku\":\"glqdhm\",\"tier\":\"Premium\"}]},{\"region\":\"alcxpjbyy\",\"billingMeters\":[{\"meterParameter\":\"qcjenkyhf\",\"meter\":\"vsqxfxjelgcmpzqj\",\"unit\":\"hqxu\"},{\"meterParameter\":\"vcacoyv\",\"meter\":\"bsizus\",\"unit\":\"zlbscmnlziji\"},{\"meterParameter\":\"ehgmvflnwyv\",\"meter\":\"xrerlniylylyf\",\"unit\":\"zutgqztwhghmupg\"},{\"meterParameter\":\"jtcdxabbujftaben\",\"meter\":\"klqpx\",\"unit\":\"cafeddw\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"a\",\"sku\":\"xud\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"ookrtalvnbw\",\"sku\":\"bemeluclvd\",\"tier\":\"Premium\"}]}]}";
+            = "{\"vmSizes\":[\"f\",\"xuifmcsypobkdqz\"],\"vmSizesWithEncryptionAtHost\":[\"sylollgtr\",\"zzydmxzjijpvua\",\"rkihcirld\"],\"vmSizeFilters\":[{\"filterMode\":\"Include\",\"regions\":[\"xnbkkj\",\"nurnnq\",\"nqbpi\",\"xqltgrd\"],\"clusterFlavors\":[\"pxrxvbfihwu\",\"vctafsrb\"],\"nodeTypes\":[\"lmliowxihspnxwqa\"],\"clusterVersions\":[\"pzwaklsbsbqqq\",\"gwwrxaomzis\",\"lrrcz\",\"zkhhltnjadhqo\"],\"osType\":[\"Linux\",\"Linux\",\"Linux\",\"Linux\"],\"vmSizes\":[\"yfbpcmsplb\",\"rrueqthwmg\"],\"espApplied\":\"b\",\"computeIsolationSupported\":\"bbxi\"},{\"filterMode\":\"Recommend\",\"regions\":[\"idlopedbwdpy\",\"yybxubmdnafcbqw\"],\"clusterFlavors\":[\"jelaqacigele\"],\"nodeTypes\":[\"bvqvwzkjopwbeo\"],\"clusterVersions\":[\"kwzdqybxcea\",\"xcptsoqfyiaseqc\",\"krtt\",\"razisg\"],\"osType\":[\"Windows\",\"Windows\",\"Windows\",\"Linux\"],\"vmSizes\":[\"bwzohmnrxxbs\",\"jklinh\",\"dptysprqs\",\"nzxojpslsvjgpli\"],\"espApplied\":\"iqwoyxqvapcoh\",\"computeIsolationSupported\":\"ucqpqojxcxzrz\"},{\"filterMode\":\"Include\",\"regions\":[\"benribcawetzq\",\"dtjwfljhznamt\"],\"clusterFlavors\":[\"mzwcjjncqt\",\"z\"],\"nodeTypes\":[\"vgbgatzuuvbxng\",\"ebwgga\"],\"clusterVersions\":[\"zlswvajqf\",\"t\"],\"osType\":[\"Windows\",\"Linux\"],\"vmSizes\":[\"sunwqrjzfrgqhaoh\",\"mbuocnjrohmbp\",\"ryxameblydyvkfkm\",\"ocxnehvsmtodl\"],\"espApplied\":\"yapucygvoa\",\"computeIsolationSupported\":\"unssxlghieegjl\"}],\"vmSizeProperties\":[{\"name\":\"aseksgbuxantuyg\",\"cores\":843652539,\"dataDiskStorageTier\":\"qipir\",\"label\":\"wrq\",\"maxDataDiskCount\":6510077536036845100,\"memoryInMb\":2459621803287073899,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":2969828509888455397,\"webWorkerResourceDiskSizeInMb\":3485860174844862242},{\"name\":\"ibkeph\",\"cores\":1317886169,\"dataDiskStorageTier\":\"rctat\",\"label\":\"intqpbrlcyr\",\"maxDataDiskCount\":8853407872304470477,\"memoryInMb\":1359574886518533297,\"supportedByVirtualMachines\":false,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":6043694343583567982,\"webWorkerResourceDiskSizeInMb\":7586630969690428270},{\"name\":\"rpcjttbstvjeaqnr\",\"cores\":1809839347,\"dataDiskStorageTier\":\"koxmlghk\",\"label\":\"idvrmaz\",\"maxDataDiskCount\":8508183643024788002,\"memoryInMb\":8735716523166265297,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":3631683090324496952,\"webWorkerResourceDiskSizeInMb\":2488471360733558894}],\"billingResources\":[{\"region\":\"vqs\",\"billingMeters\":[{\"meterParameter\":\"uuzivensrpmeyyvp\",\"meter\":\"atlb\",\"unit\":\"pzgsk\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"fvolmknbnxwcd\",\"sku\":\"mp\",\"tier\":\"Standard\"}]},{\"region\":\"wzfgbrttuiaclkie\",\"billingMeters\":[{\"meterParameter\":\"lfnthiqfyut\",\"meter\":\"iygbpvn\",\"unit\":\"wmtxkyctwwgz\"},{\"meterParameter\":\"jlmec\",\"meter\":\"gygzyvn\",\"unit\":\"zaifghtmoqqtlff\"},{\"meterParameter\":\"bkrkjj\",\"meter\":\"vfqnvhnqoewdo\",\"unit\":\"yetesy\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"bztjhqtfbovnynkb\",\"sku\":\"tnjuhpsprkzyaupi\",\"tier\":\"Premium\"}]},{\"region\":\"n\",\"billingMeters\":[{\"meterParameter\":\"qroohtu\",\"meter\":\"maonurj\",\"unit\":\"mghihp\"},{\"meterParameter\":\"cmslclblyjxltbs\",\"meter\":\"scvsfxigctm\",\"unit\":\"uupb\"},{\"meterParameter\":\"qccydrtceukdq\",\"meter\":\"yihztgeqmg\",\"unit\":\"gwldo\"}],\"diskBillingMeters\":[{\"diskRpMeter\":\"llcecfehuwaoa\",\"sku\":\"h\",\"tier\":\"Premium\"},{\"diskRpMeter\":\"lizst\",\"sku\":\"sjvh\",\"tier\":\"Standard\"}]}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         BillingResponseListResult response
-            = manager.locations().listBillingSpecsWithResponse("qa", com.azure.core.util.Context.NONE).getValue();
+            = manager.locations().listBillingSpecsWithResponse("wmkoisq", com.azure.core.util.Context.NONE).getValue();
 
-        Assertions.assertEquals("gbrt", response.vmSizes().get(0));
-        Assertions.assertEquals("qfyuttd", response.vmSizesWithEncryptionAtHost().get(0));
-        Assertions.assertEquals(FilterMode.DEFAULT, response.vmSizeFilters().get(0).filterMode());
-        Assertions.assertEquals("wxjlmec", response.vmSizeFilters().get(0).regions().get(0));
-        Assertions.assertEquals("yvneeza", response.vmSizeFilters().get(0).clusterFlavors().get(0));
-        Assertions.assertEquals("dogiyetesyp", response.vmSizeFilters().get(0).nodeTypes().get(0));
-        Assertions.assertEquals("vnynkb", response.vmSizeFilters().get(0).clusterVersions().get(0));
+        Assertions.assertEquals("f", response.vmSizes().get(0));
+        Assertions.assertEquals("sylollgtr", response.vmSizesWithEncryptionAtHost().get(0));
+        Assertions.assertEquals(FilterMode.INCLUDE, response.vmSizeFilters().get(0).filterMode());
+        Assertions.assertEquals("xnbkkj", response.vmSizeFilters().get(0).regions().get(0));
+        Assertions.assertEquals("pxrxvbfihwu", response.vmSizeFilters().get(0).clusterFlavors().get(0));
+        Assertions.assertEquals("lmliowxihspnxwqa", response.vmSizeFilters().get(0).nodeTypes().get(0));
+        Assertions.assertEquals("pzwaklsbsbqqq", response.vmSizeFilters().get(0).clusterVersions().get(0));
         Assertions.assertEquals(OSType.LINUX, response.vmSizeFilters().get(0).osType().get(0));
-        Assertions.assertEquals("urjtumghi", response.vmSizeFilters().get(0).vmSizes().get(0));
-        Assertions.assertEquals("ve", response.vmSizeFilters().get(0).espApplied());
-        Assertions.assertEquals("slclblyjxltbsju", response.vmSizeFilters().get(0).computeIsolationSupported());
-        Assertions.assertEquals("oldtvevboclzhz", response.billingResources().get(0).region());
-        Assertions.assertEquals("uxgvttxpnr",
+        Assertions.assertEquals("yfbpcmsplb", response.vmSizeFilters().get(0).vmSizes().get(0));
+        Assertions.assertEquals("b", response.vmSizeFilters().get(0).espApplied());
+        Assertions.assertEquals("bbxi", response.vmSizeFilters().get(0).computeIsolationSupported());
+        Assertions.assertEquals("vqs", response.billingResources().get(0).region());
+        Assertions.assertEquals("uuzivensrpmeyyvp",
             response.billingResources().get(0).billingMeters().get(0).meterParameter());
-        Assertions.assertEquals("zaamrdixtrekid", response.billingResources().get(0).billingMeters().get(0).meter());
-        Assertions.assertEquals("yskbruff", response.billingResources().get(0).billingMeters().get(0).unit());
-        Assertions.assertEquals("k", response.billingResources().get(0).diskBillingMeters().get(0).diskRpMeter());
-        Assertions.assertEquals("tvlxhrpqh", response.billingResources().get(0).diskBillingMeters().get(0).sku());
-        Assertions.assertEquals(Tier.PREMIUM, response.billingResources().get(0).diskBillingMeters().get(0).tier());
+        Assertions.assertEquals("atlb", response.billingResources().get(0).billingMeters().get(0).meter());
+        Assertions.assertEquals("pzgsk", response.billingResources().get(0).billingMeters().get(0).unit());
+        Assertions.assertEquals("fvolmknbnxwcd",
+            response.billingResources().get(0).diskBillingMeters().get(0).diskRpMeter());
+        Assertions.assertEquals("mp", response.billingResources().get(0).diskBillingMeters().get(0).sku());
+        Assertions.assertEquals(Tier.STANDARD, response.billingResources().get(0).diskBillingMeters().get(0).tier());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesWithResponseMockTests.java
index e74e3557e845..269d9fefc857 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/LocationsListUsagesWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.UsagesListResult;
@@ -21,21 +21,20 @@ public final class LocationsListUsagesWithResponseMockTests {
     @Test
     public void testListUsagesWithResponse() throws Exception {
         String responseStr
-            = "{\"value\":[{\"unit\":\"uidvrmazlpdwwex\",\"currentValue\":8913959723686771783,\"limit\":3631683090324496952,\"name\":{\"value\":\"bhpwvqsgnyy\",\"localizedValue\":\"ziven\"}},{\"unit\":\"pmeyyvpkpatlbijp\",\"currentValue\":7653783145819772188,\"limit\":6070721512636115339,\"name\":{\"value\":\"v\",\"localizedValue\":\"mknbnxwcdommpv\"}}]}";
+            = "{\"value\":[{\"unit\":\"lhkgmnsghp\",\"currentValue\":5615654712753691017,\"limit\":2704306276443969386,\"name\":{\"value\":\"jkhvyomacluzvxnq\",\"localizedValue\":\"rpqpd\"}}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        UsagesListResult response = manager.locations()
-            .listUsagesWithResponse("vjeaqnrmvvfkoxml", com.azure.core.util.Context.NONE)
-            .getValue();
+        UsagesListResult response
+            = manager.locations().listUsagesWithResponse("pnyghs", com.azure.core.util.Context.NONE).getValue();
 
-        Assertions.assertEquals("uidvrmazlpdwwex", response.value().get(0).unit());
-        Assertions.assertEquals(8913959723686771783L, response.value().get(0).currentValue());
-        Assertions.assertEquals(3631683090324496952L, response.value().get(0).limit());
+        Assertions.assertEquals("lhkgmnsghp", response.value().get(0).unit());
+        Assertions.assertEquals(5615654712753691017L, response.value().get(0).currentValue());
+        Assertions.assertEquals(2704306276443969386L, response.value().get(0).limit());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/MetricSpecificationsTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/MetricSpecificationsTests.java
index 8b9e386e168d..65c285fa833f 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/MetricSpecificationsTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/MetricSpecificationsTests.java
@@ -14,77 +14,72 @@ public final class MetricSpecificationsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         MetricSpecifications model = BinaryData.fromString(
-            "{\"name\":\"g\",\"displayName\":\"joxslhvnhla\",\"displayDescription\":\"q\",\"unit\":\"kzjcjbtrgae\",\"aggregationType\":\"vibr\",\"supportedAggregationTypes\":[\"s\"],\"supportedTimeGrainTypes\":[\"beitpkx\",\"tmo\",\"bklftidgfcwqmpim\",\"qxzhem\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"hujswtwkozzwcul\",\"sourceMdmNamespace\":\"awpfajnjwltlwtjj\",\"metricFilterPattern\":\"ktalhsnvkcdmxz\",\"fillGapWithZero\":false,\"category\":\"imlnwiaaomylw\",\"resourceIdDimensionNameOverride\":\"z\",\"isInternal\":false,\"delegateMetricNameOverride\":\"ethwwnpjhlfz\",\"dimensions\":[{\"name\":\"hwahfbousn\",\"displayName\":\"pgfewetwlyx\",\"internalName\":\"cxy\",\"toBeExportedForShoebox\":true},{\"name\":\"jhlimmbcxfhbcpo\",\"displayName\":\"vxcjzhqizxfpxtgq\",\"internalName\":\"javftjuhdqa\",\"toBeExportedForShoebox\":false}]}")
+            "{\"name\":\"digumbnr\",\"displayName\":\"uzzptjazysdz\",\"displayDescription\":\"zwwva\",\"unit\":\"yuvvfonkp\",\"aggregationType\":\"qyikvy\",\"supportedAggregationTypes\":[\"yavluwmncstt\"],\"supportedTimeGrainTypes\":[\"y\",\"vpo\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"gsgbdhuzq\",\"sourceMdmNamespace\":\"j\",\"metricFilterPattern\":\"kynscliqhzv\",\"fillGapWithZero\":false,\"category\":\"omtkub\",\"resourceIdDimensionNameOverride\":\"ppnvdxz\",\"isInternal\":true,\"delegateMetricNameOverride\":\"frbbc\",\"dimensions\":[{\"name\":\"gtltdhlf\",\"displayName\":\"ojpykvgtrdc\",\"internalName\":\"fmzzsdymbrny\",\"toBeExportedForShoebox\":false}]}")
             .toObject(MetricSpecifications.class);
-        Assertions.assertEquals("g", model.name());
-        Assertions.assertEquals("joxslhvnhla", model.displayName());
-        Assertions.assertEquals("q", model.displayDescription());
-        Assertions.assertEquals("kzjcjbtrgae", model.unit());
-        Assertions.assertEquals("vibr", model.aggregationType());
-        Assertions.assertEquals("s", model.supportedAggregationTypes().get(0));
-        Assertions.assertEquals("beitpkx", model.supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(false, model.enableRegionalMdmAccount());
-        Assertions.assertEquals("hujswtwkozzwcul", model.sourceMdmAccount());
-        Assertions.assertEquals("awpfajnjwltlwtjj", model.sourceMdmNamespace());
-        Assertions.assertEquals("ktalhsnvkcdmxz", model.metricFilterPattern());
-        Assertions.assertEquals(false, model.fillGapWithZero());
-        Assertions.assertEquals("imlnwiaaomylw", model.category());
-        Assertions.assertEquals("z", model.resourceIdDimensionNameOverride());
-        Assertions.assertEquals(false, model.isInternal());
-        Assertions.assertEquals("ethwwnpjhlfz", model.delegateMetricNameOverride());
-        Assertions.assertEquals("hwahfbousn", model.dimensions().get(0).name());
-        Assertions.assertEquals("pgfewetwlyx", model.dimensions().get(0).displayName());
-        Assertions.assertEquals("cxy", model.dimensions().get(0).internalName());
-        Assertions.assertEquals(true, model.dimensions().get(0).toBeExportedForShoebox());
+        Assertions.assertEquals("digumbnr", model.name());
+        Assertions.assertEquals("uzzptjazysdz", model.displayName());
+        Assertions.assertEquals("zwwva", model.displayDescription());
+        Assertions.assertEquals("yuvvfonkp", model.unit());
+        Assertions.assertEquals("qyikvy", model.aggregationType());
+        Assertions.assertEquals("yavluwmncstt", model.supportedAggregationTypes().get(0));
+        Assertions.assertEquals("y", model.supportedTimeGrainTypes().get(0));
+        Assertions.assertFalse(model.enableRegionalMdmAccount());
+        Assertions.assertEquals("gsgbdhuzq", model.sourceMdmAccount());
+        Assertions.assertEquals("j", model.sourceMdmNamespace());
+        Assertions.assertEquals("kynscliqhzv", model.metricFilterPattern());
+        Assertions.assertFalse(model.fillGapWithZero());
+        Assertions.assertEquals("omtkub", model.category());
+        Assertions.assertEquals("ppnvdxz", model.resourceIdDimensionNameOverride());
+        Assertions.assertTrue(model.isInternal());
+        Assertions.assertEquals("frbbc", model.delegateMetricNameOverride());
+        Assertions.assertEquals("gtltdhlf", model.dimensions().get(0).name());
+        Assertions.assertEquals("ojpykvgtrdc", model.dimensions().get(0).displayName());
+        Assertions.assertEquals("fmzzsdymbrny", model.dimensions().get(0).internalName());
+        Assertions.assertFalse(model.dimensions().get(0).toBeExportedForShoebox());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        MetricSpecifications model = new MetricSpecifications().withName("g")
-            .withDisplayName("joxslhvnhla")
-            .withDisplayDescription("q")
-            .withUnit("kzjcjbtrgae")
-            .withAggregationType("vibr")
-            .withSupportedAggregationTypes(Arrays.asList("s"))
-            .withSupportedTimeGrainTypes(Arrays.asList("beitpkx", "tmo", "bklftidgfcwqmpim", "qxzhem"))
+        MetricSpecifications model = new MetricSpecifications().withName("digumbnr")
+            .withDisplayName("uzzptjazysdz")
+            .withDisplayDescription("zwwva")
+            .withUnit("yuvvfonkp")
+            .withAggregationType("qyikvy")
+            .withSupportedAggregationTypes(Arrays.asList("yavluwmncstt"))
+            .withSupportedTimeGrainTypes(Arrays.asList("y", "vpo"))
             .withEnableRegionalMdmAccount(false)
-            .withSourceMdmAccount("hujswtwkozzwcul")
-            .withSourceMdmNamespace("awpfajnjwltlwtjj")
-            .withMetricFilterPattern("ktalhsnvkcdmxz")
+            .withSourceMdmAccount("gsgbdhuzq")
+            .withSourceMdmNamespace("j")
+            .withMetricFilterPattern("kynscliqhzv")
             .withFillGapWithZero(false)
-            .withCategory("imlnwiaaomylw")
-            .withResourceIdDimensionNameOverride("z")
-            .withIsInternal(false)
-            .withDelegateMetricNameOverride("ethwwnpjhlfz")
-            .withDimensions(Arrays.asList(
-                new Dimension().withName("hwahfbousn")
-                    .withDisplayName("pgfewetwlyx")
-                    .withInternalName("cxy")
-                    .withToBeExportedForShoebox(true),
-                new Dimension().withName("jhlimmbcxfhbcpo")
-                    .withDisplayName("vxcjzhqizxfpxtgq")
-                    .withInternalName("javftjuhdqa")
-                    .withToBeExportedForShoebox(false)));
+            .withCategory("omtkub")
+            .withResourceIdDimensionNameOverride("ppnvdxz")
+            .withIsInternal(true)
+            .withDelegateMetricNameOverride("frbbc")
+            .withDimensions(Arrays.asList(new Dimension().withName("gtltdhlf")
+                .withDisplayName("ojpykvgtrdc")
+                .withInternalName("fmzzsdymbrny")
+                .withToBeExportedForShoebox(false)));
         model = BinaryData.fromObject(model).toObject(MetricSpecifications.class);
-        Assertions.assertEquals("g", model.name());
-        Assertions.assertEquals("joxslhvnhla", model.displayName());
-        Assertions.assertEquals("q", model.displayDescription());
-        Assertions.assertEquals("kzjcjbtrgae", model.unit());
-        Assertions.assertEquals("vibr", model.aggregationType());
-        Assertions.assertEquals("s", model.supportedAggregationTypes().get(0));
-        Assertions.assertEquals("beitpkx", model.supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(false, model.enableRegionalMdmAccount());
-        Assertions.assertEquals("hujswtwkozzwcul", model.sourceMdmAccount());
-        Assertions.assertEquals("awpfajnjwltlwtjj", model.sourceMdmNamespace());
-        Assertions.assertEquals("ktalhsnvkcdmxz", model.metricFilterPattern());
-        Assertions.assertEquals(false, model.fillGapWithZero());
-        Assertions.assertEquals("imlnwiaaomylw", model.category());
-        Assertions.assertEquals("z", model.resourceIdDimensionNameOverride());
-        Assertions.assertEquals(false, model.isInternal());
-        Assertions.assertEquals("ethwwnpjhlfz", model.delegateMetricNameOverride());
-        Assertions.assertEquals("hwahfbousn", model.dimensions().get(0).name());
-        Assertions.assertEquals("pgfewetwlyx", model.dimensions().get(0).displayName());
-        Assertions.assertEquals("cxy", model.dimensions().get(0).internalName());
-        Assertions.assertEquals(true, model.dimensions().get(0).toBeExportedForShoebox());
+        Assertions.assertEquals("digumbnr", model.name());
+        Assertions.assertEquals("uzzptjazysdz", model.displayName());
+        Assertions.assertEquals("zwwva", model.displayDescription());
+        Assertions.assertEquals("yuvvfonkp", model.unit());
+        Assertions.assertEquals("qyikvy", model.aggregationType());
+        Assertions.assertEquals("yavluwmncstt", model.supportedAggregationTypes().get(0));
+        Assertions.assertEquals("y", model.supportedTimeGrainTypes().get(0));
+        Assertions.assertFalse(model.enableRegionalMdmAccount());
+        Assertions.assertEquals("gsgbdhuzq", model.sourceMdmAccount());
+        Assertions.assertEquals("j", model.sourceMdmNamespace());
+        Assertions.assertEquals("kynscliqhzv", model.metricFilterPattern());
+        Assertions.assertFalse(model.fillGapWithZero());
+        Assertions.assertEquals("omtkub", model.category());
+        Assertions.assertEquals("ppnvdxz", model.resourceIdDimensionNameOverride());
+        Assertions.assertTrue(model.isInternal());
+        Assertions.assertEquals("frbbc", model.delegateMetricNameOverride());
+        Assertions.assertEquals("gtltdhlf", model.dimensions().get(0).name());
+        Assertions.assertEquals("ojpykvgtrdc", model.dimensions().get(0).displayName());
+        Assertions.assertEquals("fmzzsdymbrny", model.dimensions().get(0).internalName());
+        Assertions.assertFalse(model.dimensions().get(0).toBeExportedForShoebox());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckRequestParametersTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckRequestParametersTests.java
index 7e71b3d65ba2..cba866a5aa16 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckRequestParametersTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckRequestParametersTests.java
@@ -12,18 +12,18 @@ public final class NameAvailabilityCheckRequestParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         NameAvailabilityCheckRequestParameters model
-            = BinaryData.fromString("{\"name\":\"ftumrtwnawjslbiw\",\"type\":\"jgcyztsfmznba\"}")
+            = BinaryData.fromString("{\"name\":\"ughftqsx\",\"type\":\"xujxuknd\"}")
                 .toObject(NameAvailabilityCheckRequestParameters.class);
-        Assertions.assertEquals("ftumrtwnawjslbiw", model.name());
-        Assertions.assertEquals("jgcyztsfmznba", model.type());
+        Assertions.assertEquals("ughftqsx", model.name());
+        Assertions.assertEquals("xujxuknd", model.type());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         NameAvailabilityCheckRequestParameters model
-            = new NameAvailabilityCheckRequestParameters().withName("ftumrtwnawjslbiw").withType("jgcyztsfmznba");
+            = new NameAvailabilityCheckRequestParameters().withName("ughftqsx").withType("xujxuknd");
         model = BinaryData.fromObject(model).toObject(NameAvailabilityCheckRequestParameters.class);
-        Assertions.assertEquals("ftumrtwnawjslbiw", model.name());
-        Assertions.assertEquals("jgcyztsfmznba", model.type());
+        Assertions.assertEquals("ughftqsx", model.name());
+        Assertions.assertEquals("xujxuknd", model.type());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckResultInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckResultInnerTests.java
index a8ca08d50916..dcdc03332acd 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckResultInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/NameAvailabilityCheckResultInnerTests.java
@@ -11,16 +11,16 @@
 public final class NameAvailabilityCheckResultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        NameAvailabilityCheckResultInner model
-            = BinaryData.fromString("{\"nameAvailable\":false,\"reason\":\"chqnrnrpxehuwry\",\"message\":\"gaifmvik\"}")
-                .toObject(NameAvailabilityCheckResultInner.class);
-        Assertions.assertEquals(false, model.nameAvailable());
+        NameAvailabilityCheckResultInner model = BinaryData
+            .fromString("{\"nameAvailable\":true,\"reason\":\"rjguufzdmsyqtf\",\"message\":\"whbotzingamv\"}")
+            .toObject(NameAvailabilityCheckResultInner.class);
+        Assertions.assertTrue(model.nameAvailable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        NameAvailabilityCheckResultInner model = new NameAvailabilityCheckResultInner().withNameAvailable(false);
+        NameAvailabilityCheckResultInner model = new NameAvailabilityCheckResultInner().withNameAvailable(true);
         model = BinaryData.fromObject(model).toObject(NameAvailabilityCheckResultInner.class);
-        Assertions.assertEquals(false, model.nameAvailable());
+        Assertions.assertTrue(model.nameAvailable());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationDisplayTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationDisplayTests.java
index 30590d2b0c82..20f4338fb541 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationDisplayTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationDisplayTests.java
@@ -11,25 +11,26 @@
 public final class OperationDisplayTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        OperationDisplay model = BinaryData.fromString(
-            "{\"provider\":\"hrnxrxc\",\"resource\":\"uisavokq\",\"operation\":\"fvazivjlfrqttba\",\"description\":\"katnwxyi\"}")
+        OperationDisplay model = BinaryData
+            .fromString(
+                "{\"provider\":\"zejntps\",\"resource\":\"gioilqu\",\"operation\":\"ydxtqm\",\"description\":\"ox\"}")
             .toObject(OperationDisplay.class);
-        Assertions.assertEquals("hrnxrxc", model.provider());
-        Assertions.assertEquals("uisavokq", model.resource());
-        Assertions.assertEquals("fvazivjlfrqttba", model.operation());
-        Assertions.assertEquals("katnwxyi", model.description());
+        Assertions.assertEquals("zejntps", model.provider());
+        Assertions.assertEquals("gioilqu", model.resource());
+        Assertions.assertEquals("ydxtqm", model.operation());
+        Assertions.assertEquals("ox", model.description());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        OperationDisplay model = new OperationDisplay().withProvider("hrnxrxc")
-            .withResource("uisavokq")
-            .withOperation("fvazivjlfrqttba")
-            .withDescription("katnwxyi");
+        OperationDisplay model = new OperationDisplay().withProvider("zejntps")
+            .withResource("gioilqu")
+            .withOperation("ydxtqm")
+            .withDescription("ox");
         model = BinaryData.fromObject(model).toObject(OperationDisplay.class);
-        Assertions.assertEquals("hrnxrxc", model.provider());
-        Assertions.assertEquals("uisavokq", model.resource());
-        Assertions.assertEquals("fvazivjlfrqttba", model.operation());
-        Assertions.assertEquals("katnwxyi", model.description());
+        Assertions.assertEquals("zejntps", model.provider());
+        Assertions.assertEquals("gioilqu", model.resource());
+        Assertions.assertEquals("ydxtqm", model.operation());
+        Assertions.assertEquals("ox", model.description());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationInnerTests.java
index 07ad5a191c81..911a71a7ff62 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationInnerTests.java
@@ -18,109 +18,133 @@ public final class OperationInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         OperationInner model = BinaryData.fromString(
-            "{\"name\":\"hvcyyysfg\",\"display\":{\"provider\":\"cubiipuipw\",\"resource\":\"onmacjekniz\",\"operation\":\"qvci\",\"description\":\"ev\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"rilbywdx\",\"displayName\":\"icc\",\"displayDescription\":\"wfscjfn\",\"unit\":\"szqujizdvoq\",\"aggregationType\":\"ibyowbblgyavutp\",\"supportedAggregationTypes\":[\"oxoismsksbpim\",\"qolj\"],\"supportedTimeGrainTypes\":[\"gxxlxsffgcvizq\",\"dwl\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"oupfgfb\",\"sourceMdmNamespace\":\"ubdyhgk\",\"metricFilterPattern\":\"in\",\"fillGapWithZero\":true,\"category\":\"zfttsttktlahb\",\"resourceIdDimensionNameOverride\":\"ctxtgzukxi\",\"isInternal\":false,\"delegateMetricNameOverride\":\"tg\",\"dimensions\":[{}]}]}}}")
+            "{\"name\":\"zpxdt\",\"display\":{\"provider\":\"mkqjj\",\"resource\":\"uenvrkp\",\"operation\":\"uaibrebqaaysj\",\"description\":\"xqtnq\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"fffiak\",\"displayName\":\"pqqmted\",\"displayDescription\":\"mmji\",\"unit\":\"eozphv\",\"aggregationType\":\"uyqncygupkvipmd\",\"supportedAggregationTypes\":[\"xqupevzhf\"],\"supportedTimeGrainTypes\":[\"txhojujb\",\"pelmcuvhixbjxyf\",\"n\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"ool\",\"sourceMdmNamespace\":\"tpkiwkkbnujry\",\"metricFilterPattern\":\"tylbfpncurdoiw\",\"fillGapWithZero\":false,\"category\":\"tywubxcbihwq\",\"resourceIdDimensionNameOverride\":\"fdntwjchrdgoih\",\"isInternal\":true,\"delegateMetricNameOverride\":\"ctondz\",\"dimensions\":[{}]},{\"name\":\"dfdlwggyts\",\"displayName\":\"tov\",\"displayDescription\":\"gseinq\",\"unit\":\"ufxqknpirgnepttw\",\"aggregationType\":\"sniffc\",\"supportedAggregationTypes\":[\"nrojlpijnkr\",\"frddhcrati\",\"zronasxift\",\"zq\"],\"supportedTimeGrainTypes\":[\"f\",\"wesgogczh\",\"nnxk\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"yhmossxkkg\",\"sourceMdmNamespace\":\"rrghxjbdhqxvcxgf\",\"metricFilterPattern\":\"dsofbshrns\",\"fillGapWithZero\":false,\"category\":\"wdvzyy\",\"resourceIdDimensionNameOverride\":\"cnunvjsr\",\"isInternal\":false,\"delegateMetricNameOverride\":\"wnopqgikyzirtx\",\"dimensions\":[{},{},{}]}]}}}")
             .toObject(OperationInner.class);
-        Assertions.assertEquals("hvcyyysfg", model.name());
-        Assertions.assertEquals("cubiipuipw", model.display().provider());
-        Assertions.assertEquals("onmacjekniz", model.display().resource());
-        Assertions.assertEquals("qvci", model.display().operation());
-        Assertions.assertEquals("ev", model.display().description());
-        Assertions.assertEquals("rilbywdx",
+        Assertions.assertEquals("zpxdt", model.name());
+        Assertions.assertEquals("mkqjj", model.display().provider());
+        Assertions.assertEquals("uenvrkp", model.display().resource());
+        Assertions.assertEquals("uaibrebqaaysj", model.display().operation());
+        Assertions.assertEquals("xqtnq", model.display().description());
+        Assertions.assertEquals("fffiak",
             model.properties().serviceSpecification().metricSpecifications().get(0).name());
-        Assertions.assertEquals("icc",
+        Assertions.assertEquals("pqqmted",
             model.properties().serviceSpecification().metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("wfscjfn",
+        Assertions.assertEquals("mmji",
             model.properties().serviceSpecification().metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("szqujizdvoq",
+        Assertions.assertEquals("eozphv",
             model.properties().serviceSpecification().metricSpecifications().get(0).unit());
-        Assertions.assertEquals("ibyowbblgyavutp",
+        Assertions.assertEquals("uyqncygupkvipmd",
             model.properties().serviceSpecification().metricSpecifications().get(0).aggregationType());
-        Assertions.assertEquals("oxoismsksbpim",
+        Assertions.assertEquals("xqupevzhf",
             model.properties().serviceSpecification().metricSpecifications().get(0).supportedAggregationTypes().get(0));
-        Assertions.assertEquals("gxxlxsffgcvizq",
+        Assertions.assertEquals("txhojujb",
             model.properties().serviceSpecification().metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(true,
+        Assertions.assertFalse(
             model.properties().serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("oupfgfb",
+        Assertions.assertEquals("ool",
             model.properties().serviceSpecification().metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("ubdyhgk",
+        Assertions.assertEquals("tpkiwkkbnujry",
             model.properties().serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("in",
+        Assertions.assertEquals("tylbfpncurdoiw",
             model.properties().serviceSpecification().metricSpecifications().get(0).metricFilterPattern());
-        Assertions.assertEquals(true,
-            model.properties().serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("zfttsttktlahb",
+        Assertions
+            .assertFalse(model.properties().serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
+        Assertions.assertEquals("tywubxcbihwq",
             model.properties().serviceSpecification().metricSpecifications().get(0).category());
-        Assertions.assertEquals("ctxtgzukxi",
+        Assertions.assertEquals("fdntwjchrdgoih",
             model.properties().serviceSpecification().metricSpecifications().get(0).resourceIdDimensionNameOverride());
-        Assertions.assertEquals(false,
-            model.properties().serviceSpecification().metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("tg",
+        Assertions.assertTrue(model.properties().serviceSpecification().metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("ctondz",
             model.properties().serviceSpecification().metricSpecifications().get(0).delegateMetricNameOverride());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        OperationInner model = new OperationInner().withName("hvcyyysfg")
-            .withDisplay(new OperationDisplay().withProvider("cubiipuipw")
-                .withResource("onmacjekniz")
-                .withOperation("qvci")
-                .withDescription("ev"))
-            .withProperties(new OperationProperties().withServiceSpecification(new ServiceSpecification()
-                .withMetricSpecifications(Arrays.asList(new MetricSpecifications().withName("rilbywdx")
-                    .withDisplayName("icc")
-                    .withDisplayDescription("wfscjfn")
-                    .withUnit("szqujizdvoq")
-                    .withAggregationType("ibyowbblgyavutp")
-                    .withSupportedAggregationTypes(Arrays.asList("oxoismsksbpim", "qolj"))
-                    .withSupportedTimeGrainTypes(Arrays.asList("gxxlxsffgcvizq", "dwl"))
-                    .withEnableRegionalMdmAccount(true)
-                    .withSourceMdmAccount("oupfgfb")
-                    .withSourceMdmNamespace("ubdyhgk")
-                    .withMetricFilterPattern("in")
-                    .withFillGapWithZero(true)
-                    .withCategory("zfttsttktlahb")
-                    .withResourceIdDimensionNameOverride("ctxtgzukxi")
-                    .withIsInternal(false)
-                    .withDelegateMetricNameOverride("tg")
-                    .withDimensions(Arrays.asList(new Dimension()))))));
+        OperationInner model
+            = new OperationInner().withName("zpxdt")
+                .withDisplay(new OperationDisplay().withProvider("mkqjj")
+                    .withResource("uenvrkp")
+                    .withOperation("uaibrebqaaysj")
+                    .withDescription("xqtnq"))
+                .withProperties(
+                    new OperationProperties()
+                        .withServiceSpecification(
+                            new ServiceSpecification()
+                                .withMetricSpecifications(
+                                    Arrays.asList(
+                                        new MetricSpecifications().withName("fffiak")
+                                            .withDisplayName("pqqmted")
+                                            .withDisplayDescription("mmji")
+                                            .withUnit("eozphv")
+                                            .withAggregationType("uyqncygupkvipmd")
+                                            .withSupportedAggregationTypes(Arrays.asList("xqupevzhf"))
+                                            .withSupportedTimeGrainTypes(
+                                                Arrays.asList("txhojujb", "pelmcuvhixbjxyf", "n"))
+                                            .withEnableRegionalMdmAccount(false)
+                                            .withSourceMdmAccount("ool")
+                                            .withSourceMdmNamespace("tpkiwkkbnujry")
+                                            .withMetricFilterPattern("tylbfpncurdoiw")
+                                            .withFillGapWithZero(false)
+                                            .withCategory("tywubxcbihwq")
+                                            .withResourceIdDimensionNameOverride("fdntwjchrdgoih")
+                                            .withIsInternal(true)
+                                            .withDelegateMetricNameOverride("ctondz")
+                                            .withDimensions(Arrays.asList(new Dimension())),
+                                        new MetricSpecifications().withName("dfdlwggyts")
+                                            .withDisplayName("tov")
+                                            .withDisplayDescription("gseinq")
+                                            .withUnit("ufxqknpirgnepttw")
+                                            .withAggregationType("sniffc")
+                                            .withSupportedAggregationTypes(
+                                                Arrays.asList("nrojlpijnkr", "frddhcrati", "zronasxift", "zq"))
+                                            .withSupportedTimeGrainTypes(Arrays.asList("f", "wesgogczh", "nnxk"))
+                                            .withEnableRegionalMdmAccount(true)
+                                            .withSourceMdmAccount("yhmossxkkg")
+                                            .withSourceMdmNamespace("rrghxjbdhqxvcxgf")
+                                            .withMetricFilterPattern("dsofbshrns")
+                                            .withFillGapWithZero(false)
+                                            .withCategory("wdvzyy")
+                                            .withResourceIdDimensionNameOverride("cnunvjsr")
+                                            .withIsInternal(false)
+                                            .withDelegateMetricNameOverride("wnopqgikyzirtx")
+                                            .withDimensions(
+                                                Arrays.asList(new Dimension(), new Dimension(), new Dimension()))))));
         model = BinaryData.fromObject(model).toObject(OperationInner.class);
-        Assertions.assertEquals("hvcyyysfg", model.name());
-        Assertions.assertEquals("cubiipuipw", model.display().provider());
-        Assertions.assertEquals("onmacjekniz", model.display().resource());
-        Assertions.assertEquals("qvci", model.display().operation());
-        Assertions.assertEquals("ev", model.display().description());
-        Assertions.assertEquals("rilbywdx",
+        Assertions.assertEquals("zpxdt", model.name());
+        Assertions.assertEquals("mkqjj", model.display().provider());
+        Assertions.assertEquals("uenvrkp", model.display().resource());
+        Assertions.assertEquals("uaibrebqaaysj", model.display().operation());
+        Assertions.assertEquals("xqtnq", model.display().description());
+        Assertions.assertEquals("fffiak",
             model.properties().serviceSpecification().metricSpecifications().get(0).name());
-        Assertions.assertEquals("icc",
+        Assertions.assertEquals("pqqmted",
             model.properties().serviceSpecification().metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("wfscjfn",
+        Assertions.assertEquals("mmji",
             model.properties().serviceSpecification().metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("szqujizdvoq",
+        Assertions.assertEquals("eozphv",
             model.properties().serviceSpecification().metricSpecifications().get(0).unit());
-        Assertions.assertEquals("ibyowbblgyavutp",
+        Assertions.assertEquals("uyqncygupkvipmd",
             model.properties().serviceSpecification().metricSpecifications().get(0).aggregationType());
-        Assertions.assertEquals("oxoismsksbpim",
+        Assertions.assertEquals("xqupevzhf",
             model.properties().serviceSpecification().metricSpecifications().get(0).supportedAggregationTypes().get(0));
-        Assertions.assertEquals("gxxlxsffgcvizq",
+        Assertions.assertEquals("txhojujb",
             model.properties().serviceSpecification().metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(true,
+        Assertions.assertFalse(
             model.properties().serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("oupfgfb",
+        Assertions.assertEquals("ool",
             model.properties().serviceSpecification().metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("ubdyhgk",
+        Assertions.assertEquals("tpkiwkkbnujry",
             model.properties().serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("in",
+        Assertions.assertEquals("tylbfpncurdoiw",
             model.properties().serviceSpecification().metricSpecifications().get(0).metricFilterPattern());
-        Assertions.assertEquals(true,
-            model.properties().serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("zfttsttktlahb",
+        Assertions
+            .assertFalse(model.properties().serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
+        Assertions.assertEquals("tywubxcbihwq",
             model.properties().serviceSpecification().metricSpecifications().get(0).category());
-        Assertions.assertEquals("ctxtgzukxi",
+        Assertions.assertEquals("fdntwjchrdgoih",
             model.properties().serviceSpecification().metricSpecifications().get(0).resourceIdDimensionNameOverride());
-        Assertions.assertEquals(false,
-            model.properties().serviceSpecification().metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("tg",
+        Assertions.assertTrue(model.properties().serviceSpecification().metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("ctondz",
             model.properties().serviceSpecification().metricSpecifications().get(0).delegateMetricNameOverride());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationListResultTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationListResultTests.java
index 74f68ea2ee68..4affb8a7e991 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationListResultTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationListResultTests.java
@@ -18,62 +18,42 @@ public final class OperationListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         OperationListResult model = BinaryData.fromString(
-            "{\"value\":[{\"name\":\"cjznmwcpmg\",\"display\":{\"provider\":\"draufactkah\",\"resource\":\"v\",\"operation\":\"j\",\"description\":\"uxxpshne\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{},{},{}]}}},{\"name\":\"slqubkwdl\",\"display\":{\"provider\":\"d\",\"resource\":\"tujbazpju\",\"operation\":\"minyflnorwm\",\"description\":\"vwpklvxwmygdxp\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{},{},{},{}]}}},{\"name\":\"sze\",\"display\":{\"provider\":\"bjcrxgibbdaxco\",\"resource\":\"ozauorsukokwb\",\"operation\":\"lhlv\",\"description\":\"uepzl\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{},{}]}}},{\"name\":\"oldweyuqdu\",\"display\":{\"provider\":\"nnrwrbiork\",\"resource\":\"lywjhh\",\"operation\":\"nhxmsi\",\"description\":\"omi\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{},{}]}}}],\"nextLink\":\"ufiqndieuzaof\"}")
+            "{\"value\":[{\"name\":\"wvrvmtg\",\"display\":{\"provider\":\"pyostronzmyhgfi\",\"resource\":\"sxkm\",\"operation\":\"a\",\"description\":\"rrjreafxtsgu\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{}]}}},{\"name\":\"kkxwslol\",\"display\":{\"provider\":\"vuzlm\",\"resource\":\"elfk\",\"operation\":\"plcrpwjxeznoig\",\"description\":\"njwmwkpnbsazejj\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{},{},{},{}]}}}],\"nextLink\":\"hsxttaugzxnf\"}")
             .toObject(OperationListResult.class);
-        Assertions.assertEquals("cjznmwcpmg", model.value().get(0).name());
-        Assertions.assertEquals("draufactkah", model.value().get(0).display().provider());
-        Assertions.assertEquals("v", model.value().get(0).display().resource());
-        Assertions.assertEquals("j", model.value().get(0).display().operation());
-        Assertions.assertEquals("uxxpshne", model.value().get(0).display().description());
-        Assertions.assertEquals("ufiqndieuzaof", model.nextLink());
+        Assertions.assertEquals("wvrvmtg", model.value().get(0).name());
+        Assertions.assertEquals("pyostronzmyhgfi", model.value().get(0).display().provider());
+        Assertions.assertEquals("sxkm", model.value().get(0).display().resource());
+        Assertions.assertEquals("a", model.value().get(0).display().operation());
+        Assertions.assertEquals("rrjreafxtsgu", model.value().get(0).display().description());
+        Assertions.assertEquals("hsxttaugzxnf", model.nextLink());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        OperationListResult model
-            = new OperationListResult()
-                .withValue(Arrays.asList(
-                    new OperationInner().withName("cjznmwcpmg")
-                        .withDisplay(new OperationDisplay().withProvider("draufactkah")
-                            .withResource("v")
-                            .withOperation("j")
-                            .withDescription("uxxpshne"))
-                        .withProperties(new OperationProperties().withServiceSpecification(
-                            new ServiceSpecification().withMetricSpecifications(Arrays.asList(
-                                new MetricSpecifications(), new MetricSpecifications(), new MetricSpecifications())))),
-                    new OperationInner()
-                        .withName("slqubkwdl")
-                        .withDisplay(new OperationDisplay().withProvider("d")
-                            .withResource("tujbazpju")
-                            .withOperation("minyflnorwm")
-                            .withDescription("vwpklvxwmygdxp"))
-                        .withProperties(new OperationProperties()
-                            .withServiceSpecification(new ServiceSpecification().withMetricSpecifications(
-                                Arrays.asList(new MetricSpecifications(), new MetricSpecifications(),
-                                    new MetricSpecifications(), new MetricSpecifications())))),
-                    new OperationInner().withName("sze")
-                        .withDisplay(new OperationDisplay().withProvider("bjcrxgibbdaxco")
-                            .withResource("ozauorsukokwb")
-                            .withOperation("lhlv")
-                            .withDescription("uepzl"))
-                        .withProperties(new OperationProperties().withServiceSpecification(
-                            new ServiceSpecification().withMetricSpecifications(
-                                Arrays.asList(new MetricSpecifications(), new MetricSpecifications())))),
-                    new OperationInner().withName("oldweyuqdu")
-                        .withDisplay(new OperationDisplay().withProvider("nnrwrbiork")
-                            .withResource("lywjhh")
-                            .withOperation("nhxmsi")
-                            .withDescription("omi"))
-                        .withProperties(new OperationProperties()
-                            .withServiceSpecification(new ServiceSpecification().withMetricSpecifications(
-                                Arrays.asList(new MetricSpecifications(), new MetricSpecifications()))))))
-                .withNextLink("ufiqndieuzaof");
+        OperationListResult model = new OperationListResult()
+            .withValue(Arrays.asList(
+                new OperationInner().withName("wvrvmtg")
+                    .withDisplay(new OperationDisplay().withProvider("pyostronzmyhgfi")
+                        .withResource("sxkm")
+                        .withOperation("a")
+                        .withDescription("rrjreafxtsgu"))
+                    .withProperties(new OperationProperties().withServiceSpecification(new ServiceSpecification()
+                        .withMetricSpecifications(Arrays.asList(new MetricSpecifications())))),
+                new OperationInner().withName("kkxwslol")
+                    .withDisplay(new OperationDisplay().withProvider("vuzlm")
+                        .withResource("elfk")
+                        .withOperation("plcrpwjxeznoig")
+                        .withDescription("njwmwkpnbsazejj"))
+                    .withProperties(new OperationProperties().withServiceSpecification(
+                        new ServiceSpecification().withMetricSpecifications(Arrays.asList(new MetricSpecifications(),
+                            new MetricSpecifications(), new MetricSpecifications(), new MetricSpecifications()))))))
+            .withNextLink("hsxttaugzxnf");
         model = BinaryData.fromObject(model).toObject(OperationListResult.class);
-        Assertions.assertEquals("cjznmwcpmg", model.value().get(0).name());
-        Assertions.assertEquals("draufactkah", model.value().get(0).display().provider());
-        Assertions.assertEquals("v", model.value().get(0).display().resource());
-        Assertions.assertEquals("j", model.value().get(0).display().operation());
-        Assertions.assertEquals("uxxpshne", model.value().get(0).display().description());
-        Assertions.assertEquals("ufiqndieuzaof", model.nextLink());
+        Assertions.assertEquals("wvrvmtg", model.value().get(0).name());
+        Assertions.assertEquals("pyostronzmyhgfi", model.value().get(0).display().provider());
+        Assertions.assertEquals("sxkm", model.value().get(0).display().resource());
+        Assertions.assertEquals("a", model.value().get(0).display().operation());
+        Assertions.assertEquals("rrjreafxtsgu", model.value().get(0).display().description());
+        Assertions.assertEquals("hsxttaugzxnf", model.nextLink());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationPropertiesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationPropertiesTests.java
index e9f6409f4020..b98f245ce808 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationPropertiesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationPropertiesTests.java
@@ -16,40 +16,40 @@ public final class OperationPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         OperationProperties model = BinaryData.fromString(
-            "{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"qqfkuv\",\"displayName\":\"xkdmligo\",\"displayDescription\":\"brxk\",\"unit\":\"loazuruocbgoo\",\"aggregationType\":\"te\",\"supportedAggregationTypes\":[\"fhjxakvvjgs\",\"ordilmywwtkgkxny\",\"dabg\",\"vudtjuewbcihx\"],\"supportedTimeGrainTypes\":[\"hcjyxc\",\"ybvpay\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"dzpxgwjpl\",\"sourceMdmNamespace\":\"gstcyohpf\",\"metricFilterPattern\":\"rkdbdgiogsjkmnwq\",\"fillGapWithZero\":true,\"category\":\"aiy\",\"resourceIdDimensionNameOverride\":\"d\",\"isInternal\":true,\"delegateMetricNameOverride\":\"egfnmntfpmvmemfn\",\"dimensions\":[{\"name\":\"vvbalx\",\"displayName\":\"lchpodbzevwrdn\",\"internalName\":\"ukuv\",\"toBeExportedForShoebox\":true},{\"name\":\"wsmystuluqypf\",\"displayName\":\"lerchpq\",\"internalName\":\"f\",\"toBeExportedForShoebox\":true}]},{\"name\":\"bwidfcxsspuunn\",\"displayName\":\"yhkx\",\"displayDescription\":\"ddrihpf\",\"unit\":\"qcaaewdaomdjvl\",\"aggregationType\":\"x\",\"supportedAggregationTypes\":[\"brm\"],\"supportedTimeGrainTypes\":[\"ivsiy\",\"zkdnc\",\"dxonbzoggculap\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"pgogtqxepny\",\"sourceMdmNamespace\":\"fuajly\",\"metricFilterPattern\":\"lvofqzhvfcibyfmo\",\"fillGapWithZero\":false,\"category\":\"kjpvdwxf\",\"resourceIdDimensionNameOverride\":\"iivwzjbhyzsxjrka\",\"isInternal\":true,\"delegateMetricNameOverride\":\"negvmnvuqe\",\"dimensions\":[{\"name\":\"spastjbkkdmf\",\"displayName\":\"est\",\"internalName\":\"lx\",\"toBeExportedForShoebox\":true}]},{\"name\":\"ozapeew\",\"displayName\":\"pxlktwkuziycsl\",\"displayDescription\":\"ufuztcktyhjtq\",\"unit\":\"cgzulwmmrqzzr\",\"aggregationType\":\"vpglydz\",\"supportedAggregationTypes\":[\"vqeevtoep\",\"yutnwytpzdmov\",\"vf\",\"aawzqadfl\"],\"supportedTimeGrainTypes\":[\"riglaec\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"icokpv\",\"sourceMdmNamespace\":\"lqtmldgxob\",\"metricFilterPattern\":\"rclnpkc\",\"fillGapWithZero\":false,\"category\":\"riykhyawfvjlbox\",\"resourceIdDimensionNameOverride\":\"kjlmx\",\"isInternal\":false,\"delegateMetricNameOverride\":\"ynhdwdigum\",\"dimensions\":[{\"name\":\"auzzptjazysd\",\"displayName\":\"ezwwv\",\"internalName\":\"qyuvvfonkp\",\"toBeExportedForShoebox\":false},{\"name\":\"ikvylauya\",\"displayName\":\"uwmncs\",\"internalName\":\"ijf\",\"toBeExportedForShoebox\":false}]},{\"name\":\"o\",\"displayName\":\"rsg\",\"displayDescription\":\"b\",\"unit\":\"uzqgnjdgkynsc\",\"aggregationType\":\"qhzvhxnkomt\",\"supportedAggregationTypes\":[\"otppnv\"],\"supportedTimeGrainTypes\":[\"xhihfrbbcevqagtl\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"fkqojpy\",\"sourceMdmNamespace\":\"gtrd\",\"metricFilterPattern\":\"ifmzzsd\",\"fillGapWithZero\":false,\"category\":\"nysuxmprafwgckh\",\"resourceIdDimensionNameOverride\":\"xvd\",\"isInternal\":true,\"delegateMetricNameOverride\":\"afqr\",\"dimensions\":[{\"name\":\"spave\",\"displayName\":\"r\",\"internalName\":\"bunzozudh\",\"toBeExportedForShoebox\":true},{\"name\":\"moy\",\"displayName\":\"dyuib\",\"internalName\":\"fdn\",\"toBeExportedForShoebox\":true},{\"name\":\"vfvfcj\",\"displayName\":\"eoisrvhmgor\",\"internalName\":\"ukiscvwmzhw\",\"toBeExportedForShoebox\":true}]}]}}")
+            "{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"f\",\"displayName\":\"aomtbghhavgrvkff\",\"displayDescription\":\"jzhpjbibgjmfx\",\"unit\":\"vfcluyovwxnbkfe\",\"aggregationType\":\"xscyhwzdgirujbz\",\"supportedAggregationTypes\":[\"vzzbtdcq\",\"pniyujviyl\",\"dshf\"],\"supportedTimeGrainTypes\":[\"rbgyefry\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"ojfmwnco\",\"sourceMdmNamespace\":\"rfh\",\"metricFilterPattern\":\"ctymoxoftp\",\"fillGapWithZero\":false,\"category\":\"yczuhxacpq\",\"resourceIdDimensionNameOverride\":\"ihhyuspskasd\",\"isInternal\":false,\"delegateMetricNameOverride\":\"wdgzxulucv\",\"dimensions\":[{\"name\":\"sreuzvxurisjnh\",\"displayName\":\"txifqj\",\"internalName\":\"xmrhu\",\"toBeExportedForShoebox\":false},{\"name\":\"cesutrgjupauut\",\"displayName\":\"oqh\",\"internalName\":\"ejqgw\",\"toBeExportedForShoebox\":false},{\"name\":\"qntcypsxjvfoimwk\",\"displayName\":\"ircizjxvy\",\"internalName\":\"ceacvlhvygdy\",\"toBeExportedForShoebox\":true},{\"name\":\"rtwnawjslbi\",\"displayName\":\"ojgcyzt\",\"internalName\":\"mznbaeqphch\",\"toBeExportedForShoebox\":false}]},{\"name\":\"rpxeh\",\"displayName\":\"rykqgaifmvikl\",\"displayDescription\":\"dvk\",\"unit\":\"ejd\",\"aggregationType\":\"xcv\",\"supportedAggregationTypes\":[\"hnjivo\"],\"supportedTimeGrainTypes\":[\"novqfzge\",\"jdftuljltd\",\"ceamtm\",\"zuo\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"cwwqiokn\",\"sourceMdmNamespace\":\"xmojmsvpkjp\",\"metricFilterPattern\":\"kwcf\",\"fillGapWithZero\":true,\"category\":\"yxgtczh\",\"resourceIdDimensionNameOverride\":\"dbsdshm\",\"isInternal\":true,\"delegateMetricNameOverride\":\"ehvbbxurip\",\"dimensions\":[{\"name\":\"htba\",\"displayName\":\"gx\",\"internalName\":\"rc\",\"toBeExportedForShoebox\":true},{\"name\":\"lyhpluodpvruud\",\"displayName\":\"zibt\",\"internalName\":\"stgktst\",\"toBeExportedForShoebox\":true},{\"name\":\"clzedqbcvh\",\"displayName\":\"h\",\"internalName\":\"odqkdlwwqfb\",\"toBeExportedForShoebox\":false}]},{\"name\":\"xtrqjfs\",\"displayName\":\"mbtxhwgf\",\"displayDescription\":\"rtawcoezb\",\"unit\":\"ubskhudygoookkq\",\"aggregationType\":\"jb\",\"supportedAggregationTypes\":[\"orfmluiqt\",\"zf\"],\"supportedTimeGrainTypes\":[\"vnqqybaryeua\",\"jkqa\",\"qgzsles\",\"cbhernntiewdj\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"uwrbehwagoh\",\"sourceMdmNamespace\":\"f\",\"metricFilterPattern\":\"mrqemvvhmx\",\"fillGapWithZero\":false,\"category\":\"futacoebjvewzc\",\"resourceIdDimensionNameOverride\":\"nmwcpmgu\",\"isInternal\":true,\"delegateMetricNameOverride\":\"aufactkahzovajjz\",\"dimensions\":[{\"name\":\"pshneekulfgslq\",\"displayName\":\"kwdlenrdsutujba\",\"internalName\":\"juohminyflnorw\",\"toBeExportedForShoebox\":true},{\"name\":\"wpklvxw\",\"displayName\":\"gdxpg\",\"internalName\":\"chisze\",\"toBeExportedForShoebox\":false},{\"name\":\"jcrxgibbdaxcon\",\"displayName\":\"zauorsuk\",\"internalName\":\"wbqpl\",\"toBeExportedForShoebox\":false}]}]}}")
             .toObject(OperationProperties.class);
-        Assertions.assertEquals("qqfkuv", model.serviceSpecification().metricSpecifications().get(0).name());
-        Assertions.assertEquals("xkdmligo", model.serviceSpecification().metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("brxk",
+        Assertions.assertEquals("f", model.serviceSpecification().metricSpecifications().get(0).name());
+        Assertions.assertEquals("aomtbghhavgrvkff",
+            model.serviceSpecification().metricSpecifications().get(0).displayName());
+        Assertions.assertEquals("jzhpjbibgjmfx",
             model.serviceSpecification().metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("loazuruocbgoo", model.serviceSpecification().metricSpecifications().get(0).unit());
-        Assertions.assertEquals("te", model.serviceSpecification().metricSpecifications().get(0).aggregationType());
-        Assertions.assertEquals("fhjxakvvjgs",
+        Assertions.assertEquals("vfcluyovwxnbkfe", model.serviceSpecification().metricSpecifications().get(0).unit());
+        Assertions.assertEquals("xscyhwzdgirujbz",
+            model.serviceSpecification().metricSpecifications().get(0).aggregationType());
+        Assertions.assertEquals("vzzbtdcq",
             model.serviceSpecification().metricSpecifications().get(0).supportedAggregationTypes().get(0));
-        Assertions.assertEquals("hcjyxc",
+        Assertions.assertEquals("rbgyefry",
             model.serviceSpecification().metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(true,
-            model.serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("dzpxgwjpl",
+        Assertions.assertFalse(model.serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
+        Assertions.assertEquals("ojfmwnco",
             model.serviceSpecification().metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("gstcyohpf",
-            model.serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("rkdbdgiogsjkmnwq",
+        Assertions.assertEquals("rfh", model.serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
+        Assertions.assertEquals("ctymoxoftp",
             model.serviceSpecification().metricSpecifications().get(0).metricFilterPattern());
-        Assertions.assertEquals(true, model.serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("aiy", model.serviceSpecification().metricSpecifications().get(0).category());
-        Assertions.assertEquals("d",
+        Assertions.assertFalse(model.serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
+        Assertions.assertEquals("yczuhxacpq", model.serviceSpecification().metricSpecifications().get(0).category());
+        Assertions.assertEquals("ihhyuspskasd",
             model.serviceSpecification().metricSpecifications().get(0).resourceIdDimensionNameOverride());
-        Assertions.assertEquals(true, model.serviceSpecification().metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("egfnmntfpmvmemfn",
+        Assertions.assertFalse(model.serviceSpecification().metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("wdgzxulucv",
             model.serviceSpecification().metricSpecifications().get(0).delegateMetricNameOverride());
-        Assertions.assertEquals("vvbalx",
+        Assertions.assertEquals("sreuzvxurisjnh",
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).name());
-        Assertions.assertEquals("lchpodbzevwrdn",
+        Assertions.assertEquals("txifqj",
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).displayName());
-        Assertions.assertEquals("ukuv",
+        Assertions.assertEquals("xmrhu",
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).internalName());
-        Assertions.assertEquals(true,
+        Assertions.assertFalse(
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).toBeExportedForShoebox());
     }
 
@@ -57,139 +57,130 @@ public void testDeserialize() throws Exception {
     public void testSerialize() throws Exception {
         OperationProperties model = new OperationProperties()
             .withServiceSpecification(new ServiceSpecification().withMetricSpecifications(Arrays.asList(
-                new MetricSpecifications().withName("qqfkuv")
-                    .withDisplayName("xkdmligo")
-                    .withDisplayDescription("brxk")
-                    .withUnit("loazuruocbgoo")
-                    .withAggregationType("te")
-                    .withSupportedAggregationTypes(
-                        Arrays.asList("fhjxakvvjgs", "ordilmywwtkgkxny", "dabg", "vudtjuewbcihx"))
-                    .withSupportedTimeGrainTypes(Arrays.asList("hcjyxc", "ybvpay"))
-                    .withEnableRegionalMdmAccount(true)
-                    .withSourceMdmAccount("dzpxgwjpl")
-                    .withSourceMdmNamespace("gstcyohpf")
-                    .withMetricFilterPattern("rkdbdgiogsjkmnwq")
-                    .withFillGapWithZero(true)
-                    .withCategory("aiy")
-                    .withResourceIdDimensionNameOverride("d")
-                    .withIsInternal(true)
-                    .withDelegateMetricNameOverride("egfnmntfpmvmemfn")
-                    .withDimensions(Arrays.asList(
-                        new Dimension().withName("vvbalx")
-                            .withDisplayName("lchpodbzevwrdn")
-                            .withInternalName("ukuv")
-                            .withToBeExportedForShoebox(true),
-                        new Dimension().withName("wsmystuluqypf")
-                            .withDisplayName("lerchpq")
-                            .withInternalName("f")
-                            .withToBeExportedForShoebox(true))),
-                new MetricSpecifications().withName("bwidfcxsspuunn")
-                    .withDisplayName("yhkx")
-                    .withDisplayDescription("ddrihpf")
-                    .withUnit("qcaaewdaomdjvl")
-                    .withAggregationType("x")
-                    .withSupportedAggregationTypes(Arrays.asList("brm"))
-                    .withSupportedTimeGrainTypes(Arrays.asList("ivsiy", "zkdnc", "dxonbzoggculap"))
+                new MetricSpecifications().withName("f")
+                    .withDisplayName("aomtbghhavgrvkff")
+                    .withDisplayDescription("jzhpjbibgjmfx")
+                    .withUnit("vfcluyovwxnbkfe")
+                    .withAggregationType("xscyhwzdgirujbz")
+                    .withSupportedAggregationTypes(Arrays.asList("vzzbtdcq", "pniyujviyl", "dshf"))
+                    .withSupportedTimeGrainTypes(Arrays.asList("rbgyefry"))
                     .withEnableRegionalMdmAccount(false)
-                    .withSourceMdmAccount("pgogtqxepny")
-                    .withSourceMdmNamespace("fuajly")
-                    .withMetricFilterPattern("lvofqzhvfcibyfmo")
+                    .withSourceMdmAccount("ojfmwnco")
+                    .withSourceMdmNamespace("rfh")
+                    .withMetricFilterPattern("ctymoxoftp")
                     .withFillGapWithZero(false)
-                    .withCategory("kjpvdwxf")
-                    .withResourceIdDimensionNameOverride("iivwzjbhyzsxjrka")
-                    .withIsInternal(true)
-                    .withDelegateMetricNameOverride("negvmnvuqe")
-                    .withDimensions(Arrays.asList(new Dimension().withName("spastjbkkdmf")
-                        .withDisplayName("est")
-                        .withInternalName("lx")
-                        .withToBeExportedForShoebox(true))),
-                new MetricSpecifications().withName("ozapeew")
-                    .withDisplayName("pxlktwkuziycsl")
-                    .withDisplayDescription("ufuztcktyhjtq")
-                    .withUnit("cgzulwmmrqzzr")
-                    .withAggregationType("vpglydz")
-                    .withSupportedAggregationTypes(Arrays.asList("vqeevtoep", "yutnwytpzdmov", "vf", "aawzqadfl"))
-                    .withSupportedTimeGrainTypes(Arrays.asList("riglaec"))
-                    .withEnableRegionalMdmAccount(true)
-                    .withSourceMdmAccount("icokpv")
-                    .withSourceMdmNamespace("lqtmldgxob")
-                    .withMetricFilterPattern("rclnpkc")
-                    .withFillGapWithZero(false)
-                    .withCategory("riykhyawfvjlbox")
-                    .withResourceIdDimensionNameOverride("kjlmx")
+                    .withCategory("yczuhxacpq")
+                    .withResourceIdDimensionNameOverride("ihhyuspskasd")
                     .withIsInternal(false)
-                    .withDelegateMetricNameOverride("ynhdwdigum")
+                    .withDelegateMetricNameOverride("wdgzxulucv")
                     .withDimensions(Arrays.asList(
-                        new Dimension().withName("auzzptjazysd")
-                            .withDisplayName("ezwwv")
-                            .withInternalName("qyuvvfonkp")
+                        new Dimension().withName("sreuzvxurisjnh")
+                            .withDisplayName("txifqj")
+                            .withInternalName("xmrhu")
                             .withToBeExportedForShoebox(false),
-                        new Dimension().withName("ikvylauya")
-                            .withDisplayName("uwmncs")
-                            .withInternalName("ijf")
+                        new Dimension().withName("cesutrgjupauut")
+                            .withDisplayName("oqh")
+                            .withInternalName("ejqgw")
+                            .withToBeExportedForShoebox(false),
+                        new Dimension().withName("qntcypsxjvfoimwk")
+                            .withDisplayName("ircizjxvy")
+                            .withInternalName("ceacvlhvygdy")
+                            .withToBeExportedForShoebox(true),
+                        new Dimension().withName("rtwnawjslbi")
+                            .withDisplayName("ojgcyzt")
+                            .withInternalName("mznbaeqphch")
                             .withToBeExportedForShoebox(false))),
-                new MetricSpecifications().withName("o")
-                    .withDisplayName("rsg")
-                    .withDisplayDescription("b")
-                    .withUnit("uzqgnjdgkynsc")
-                    .withAggregationType("qhzvhxnkomt")
-                    .withSupportedAggregationTypes(Arrays.asList("otppnv"))
-                    .withSupportedTimeGrainTypes(Arrays.asList("xhihfrbbcevqagtl"))
+                new MetricSpecifications().withName("rpxeh")
+                    .withDisplayName("rykqgaifmvikl")
+                    .withDisplayDescription("dvk")
+                    .withUnit("ejd")
+                    .withAggregationType("xcv")
+                    .withSupportedAggregationTypes(Arrays.asList("hnjivo"))
+                    .withSupportedTimeGrainTypes(Arrays.asList("novqfzge", "jdftuljltd", "ceamtm", "zuo"))
+                    .withEnableRegionalMdmAccount(false)
+                    .withSourceMdmAccount("cwwqiokn")
+                    .withSourceMdmNamespace("xmojmsvpkjp")
+                    .withMetricFilterPattern("kwcf")
+                    .withFillGapWithZero(true)
+                    .withCategory("yxgtczh")
+                    .withResourceIdDimensionNameOverride("dbsdshm")
+                    .withIsInternal(true)
+                    .withDelegateMetricNameOverride("ehvbbxurip")
+                    .withDimensions(Arrays.asList(
+                        new Dimension().withName("htba")
+                            .withDisplayName("gx")
+                            .withInternalName("rc")
+                            .withToBeExportedForShoebox(true),
+                        new Dimension().withName("lyhpluodpvruud")
+                            .withDisplayName("zibt")
+                            .withInternalName("stgktst")
+                            .withToBeExportedForShoebox(true),
+                        new Dimension().withName("clzedqbcvh")
+                            .withDisplayName("h")
+                            .withInternalName("odqkdlwwqfb")
+                            .withToBeExportedForShoebox(false))),
+                new MetricSpecifications().withName("xtrqjfs")
+                    .withDisplayName("mbtxhwgf")
+                    .withDisplayDescription("rtawcoezb")
+                    .withUnit("ubskhudygoookkq")
+                    .withAggregationType("jb")
+                    .withSupportedAggregationTypes(Arrays.asList("orfmluiqt", "zf"))
+                    .withSupportedTimeGrainTypes(Arrays.asList("vnqqybaryeua", "jkqa", "qgzsles", "cbhernntiewdj"))
                     .withEnableRegionalMdmAccount(true)
-                    .withSourceMdmAccount("fkqojpy")
-                    .withSourceMdmNamespace("gtrd")
-                    .withMetricFilterPattern("ifmzzsd")
+                    .withSourceMdmAccount("uwrbehwagoh")
+                    .withSourceMdmNamespace("f")
+                    .withMetricFilterPattern("mrqemvvhmx")
                     .withFillGapWithZero(false)
-                    .withCategory("nysuxmprafwgckh")
-                    .withResourceIdDimensionNameOverride("xvd")
+                    .withCategory("futacoebjvewzc")
+                    .withResourceIdDimensionNameOverride("nmwcpmgu")
                     .withIsInternal(true)
-                    .withDelegateMetricNameOverride("afqr")
+                    .withDelegateMetricNameOverride("aufactkahzovajjz")
                     .withDimensions(Arrays.asList(
-                        new Dimension().withName("spave")
-                            .withDisplayName("r")
-                            .withInternalName("bunzozudh")
+                        new Dimension().withName("pshneekulfgslq")
+                            .withDisplayName("kwdlenrdsutujba")
+                            .withInternalName("juohminyflnorw")
                             .withToBeExportedForShoebox(true),
-                        new Dimension().withName("moy")
-                            .withDisplayName("dyuib")
-                            .withInternalName("fdn")
-                            .withToBeExportedForShoebox(true),
-                        new Dimension().withName("vfvfcj")
-                            .withDisplayName("eoisrvhmgor")
-                            .withInternalName("ukiscvwmzhw")
-                            .withToBeExportedForShoebox(true))))));
+                        new Dimension().withName("wpklvxw")
+                            .withDisplayName("gdxpg")
+                            .withInternalName("chisze")
+                            .withToBeExportedForShoebox(false),
+                        new Dimension().withName("jcrxgibbdaxcon")
+                            .withDisplayName("zauorsuk")
+                            .withInternalName("wbqpl")
+                            .withToBeExportedForShoebox(false))))));
         model = BinaryData.fromObject(model).toObject(OperationProperties.class);
-        Assertions.assertEquals("qqfkuv", model.serviceSpecification().metricSpecifications().get(0).name());
-        Assertions.assertEquals("xkdmligo", model.serviceSpecification().metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("brxk",
+        Assertions.assertEquals("f", model.serviceSpecification().metricSpecifications().get(0).name());
+        Assertions.assertEquals("aomtbghhavgrvkff",
+            model.serviceSpecification().metricSpecifications().get(0).displayName());
+        Assertions.assertEquals("jzhpjbibgjmfx",
             model.serviceSpecification().metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("loazuruocbgoo", model.serviceSpecification().metricSpecifications().get(0).unit());
-        Assertions.assertEquals("te", model.serviceSpecification().metricSpecifications().get(0).aggregationType());
-        Assertions.assertEquals("fhjxakvvjgs",
+        Assertions.assertEquals("vfcluyovwxnbkfe", model.serviceSpecification().metricSpecifications().get(0).unit());
+        Assertions.assertEquals("xscyhwzdgirujbz",
+            model.serviceSpecification().metricSpecifications().get(0).aggregationType());
+        Assertions.assertEquals("vzzbtdcq",
             model.serviceSpecification().metricSpecifications().get(0).supportedAggregationTypes().get(0));
-        Assertions.assertEquals("hcjyxc",
+        Assertions.assertEquals("rbgyefry",
             model.serviceSpecification().metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(true,
-            model.serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("dzpxgwjpl",
+        Assertions.assertFalse(model.serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
+        Assertions.assertEquals("ojfmwnco",
             model.serviceSpecification().metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("gstcyohpf",
-            model.serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("rkdbdgiogsjkmnwq",
+        Assertions.assertEquals("rfh", model.serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
+        Assertions.assertEquals("ctymoxoftp",
             model.serviceSpecification().metricSpecifications().get(0).metricFilterPattern());
-        Assertions.assertEquals(true, model.serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("aiy", model.serviceSpecification().metricSpecifications().get(0).category());
-        Assertions.assertEquals("d",
+        Assertions.assertFalse(model.serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
+        Assertions.assertEquals("yczuhxacpq", model.serviceSpecification().metricSpecifications().get(0).category());
+        Assertions.assertEquals("ihhyuspskasd",
             model.serviceSpecification().metricSpecifications().get(0).resourceIdDimensionNameOverride());
-        Assertions.assertEquals(true, model.serviceSpecification().metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("egfnmntfpmvmemfn",
+        Assertions.assertFalse(model.serviceSpecification().metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("wdgzxulucv",
             model.serviceSpecification().metricSpecifications().get(0).delegateMetricNameOverride());
-        Assertions.assertEquals("vvbalx",
+        Assertions.assertEquals("sreuzvxurisjnh",
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).name());
-        Assertions.assertEquals("lchpodbzevwrdn",
+        Assertions.assertEquals("txifqj",
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).displayName());
-        Assertions.assertEquals("ukuv",
+        Assertions.assertEquals("xmrhu",
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).internalName());
-        Assertions.assertEquals(true,
+        Assertions.assertFalse(
             model.serviceSpecification().metricSpecifications().get(0).dimensions().get(0).toBeExportedForShoebox());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationsListMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationsListMockTests.java
index 67f48645fbed..f026516088d5 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationsListMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/OperationsListMockTests.java
@@ -7,8 +7,8 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.Operation;
@@ -22,27 +22,27 @@ public final class OperationsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"name\":\"dqq\",\"display\":{\"provider\":\"kva\",\"resource\":\"l\",\"operation\":\"jqvq\",\"description\":\"wehtaemxh\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"usxivzrrryvei\",\"displayName\":\"pskdyzatvfuzk\",\"displayDescription\":\"tjvv\",\"unit\":\"xwigsye\",\"aggregationType\":\"qdsmjtg\",\"supportedAggregationTypes\":[\"dgkkile\",\"lkcsmknhwtbbae\"],\"supportedTimeGrainTypes\":[\"vv\",\"qfloygbdgwum\",\"xdgd\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"gdexjd\",\"sourceMdmNamespace\":\"jsaqwotmmwllcols\",\"metricFilterPattern\":\"xaptefhexcgjok\",\"fillGapWithZero\":true,\"category\":\"hv\",\"resourceIdDimensionNameOverride\":\"jbekpeeksnbksdq\",\"isInternal\":true,\"delegateMetricNameOverride\":\"klxesl\",\"dimensions\":[{},{},{},{}]}]}}}]}";
+            = "{\"value\":[{\"name\":\"birkfpksokdg\",\"display\":{\"provider\":\"wijymr\",\"resource\":\"guzozkyew\",\"operation\":\"nzhhhqos\",\"description\":\"fjkutycyarnroo\"},\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"oghktdpycz\",\"displayName\":\"oeocnhzqrott\",\"displayDescription\":\"cfyjzp\",\"unit\":\"rl\",\"aggregationType\":\"apqinf\",\"supportedAggregationTypes\":[\"yglqdhmrjzral\",\"xpjb\",\"ypsjoq\",\"jenkyh\"],\"supportedTimeGrainTypes\":[\"vsqxfxjelgcmpzqj\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"xuwyvc\",\"sourceMdmNamespace\":\"oyvivbsiz\",\"metricFilterPattern\":\"jszlb\",\"fillGapWithZero\":true,\"category\":\"lzijiufehgmvflnw\",\"resourceIdDimensionNameOverride\":\"qkxrerl\",\"isInternal\":false,\"delegateMetricNameOverride\":\"yl\",\"dimensions\":[{},{}]}]}}}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<Operation> response = manager.operations().list(com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("dqq", response.iterator().next().name());
-        Assertions.assertEquals("kva", response.iterator().next().display().provider());
-        Assertions.assertEquals("l", response.iterator().next().display().resource());
-        Assertions.assertEquals("jqvq", response.iterator().next().display().operation());
-        Assertions.assertEquals("wehtaemxh", response.iterator().next().display().description());
-        Assertions.assertEquals("usxivzrrryvei",
+        Assertions.assertEquals("birkfpksokdg", response.iterator().next().name());
+        Assertions.assertEquals("wijymr", response.iterator().next().display().provider());
+        Assertions.assertEquals("guzozkyew", response.iterator().next().display().resource());
+        Assertions.assertEquals("nzhhhqos", response.iterator().next().display().operation());
+        Assertions.assertEquals("fjkutycyarnroo", response.iterator().next().display().description());
+        Assertions.assertEquals("oghktdpycz",
             response.iterator().next().properties().serviceSpecification().metricSpecifications().get(0).name());
-        Assertions.assertEquals("pskdyzatvfuzk",
+        Assertions.assertEquals("oeocnhzqrott",
             response.iterator().next().properties().serviceSpecification().metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("tjvv",
+        Assertions.assertEquals("cfyjzp",
             response.iterator()
                 .next()
                 .properties()
@@ -50,9 +50,9 @@ public void testList() throws Exception {
                 .metricSpecifications()
                 .get(0)
                 .displayDescription());
-        Assertions.assertEquals("xwigsye",
+        Assertions.assertEquals("rl",
             response.iterator().next().properties().serviceSpecification().metricSpecifications().get(0).unit());
-        Assertions.assertEquals("qdsmjtg",
+        Assertions.assertEquals("apqinf",
             response.iterator()
                 .next()
                 .properties()
@@ -60,7 +60,7 @@ public void testList() throws Exception {
                 .metricSpecifications()
                 .get(0)
                 .aggregationType());
-        Assertions.assertEquals("dgkkile",
+        Assertions.assertEquals("yglqdhmrjzral",
             response.iterator()
                 .next()
                 .properties()
@@ -69,7 +69,7 @@ public void testList() throws Exception {
                 .get(0)
                 .supportedAggregationTypes()
                 .get(0));
-        Assertions.assertEquals("vv",
+        Assertions.assertEquals("vsqxfxjelgcmpzqj",
             response.iterator()
                 .next()
                 .properties()
@@ -78,15 +78,14 @@ public void testList() throws Exception {
                 .get(0)
                 .supportedTimeGrainTypes()
                 .get(0));
-        Assertions.assertEquals(false,
-            response.iterator()
-                .next()
-                .properties()
-                .serviceSpecification()
-                .metricSpecifications()
-                .get(0)
-                .enableRegionalMdmAccount());
-        Assertions.assertEquals("gdexjd",
+        Assertions.assertFalse(response.iterator()
+            .next()
+            .properties()
+            .serviceSpecification()
+            .metricSpecifications()
+            .get(0)
+            .enableRegionalMdmAccount());
+        Assertions.assertEquals("xuwyvc",
             response.iterator()
                 .next()
                 .properties()
@@ -94,7 +93,7 @@ public void testList() throws Exception {
                 .metricSpecifications()
                 .get(0)
                 .sourceMdmAccount());
-        Assertions.assertEquals("jsaqwotmmwllcols",
+        Assertions.assertEquals("oyvivbsiz",
             response.iterator()
                 .next()
                 .properties()
@@ -102,7 +101,7 @@ public void testList() throws Exception {
                 .metricSpecifications()
                 .get(0)
                 .sourceMdmNamespace());
-        Assertions.assertEquals("xaptefhexcgjok",
+        Assertions.assertEquals("jszlb",
             response.iterator()
                 .next()
                 .properties()
@@ -110,17 +109,16 @@ public void testList() throws Exception {
                 .metricSpecifications()
                 .get(0)
                 .metricFilterPattern());
-        Assertions.assertEquals(true,
-            response.iterator()
-                .next()
-                .properties()
-                .serviceSpecification()
-                .metricSpecifications()
-                .get(0)
-                .fillGapWithZero());
-        Assertions.assertEquals("hv",
+        Assertions.assertTrue(response.iterator()
+            .next()
+            .properties()
+            .serviceSpecification()
+            .metricSpecifications()
+            .get(0)
+            .fillGapWithZero());
+        Assertions.assertEquals("lzijiufehgmvflnw",
             response.iterator().next().properties().serviceSpecification().metricSpecifications().get(0).category());
-        Assertions.assertEquals("jbekpeeksnbksdq",
+        Assertions.assertEquals("qkxrerl",
             response.iterator()
                 .next()
                 .properties()
@@ -128,9 +126,9 @@ public void testList() throws Exception {
                 .metricSpecifications()
                 .get(0)
                 .resourceIdDimensionNameOverride());
-        Assertions.assertEquals(true,
+        Assertions.assertFalse(
             response.iterator().next().properties().serviceSpecification().metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("klxesl",
+        Assertions.assertEquals("yl",
             response.iterator()
                 .next()
                 .properties()
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionListResultTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionListResultTests.java
index 807f4890628f..b8e78914c9ee 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionListResultTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionListResultTests.java
@@ -16,35 +16,27 @@ public final class PrivateEndpointConnectionListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateEndpointConnectionListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"qodfvp\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"oxgsgbpfgzdjtx\",\"actionsRequired\":\"flbqvgaq\"},\"linkIdentifier\":\"gafcqu\",\"provisioningState\":\"Succeeded\"},\"id\":\"etnwsdtutnw\",\"name\":\"duy\",\"type\":\"vuzhyr\"},{\"properties\":{\"privateEndpoint\":{\"id\":\"ipmve\"},\"privateLinkServiceConnectionState\":{\"status\":\"Removed\",\"description\":\"ukuqgsj\",\"actionsRequired\":\"undxgketw\"},\"linkIdentifier\":\"hzjhf\",\"provisioningState\":\"InProgress\"},\"id\":\"vmuvgpmu\",\"name\":\"eqsx\",\"type\":\"mhfbuzjy\"},{\"properties\":{\"privateEndpoint\":{\"id\":\"as\"},\"privateLinkServiceConnectionState\":{\"status\":\"Removed\",\"description\":\"dyp\",\"actionsRequired\":\"yue\"},\"linkIdentifier\":\"lynsqyrpf\",\"provisioningState\":\"Canceled\"},\"id\":\"lttymsjn\",\"name\":\"gqdnfwqzd\",\"type\":\"gtilax\"}],\"nextLink\":\"fhqlyvi\"}")
+            "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"r\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"unzo\",\"actionsRequired\":\"dhcxgkmoy\"},\"linkIdentifier\":\"dyuib\",\"provisioningState\":\"Failed\"},\"id\":\"nbzydvfvfcj\",\"name\":\"aeoisrvh\",\"type\":\"gorf\"}],\"nextLink\":\"kiscvwmzhwpl\"}")
             .toObject(PrivateEndpointConnectionListResult.class);
         Assertions.assertEquals(PrivateLinkServiceConnectionStatus.REJECTED,
             model.value().get(0).privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("oxgsgbpfgzdjtx",
-            model.value().get(0).privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("flbqvgaq", model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("unzo", model.value().get(0).privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("dhcxgkmoy",
+            model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PrivateEndpointConnectionListResult model = new PrivateEndpointConnectionListResult().withValue(Arrays.asList(
-            new PrivateEndpointConnectionInner().withPrivateLinkServiceConnectionState(
+        PrivateEndpointConnectionListResult model = new PrivateEndpointConnectionListResult()
+            .withValue(Arrays.asList(new PrivateEndpointConnectionInner().withPrivateLinkServiceConnectionState(
                 new PrivateLinkServiceConnectionState().withStatus(PrivateLinkServiceConnectionStatus.REJECTED)
-                    .withDescription("oxgsgbpfgzdjtx")
-                    .withActionsRequired("flbqvgaq")),
-            new PrivateEndpointConnectionInner().withPrivateLinkServiceConnectionState(
-                new PrivateLinkServiceConnectionState().withStatus(PrivateLinkServiceConnectionStatus.REMOVED)
-                    .withDescription("ukuqgsj")
-                    .withActionsRequired("undxgketw")),
-            new PrivateEndpointConnectionInner().withPrivateLinkServiceConnectionState(
-                new PrivateLinkServiceConnectionState().withStatus(PrivateLinkServiceConnectionStatus.REMOVED)
-                    .withDescription("dyp")
-                    .withActionsRequired("yue"))));
+                    .withDescription("unzo")
+                    .withActionsRequired("dhcxgkmoy"))));
         model = BinaryData.fromObject(model).toObject(PrivateEndpointConnectionListResult.class);
         Assertions.assertEquals(PrivateLinkServiceConnectionStatus.REJECTED,
             model.value().get(0).privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("oxgsgbpfgzdjtx",
-            model.value().get(0).privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("flbqvgaq", model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("unzo", model.value().get(0).privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("dhcxgkmoy",
+            model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateMockTests.java
index 128954bfefce..2bd27dab82ae 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsCreateOrUpdateMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.PrivateEndpointConnection;
@@ -23,27 +23,27 @@ public final class PrivateEndpointConnectionsCreateOrUpdateMockTests {
     @Test
     public void testCreateOrUpdate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"sjybvitv\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"y\",\"actionsRequired\":\"nu\"},\"linkIdentifier\":\"ggmuwdcho\",\"provisioningState\":\"Succeeded\"},\"id\":\"fexl\",\"name\":\"xn\",\"type\":\"akizvoaikna\"}";
+            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"iswskuk\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"sbvw\",\"actionsRequired\":\"pkxkdtxfk\"},\"linkIdentifier\":\"lq\",\"provisioningState\":\"Succeeded\"},\"id\":\"nvgmmbugtywa\",\"name\":\"mqaqkueatgroes\",\"type\":\"oygzcbyfqxkfao\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateEndpointConnection response = manager.privateEndpointConnections()
-            .define("selpkpbaf")
-            .withExistingCluster("fbzkk", "tnhqsycl")
+            .define("gkzz")
+            .withExistingCluster("uusioycblev", "mclujyxkyxlzgs")
             .withPrivateLinkServiceConnectionState(
-                new PrivateLinkServiceConnectionState().withStatus(PrivateLinkServiceConnectionStatus.APPROVED)
-                    .withDescription("d")
-                    .withActionsRequired("rsofpltdbmairrh"))
+                new PrivateLinkServiceConnectionState().withStatus(PrivateLinkServiceConnectionStatus.REMOVED)
+                    .withDescription("pgvdwnapfdqw")
+                    .withActionsRequired("ftptnuwj"))
             .create();
 
-        Assertions.assertEquals(PrivateLinkServiceConnectionStatus.PENDING,
+        Assertions.assertEquals(PrivateLinkServiceConnectionStatus.REJECTED,
             response.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("y", response.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("nu", response.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("sbvw", response.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("pkxkdtxfk", response.privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteMockTests.java
index 6a15b48d2759..6e92c9f7bde2 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsDeleteMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,10 @@ public void testDelete() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.privateEndpointConnections().delete("zlex", "sfledyn", "jpziu", com.azure.core.util.Context.NONE);
+        manager.privateEndpointConnections()
+            .delete("dbrxmrgc", "bapxkiyfjjkb", "jbuscg", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
index f34608ddf5a9..20d9a89769e9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.PrivateEndpointConnection;
@@ -22,22 +22,22 @@ public final class PrivateEndpointConnectionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"wsrsxkrplbja\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"wwviyo\",\"actionsRequired\":\"suhbrnn\"},\"linkIdentifier\":\"xs\",\"provisioningState\":\"Failed\"},\"id\":\"qkbiwet\",\"name\":\"ozycy\",\"type\":\"iqyhgfse\"}";
+            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"zhomewjjstliu\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"wmoaiancznvodrrs\",\"actionsRequired\":\"lxydkxrxv\"},\"linkIdentifier\":\"xiwkgfbql\",\"provisioningState\":\"Deleting\"},\"id\":\"hychocokuleh\",\"name\":\"rqlrqffawe\",\"type\":\"urkphyjdxravju\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateEndpointConnection response = manager.privateEndpointConnections()
-            .getWithResponse("fz", "bfw", "rzx", com.azure.core.util.Context.NONE)
+            .getWithResponse("aqnvzoqgyipemchg", "v", "czuejdtxptl", com.azure.core.util.Context.NONE)
             .getValue();
 
         Assertions.assertEquals(PrivateLinkServiceConnectionStatus.PENDING,
             response.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("wwviyo", response.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("suhbrnn", response.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("wmoaiancznvodrrs", response.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("lxydkxrxv", response.privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterMockTests.java
index fc904a15d959..edd282476ba5 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateEndpointConnectionsListByClusterMockTests.java
@@ -7,8 +7,8 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.PrivateEndpointConnection;
@@ -23,23 +23,23 @@ public final class PrivateEndpointConnectionsListByClusterMockTests {
     @Test
     public void testListByCluster() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"knlejjjkxybwfd\"},\"privateLinkServiceConnectionState\":{\"status\":\"Removed\",\"description\":\"bztensvkzykjtj\",\"actionsRequired\":\"sxfwushcdp\"},\"linkIdentifier\":\"pn\",\"provisioningState\":\"Updating\"},\"id\":\"jfbp\",\"name\":\"uwxeoiojfizf\",\"type\":\"vkjzwfbcyaykm\"}]}";
+            = "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"bklqpxz\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"feddwwnlza\",\"actionsRequired\":\"xud\"},\"linkIdentifier\":\"hgookrtalvnbwgpb\",\"provisioningState\":\"Failed\"},\"id\":\"uclvdjj\",\"name\":\"kyrdnqodx\",\"type\":\"hhxhq\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        PagedIterable<PrivateEndpointConnection> response
-            = manager.privateEndpointConnections().listByCluster("ustcpoq", "avnwqj", com.azure.core.util.Context.NONE);
+        PagedIterable<PrivateEndpointConnection> response = manager.privateEndpointConnections()
+            .listByCluster("xzutgqztwhghmupg", "yjtcdxabbujftab", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals(PrivateLinkServiceConnectionStatus.REMOVED,
+        Assertions.assertEquals(PrivateLinkServiceConnectionStatus.REJECTED,
             response.iterator().next().privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("bztensvkzykjtj",
+        Assertions.assertEquals("feddwwnlza",
             response.iterator().next().privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("sxfwushcdp",
+        Assertions.assertEquals("xud",
             response.iterator().next().privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationPropertiesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationPropertiesTests.java
index d5bc717895cf..3281be81206e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationPropertiesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationPropertiesTests.java
@@ -20,7 +20,7 @@ public void testDeserialize() throws Exception {
             .toObject(PrivateLinkConfigurationProperties.class);
         Assertions.assertEquals("jzicwifsjt", model.groupId());
         Assertions.assertEquals("khaj", model.ipConfigurations().get(0).name());
-        Assertions.assertEquals(true, model.ipConfigurations().get(0).primary());
+        Assertions.assertTrue(model.ipConfigurations().get(0).primary());
         Assertions.assertEquals("honowkgshwank", model.ipConfigurations().get(0).privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.STATIC,
             model.ipConfigurations().get(0).privateIpAllocationMethod());
@@ -49,7 +49,7 @@ public void testSerialize() throws Exception {
         model = BinaryData.fromObject(model).toObject(PrivateLinkConfigurationProperties.class);
         Assertions.assertEquals("jzicwifsjt", model.groupId());
         Assertions.assertEquals("khaj", model.ipConfigurations().get(0).name());
-        Assertions.assertEquals(true, model.ipConfigurations().get(0).primary());
+        Assertions.assertTrue(model.ipConfigurations().get(0).primary());
         Assertions.assertEquals("honowkgshwank", model.ipConfigurations().get(0).privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.STATIC,
             model.ipConfigurations().get(0).privateIpAllocationMethod());
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationTests.java
index 9b6a400d4130..f1eb95eba876 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkConfigurationTests.java
@@ -21,7 +21,7 @@ public void testDeserialize() throws Exception {
         Assertions.assertEquals("xxjnspydptk", model.name());
         Assertions.assertEquals("udwtiukbl", model.groupId());
         Assertions.assertEquals("kgjn", model.ipConfigurations().get(0).name());
-        Assertions.assertEquals(false, model.ipConfigurations().get(0).primary());
+        Assertions.assertFalse(model.ipConfigurations().get(0).primary());
         Assertions.assertEquals("p", model.ipConfigurations().get(0).privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.DYNAMIC,
             model.ipConfigurations().get(0).privateIpAllocationMethod());
@@ -41,7 +41,7 @@ public void testSerialize() throws Exception {
         Assertions.assertEquals("xxjnspydptk", model.name());
         Assertions.assertEquals("udwtiukbl", model.groupId());
         Assertions.assertEquals("kgjn", model.ipConfigurations().get(0).name());
-        Assertions.assertEquals(false, model.ipConfigurations().get(0).primary());
+        Assertions.assertFalse(model.ipConfigurations().get(0).primary());
         Assertions.assertEquals("p", model.ipConfigurations().get(0).privateIpAddress());
         Assertions.assertEquals(PrivateIpAllocationMethod.DYNAMIC,
             model.ipConfigurations().get(0).privateIpAllocationMethod());
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceInnerTests.java
index 5a1312d8a4f6..480c10b3502a 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceInnerTests.java
@@ -13,16 +13,16 @@ public final class PrivateLinkResourceInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkResourceInner model = BinaryData.fromString(
-            "{\"properties\":{\"groupId\":\"ahhvjhhna\",\"requiredMembers\":[\"bbjjidjksyxk\",\"xvxevblbjednljla\",\"euaulxu\"],\"requiredZoneNames\":[\"jbnkpp\",\"ynenlsvxeizz\"]},\"id\":\"klnsrmffey\",\"name\":\"xcktpiymerteeamm\",\"type\":\"qiekkkzddrt\"}")
+            "{\"properties\":{\"groupId\":\"ogfnzjvusf\",\"requiredMembers\":[\"mozuxylfsb\",\"kadpysown\"],\"requiredZoneNames\":[\"kb\",\"grjqctojcmi\",\"of\"]},\"id\":\"ypefojyqdhcupl\",\"name\":\"plcwkhi\",\"type\":\"ihlhzdsqtzb\"}")
             .toObject(PrivateLinkResourceInner.class);
-        Assertions.assertEquals("jbnkpp", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("kb", model.requiredZoneNames().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         PrivateLinkResourceInner model
-            = new PrivateLinkResourceInner().withRequiredZoneNames(Arrays.asList("jbnkpp", "ynenlsvxeizz"));
+            = new PrivateLinkResourceInner().withRequiredZoneNames(Arrays.asList("kb", "grjqctojcmi", "of"));
         model = BinaryData.fromObject(model).toObject(PrivateLinkResourceInner.class);
-        Assertions.assertEquals("jbnkpp", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("kb", model.requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceListResultInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceListResultInnerTests.java
index e5cfa69a8f92..9087da11df57 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceListResultInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourceListResultInnerTests.java
@@ -14,18 +14,16 @@ public final class PrivateLinkResourceListResultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkResourceListResultInner model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"groupId\":\"vk\",\"requiredMembers\":[\"zunbixx\",\"ti\",\"vcpwpgclrc\",\"vtsoxf\"],\"requiredZoneNames\":[\"nxpmyyefrpmpdnq\",\"skawaoqvmmb\",\"pqfrtqlkz\"]},\"id\":\"gnitgvkxlzyq\",\"name\":\"rfe\",\"type\":\"cealzxwh\"},{\"properties\":{\"groupId\":\"symoyq\",\"requiredMembers\":[\"igdivbkbxg\",\"mf\"],\"requiredZoneNames\":[\"wasqvdaeyyg\",\"xakjsqzhzb\"]},\"id\":\"kgimsidxasic\",\"name\":\"dyvvjskgfmocwahp\",\"type\":\"gat\"}]}")
+            "{\"value\":[{\"properties\":{\"groupId\":\"xilcbtgnhnzey\",\"requiredMembers\":[\"jjfzqlqhycavo\"],\"requiredZoneNames\":[\"xdbeesmieknl\",\"ariaawi\",\"agy\"]},\"id\":\"qfby\",\"name\":\"yr\",\"type\":\"giagtcojo\"}]}")
             .toObject(PrivateLinkResourceListResultInner.class);
-        Assertions.assertEquals("nxpmyyefrpmpdnq", model.value().get(0).requiredZoneNames().get(0));
+        Assertions.assertEquals("xdbeesmieknl", model.value().get(0).requiredZoneNames().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         PrivateLinkResourceListResultInner model = new PrivateLinkResourceListResultInner().withValue(Arrays.asList(
-            new PrivateLinkResourceInner()
-                .withRequiredZoneNames(Arrays.asList("nxpmyyefrpmpdnq", "skawaoqvmmb", "pqfrtqlkz")),
-            new PrivateLinkResourceInner().withRequiredZoneNames(Arrays.asList("wasqvdaeyyg", "xakjsqzhzb"))));
+            new PrivateLinkResourceInner().withRequiredZoneNames(Arrays.asList("xdbeesmieknl", "ariaawi", "agy"))));
         model = BinaryData.fromObject(model).toObject(PrivateLinkResourceListResultInner.class);
-        Assertions.assertEquals("nxpmyyefrpmpdnq", model.value().get(0).requiredZoneNames().get(0));
+        Assertions.assertEquals("xdbeesmieknl", model.value().get(0).requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcePropertiesTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcePropertiesTests.java
index a1021a0fff47..7c44a52967a9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcePropertiesTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcePropertiesTests.java
@@ -13,16 +13,16 @@ public final class PrivateLinkResourcePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkResourceProperties model = BinaryData.fromString(
-            "{\"groupId\":\"doj\",\"requiredMembers\":[\"vavrefdees\"],\"requiredZoneNames\":[\"uij\",\"xtxsuwprtujw\"]}")
+            "{\"groupId\":\"gnowcjhfgmveca\",\"requiredMembers\":[\"mwotey\",\"wcluqovekqvgq\",\"uwifzmpjwyiv\",\"ikf\"],\"requiredZoneNames\":[\"hrfsphuagrtti\",\"teusqczkvyklxu\",\"yja\"]}")
             .toObject(PrivateLinkResourceProperties.class);
-        Assertions.assertEquals("uij", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("hrfsphuagrtti", model.requiredZoneNames().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PrivateLinkResourceProperties model
-            = new PrivateLinkResourceProperties().withRequiredZoneNames(Arrays.asList("uij", "xtxsuwprtujw"));
+        PrivateLinkResourceProperties model = new PrivateLinkResourceProperties()
+            .withRequiredZoneNames(Arrays.asList("hrfsphuagrtti", "teusqczkvyklxu", "yja"));
         model = BinaryData.fromObject(model).toObject(PrivateLinkResourceProperties.class);
-        Assertions.assertEquals("uij", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("hrfsphuagrtti", model.requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetWithResponseMockTests.java
index 754ea73195f5..2886d5886b10 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesGetWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.PrivateLinkResource;
@@ -21,19 +21,19 @@ public final class PrivateLinkResourcesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"groupId\":\"xeg\",\"requiredMembers\":[\"rtudawlpjfel\",\"erppt\",\"bgqnz\",\"nhii\"],\"requiredZoneNames\":[\"lwcjgckbbcccgzpr\",\"oxnyuffatsg\",\"tipwcxbyubhiqd\"]},\"id\":\"urnpnuhzafccnuh\",\"name\":\"i\",\"type\":\"byl\"}";
+            = "{\"properties\":{\"groupId\":\"ssmzhhkuui\",\"requiredMembers\":[\"q\"],\"requiredZoneNames\":[\"ekvalblhtjq\",\"qyv\"]},\"id\":\"hta\",\"name\":\"mxhzzysevus\",\"type\":\"ivzrrryveimipsk\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateLinkResource response = manager.privateLinkResources()
-            .getWithResponse("bizt", "ofqcvovjufycsjm", "bemyeji", com.azure.core.util.Context.NONE)
+            .getWithResponse("hzr", "qalsxkd", "wqapfgsdp", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("lwcjgckbbcccgzpr", response.requiredZoneNames().get(0));
+        Assertions.assertEquals("ekvalblhtjq", response.requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterWithResponseMockTests.java
index d16feeeb3afe..c1aae57fd80f 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/PrivateLinkResourcesListByClusterWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.PrivateLinkResourceListResult;
@@ -21,19 +21,19 @@ public final class PrivateLinkResourcesListByClusterWithResponseMockTests {
     @Test
     public void testListByClusterWithResponse() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"groupId\":\"pejtl\",\"requiredMembers\":[\"aonwivkcqhrxh\",\"knlccrmmkyup\",\"jubyqjfkakfq\"],\"requiredZoneNames\":[\"em\",\"il\"]},\"id\":\"dxjascowvfdj\",\"name\":\"pdxphlkksnmgzvyf\",\"type\":\"jd\"},{\"properties\":{\"groupId\":\"qnwsithuqolyah\",\"requiredMembers\":[\"wqulsutrjbhxykf\",\"y\"],\"requiredZoneNames\":[\"vqqugdrftbcv\",\"xreuquowtlj\",\"fwhreagkhyxv\",\"qtvbczsu\"]},\"id\":\"dgglmepjpfs\",\"name\":\"ykgsangpszng\",\"type\":\"fpgylkve\"},{\"properties\":{\"groupId\":\"jcngoadyed\",\"requiredMembers\":[\"gjfoknubnoitpkpz\",\"rgdg\",\"vcoqraswugyxpqi\"],\"requiredZoneNames\":[\"ialwv\",\"kbuhzaca\",\"ty\"]},\"id\":\"co\",\"name\":\"cujp\",\"type\":\"sxzakuejkm\"}]}";
+            = "{\"value\":[{\"properties\":{\"groupId\":\"dljdjuskb\",\"requiredMembers\":[\"qyn\"],\"requiredZoneNames\":[\"ysfaqegplwrysh\",\"ddkvbxgkqu\",\"ybwptda\"]},\"id\":\"rvv\",\"name\":\"f\",\"type\":\"tymtpoiwenazer\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateLinkResourceListResult response = manager.privateLinkResources()
-            .listByClusterWithResponse("lnuwiguy", "lykwphvxz", com.azure.core.util.Context.NONE)
+            .listByClusterWithResponse("tehqpuvjmvq", "tdwckygr", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("em", response.value().get(0).requiredZoneNames().get(0));
+        Assertions.assertEquals("ysfaqegplwrysh", response.value().get(0).requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/QuotaCapabilityTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/QuotaCapabilityTests.java
index 830af79278b2..2269f56bb59c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/QuotaCapabilityTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/QuotaCapabilityTests.java
@@ -14,31 +14,37 @@ public final class QuotaCapabilityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         QuotaCapability model = BinaryData.fromString(
-            "{\"coresUsed\":3612110443400649371,\"maxCoresAllowed\":137695562924143561,\"regionalQuotas\":[{\"regionName\":\"qlgkfbtn\",\"coresUsed\":6879764245530477433,\"coresAvailable\":6187820984312370265},{\"regionName\":\"cn\",\"coresUsed\":5913508679242564666,\"coresAvailable\":456815432362653733}]}")
+            "{\"coresUsed\":5312783206880341268,\"maxCoresAllowed\":6849457451153472340,\"regionalQuotas\":[{\"regionName\":\"yvpnqicvinvkjj\",\"coresUsed\":2589593210312984687,\"coresAvailable\":4841685687030485565},{\"regionName\":\"zclewyhmlw\",\"coresUsed\":4550643593085904235,\"coresAvailable\":7583753681353365970},{\"regionName\":\"ncckw\",\"coresUsed\":8886702787587006414,\"coresAvailable\":3042520873756069098},{\"regionName\":\"buy\",\"coresUsed\":3879488324332332971,\"coresAvailable\":3336688530797945721}]}")
             .toObject(QuotaCapability.class);
-        Assertions.assertEquals(3612110443400649371L, model.coresUsed());
-        Assertions.assertEquals(137695562924143561L, model.maxCoresAllowed());
-        Assertions.assertEquals("qlgkfbtn", model.regionalQuotas().get(0).regionName());
-        Assertions.assertEquals(6879764245530477433L, model.regionalQuotas().get(0).coresUsed());
-        Assertions.assertEquals(6187820984312370265L, model.regionalQuotas().get(0).coresAvailable());
+        Assertions.assertEquals(5312783206880341268L, model.coresUsed());
+        Assertions.assertEquals(6849457451153472340L, model.maxCoresAllowed());
+        Assertions.assertEquals("yvpnqicvinvkjj", model.regionalQuotas().get(0).regionName());
+        Assertions.assertEquals(2589593210312984687L, model.regionalQuotas().get(0).coresUsed());
+        Assertions.assertEquals(4841685687030485565L, model.regionalQuotas().get(0).coresAvailable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        QuotaCapability model = new QuotaCapability().withCoresUsed(3612110443400649371L)
-            .withMaxCoresAllowed(137695562924143561L)
+        QuotaCapability model = new QuotaCapability().withCoresUsed(5312783206880341268L)
+            .withMaxCoresAllowed(6849457451153472340L)
             .withRegionalQuotas(Arrays.asList(
-                new RegionalQuotaCapability().withRegionName("qlgkfbtn")
-                    .withCoresUsed(6879764245530477433L)
-                    .withCoresAvailable(6187820984312370265L),
-                new RegionalQuotaCapability().withRegionName("cn")
-                    .withCoresUsed(5913508679242564666L)
-                    .withCoresAvailable(456815432362653733L)));
+                new RegionalQuotaCapability().withRegionName("yvpnqicvinvkjj")
+                    .withCoresUsed(2589593210312984687L)
+                    .withCoresAvailable(4841685687030485565L),
+                new RegionalQuotaCapability().withRegionName("zclewyhmlw")
+                    .withCoresUsed(4550643593085904235L)
+                    .withCoresAvailable(7583753681353365970L),
+                new RegionalQuotaCapability().withRegionName("ncckw")
+                    .withCoresUsed(8886702787587006414L)
+                    .withCoresAvailable(3042520873756069098L),
+                new RegionalQuotaCapability().withRegionName("buy")
+                    .withCoresUsed(3879488324332332971L)
+                    .withCoresAvailable(3336688530797945721L)));
         model = BinaryData.fromObject(model).toObject(QuotaCapability.class);
-        Assertions.assertEquals(3612110443400649371L, model.coresUsed());
-        Assertions.assertEquals(137695562924143561L, model.maxCoresAllowed());
-        Assertions.assertEquals("qlgkfbtn", model.regionalQuotas().get(0).regionName());
-        Assertions.assertEquals(6879764245530477433L, model.regionalQuotas().get(0).coresUsed());
-        Assertions.assertEquals(6187820984312370265L, model.regionalQuotas().get(0).coresAvailable());
+        Assertions.assertEquals(5312783206880341268L, model.coresUsed());
+        Assertions.assertEquals(6849457451153472340L, model.maxCoresAllowed());
+        Assertions.assertEquals("yvpnqicvinvkjj", model.regionalQuotas().get(0).regionName());
+        Assertions.assertEquals(2589593210312984687L, model.regionalQuotas().get(0).coresUsed());
+        Assertions.assertEquals(4841685687030485565L, model.regionalQuotas().get(0).coresAvailable());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionalQuotaCapabilityTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionalQuotaCapabilityTests.java
index 5b06153b81c8..934519101bbb 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionalQuotaCapabilityTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionalQuotaCapabilityTests.java
@@ -13,21 +13,21 @@ public final class RegionalQuotaCapabilityTests {
     public void testDeserialize() throws Exception {
         RegionalQuotaCapability model = BinaryData
             .fromString(
-                "{\"regionName\":\"df\",\"coresUsed\":537247289030713733,\"coresAvailable\":4579200553418378126}")
+                "{\"regionName\":\"tpp\",\"coresUsed\":344862766670091820,\"coresAvailable\":1768663983323478544}")
             .toObject(RegionalQuotaCapability.class);
-        Assertions.assertEquals("df", model.regionName());
-        Assertions.assertEquals(537247289030713733L, model.coresUsed());
-        Assertions.assertEquals(4579200553418378126L, model.coresAvailable());
+        Assertions.assertEquals("tpp", model.regionName());
+        Assertions.assertEquals(344862766670091820L, model.coresUsed());
+        Assertions.assertEquals(1768663983323478544L, model.coresAvailable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RegionalQuotaCapability model = new RegionalQuotaCapability().withRegionName("df")
-            .withCoresUsed(537247289030713733L)
-            .withCoresAvailable(4579200553418378126L);
+        RegionalQuotaCapability model = new RegionalQuotaCapability().withRegionName("tpp")
+            .withCoresUsed(344862766670091820L)
+            .withCoresAvailable(1768663983323478544L);
         model = BinaryData.fromObject(model).toObject(RegionalQuotaCapability.class);
-        Assertions.assertEquals("df", model.regionName());
-        Assertions.assertEquals(537247289030713733L, model.coresUsed());
-        Assertions.assertEquals(4579200553418378126L, model.coresAvailable());
+        Assertions.assertEquals("tpp", model.regionName());
+        Assertions.assertEquals(344862766670091820L, model.coresUsed());
+        Assertions.assertEquals(1768663983323478544L, model.coresAvailable());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionsCapabilityTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionsCapabilityTests.java
index c2d863fa36dc..6c053e8b597a 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionsCapabilityTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RegionsCapabilityTests.java
@@ -12,15 +12,15 @@
 public final class RegionsCapabilityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        RegionsCapability model = BinaryData.fromString("{\"available\":[\"dmovsm\",\"l\",\"wabm\",\"oefki\"]}")
+        RegionsCapability model = BinaryData.fromString("{\"available\":[\"nsj\",\"r\",\"tiagx\",\"dszue\"]}")
             .toObject(RegionsCapability.class);
-        Assertions.assertEquals("dmovsm", model.available().get(0));
+        Assertions.assertEquals("nsj", model.available().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RegionsCapability model = new RegionsCapability().withAvailable(Arrays.asList("dmovsm", "l", "wabm", "oefki"));
+        RegionsCapability model = new RegionsCapability().withAvailable(Arrays.asList("nsj", "r", "tiagx", "dszue"));
         model = BinaryData.fromObject(model).toObject(RegionsCapability.class);
-        Assertions.assertEquals("dmovsm", model.available().get(0));
+        Assertions.assertEquals("nsj", model.available().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RuntimeScriptActionDetailInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RuntimeScriptActionDetailInnerTests.java
index dda8a1364b22..77d9179dc1f4 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RuntimeScriptActionDetailInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/RuntimeScriptActionDetailInnerTests.java
@@ -13,24 +13,24 @@ public final class RuntimeScriptActionDetailInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RuntimeScriptActionDetailInner model = BinaryData.fromString(
-            "{\"scriptExecutionId\":1138155605453758000,\"startTime\":\"pmjerbdkelvidiz\",\"endTime\":\"sdbccxjmonfdgnwn\",\"status\":\"puuw\",\"operation\":\"tvuqjctzenkeifzz\",\"executionSummary\":[{\"status\":\"as\",\"instanceCount\":897576014},{\"status\":\"hbxcu\",\"instanceCount\":995133757},{\"status\":\"gsrboldforobw\",\"instanceCount\":2116230034},{\"status\":\"zbfhfovvac\",\"instanceCount\":1350154839}],\"debugInformation\":\"uodxesza\",\"name\":\"belawumuaslzkwr\",\"uri\":\"woycqucwyha\",\"parameters\":\"omd\",\"roles\":[\"ywuhpsvfuur\",\"tlwexxwlalniexz\",\"rzpgep\"],\"applicationName\":\"yb\"}")
+            "{\"scriptExecutionId\":7186783444328616687,\"startTime\":\"jednlj\",\"endTime\":\"geuaulx\",\"status\":\"smjbnkppxyn\",\"operation\":\"lsvxeizz\",\"executionSummary\":[{\"status\":\"nsrmffeycx\",\"instanceCount\":750514021},{\"status\":\"iymerteeammxqi\",\"instanceCount\":1876834385},{\"status\":\"zddrt\",\"instanceCount\":550978856}],\"debugInformation\":\"jbmxvavre\",\"name\":\"de\",\"uri\":\"svecuijpxtxs\",\"parameters\":\"prtujwsawdd\",\"roles\":[\"babxvitit\",\"tzeexav\",\"xtfglecdmdqb\",\"pypqtgsfj\"],\"applicationName\":\"b\"}")
             .toObject(RuntimeScriptActionDetailInner.class);
-        Assertions.assertEquals("belawumuaslzkwr", model.name());
-        Assertions.assertEquals("woycqucwyha", model.uri());
-        Assertions.assertEquals("omd", model.parameters());
-        Assertions.assertEquals("ywuhpsvfuur", model.roles().get(0));
+        Assertions.assertEquals("de", model.name());
+        Assertions.assertEquals("svecuijpxtxs", model.uri());
+        Assertions.assertEquals("prtujwsawdd", model.parameters());
+        Assertions.assertEquals("babxvitit", model.roles().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RuntimeScriptActionDetailInner model = new RuntimeScriptActionDetailInner().withName("belawumuaslzkwr")
-            .withUri("woycqucwyha")
-            .withParameters("omd")
-            .withRoles(Arrays.asList("ywuhpsvfuur", "tlwexxwlalniexz", "rzpgep"));
+        RuntimeScriptActionDetailInner model = new RuntimeScriptActionDetailInner().withName("de")
+            .withUri("svecuijpxtxs")
+            .withParameters("prtujwsawdd")
+            .withRoles(Arrays.asList("babxvitit", "tzeexav", "xtfglecdmdqb", "pypqtgsfj"));
         model = BinaryData.fromObject(model).toObject(RuntimeScriptActionDetailInner.class);
-        Assertions.assertEquals("belawumuaslzkwr", model.name());
-        Assertions.assertEquals("woycqucwyha", model.uri());
-        Assertions.assertEquals("omd", model.parameters());
-        Assertions.assertEquals("ywuhpsvfuur", model.roles().get(0));
+        Assertions.assertEquals("de", model.name());
+        Assertions.assertEquals("svecuijpxtxs", model.uri());
+        Assertions.assertEquals("prtujwsawdd", model.parameters());
+        Assertions.assertEquals("babxvitit", model.roles().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionHistoryListTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionHistoryListTests.java
index ffa0ed0ef78a..3b9ad39d6c04 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionHistoryListTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionHistoryListTests.java
@@ -11,7 +11,7 @@ public final class ScriptActionExecutionHistoryListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ScriptActionExecutionHistoryList model = BinaryData.fromString(
-            "{\"value\":[{\"scriptExecutionId\":7238089424205548916,\"startTime\":\"nrkcxkj\",\"endTime\":\"nxm\",\"status\":\"uxswqrntvl\",\"operation\":\"jpsttexoq\",\"executionSummary\":[{\"status\":\"yyufmhruncuw\",\"instanceCount\":2077646980},{\"status\":\"kcdqzhlct\",\"instanceCount\":1266865634},{\"status\":\"qn\",\"instanceCount\":981773620},{\"status\":\"chrqb\",\"instanceCount\":1026325475}],\"debugInformation\":\"cgegydcwbo\",\"name\":\"jumvqqolihrraio\",\"uri\":\"aubrjtloq\",\"parameters\":\"uojrngiflr\",\"roles\":[\"asccbiui\",\"zdlyjdfqw\"],\"applicationName\":\"yoqufdvruz\"}],\"nextLink\":\"zojhpctfnmd\"}")
+            "{\"value\":[{\"scriptExecutionId\":3476105471330074630,\"startTime\":\"irudh\",\"endTime\":\"mes\",\"status\":\"dlpagzrcxfail\",\"operation\":\"xwmdboxd\",\"executionSummary\":[{\"status\":\"tufqobrjlnacgc\",\"instanceCount\":682130924},{\"status\":\"hxkizvytnrzv\",\"instanceCount\":1424631675},{\"status\":\"aaeranokqgukk\",\"instanceCount\":531608748},{\"status\":\"broyla\",\"instanceCount\":271109823}],\"debugInformation\":\"cdisd\",\"name\":\"sfjbjsvg\",\"uri\":\"rwhryvycytd\",\"parameters\":\"xgccknfnw\",\"roles\":[\"tmvpdvjdhtt\",\"a\",\"fedxihchrphkm\",\"rjdqnsdfzp\"],\"applicationName\":\"tg\"}],\"nextLink\":\"lkdghr\"}")
             .toObject(ScriptActionExecutionHistoryList.class);
     }
 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionSummaryTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionSummaryTests.java
index 4596154ff3ed..af54823dfc36 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionSummaryTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionExecutionSummaryTests.java
@@ -11,7 +11,7 @@ public final class ScriptActionExecutionSummaryTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ScriptActionExecutionSummary model
-            = BinaryData.fromString("{\"status\":\"wpgdak\",\"instanceCount\":1202587998}")
+            = BinaryData.fromString("{\"status\":\"hhxud\",\"instanceCount\":1368673691}")
                 .toObject(ScriptActionExecutionSummary.class);
     }
 
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteWithResponseMockTests.java
index f93d4d6315d7..08d2349ba14a 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsDeleteWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,10 @@ public void testDeleteWithResponse() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.scriptActions().deleteWithResponse("ui", "vxva", "vcrk", com.azure.core.util.Context.NONE);
+        manager.scriptActions()
+            .deleteWithResponse("yzatvfuzkaft", "vvruxwi", "syeipqd", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailWithResponseMockTests.java
index 3272d770f68b..79bd8be9d265 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsGetExecutionDetailWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.RuntimeScriptActionDetail;
@@ -21,22 +21,22 @@ public final class ScriptActionsGetExecutionDetailWithResponseMockTests {
     @Test
     public void testGetExecutionDetailWithResponse() throws Exception {
         String responseStr
-            = "{\"scriptExecutionId\":3671581328871244489,\"startTime\":\"atbwbqam\",\"endTime\":\"uliyslpkcv\",\"status\":\"f\",\"operation\":\"xxe\",\"executionSummary\":[{\"status\":\"bormcqmiciijqpkz\",\"instanceCount\":1276736582}],\"debugInformation\":\"xjmcsmyqwixvcpw\",\"name\":\"kwywzwofalic\",\"uri\":\"duoiqt\",\"parameters\":\"t\",\"roles\":[\"sknxrwzawnvsbcf\",\"zagxnvhycvdi\",\"wrzregzgyufu\"],\"applicationName\":\"wpwerye\"}";
+            = "{\"scriptExecutionId\":1560135897050065266,\"startTime\":\"rmgjfbpkuwx\",\"endTime\":\"iojfizfavkjzwfbc\",\"status\":\"y\",\"operation\":\"mfzsbf\",\"executionSummary\":[{\"status\":\"xmdewsrsxkrplbj\",\"instanceCount\":785597151}],\"debugInformation\":\"wwviyo\",\"name\":\"ps\",\"uri\":\"hbrnnhjx\",\"parameters\":\"wjh\",\"roles\":[\"biwetpo\",\"ycyqiqyhgfsetzl\",\"xbsfledynoj\"],\"applicationName\":\"iuwfbzkkdtnhqsy\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         RuntimeScriptActionDetail response = manager.scriptActions()
-            .getExecutionDetailWithResponse("yzjdnrqjbt", "jeaoqaqbz", "yh", com.azure.core.util.Context.NONE)
+            .getExecutionDetailWithResponse("vkzykjtjknsxf", "us", "cdp", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("kwywzwofalic", response.name());
-        Assertions.assertEquals("duoiqt", response.uri());
-        Assertions.assertEquals("t", response.parameters());
-        Assertions.assertEquals("sknxrwzawnvsbcf", response.roles().get(0));
+        Assertions.assertEquals("ps", response.name());
+        Assertions.assertEquals("hbrnnhjx", response.uri());
+        Assertions.assertEquals("wjh", response.parameters());
+        Assertions.assertEquals("biwetpo", response.roles().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterMockTests.java
index 28ac489edfea..8988ad16aa30 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListByClusterMockTests.java
@@ -7,8 +7,8 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.RuntimeScriptActionDetail;
@@ -22,21 +22,21 @@ public final class ScriptActionsListByClusterMockTests {
     @Test
     public void testListByCluster() throws Exception {
         String responseStr
-            = "{\"value\":[{\"scriptExecutionId\":2665247310105497195,\"startTime\":\"xaeaovurexdnds\",\"endTime\":\"weaderzm\",\"status\":\"t\",\"operation\":\"agttm\",\"executionSummary\":[{\"status\":\"goaqylkjztj\",\"instanceCount\":1339575917},{\"status\":\"jcg\",\"instanceCount\":556812746},{\"status\":\"pfinzcpdltkrlg\",\"instanceCount\":408763108}],\"debugInformation\":\"drvcqguef\",\"name\":\"hompheqdurelyu\",\"uri\":\"lf\",\"parameters\":\"u\",\"roles\":[\"ckyeclcdigpta\",\"brzmqxucycijoclx\"],\"applicationName\":\"tgjcy\"}]}";
+            = "{\"value\":[{\"scriptExecutionId\":5649221545528057651,\"startTime\":\"aedorvvmqf\",\"endTime\":\"ygbdgwumgxdgdhpa\",\"status\":\"dexjddvjs\",\"operation\":\"wotmmwllcolsrsxa\",\"executionSummary\":[{\"status\":\"hexcgjokj\",\"instanceCount\":308186783}],\"debugInformation\":\"v\",\"name\":\"qjbek\",\"uri\":\"eeksnbksdqhjvyk\",\"parameters\":\"eslk\",\"roles\":[\"ustcpoq\",\"avnwqj\",\"g\",\"knlejjjkxybwfd\"],\"applicationName\":\"jbzten\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<RuntimeScriptActionDetail> response
-            = manager.scriptActions().listByCluster("lbnb", "xvhcs", com.azure.core.util.Context.NONE);
+            = manager.scriptActions().listByCluster("mjtgrqg", "gkkileplkcsmkn", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("hompheqdurelyu", response.iterator().next().name());
-        Assertions.assertEquals("lf", response.iterator().next().uri());
-        Assertions.assertEquals("u", response.iterator().next().parameters());
-        Assertions.assertEquals("ckyeclcdigpta", response.iterator().next().roles().get(0));
+        Assertions.assertEquals("qjbek", response.iterator().next().name());
+        Assertions.assertEquals("eeksnbksdqhjvyk", response.iterator().next().uri());
+        Assertions.assertEquals("eslk", response.iterator().next().parameters());
+        Assertions.assertEquals("ustcpoq", response.iterator().next().roles().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListTests.java
index e34378721246..cffdcf36b468 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptActionsListTests.java
@@ -14,37 +14,33 @@ public final class ScriptActionsListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ScriptActionsList model = BinaryData.fromString(
-            "{\"value\":[{\"scriptExecutionId\":1563332735084443990,\"startTime\":\"ft\",\"endTime\":\"qobr\",\"status\":\"nac\",\"operation\":\"ckknhxkizvy\",\"executionSummary\":[{\"status\":\"vuljraaeranokqg\",\"instanceCount\":578630229},{\"status\":\"qnvb\",\"instanceCount\":387687877}],\"debugInformation\":\"a\",\"name\":\"xulcdisdos\",\"uri\":\"jbjsvgjrwh\",\"parameters\":\"vyc\",\"roles\":[\"dclxgc\"],\"applicationName\":\"nfnw\"},{\"scriptExecutionId\":3132711740281855287,\"startTime\":\"pdvjdhttzaefedx\",\"endTime\":\"ch\",\"status\":\"hk\",\"operation\":\"rjdqnsdfzp\",\"executionSummary\":[{\"status\":\"kylkdghrj\",\"instanceCount\":852383444}],\"debugInformation\":\"lwxezwzhokvbwnh\",\"name\":\"tqlgehgppi\",\"uri\":\"ifhpf\",\"parameters\":\"ajvgcxtxjcsheafi\",\"roles\":[\"tugsresmkssjh\",\"iftxfkf\",\"egprhptil\",\"ucb\"],\"applicationName\":\"tgdqohmcwsldriz\"},{\"scriptExecutionId\":7692206600451693142,\"startTime\":\"ralllibphb\",\"endTime\":\"mizak\",\"status\":\"ankjpdnjzh\",\"operation\":\"oylhjlmuoyxprimr\",\"executionSummary\":[{\"status\":\"eecjmeis\",\"instanceCount\":1157129881},{\"status\":\"asylwx\",\"instanceCount\":1212726658}],\"debugInformation\":\"mweoohgu\",\"name\":\"fuzboyjathwtzolb\",\"uri\":\"emwmdxmebwjs\",\"parameters\":\"p\",\"roles\":[\"lxveabfqx\",\"mwmqtibx\"],\"applicationName\":\"jddtvqct\"},{\"scriptExecutionId\":3995165957523237174,\"startTime\":\"aeukm\",\"endTime\":\"ieekpndzaa\",\"status\":\"udqmeqwigpibudq\",\"operation\":\"xebeybpmz\",\"executionSummary\":[{\"status\":\"ff\",\"instanceCount\":1447322372},{\"status\":\"tmhheioqa\",\"instanceCount\":170135486},{\"status\":\"eufuqyrxpdlcgql\",\"instanceCount\":732264201}],\"debugInformation\":\"jqfrddgamquh\",\"name\":\"os\",\"uri\":\"sjuivfcdisyir\",\"parameters\":\"zhczexrxzbujrtrh\",\"roles\":[\"wrevkhgnlnzon\",\"lrpiqywnc\",\"jtszcof\",\"zehtdhgb\"],\"applicationName\":\"vreljea\"}],\"nextLink\":\"rvzmlovuana\"}")
+            "{\"value\":[{\"scriptExecutionId\":4537390280349564977,\"startTime\":\"vxcjzhqizxfpxtgq\",\"endTime\":\"javftjuhdqa\",\"status\":\"mtggu\",\"operation\":\"ijr\",\"executionSummary\":[{\"status\":\"vmmghfcfiwrxgk\",\"instanceCount\":1596697892},{\"status\":\"yinzqodfvpgs\",\"instanceCount\":1015474593}],\"debugInformation\":\"sgbpfgzdjtx\",\"name\":\"zflbqvg\",\"uri\":\"qvlgafcqusrdvetn\",\"parameters\":\"dtutnwldu\",\"roles\":[\"vuzhyr\",\"ewipm\",\"ekdxuku\",\"gsjj\"],\"applicationName\":\"n\"},{\"scriptExecutionId\":3831840091585839661,\"startTime\":\"twzhhzjhfjmhv\",\"endTime\":\"uvgp\",\"status\":\"neqsxvmh\",\"operation\":\"uzjyihsasbhudypo\",\"executionSummary\":[{\"status\":\"ms\",\"instanceCount\":1558457912},{\"status\":\"qyrp\",\"instanceCount\":1551193152}],\"debugInformation\":\"rlttymsjnygqdnfw\",\"name\":\"zdzgtilaxhnfhqly\",\"uri\":\"ijouwivkxoyzunb\",\"parameters\":\"xrtikvcpwpgclr\",\"roles\":[\"vtsoxf\",\"kenx\",\"m\",\"yefrpmpdnqqska\"],\"applicationName\":\"oqvm\"},{\"scriptExecutionId\":5088928325379042418,\"startTime\":\"fr\",\"endTime\":\"lkzmegnitgvkxl\",\"status\":\"qdrfegcealzxwhc\",\"operation\":\"symoyq\",\"executionSummary\":[{\"status\":\"gdivbkbxg\",\"instanceCount\":1748093072},{\"status\":\"juwasqvdaeyyguxa\",\"instanceCount\":411771042}],\"debugInformation\":\"zhzbezkgimsi\",\"name\":\"xasicddyvvjskg\",\"uri\":\"mocwa\",\"parameters\":\"qgatjeaahhvjhhn\",\"roles\":[\"zybbj\"],\"applicationName\":\"dj\"}],\"nextLink\":\"yxkyxvx\"}")
             .toObject(ScriptActionsList.class);
-        Assertions.assertEquals("xulcdisdos", model.value().get(0).name());
-        Assertions.assertEquals("jbjsvgjrwh", model.value().get(0).uri());
-        Assertions.assertEquals("vyc", model.value().get(0).parameters());
-        Assertions.assertEquals("dclxgc", model.value().get(0).roles().get(0));
+        Assertions.assertEquals("zflbqvg", model.value().get(0).name());
+        Assertions.assertEquals("qvlgafcqusrdvetn", model.value().get(0).uri());
+        Assertions.assertEquals("dtutnwldu", model.value().get(0).parameters());
+        Assertions.assertEquals("vuzhyr", model.value().get(0).roles().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ScriptActionsList model = new ScriptActionsList().withValue(Arrays.asList(
-            new RuntimeScriptActionDetailInner().withName("xulcdisdos")
-                .withUri("jbjsvgjrwh")
-                .withParameters("vyc")
-                .withRoles(Arrays.asList("dclxgc")),
-            new RuntimeScriptActionDetailInner().withName("tqlgehgppi")
-                .withUri("ifhpf")
-                .withParameters("ajvgcxtxjcsheafi")
-                .withRoles(Arrays.asList("tugsresmkssjh", "iftxfkf", "egprhptil", "ucb")),
-            new RuntimeScriptActionDetailInner().withName("fuzboyjathwtzolb")
-                .withUri("emwmdxmebwjs")
-                .withParameters("p")
-                .withRoles(Arrays.asList("lxveabfqx", "mwmqtibx")),
-            new RuntimeScriptActionDetailInner().withName("os")
-                .withUri("sjuivfcdisyir")
-                .withParameters("zhczexrxzbujrtrh")
-                .withRoles(Arrays.asList("wrevkhgnlnzon", "lrpiqywnc", "jtszcof", "zehtdhgb"))));
+            new RuntimeScriptActionDetailInner().withName("zflbqvg")
+                .withUri("qvlgafcqusrdvetn")
+                .withParameters("dtutnwldu")
+                .withRoles(Arrays.asList("vuzhyr", "ewipm", "ekdxuku", "gsjj")),
+            new RuntimeScriptActionDetailInner().withName("zdzgtilaxhnfhqly")
+                .withUri("ijouwivkxoyzunb")
+                .withParameters("xrtikvcpwpgclr")
+                .withRoles(Arrays.asList("vtsoxf", "kenx", "m", "yefrpmpdnqqska")),
+            new RuntimeScriptActionDetailInner().withName("xasicddyvvjskg")
+                .withUri("mocwa")
+                .withParameters("qgatjeaahhvjhhn")
+                .withRoles(Arrays.asList("zybbj"))));
         model = BinaryData.fromObject(model).toObject(ScriptActionsList.class);
-        Assertions.assertEquals("xulcdisdos", model.value().get(0).name());
-        Assertions.assertEquals("jbjsvgjrwh", model.value().get(0).uri());
-        Assertions.assertEquals("vyc", model.value().get(0).parameters());
-        Assertions.assertEquals("dclxgc", model.value().get(0).roles().get(0));
+        Assertions.assertEquals("zflbqvg", model.value().get(0).name());
+        Assertions.assertEquals("qvlgafcqusrdvetn", model.value().get(0).uri());
+        Assertions.assertEquals("dtutnwldu", model.value().get(0).parameters());
+        Assertions.assertEquals("vuzhyr", model.value().get(0).roles().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesListByClusterMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesListByClusterMockTests.java
index d4e946ca1eee..2b1497a55d7e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesListByClusterMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesListByClusterMockTests.java
@@ -7,8 +7,8 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import com.azure.resourcemanager.hdinsight.models.RuntimeScriptActionDetail;
@@ -22,21 +22,21 @@ public final class ScriptExecutionHistoriesListByClusterMockTests {
     @Test
     public void testListByCluster() throws Exception {
         String responseStr
-            = "{\"value\":[{\"scriptExecutionId\":6880850551293493350,\"startTime\":\"xee\",\"endTime\":\"xiqhzlraymezxlsk\",\"status\":\"mxrfdsa\",\"operation\":\"ednwyyshtu\",\"executionSummary\":[{\"status\":\"vuafpwzyifr\",\"instanceCount\":2115372469},{\"status\":\"txeqi\",\"instanceCount\":1298920970},{\"status\":\"dyimsfay\",\"instanceCount\":771634222}],\"debugInformation\":\"avkjog\",\"name\":\"sl\",\"uri\":\"bnsmjkwynqxaek\",\"parameters\":\"ykvwjtqpkevmyltj\",\"roles\":[\"spxklu\",\"cclfgxannn\"],\"applicationName\":\"t\"}]}";
+            = "{\"value\":[{\"scriptExecutionId\":1782956154841144799,\"startTime\":\"bxsjybvitvqkj\",\"endTime\":\"znumtggmuwdchoz\",\"status\":\"kfexlv\",\"operation\":\"oakizvoai\",\"executionSummary\":[{\"status\":\"lnuwiguy\",\"instanceCount\":1872372943}],\"debugInformation\":\"wphvxz\",\"name\":\"wxh\",\"uri\":\"pejtl\",\"parameters\":\"xaonwivkcqh\",\"roles\":[\"hxknlccrmmkyupi\",\"ubyqj\"],\"applicationName\":\"akfqfrkemyildud\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<RuntimeScriptActionDetail> response = manager.scriptExecutionHistories()
-            .listByCluster("tfvpndpmiljpn", "ynudqllzsa", com.azure.core.util.Context.NONE);
+            .listByCluster("bmairrhvhfnracwn", "qigtuujwouhdaws", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("sl", response.iterator().next().name());
-        Assertions.assertEquals("bnsmjkwynqxaek", response.iterator().next().uri());
-        Assertions.assertEquals("ykvwjtqpkevmyltj", response.iterator().next().parameters());
-        Assertions.assertEquals("spxklu", response.iterator().next().roles().get(0));
+        Assertions.assertEquals("wxh", response.iterator().next().name());
+        Assertions.assertEquals("pejtl", response.iterator().next().uri());
+        Assertions.assertEquals("xaonwivkcqh", response.iterator().next().parameters());
+        Assertions.assertEquals("hxknlccrmmkyupi", response.iterator().next().roles().get(0));
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesPromoteWithResponseMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesPromoteWithResponseMockTests.java
index e4ad4571eaad..d547165b7c8c 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesPromoteWithResponseMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ScriptExecutionHistoriesPromoteWithResponseMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -25,10 +25,10 @@ public void testPromoteWithResponse() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.scriptExecutionHistories()
-            .promoteWithResponse("posew", "igpxvkq", "aupxvpi", com.azure.core.util.Context.NONE);
+            .promoteWithResponse("jascowvfdjkpd", "phlkksnm", "zvyfijdkzuqnwsi", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ServiceSpecificationTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ServiceSpecificationTests.java
index 3e403b3c2653..bd44be44ecdb 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ServiceSpecificationTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/ServiceSpecificationTests.java
@@ -15,90 +15,149 @@ public final class ServiceSpecificationTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ServiceSpecification model = BinaryData.fromString(
-            "{\"metricSpecifications\":[{\"name\":\"vxilcbt\",\"displayName\":\"hnze\",\"displayDescription\":\"xtjjfzqlqhycav\",\"unit\":\"ggxdb\",\"aggregationType\":\"smieknlra\",\"supportedAggregationTypes\":[\"awiuagyd\",\"qfby\",\"yr\",\"giagtcojo\"],\"supportedTimeGrainTypes\":[\"ogfnzjvusf\",\"ld\",\"ozuxylfsbtkadpys\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"tgkbugrjqctojc\",\"sourceMdmNamespace\":\"sofieypefojyqd\",\"metricFilterPattern\":\"u\",\"fillGapWithZero\":false,\"category\":\"lcwkhihihlhz\",\"resourceIdDimensionNameOverride\":\"qtz\",\"isInternal\":true,\"delegateMetricNameOverride\":\"nowc\",\"dimensions\":[{\"name\":\"mvec\",\"displayName\":\"txmwoteyow\",\"internalName\":\"uqovekqvgqouwif\",\"toBeExportedForShoebox\":false},{\"name\":\"wyivqikf\",\"displayName\":\"vhrfsphuagrt\",\"internalName\":\"kteusqczk\",\"toBeExportedForShoebox\":false},{\"name\":\"xubyjaffmmfblcqc\",\"displayName\":\"bgq\",\"internalName\":\"rtalmet\",\"toBeExportedForShoebox\":false},{\"name\":\"dslqxihhrmooizqs\",\"displayName\":\"pxiutc\",\"internalName\":\"pzhyr\",\"toBeExportedForShoebox\":true}]}]}")
+            "{\"metricSpecifications\":[{\"name\":\"epzl\",\"displayName\":\"hw\",\"displayDescription\":\"oldweyuqdu\",\"unit\":\"mnnrwr\",\"aggregationType\":\"ork\",\"supportedAggregationTypes\":[\"ywjhhgdnhx\",\"sivfomilo\"],\"supportedTimeGrainTypes\":[\"dufiq\",\"dieuzaofj\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"yyysfgdotcubi\",\"sourceMdmNamespace\":\"uipwoqonmacje\",\"metricFilterPattern\":\"izsh\",\"fillGapWithZero\":false,\"category\":\"m\",\"resourceIdDimensionNameOverride\":\"vfgmblrrilby\",\"isInternal\":true,\"delegateMetricNameOverride\":\"miccwrwfscjfnyn\",\"dimensions\":[{\"name\":\"jizdvoqyt\",\"displayName\":\"yo\",\"internalName\":\"blgyavutpthj\",\"toBeExportedForShoebox\":true},{\"name\":\"smsks\",\"displayName\":\"iml\",\"internalName\":\"ljxkcgxxlx\",\"toBeExportedForShoebox\":false}]},{\"name\":\"cvizqzdwlvw\",\"displayName\":\"oupfgfb\",\"displayDescription\":\"ubdyhgk\",\"unit\":\"in\",\"aggregationType\":\"owzfttsttkt\",\"supportedAggregationTypes\":[\"bqactxtgzukx\"],\"supportedTimeGrainTypes\":[\"m\",\"tg\",\"qqxhrnxrxcpj\"],\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"vokqdzfv\",\"sourceMdmNamespace\":\"ivjlfrqttbajlka\",\"metricFilterPattern\":\"wxyiopidkqq\",\"fillGapWithZero\":true,\"category\":\"s\",\"resourceIdDimensionNameOverride\":\"kdmligovi\",\"isInternal\":false,\"delegateMetricNameOverride\":\"pmloazuruoc\",\"dimensions\":[{\"name\":\"rb\",\"displayName\":\"oybfhjxakvvj\",\"internalName\":\"lordilmywwtkgkxn\",\"toBeExportedForShoebox\":false}]},{\"name\":\"b\",\"displayName\":\"vudtjuewbcihx\",\"displayDescription\":\"whcjyxcc\",\"unit\":\"vpayakkudzpx\",\"aggregationType\":\"jplmagstcy\",\"supportedAggregationTypes\":[\"fkyrk\",\"bdgiogsjk\",\"nwqjnoba\",\"yhddvia\"],\"supportedTimeGrainTypes\":[\"fnmntfpmvmemfn\",\"zdwvvbalxl\",\"lchpodbzevwrdn\",\"fukuvsjcswsmystu\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"pfcvlerchpqbmfp\",\"sourceMdmNamespace\":\"abwidfcxsspuun\",\"metricFilterPattern\":\"xyh\",\"fillGapWithZero\":false,\"category\":\"ddrihpf\",\"resourceIdDimensionNameOverride\":\"qcaaewdaomdjvl\",\"isInternal\":false,\"delegateMetricNameOverride\":\"kzbrmsgeivsiy\",\"dimensions\":[{\"name\":\"ncj\",\"displayName\":\"onbzoggculapzwy\",\"internalName\":\"gogtqxepnylbf\",\"toBeExportedForShoebox\":true},{\"name\":\"yjt\",\"displayName\":\"of\",\"internalName\":\"hvfcibyfmow\",\"toBeExportedForShoebox\":true}]},{\"name\":\"jpvd\",\"displayName\":\"fzwiivwzjbhyz\",\"displayDescription\":\"jrkambtrnegvmnv\",\"unit\":\"eqvldspast\",\"aggregationType\":\"kkdmfl\",\"supportedAggregationTypes\":[\"tmjlx\",\"ril\",\"zapeewchpx\"],\"supportedTimeGrainTypes\":[\"wk\",\"ziycslevufuztck\",\"yhjtqedcgzu\"],\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"rqzz\",\"sourceMdmNamespace\":\"jvpglydzgk\",\"metricFilterPattern\":\"qeevt\",\"fillGapWithZero\":false,\"category\":\"yutnwytpzdmov\",\"resourceIdDimensionNameOverride\":\"fvaawzqa\",\"isInternal\":false,\"delegateMetricNameOverride\":\"z\",\"dimensions\":[{\"name\":\"laecxndticok\",\"displayName\":\"zmlqtmldgxo\",\"internalName\":\"irclnpk\",\"toBeExportedForShoebox\":false},{\"name\":\"zriykhy\",\"displayName\":\"fvjlboxqvkjlmx\",\"internalName\":\"mdy\",\"toBeExportedForShoebox\":false}]}]}")
             .toObject(ServiceSpecification.class);
-        Assertions.assertEquals("vxilcbt", model.metricSpecifications().get(0).name());
-        Assertions.assertEquals("hnze", model.metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("xtjjfzqlqhycav", model.metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("ggxdb", model.metricSpecifications().get(0).unit());
-        Assertions.assertEquals("smieknlra", model.metricSpecifications().get(0).aggregationType());
-        Assertions.assertEquals("awiuagyd", model.metricSpecifications().get(0).supportedAggregationTypes().get(0));
-        Assertions.assertEquals("ogfnzjvusf", model.metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(true, model.metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("tgkbugrjqctojc", model.metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("sofieypefojyqd", model.metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("u", model.metricSpecifications().get(0).metricFilterPattern());
-        Assertions.assertEquals(false, model.metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("lcwkhihihlhz", model.metricSpecifications().get(0).category());
-        Assertions.assertEquals("qtz", model.metricSpecifications().get(0).resourceIdDimensionNameOverride());
-        Assertions.assertEquals(true, model.metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("nowc", model.metricSpecifications().get(0).delegateMetricNameOverride());
-        Assertions.assertEquals("mvec", model.metricSpecifications().get(0).dimensions().get(0).name());
-        Assertions.assertEquals("txmwoteyow", model.metricSpecifications().get(0).dimensions().get(0).displayName());
-        Assertions.assertEquals("uqovekqvgqouwif",
-            model.metricSpecifications().get(0).dimensions().get(0).internalName());
-        Assertions.assertEquals(false,
-            model.metricSpecifications().get(0).dimensions().get(0).toBeExportedForShoebox());
+        Assertions.assertEquals("epzl", model.metricSpecifications().get(0).name());
+        Assertions.assertEquals("hw", model.metricSpecifications().get(0).displayName());
+        Assertions.assertEquals("oldweyuqdu", model.metricSpecifications().get(0).displayDescription());
+        Assertions.assertEquals("mnnrwr", model.metricSpecifications().get(0).unit());
+        Assertions.assertEquals("ork", model.metricSpecifications().get(0).aggregationType());
+        Assertions.assertEquals("ywjhhgdnhx", model.metricSpecifications().get(0).supportedAggregationTypes().get(0));
+        Assertions.assertEquals("dufiq", model.metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
+        Assertions.assertFalse(model.metricSpecifications().get(0).enableRegionalMdmAccount());
+        Assertions.assertEquals("yyysfgdotcubi", model.metricSpecifications().get(0).sourceMdmAccount());
+        Assertions.assertEquals("uipwoqonmacje", model.metricSpecifications().get(0).sourceMdmNamespace());
+        Assertions.assertEquals("izsh", model.metricSpecifications().get(0).metricFilterPattern());
+        Assertions.assertFalse(model.metricSpecifications().get(0).fillGapWithZero());
+        Assertions.assertEquals("m", model.metricSpecifications().get(0).category());
+        Assertions.assertEquals("vfgmblrrilby", model.metricSpecifications().get(0).resourceIdDimensionNameOverride());
+        Assertions.assertTrue(model.metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("miccwrwfscjfnyn", model.metricSpecifications().get(0).delegateMetricNameOverride());
+        Assertions.assertEquals("jizdvoqyt", model.metricSpecifications().get(0).dimensions().get(0).name());
+        Assertions.assertEquals("yo", model.metricSpecifications().get(0).dimensions().get(0).displayName());
+        Assertions.assertEquals("blgyavutpthj", model.metricSpecifications().get(0).dimensions().get(0).internalName());
+        Assertions.assertTrue(model.metricSpecifications().get(0).dimensions().get(0).toBeExportedForShoebox());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ServiceSpecification model = new ServiceSpecification()
-            .withMetricSpecifications(Arrays.asList(new MetricSpecifications().withName("vxilcbt")
-                .withDisplayName("hnze")
-                .withDisplayDescription("xtjjfzqlqhycav")
-                .withUnit("ggxdb")
-                .withAggregationType("smieknlra")
-                .withSupportedAggregationTypes(Arrays.asList("awiuagyd", "qfby", "yr", "giagtcojo"))
-                .withSupportedTimeGrainTypes(Arrays.asList("ogfnzjvusf", "ld", "ozuxylfsbtkadpys"))
-                .withEnableRegionalMdmAccount(true)
-                .withSourceMdmAccount("tgkbugrjqctojc")
-                .withSourceMdmNamespace("sofieypefojyqd")
-                .withMetricFilterPattern("u")
+        ServiceSpecification model = new ServiceSpecification().withMetricSpecifications(Arrays.asList(
+            new MetricSpecifications().withName("epzl")
+                .withDisplayName("hw")
+                .withDisplayDescription("oldweyuqdu")
+                .withUnit("mnnrwr")
+                .withAggregationType("ork")
+                .withSupportedAggregationTypes(Arrays.asList("ywjhhgdnhx", "sivfomilo"))
+                .withSupportedTimeGrainTypes(Arrays.asList("dufiq", "dieuzaofj"))
+                .withEnableRegionalMdmAccount(false)
+                .withSourceMdmAccount("yyysfgdotcubi")
+                .withSourceMdmNamespace("uipwoqonmacje")
+                .withMetricFilterPattern("izsh")
                 .withFillGapWithZero(false)
-                .withCategory("lcwkhihihlhz")
-                .withResourceIdDimensionNameOverride("qtz")
+                .withCategory("m")
+                .withResourceIdDimensionNameOverride("vfgmblrrilby")
                 .withIsInternal(true)
-                .withDelegateMetricNameOverride("nowc")
+                .withDelegateMetricNameOverride("miccwrwfscjfnyn")
                 .withDimensions(Arrays.asList(
-                    new Dimension().withName("mvec")
-                        .withDisplayName("txmwoteyow")
-                        .withInternalName("uqovekqvgqouwif")
-                        .withToBeExportedForShoebox(false),
-                    new Dimension().withName("wyivqikf")
-                        .withDisplayName("vhrfsphuagrt")
-                        .withInternalName("kteusqczk")
-                        .withToBeExportedForShoebox(false),
-                    new Dimension().withName("xubyjaffmmfblcqc")
-                        .withDisplayName("bgq")
-                        .withInternalName("rtalmet")
+                    new Dimension().withName("jizdvoqyt")
+                        .withDisplayName("yo")
+                        .withInternalName("blgyavutpthj")
+                        .withToBeExportedForShoebox(true),
+                    new Dimension().withName("smsks")
+                        .withDisplayName("iml")
+                        .withInternalName("ljxkcgxxlx")
+                        .withToBeExportedForShoebox(false))),
+            new MetricSpecifications().withName("cvizqzdwlvw")
+                .withDisplayName("oupfgfb")
+                .withDisplayDescription("ubdyhgk")
+                .withUnit("in")
+                .withAggregationType("owzfttsttkt")
+                .withSupportedAggregationTypes(Arrays.asList("bqactxtgzukx"))
+                .withSupportedTimeGrainTypes(Arrays.asList("m", "tg", "qqxhrnxrxcpj"))
+                .withEnableRegionalMdmAccount(true)
+                .withSourceMdmAccount("vokqdzfv")
+                .withSourceMdmNamespace("ivjlfrqttbajlka")
+                .withMetricFilterPattern("wxyiopidkqq")
+                .withFillGapWithZero(true)
+                .withCategory("s")
+                .withResourceIdDimensionNameOverride("kdmligovi")
+                .withIsInternal(false)
+                .withDelegateMetricNameOverride("pmloazuruoc")
+                .withDimensions(Arrays.asList(new Dimension().withName("rb")
+                    .withDisplayName("oybfhjxakvvj")
+                    .withInternalName("lordilmywwtkgkxn")
+                    .withToBeExportedForShoebox(false))),
+            new MetricSpecifications().withName("b")
+                .withDisplayName("vudtjuewbcihx")
+                .withDisplayDescription("whcjyxcc")
+                .withUnit("vpayakkudzpx")
+                .withAggregationType("jplmagstcy")
+                .withSupportedAggregationTypes(Arrays.asList("fkyrk", "bdgiogsjk", "nwqjnoba", "yhddvia"))
+                .withSupportedTimeGrainTypes(
+                    Arrays.asList("fnmntfpmvmemfn", "zdwvvbalxl", "lchpodbzevwrdn", "fukuvsjcswsmystu"))
+                .withEnableRegionalMdmAccount(false)
+                .withSourceMdmAccount("pfcvlerchpqbmfp")
+                .withSourceMdmNamespace("abwidfcxsspuun")
+                .withMetricFilterPattern("xyh")
+                .withFillGapWithZero(false)
+                .withCategory("ddrihpf")
+                .withResourceIdDimensionNameOverride("qcaaewdaomdjvl")
+                .withIsInternal(false)
+                .withDelegateMetricNameOverride("kzbrmsgeivsiy")
+                .withDimensions(Arrays.asList(
+                    new Dimension().withName("ncj")
+                        .withDisplayName("onbzoggculapzwy")
+                        .withInternalName("gogtqxepnylbf")
+                        .withToBeExportedForShoebox(true),
+                    new Dimension().withName("yjt")
+                        .withDisplayName("of")
+                        .withInternalName("hvfcibyfmow")
+                        .withToBeExportedForShoebox(true))),
+            new MetricSpecifications().withName("jpvd")
+                .withDisplayName("fzwiivwzjbhyz")
+                .withDisplayDescription("jrkambtrnegvmnv")
+                .withUnit("eqvldspast")
+                .withAggregationType("kkdmfl")
+                .withSupportedAggregationTypes(Arrays.asList("tmjlx", "ril", "zapeewchpx"))
+                .withSupportedTimeGrainTypes(Arrays.asList("wk", "ziycslevufuztck", "yhjtqedcgzu"))
+                .withEnableRegionalMdmAccount(false)
+                .withSourceMdmAccount("rqzz")
+                .withSourceMdmNamespace("jvpglydzgk")
+                .withMetricFilterPattern("qeevt")
+                .withFillGapWithZero(false)
+                .withCategory("yutnwytpzdmov")
+                .withResourceIdDimensionNameOverride("fvaawzqa")
+                .withIsInternal(false)
+                .withDelegateMetricNameOverride("z")
+                .withDimensions(Arrays.asList(
+                    new Dimension().withName("laecxndticok")
+                        .withDisplayName("zmlqtmldgxo")
+                        .withInternalName("irclnpk")
                         .withToBeExportedForShoebox(false),
-                    new Dimension().withName("dslqxihhrmooizqs")
-                        .withDisplayName("pxiutc")
-                        .withInternalName("pzhyr")
-                        .withToBeExportedForShoebox(true)))));
+                    new Dimension().withName("zriykhy")
+                        .withDisplayName("fvjlboxqvkjlmx")
+                        .withInternalName("mdy")
+                        .withToBeExportedForShoebox(false)))));
         model = BinaryData.fromObject(model).toObject(ServiceSpecification.class);
-        Assertions.assertEquals("vxilcbt", model.metricSpecifications().get(0).name());
-        Assertions.assertEquals("hnze", model.metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("xtjjfzqlqhycav", model.metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("ggxdb", model.metricSpecifications().get(0).unit());
-        Assertions.assertEquals("smieknlra", model.metricSpecifications().get(0).aggregationType());
-        Assertions.assertEquals("awiuagyd", model.metricSpecifications().get(0).supportedAggregationTypes().get(0));
-        Assertions.assertEquals("ogfnzjvusf", model.metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
-        Assertions.assertEquals(true, model.metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("tgkbugrjqctojc", model.metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("sofieypefojyqd", model.metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("u", model.metricSpecifications().get(0).metricFilterPattern());
-        Assertions.assertEquals(false, model.metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("lcwkhihihlhz", model.metricSpecifications().get(0).category());
-        Assertions.assertEquals("qtz", model.metricSpecifications().get(0).resourceIdDimensionNameOverride());
-        Assertions.assertEquals(true, model.metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("nowc", model.metricSpecifications().get(0).delegateMetricNameOverride());
-        Assertions.assertEquals("mvec", model.metricSpecifications().get(0).dimensions().get(0).name());
-        Assertions.assertEquals("txmwoteyow", model.metricSpecifications().get(0).dimensions().get(0).displayName());
-        Assertions.assertEquals("uqovekqvgqouwif",
-            model.metricSpecifications().get(0).dimensions().get(0).internalName());
-        Assertions.assertEquals(false,
-            model.metricSpecifications().get(0).dimensions().get(0).toBeExportedForShoebox());
+        Assertions.assertEquals("epzl", model.metricSpecifications().get(0).name());
+        Assertions.assertEquals("hw", model.metricSpecifications().get(0).displayName());
+        Assertions.assertEquals("oldweyuqdu", model.metricSpecifications().get(0).displayDescription());
+        Assertions.assertEquals("mnnrwr", model.metricSpecifications().get(0).unit());
+        Assertions.assertEquals("ork", model.metricSpecifications().get(0).aggregationType());
+        Assertions.assertEquals("ywjhhgdnhx", model.metricSpecifications().get(0).supportedAggregationTypes().get(0));
+        Assertions.assertEquals("dufiq", model.metricSpecifications().get(0).supportedTimeGrainTypes().get(0));
+        Assertions.assertFalse(model.metricSpecifications().get(0).enableRegionalMdmAccount());
+        Assertions.assertEquals("yyysfgdotcubi", model.metricSpecifications().get(0).sourceMdmAccount());
+        Assertions.assertEquals("uipwoqonmacje", model.metricSpecifications().get(0).sourceMdmNamespace());
+        Assertions.assertEquals("izsh", model.metricSpecifications().get(0).metricFilterPattern());
+        Assertions.assertFalse(model.metricSpecifications().get(0).fillGapWithZero());
+        Assertions.assertEquals("m", model.metricSpecifications().get(0).category());
+        Assertions.assertEquals("vfgmblrrilby", model.metricSpecifications().get(0).resourceIdDimensionNameOverride());
+        Assertions.assertTrue(model.metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("miccwrwfscjfnyn", model.metricSpecifications().get(0).delegateMetricNameOverride());
+        Assertions.assertEquals("jizdvoqyt", model.metricSpecifications().get(0).dimensions().get(0).name());
+        Assertions.assertEquals("yo", model.metricSpecifications().get(0).dimensions().get(0).displayName());
+        Assertions.assertEquals("blgyavutpthj", model.metricSpecifications().get(0).dimensions().get(0).internalName());
+        Assertions.assertTrue(model.metricSpecifications().get(0).dimensions().get(0).toBeExportedForShoebox());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsageTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsageTests.java
index 3ce031cc8765..2bb090b995d6 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsageTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsageTests.java
@@ -12,19 +12,20 @@ public final class UsageTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         Usage model = BinaryData.fromString(
-            "{\"unit\":\"l\",\"currentValue\":4701202797943859637,\"limit\":171678662002400976,\"name\":{\"value\":\"twvogvbbe\",\"localizedValue\":\"cngqqmoakufgmjz\"}}")
+            "{\"unit\":\"gdknnqv\",\"currentValue\":8546326573006782142,\"limit\":796378729484127038,\"name\":{\"value\":\"udsgs\",\"localizedValue\":\"mkycgra\"}}")
             .toObject(Usage.class);
-        Assertions.assertEquals("l", model.unit());
-        Assertions.assertEquals(4701202797943859637L, model.currentValue());
-        Assertions.assertEquals(171678662002400976L, model.limit());
+        Assertions.assertEquals("gdknnqv", model.unit());
+        Assertions.assertEquals(8546326573006782142L, model.currentValue());
+        Assertions.assertEquals(796378729484127038L, model.limit());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        Usage model = new Usage().withUnit("l").withCurrentValue(4701202797943859637L).withLimit(171678662002400976L);
+        Usage model
+            = new Usage().withUnit("gdknnqv").withCurrentValue(8546326573006782142L).withLimit(796378729484127038L);
         model = BinaryData.fromObject(model).toObject(Usage.class);
-        Assertions.assertEquals("l", model.unit());
-        Assertions.assertEquals(4701202797943859637L, model.currentValue());
-        Assertions.assertEquals(171678662002400976L, model.limit());
+        Assertions.assertEquals("gdknnqv", model.unit());
+        Assertions.assertEquals(8546326573006782142L, model.currentValue());
+        Assertions.assertEquals(796378729484127038L, model.limit());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsagesListResultInnerTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsagesListResultInnerTests.java
index d407cf1995d3..a16842bbdaa9 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsagesListResultInnerTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/UsagesListResultInnerTests.java
@@ -14,25 +14,21 @@ public final class UsagesListResultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         UsagesListResultInner model = BinaryData.fromString(
-            "{\"value\":[{\"unit\":\"dcpzfoqo\",\"currentValue\":4892524565143747736,\"limit\":6615741978857229687,\"name\":{\"value\":\"gszufoxciqopid\",\"localizedValue\":\"mciodhkhazxkhn\"}},{\"unit\":\"onlwntoeg\",\"currentValue\":8928756986200818231,\"limit\":8840780603115522856,\"name\":{\"value\":\"z\",\"localizedValue\":\"mrv\"}},{\"unit\":\"ztvbtqgsfr\",\"currentValue\":3999543626969444509,\"limit\":1008926283024648920,\"name\":{\"value\":\"lmnguxaw\",\"localizedValue\":\"ldsyuuximerqfob\"}},{\"unit\":\"znkbykutwpfhpagm\",\"currentValue\":5006093182566843640,\"limit\":5038627427973777976,\"name\":{\"value\":\"sd\",\"localizedValue\":\"kgtdlmkkze\"}}]}")
+            "{\"value\":[{\"unit\":\"tolmncwsobqw\",\"currentValue\":4514787452108885554,\"limit\":5654195431166964592,\"name\":{\"value\":\"hucqdpfuvg\",\"localizedValue\":\"bjj\"}},{\"unit\":\"nvxbvt\",\"currentValue\":2563596213274806167,\"limit\":5788917619070236735,\"name\":{\"value\":\"mr\",\"localizedValue\":\"qtvcofudflvkgj\"}}]}")
             .toObject(UsagesListResultInner.class);
-        Assertions.assertEquals("dcpzfoqo", model.value().get(0).unit());
-        Assertions.assertEquals(4892524565143747736L, model.value().get(0).currentValue());
-        Assertions.assertEquals(6615741978857229687L, model.value().get(0).limit());
+        Assertions.assertEquals("tolmncwsobqw", model.value().get(0).unit());
+        Assertions.assertEquals(4514787452108885554L, model.value().get(0).currentValue());
+        Assertions.assertEquals(5654195431166964592L, model.value().get(0).limit());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         UsagesListResultInner model = new UsagesListResultInner().withValue(Arrays.asList(
-            new Usage().withUnit("dcpzfoqo").withCurrentValue(4892524565143747736L).withLimit(6615741978857229687L),
-            new Usage().withUnit("onlwntoeg").withCurrentValue(8928756986200818231L).withLimit(8840780603115522856L),
-            new Usage().withUnit("ztvbtqgsfr").withCurrentValue(3999543626969444509L).withLimit(1008926283024648920L),
-            new Usage().withUnit("znkbykutwpfhpagm")
-                .withCurrentValue(5006093182566843640L)
-                .withLimit(5038627427973777976L)));
+            new Usage().withUnit("tolmncwsobqw").withCurrentValue(4514787452108885554L).withLimit(5654195431166964592L),
+            new Usage().withUnit("nvxbvt").withCurrentValue(2563596213274806167L).withLimit(5788917619070236735L)));
         model = BinaryData.fromObject(model).toObject(UsagesListResultInner.class);
-        Assertions.assertEquals("dcpzfoqo", model.value().get(0).unit());
-        Assertions.assertEquals(4892524565143747736L, model.value().get(0).currentValue());
-        Assertions.assertEquals(6615741978857229687L, model.value().get(0).limit());
+        Assertions.assertEquals("tolmncwsobqw", model.value().get(0).unit());
+        Assertions.assertEquals(4514787452108885554L, model.value().get(0).currentValue());
+        Assertions.assertEquals(5654195431166964592L, model.value().get(0).limit());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionSpecTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionSpecTests.java
index 454e0740aecb..4b4a0b05d0b1 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionSpecTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionSpecTests.java
@@ -14,25 +14,25 @@ public final class VersionSpecTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VersionSpec model = BinaryData.fromString(
-            "{\"friendlyName\":\"lvkgju\",\"displayName\":\"dknnqvsazn\",\"isDefault\":false,\"componentVersions\":{\"hmk\":\"udsgs\",\"rauwjuetaebu\":\"c\"}}")
+            "{\"friendlyName\":\"wnujhemmsbvdk\",\"displayName\":\"odtji\",\"isDefault\":false,\"componentVersions\":{\"f\":\"fltkacjv\",\"gaowpulpqblylsyx\":\"dlfoakggkfp\"}}")
             .toObject(VersionSpec.class);
-        Assertions.assertEquals("lvkgju", model.friendlyName());
-        Assertions.assertEquals("dknnqvsazn", model.displayName());
-        Assertions.assertEquals(false, model.isDefault());
-        Assertions.assertEquals("udsgs", model.componentVersions().get("hmk"));
+        Assertions.assertEquals("wnujhemmsbvdk", model.friendlyName());
+        Assertions.assertEquals("odtji", model.displayName());
+        Assertions.assertFalse(model.isDefault());
+        Assertions.assertEquals("fltkacjv", model.componentVersions().get("f"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VersionSpec model = new VersionSpec().withFriendlyName("lvkgju")
-            .withDisplayName("dknnqvsazn")
+        VersionSpec model = new VersionSpec().withFriendlyName("wnujhemmsbvdk")
+            .withDisplayName("odtji")
             .withIsDefault(false)
-            .withComponentVersions(mapOf("hmk", "udsgs", "rauwjuetaebu", "c"));
+            .withComponentVersions(mapOf("f", "fltkacjv", "gaowpulpqblylsyx", "dlfoakggkfp"));
         model = BinaryData.fromObject(model).toObject(VersionSpec.class);
-        Assertions.assertEquals("lvkgju", model.friendlyName());
-        Assertions.assertEquals("dknnqvsazn", model.displayName());
-        Assertions.assertEquals(false, model.isDefault());
-        Assertions.assertEquals("udsgs", model.componentVersions().get("hmk"));
+        Assertions.assertEquals("wnujhemmsbvdk", model.friendlyName());
+        Assertions.assertEquals("odtji", model.displayName());
+        Assertions.assertFalse(model.isDefault());
+        Assertions.assertEquals("fltkacjv", model.componentVersions().get("f"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionsCapabilityTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionsCapabilityTests.java
index 9ec5f481efca..42d5ef6e3865 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionsCapabilityTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VersionsCapabilityTests.java
@@ -5,8 +5,8 @@
 package com.azure.resourcemanager.hdinsight.generated;
 
 import com.azure.core.util.BinaryData;
-import com.azure.resourcemanager.hdinsight.models.VersionsCapability;
 import com.azure.resourcemanager.hdinsight.models.VersionSpec;
+import com.azure.resourcemanager.hdinsight.models.VersionsCapability;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,26 +16,26 @@ public final class VersionsCapabilityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VersionsCapability model = BinaryData.fromString(
-            "{\"available\":[{\"friendlyName\":\"jaltolmnc\",\"displayName\":\"obqwcsdbnwdcfh\",\"isDefault\":true,\"componentVersions\":{\"vxb\":\"fuvglsbjjca\",\"udutnco\":\"t\",\"xqtvcofu\":\"mr\"}}]}")
+            "{\"available\":[{\"friendlyName\":\"zfgs\",\"displayName\":\"yfxrx\",\"isDefault\":false,\"componentVersions\":{\"uqlcvydy\":\"ramxjezwlwnw\",\"oo\":\"atdooaojkniod\"}}]}")
             .toObject(VersionsCapability.class);
-        Assertions.assertEquals("jaltolmnc", model.available().get(0).friendlyName());
-        Assertions.assertEquals("obqwcsdbnwdcfh", model.available().get(0).displayName());
-        Assertions.assertEquals(true, model.available().get(0).isDefault());
-        Assertions.assertEquals("fuvglsbjjca", model.available().get(0).componentVersions().get("vxb"));
+        Assertions.assertEquals("zfgs", model.available().get(0).friendlyName());
+        Assertions.assertEquals("yfxrx", model.available().get(0).displayName());
+        Assertions.assertFalse(model.available().get(0).isDefault());
+        Assertions.assertEquals("ramxjezwlwnw", model.available().get(0).componentVersions().get("uqlcvydy"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VersionsCapability model
-            = new VersionsCapability().withAvailable(Arrays.asList(new VersionSpec().withFriendlyName("jaltolmnc")
-                .withDisplayName("obqwcsdbnwdcfh")
-                .withIsDefault(true)
-                .withComponentVersions(mapOf("vxb", "fuvglsbjjca", "udutnco", "t", "xqtvcofu", "mr"))));
+            = new VersionsCapability().withAvailable(Arrays.asList(new VersionSpec().withFriendlyName("zfgs")
+                .withDisplayName("yfxrx")
+                .withIsDefault(false)
+                .withComponentVersions(mapOf("uqlcvydy", "ramxjezwlwnw", "oo", "atdooaojkniod"))));
         model = BinaryData.fromObject(model).toObject(VersionsCapability.class);
-        Assertions.assertEquals("jaltolmnc", model.available().get(0).friendlyName());
-        Assertions.assertEquals("obqwcsdbnwdcfh", model.available().get(0).displayName());
-        Assertions.assertEquals(true, model.available().get(0).isDefault());
-        Assertions.assertEquals("fuvglsbjjca", model.available().get(0).componentVersions().get("vxb"));
+        Assertions.assertEquals("zfgs", model.available().get(0).friendlyName());
+        Assertions.assertEquals("yfxrx", model.available().get(0).displayName());
+        Assertions.assertFalse(model.available().get(0).isDefault());
+        Assertions.assertEquals("ramxjezwlwnw", model.available().get(0).componentVersions().get("uqlcvydy"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsMockTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsMockTests.java
index 1664334841f7..e13511d22a6e 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsMockTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VirtualMachinesRestartHostsMockTests.java
@@ -6,8 +6,8 @@
 
 import com.azure.core.credential.AccessToken;
 import com.azure.core.http.HttpClient;
-import com.azure.core.management.AzureEnvironment;
 import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.hdinsight.HDInsightManager;
 import java.nio.charset.StandardCharsets;
@@ -26,10 +26,11 @@ public void testRestartHosts() throws Exception {
         HDInsightManager manager = HDInsightManager.configure()
             .withHttpClient(httpClient)
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
-                new AzureProfile("", "", AzureEnvironment.AZURE));
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.virtualMachines()
-            .restartHosts("rcyrucpcunnu", "dqumoenodnai", Arrays.asList("hqhsknd"), com.azure.core.util.Context.NONE);
+            .restartHosts("exreu", "uowtljvfwhrea", Arrays.asList("hyxvrqt", "bczsulmdgglmepjp", "s"),
+                com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizeCompatibilityFilterV2Tests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizeCompatibilityFilterV2Tests.java
index c65a10ced257..28bb9c7d20af 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizeCompatibilityFilterV2Tests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizeCompatibilityFilterV2Tests.java
@@ -15,39 +15,39 @@ public final class VmSizeCompatibilityFilterV2Tests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VmSizeCompatibilityFilterV2 model = BinaryData.fromString(
-            "{\"filterMode\":\"Recommend\",\"regions\":[\"jlpijnkrx\",\"rddh\",\"ratiz\"],\"clusterFlavors\":[\"nasx\",\"ft\",\"zq\"],\"nodeTypes\":[\"f\",\"wesgogczh\",\"nnxk\"],\"clusterVersions\":[\"nyhmossxkkgthr\",\"gh\",\"jbdhqxvc\"],\"osType\":[\"Windows\",\"Windows\",\"Linux\",\"Windows\"],\"vmSizes\":[\"bshrnsvbuswd\",\"z\",\"ybycnunvj\",\"rtkfawnopq\"],\"espApplied\":\"kyzirtxdyux\",\"computeIsolationSupported\":\"jntpsewgioilqu\"}")
+            "{\"filterMode\":\"Exclude\",\"regions\":[\"wzxltjc\",\"nhltiugcxn\",\"vvwxqi\"],\"clusterFlavors\":[\"unyowxwl\",\"djrkvfgbvfvpd\",\"odacizs\",\"q\"],\"nodeTypes\":[\"rribd\",\"ibqipqkg\",\"vxndz\"],\"clusterVersions\":[\"refajpjorwkqnyh\",\"b\",\"j\"],\"osType\":[\"Windows\",\"Linux\",\"Windows\",\"Windows\"],\"vmSizes\":[\"ab\",\"bsystawfsdjpvk\",\"p\"],\"espApplied\":\"xbkzbzkdvncj\",\"computeIsolationSupported\":\"udurgkakmokz\"}")
             .toObject(VmSizeCompatibilityFilterV2.class);
-        Assertions.assertEquals(FilterMode.RECOMMEND, model.filterMode());
-        Assertions.assertEquals("jlpijnkrx", model.regions().get(0));
-        Assertions.assertEquals("nasx", model.clusterFlavors().get(0));
-        Assertions.assertEquals("f", model.nodeTypes().get(0));
-        Assertions.assertEquals("nyhmossxkkgthr", model.clusterVersions().get(0));
+        Assertions.assertEquals(FilterMode.EXCLUDE, model.filterMode());
+        Assertions.assertEquals("wzxltjc", model.regions().get(0));
+        Assertions.assertEquals("unyowxwl", model.clusterFlavors().get(0));
+        Assertions.assertEquals("rribd", model.nodeTypes().get(0));
+        Assertions.assertEquals("refajpjorwkqnyh", model.clusterVersions().get(0));
         Assertions.assertEquals(OSType.WINDOWS, model.osType().get(0));
-        Assertions.assertEquals("bshrnsvbuswd", model.vmSizes().get(0));
-        Assertions.assertEquals("kyzirtxdyux", model.espApplied());
-        Assertions.assertEquals("jntpsewgioilqu", model.computeIsolationSupported());
+        Assertions.assertEquals("ab", model.vmSizes().get(0));
+        Assertions.assertEquals("xbkzbzkdvncj", model.espApplied());
+        Assertions.assertEquals("udurgkakmokz", model.computeIsolationSupported());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VmSizeCompatibilityFilterV2 model = new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.RECOMMEND)
-            .withRegions(Arrays.asList("jlpijnkrx", "rddh", "ratiz"))
-            .withClusterFlavors(Arrays.asList("nasx", "ft", "zq"))
-            .withNodeTypes(Arrays.asList("f", "wesgogczh", "nnxk"))
-            .withClusterVersions(Arrays.asList("nyhmossxkkgthr", "gh", "jbdhqxvc"))
-            .withOsType(Arrays.asList(OSType.WINDOWS, OSType.WINDOWS, OSType.LINUX, OSType.WINDOWS))
-            .withVmSizes(Arrays.asList("bshrnsvbuswd", "z", "ybycnunvj", "rtkfawnopq"))
-            .withEspApplied("kyzirtxdyux")
-            .withComputeIsolationSupported("jntpsewgioilqu");
+        VmSizeCompatibilityFilterV2 model = new VmSizeCompatibilityFilterV2().withFilterMode(FilterMode.EXCLUDE)
+            .withRegions(Arrays.asList("wzxltjc", "nhltiugcxn", "vvwxqi"))
+            .withClusterFlavors(Arrays.asList("unyowxwl", "djrkvfgbvfvpd", "odacizs", "q"))
+            .withNodeTypes(Arrays.asList("rribd", "ibqipqkg", "vxndz"))
+            .withClusterVersions(Arrays.asList("refajpjorwkqnyh", "b", "j"))
+            .withOsType(Arrays.asList(OSType.WINDOWS, OSType.LINUX, OSType.WINDOWS, OSType.WINDOWS))
+            .withVmSizes(Arrays.asList("ab", "bsystawfsdjpvk", "p"))
+            .withEspApplied("xbkzbzkdvncj")
+            .withComputeIsolationSupported("udurgkakmokz");
         model = BinaryData.fromObject(model).toObject(VmSizeCompatibilityFilterV2.class);
-        Assertions.assertEquals(FilterMode.RECOMMEND, model.filterMode());
-        Assertions.assertEquals("jlpijnkrx", model.regions().get(0));
-        Assertions.assertEquals("nasx", model.clusterFlavors().get(0));
-        Assertions.assertEquals("f", model.nodeTypes().get(0));
-        Assertions.assertEquals("nyhmossxkkgthr", model.clusterVersions().get(0));
+        Assertions.assertEquals(FilterMode.EXCLUDE, model.filterMode());
+        Assertions.assertEquals("wzxltjc", model.regions().get(0));
+        Assertions.assertEquals("unyowxwl", model.clusterFlavors().get(0));
+        Assertions.assertEquals("rribd", model.nodeTypes().get(0));
+        Assertions.assertEquals("refajpjorwkqnyh", model.clusterVersions().get(0));
         Assertions.assertEquals(OSType.WINDOWS, model.osType().get(0));
-        Assertions.assertEquals("bshrnsvbuswd", model.vmSizes().get(0));
-        Assertions.assertEquals("kyzirtxdyux", model.espApplied());
-        Assertions.assertEquals("jntpsewgioilqu", model.computeIsolationSupported());
+        Assertions.assertEquals("ab", model.vmSizes().get(0));
+        Assertions.assertEquals("xbkzbzkdvncj", model.espApplied());
+        Assertions.assertEquals("udurgkakmokz", model.computeIsolationSupported());
     }
 }
diff --git a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizePropertyTests.java b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizePropertyTests.java
index a3a4e63342bd..b38c83c4aa83 100644
--- a/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizePropertyTests.java
+++ b/sdk/hdinsight/azure-resourcemanager-hdinsight/src/test/java/com/azure/resourcemanager/hdinsight/generated/VmSizePropertyTests.java
@@ -12,42 +12,42 @@ public final class VmSizePropertyTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VmSizeProperty model = BinaryData.fromString(
-            "{\"name\":\"ydxtqm\",\"cores\":323647852,\"dataDiskStorageTier\":\"orgguf\",\"label\":\"aomtbghhavgrvkff\",\"maxDataDiskCount\":5595663447131926478,\"memoryInMb\":3841332379064621298,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":true,\"virtualMachineResourceDiskSizeInMb\":6764739063385765952,\"webWorkerResourceDiskSizeInMb\":7551905176757776284}")
+            "{\"name\":\"jk\",\"cores\":1622584038,\"dataDiskStorageTier\":\"mouwqlgzrfzeey\",\"label\":\"izikayuhq\",\"maxDataDiskCount\":8650674702908423803,\"memoryInMb\":7267265154767840469,\"supportedByVirtualMachines\":true,\"supportedByWebWorkerRoles\":false,\"virtualMachineResourceDiskSizeInMb\":629489002910902814,\"webWorkerResourceDiskSizeInMb\":8237830073363773936}")
             .toObject(VmSizeProperty.class);
-        Assertions.assertEquals("ydxtqm", model.name());
-        Assertions.assertEquals(323647852, model.cores());
-        Assertions.assertEquals("orgguf", model.dataDiskStorageTier());
-        Assertions.assertEquals("aomtbghhavgrvkff", model.label());
-        Assertions.assertEquals(5595663447131926478L, model.maxDataDiskCount());
-        Assertions.assertEquals(3841332379064621298L, model.memoryInMb());
-        Assertions.assertEquals(true, model.supportedByVirtualMachines());
-        Assertions.assertEquals(true, model.supportedByWebWorkerRoles());
-        Assertions.assertEquals(6764739063385765952L, model.virtualMachineResourceDiskSizeInMb());
-        Assertions.assertEquals(7551905176757776284L, model.webWorkerResourceDiskSizeInMb());
+        Assertions.assertEquals("jk", model.name());
+        Assertions.assertEquals(1622584038, model.cores());
+        Assertions.assertEquals("mouwqlgzrfzeey", model.dataDiskStorageTier());
+        Assertions.assertEquals("izikayuhq", model.label());
+        Assertions.assertEquals(8650674702908423803L, model.maxDataDiskCount());
+        Assertions.assertEquals(7267265154767840469L, model.memoryInMb());
+        Assertions.assertTrue(model.supportedByVirtualMachines());
+        Assertions.assertFalse(model.supportedByWebWorkerRoles());
+        Assertions.assertEquals(629489002910902814L, model.virtualMachineResourceDiskSizeInMb());
+        Assertions.assertEquals(8237830073363773936L, model.webWorkerResourceDiskSizeInMb());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VmSizeProperty model = new VmSizeProperty().withName("ydxtqm")
-            .withCores(323647852)
-            .withDataDiskStorageTier("orgguf")
-            .withLabel("aomtbghhavgrvkff")
-            .withMaxDataDiskCount(5595663447131926478L)
-            .withMemoryInMb(3841332379064621298L)
+        VmSizeProperty model = new VmSizeProperty().withName("jk")
+            .withCores(1622584038)
+            .withDataDiskStorageTier("mouwqlgzrfzeey")
+            .withLabel("izikayuhq")
+            .withMaxDataDiskCount(8650674702908423803L)
+            .withMemoryInMb(7267265154767840469L)
             .withSupportedByVirtualMachines(true)
-            .withSupportedByWebWorkerRoles(true)
-            .withVirtualMachineResourceDiskSizeInMb(6764739063385765952L)
-            .withWebWorkerResourceDiskSizeInMb(7551905176757776284L);
+            .withSupportedByWebWorkerRoles(false)
+            .withVirtualMachineResourceDiskSizeInMb(629489002910902814L)
+            .withWebWorkerResourceDiskSizeInMb(8237830073363773936L);
         model = BinaryData.fromObject(model).toObject(VmSizeProperty.class);
-        Assertions.assertEquals("ydxtqm", model.name());
-        Assertions.assertEquals(323647852, model.cores());
-        Assertions.assertEquals("orgguf", model.dataDiskStorageTier());
-        Assertions.assertEquals("aomtbghhavgrvkff", model.label());
-        Assertions.assertEquals(5595663447131926478L, model.maxDataDiskCount());
-        Assertions.assertEquals(3841332379064621298L, model.memoryInMb());
-        Assertions.assertEquals(true, model.supportedByVirtualMachines());
-        Assertions.assertEquals(true, model.supportedByWebWorkerRoles());
-        Assertions.assertEquals(6764739063385765952L, model.virtualMachineResourceDiskSizeInMb());
-        Assertions.assertEquals(7551905176757776284L, model.webWorkerResourceDiskSizeInMb());
+        Assertions.assertEquals("jk", model.name());
+        Assertions.assertEquals(1622584038, model.cores());
+        Assertions.assertEquals("mouwqlgzrfzeey", model.dataDiskStorageTier());
+        Assertions.assertEquals("izikayuhq", model.label());
+        Assertions.assertEquals(8650674702908423803L, model.maxDataDiskCount());
+        Assertions.assertEquals(7267265154767840469L, model.memoryInMb());
+        Assertions.assertTrue(model.supportedByVirtualMachines());
+        Assertions.assertFalse(model.supportedByWebWorkerRoles());
+        Assertions.assertEquals(629489002910902814L, model.virtualMachineResourceDiskSizeInMb());
+        Assertions.assertEquals(8237830073363773936L, model.webWorkerResourceDiskSizeInMb());
     }
 }
diff --git a/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml b/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml
index f50a44e4f018..1441ff51c97f 100644
--- a/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml
+++ b/sdk/healthbot/azure-resourcemanager-healthbot/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml b/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml
index 10069bab3c2f..cd036dbcb050 100644
--- a/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml
+++ b/sdk/healthcareapis/azure-resourcemanager-healthcareapis/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/healthdataaiservices/azure-health-deidentification/pom.xml b/sdk/healthdataaiservices/azure-health-deidentification/pom.xml
index 370efec9b5d2..3ea62839e106 100644
--- a/sdk/healthdataaiservices/azure-health-deidentification/pom.xml
+++ b/sdk/healthdataaiservices/azure-health-deidentification/pom.xml
@@ -67,7 +67,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/pom.xml b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/pom.xml
index eef6f1b2a5c6..6510bc798a95 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/pom.xml
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml b/sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml
index 66632f620285..ae7b80a63110 100644
--- a/sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml
+++ b/sdk/healthinsights/azure-health-insights-cancerprofiling/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml b/sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml
index e25bfc23bf11..fb44e26eef2f 100644
--- a/sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml
+++ b/sdk/healthinsights/azure-health-insights-clinicalmatching/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/pom.xml b/sdk/healthinsights/azure-health-insights-radiologyinsights/pom.xml
index 1aeb3a8c6b24..69b12601c3ad 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/pom.xml
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml b/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml
index 3b6287c72ded..dbbe962ebe66 100644
--- a/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml
+++ b/sdk/hybridcompute/azure-resourcemanager-hybridcompute/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/hybridconnectivity/azure-resourcemanager-hybridconnectivity/pom.xml b/sdk/hybridconnectivity/azure-resourcemanager-hybridconnectivity/pom.xml
index de9327287ad4..43c3ab80906c 100644
--- a/sdk/hybridconnectivity/azure-resourcemanager-hybridconnectivity/pom.xml
+++ b/sdk/hybridconnectivity/azure-resourcemanager-hybridconnectivity/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/hybridcontainerservice/azure-resourcemanager-hybridcontainerservice/pom.xml b/sdk/hybridcontainerservice/azure-resourcemanager-hybridcontainerservice/pom.xml
index 10f2a77b983e..38e4fde9d8f2 100644
--- a/sdk/hybridcontainerservice/azure-resourcemanager-hybridcontainerservice/pom.xml
+++ b/sdk/hybridcontainerservice/azure-resourcemanager-hybridcontainerservice/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml b/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml
index e30819934cae..c794c6aa21b7 100644
--- a/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml
+++ b/sdk/hybridkubernetes/azure-resourcemanager-hybridkubernetes/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml b/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml
index d6c0e77fe798..1e24acf3880c 100644
--- a/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml
+++ b/sdk/hybridnetwork/azure-resourcemanager-hybridnetwork/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/identity/azure-identity-broker/CHANGELOG.md b/sdk/identity/azure-identity-broker/CHANGELOG.md
index fc852b1bf140..e3de2b6bc2b6 100644
--- a/sdk/identity/azure-identity-broker/CHANGELOG.md
+++ b/sdk/identity/azure-identity-broker/CHANGELOG.md
@@ -10,6 +10,14 @@
 
 ### Other Changes
 
+## 1.1.18 (2025-10-13)
+
+### Other Changes
+
+#### Dependency Updates
+
+- Upgraded `azure-identity` from `1.18.0` to version `1.18.1`.
+
 ## 1.1.17 (2025-09-16)
 
 ### Other Changes
diff --git a/sdk/identity/azure-identity-broker/README.md b/sdk/identity/azure-identity-broker/README.md
index ed90e21a8759..a326a063c1ef 100644
--- a/sdk/identity/azure-identity-broker/README.md
+++ b/sdk/identity/azure-identity-broker/README.md
@@ -46,7 +46,7 @@ To take dependency on a particular version of the library that isn't present in
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity-broker</artifactId>
-    <version>1.1.16</version>
+    <version>1.1.18</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/identity/azure-identity-extensions/pom.xml b/sdk/identity/azure-identity-extensions/pom.xml
index 4daa3bc9cf6c..930ff4c8697f 100644
--- a/sdk/identity/azure-identity-extensions/pom.xml
+++ b/sdk/identity/azure-identity-extensions/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <!-- test   -->
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
index 1aadd40d716c..6f1574d62dc4 100644
--- a/sdk/identity/azure-identity/CHANGELOG.md
+++ b/sdk/identity/azure-identity/CHANGELOG.md
@@ -3,7 +3,6 @@
 ## 1.19.0-beta.1 (Unreleased)
 
 ### Features Added
-- Fixed `DefaultAzureCredential` behavior when `AZURE_TOKEN_CREDENTIALS` environment variable is explicitly set to `ManagedIdentityCredential`. The credential now skips unnecessary probe requests and enables retry logic with exponential backoff for improved resiliency in environments where the managed identity endpoint may be temporarily unavailable.
 
 ### Breaking Changes
 
@@ -11,6 +10,19 @@
 
 ### Other Changes
 
+## 1.18.1 (2025-10-13)
+
+### Features Added
+
+- Fixed `DefaultAzureCredential` behavior when `AZURE_TOKEN_CREDENTIALS` environment variable is explicitly set to `ManagedIdentityCredential`. The credential now skips unnecessary probe requests and enables retry logic with exponential backoff for improved resiliency in environments where the managed identity endpoint may be temporarily unavailable.
+
+### Other Changes
+
+#### Dependency Updates
+
+- Upgraded `azure-core` from `1.56.1` to version `1.57.0`.
+- Upgraded `azure-core-http-netty` from `1.16.1` to version `1.16.2`.
+
 ## 1.18.0 (2025-09-16)
 
 ### Features Added
diff --git a/sdk/identity/azure-identity/README.md b/sdk/identity/azure-identity/README.md
index cf45e93cb036..eaf2776cdb7d 100644
--- a/sdk/identity/azure-identity/README.md
+++ b/sdk/identity/azure-identity/README.md
@@ -46,7 +46,7 @@ To take dependency on a particular version of the library that isn't present in
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.16.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/WorkloadIdentityTokenProxyPolicy.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/WorkloadIdentityTokenProxyPolicy.java
new file mode 100644
index 000000000000..e8f6f1af31a2
--- /dev/null
+++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/WorkloadIdentityTokenProxyPolicy.java
@@ -0,0 +1,276 @@
+package com.azure.identity.implementation;
+
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.HttpPipelineCallContext;
+import com.azure.core.http.HttpPipelineNextPolicy;
+import com.azure.core.http.HttpPipelineNextSyncPolicy;
+import com.azure.core.http.HttpRequest;
+import com.azure.core.http.HttpResponse;
+import com.azure.core.http.policy.HttpPipelinePolicy;
+import com.azure.core.util.Configuration;
+import com.azure.core.util.CoreUtils;
+import com.azure.core.util.logging.ClientLogger;
+
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyStore;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+
+import reactor.core.publisher.Mono;
+
+
+public class WorkloadIdentityTokenProxyPolicy implements HttpPipelinePolicy {
+
+    private static final ClientLogger LOGGER = new ClientLogger(WorkloadIdentityTokenProxyPolicy.class);
+    
+    public static final String AZURE_KUBERNETES_TOKEN_PROXY = "AZURE_KUBERNETES_TOKEN_PROXY";
+    public static final String AZURE_KUBERNETES_CA_FILE = "AZURE_KUBERNETES_CA_FILE";
+    public static final String AZURE_KUBERNETES_CA_DATA = "AZURE_KUBERNETES_CA_DATA";
+    public static final String AZURE_KUBERNETES_SNI_NAME = "AZURE_KUBERNETES_SNI_NAME";
+
+    private byte[] caData;
+    private String caFile;
+    private String sniName;
+    private URI tokenProxyUri;
+    private HttpClient httpClient;
+    private SSLContext sslContext;
+    private byte[] lastCaBytes;
+
+
+    WorkloadIdentityTokenProxyPolicy(IdentityClientOptions identityClientOptions) {
+        Configuration configuration = identityClientOptions.getConfiguration() == null
+            ? Configuration.getGlobalConfiguration()
+            : identityClientOptions.getConfiguration();
+
+        String tokenProxyUrl = configuration.get(AZURE_KUBERNETES_TOKEN_PROXY);
+        String sniName = configuration.get(AZURE_KUBERNETES_SNI_NAME);
+        String caFile = configuration.get(AZURE_KUBERNETES_CA_FILE);
+        String caData = configuration.get(AZURE_KUBERNETES_CA_DATA);
+
+        if (CoreUtils.isNullOrEmpty(tokenProxyUrl)) {
+            if (!CoreUtils.isNullOrEmpty(sniName) 
+                || !CoreUtils.isNullOrEmpty(caFile) 
+                || !CoreUtils.isNullOrEmpty(caData)) {
+                throw LOGGER.logExceptionAsError(new IllegalStateException(
+                    "AZURE_KUBERNETES_TOKEN_PROXY is not set but other custom endpoint-related environment variables are present"));
+            }
+            this.tokenProxyUri = null;
+            this.caFile = null;
+            this.caData = null;
+            this.sniName = null;
+            return;
+        }
+
+        if (!CoreUtils.isNullOrEmpty(caFile) && !CoreUtils.isNullOrEmpty(caData)) {
+            throw LOGGER.logExceptionAsError(new IllegalStateException(
+                "Only one of AZURE_KUBERNETES_CA_FILE or AZURE_KUBERNETES_CA_DATA can be set."));
+        }
+
+        this.tokenProxyUri = parseAndValidateProxyUrl(tokenProxyUrl);
+        this.sniName = sniName;
+        this.caFile = caFile;
+        this.caData = CoreUtils.isNullOrEmpty(caData) ? null : caData.getBytes();
+    }
+
+    @Override
+    public Mono<HttpResponse> process(HttpPipelineCallContext context, HttpPipelineNextPolicy next) {
+        //HttpClient client = createHttpClient();
+        HttpRequest request = context.getHttpRequest();
+        HttpRequest proxyRequest = rewriteTokenRequestForProxy(request);
+        context.setHttpRequest(proxyRequest);
+        return next.process();
+    }
+
+
+    @Override
+    public HttpResponse processSync(HttpPipelineCallContext context, HttpPipelineNextSyncPolicy next) {
+        HttpRequest request = context.getHttpRequest();
+        HttpRequest proxyRequest = rewriteTokenRequestForProxy(request);
+        context.setHttpRequest(proxyRequest);
+        return next.processSync();
+    }
+
+    private HttpRequest rewriteTokenRequestForProxy(HttpRequest request) {
+        try {
+            URI originalUri = request.getUrl().toURI();
+            String originalPath = originalUri.getRawPath();
+            String originalQuery = originalUri.getRawQuery();
+
+            String tokenProxyBase = tokenProxyUri.toString();
+            if(!tokenProxyBase.endsWith("/")) tokenProxyBase += "/";
+            URI combined = URI.create(tokenProxyBase).resolve(originalPath.startsWith("/") ? originalPath.substring(1) : originalPath);
+
+            String combinedStr = combined.toString();
+            if (originalQuery != null && !originalQuery.isEmpty()) {
+                combinedStr += "?" + originalQuery;
+            }
+
+            URI newUri = URI.create(combinedStr);
+            HttpRequest newRequest = new HttpRequest(request.getHttpMethod(), newUri.toURL());
+            
+            if (request.getHeaders() != null) {
+                newRequest.setHeaders(request.getHeaders());
+            }
+            
+            if (request.getBodyAsBinaryData() != null) {
+                newRequest.setBody(request.getBodyAsBinaryData());
+            }
+                        
+            return newRequest;
+
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to rewrite token request for proxy", e);
+        }
+    }
+
+    // private HttpClient createHttpClient() {
+    //     if((caData == null || caData.length == 0) && (caFile == null || caFile.isEmpty())) {
+    //         if(httpClient == null) {
+    //             // httpClient = 
+    //         }
+    //     }
+    //     if(caFile == null || caFile.isEmpty()) {
+    //         // httpClient = 
+    //     }
+    //     throw new UnsupportedOperationException("Unimplemented method 'createHttpClient'");
+    // }
+
+    private SSLContext getSSLContext() {
+        try {
+            // If no CA override provide, use default
+            if(CoreUtils.isNullOrEmpty(caFile) && (caData == null || caData.length == 0)) {
+                if(sslContext == null) {
+                    sslContext = SSLContext.getDefault();
+                }
+                return sslContext;
+            }
+
+            // If CA data provided, use it
+            if(CoreUtils.isNullOrEmpty(caFile)) {
+                if(sslContext == null) {
+                    sslContext = createSslContextFromBytes(caData);
+                }
+                return sslContext;
+            }
+
+            // If CA file provided, read it (and re-read if it changes)
+            Path path = Paths.get(caFile);
+            if(!Files.exists(path)) {
+                throw new IOException("CA File not found: " + caFile);
+            }
+
+            byte[] currentContent = Files.readAllBytes(path);
+
+            if(currentContent.length == 0) {
+                if(sslContext == null) {
+                    throw new IOException("CA File " + caFile + " is empty.");
+                }
+                return sslContext;
+            }
+
+            if(sslContext == null || !Arrays.equals(currentContent, lastCaBytes)) {
+                sslContext = createSslContextFromBytes(currentContent);
+                lastCaBytes = currentContent;
+            }
+
+            return sslContext;
+
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to create default SSLContext", e);
+        }
+    }
+
+    // Create SSLContext from byte array containing PEM certificate data
+    private SSLContext createSslContextFromBytes(byte[] certificateData) {
+        try (InputStream inputStream = new ByteArrayInputStream(certificateData)) {
+            CertificateFactory cf = CertificateFactory.getInstance("X.509");
+            X509Certificate caCert = (X509Certificate) cf.generateCertificate(inputStream);
+            return createSslContext(caCert);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to create SSLContext from bytes", e);
+        }
+    }
+
+    // Create SSLContext from a single X509Certificate
+    private SSLContext createSslContext(X509Certificate caCert) {
+        try {
+            KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType());
+            keystore.load(null, null);
+            keystore.setCertificateEntry("ca-cert", caCert);
+
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init(keystore);
+
+            SSLContext context = SSLContext.getInstance("TLS");
+            context.init(null, tmf.getTrustManagers(), null);
+            return context;
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to create SSLContext", e);
+        }
+    }
+
+    /**
+     * Parses and validates the custom token proxy URL.
+     *
+     * @param endpoint The proxy endpoint URL string
+     * @return Validated URI
+     * @throws IllegalArgumentException if URL is invalid
+     */
+    private static URI parseAndValidateProxyUrl(String endpoint) {
+        if (CoreUtils.isNullOrEmpty(endpoint)) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException("Proxy endpoint cannot be null or empty"));
+        }
+
+        URI tokenProxy;
+        try {
+            tokenProxy = new URI(endpoint);
+        } catch (URISyntaxException e) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                "Failed to parse custom token proxy URL: " + endpoint, e));
+        }
+
+        if (!"https".equals(tokenProxy.getScheme())) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                "Custom token endpoint must use https scheme, got: " + tokenProxy.getScheme()));
+        }
+
+        if (tokenProxy.getRawUserInfo() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                "Custom token endpoint URL must not contain user info: " + endpoint));
+        }
+
+        if (tokenProxy.getRawQuery() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                "Custom token endpoint URL must not contain a query: " + endpoint));
+        }
+
+        if (tokenProxy.getRawFragment() != null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                "Custom token endpoint URL must not contain a fragment: " + endpoint));
+        }
+
+        if (tokenProxy.getRawPath() == null || tokenProxy.getRawPath().isEmpty()) {
+            try {
+                tokenProxy = new URI(tokenProxy.getScheme(), null, tokenProxy.getHost(), 
+                    tokenProxy.getPort(), "/", null, null);
+            } catch (URISyntaxException e) {
+                throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                    "Failed to normalize proxy URL path", e));
+            }
+        }
+
+        return tokenProxy;
+    }
+
+}
\ No newline at end of file
diff --git a/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml b/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml
index 46a4200a46b2..9ef5f8c24b64 100644
--- a/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml
+++ b/sdk/imagebuilder/azure-resourcemanager-imagebuilder/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/impactreporting/azure-resourcemanager-impactreporting/pom.xml b/sdk/impactreporting/azure-resourcemanager-impactreporting/pom.xml
index e96cc181987c..68ae7e9f6cef 100644
--- a/sdk/impactreporting/azure-resourcemanager-impactreporting/pom.xml
+++ b/sdk/impactreporting/azure-resourcemanager-impactreporting/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/informaticadatamanagement/azure-resourcemanager-informaticadatamanagement/pom.xml b/sdk/informaticadatamanagement/azure-resourcemanager-informaticadatamanagement/pom.xml
index c5b6006c7f60..ec03e651087e 100644
--- a/sdk/informaticadatamanagement/azure-resourcemanager-informaticadatamanagement/pom.xml
+++ b/sdk/informaticadatamanagement/azure-resourcemanager-informaticadatamanagement/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml b/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml
index 53b0c6f9f248..28a3f078a0cc 100644
--- a/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml
+++ b/sdk/iotcentral/azure-resourcemanager-iotcentral/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/iotfirmwaredefense/azure-resourcemanager-iotfirmwaredefense/pom.xml b/sdk/iotfirmwaredefense/azure-resourcemanager-iotfirmwaredefense/pom.xml
index 840f5c293de9..063e3d9c1d94 100644
--- a/sdk/iotfirmwaredefense/azure-resourcemanager-iotfirmwaredefense/pom.xml
+++ b/sdk/iotfirmwaredefense/azure-resourcemanager-iotfirmwaredefense/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/iothub/azure-resourcemanager-iothub/pom.xml b/sdk/iothub/azure-resourcemanager-iothub/pom.xml
index 42dba0104898..8af222c855cc 100644
--- a/sdk/iothub/azure-resourcemanager-iothub/pom.xml
+++ b/sdk/iothub/azure-resourcemanager-iothub/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/iotoperations/azure-resourcemanager-iotoperations/pom.xml b/sdk/iotoperations/azure-resourcemanager-iotoperations/pom.xml
index c57acb7d0e97..ad1deb7c39b1 100644
--- a/sdk/iotoperations/azure-resourcemanager-iotoperations/pom.xml
+++ b/sdk/iotoperations/azure-resourcemanager-iotoperations/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/keyvault-v2/platform-matrix.json b/sdk/keyvault-v2/platform-matrix.json
index 6fbf3f7ee4b4..6a7d67cfa368 100644
--- a/sdk/keyvault-v2/platform-matrix.json
+++ b/sdk/keyvault-v2/platform-matrix.json
@@ -42,7 +42,7 @@
       },
       "ArmTemplateParameters": "@{ enableHsm = $true }",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "TestOptions": ""
     }
   ]
diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml
index b9623d51eeb0..07ef47f6ee6e 100644
--- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml
index 36c3012dc731..d6043b63da8b 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml
index 61d1f7e2f31b..3390c0a2d7dd 100644
--- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/keyvault/azure-security-keyvault-perf/pom.xml b/sdk/keyvault/azure-security-keyvault-perf/pom.xml
index 75c09670a626..8903e47d4c30 100644
--- a/sdk/keyvault/azure-security-keyvault-perf/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-perf/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml
index fe2f607a352d..4597e00339b6 100644
--- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/keyvault/platform-matrix.json b/sdk/keyvault/platform-matrix.json
index 9be68f635bd9..3ee02b824635 100644
--- a/sdk/keyvault/platform-matrix.json
+++ b/sdk/keyvault/platform-matrix.json
@@ -42,7 +42,7 @@
       },
       "ArmTemplateParameters": "@{ enableHsm = $true }",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "TestOptions": ""
     }
   ]
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensions/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensions/pom.xml
index 156d59af77c0..12700595f4aa 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensions/pom.xml
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensions/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensiontypes/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensiontypes/pom.xml
index 61be726dd923..bdaf94b872e1 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensiontypes/pom.xml
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-extensiontypes/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-fluxconfigurations/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-fluxconfigurations/pom.xml
index 9b46fd01c61e..a430514bbe80 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-fluxconfigurations/pom.xml
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-fluxconfigurations/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-privatelinkscopes/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-privatelinkscopes/pom.xml
index 33f61e7fe679..1828c70ca0b9 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-privatelinkscopes/pom.xml
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration-privatelinkscopes/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
index ff3a1bb5e5ea..5e39ec7ae542 100644
--- a/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
+++ b/sdk/kubernetesconfiguration/azure-resourcemanager-kubernetesconfiguration/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/kusto/azure-resourcemanager-kusto/pom.xml b/sdk/kusto/azure-resourcemanager-kusto/pom.xml
index de79db46dcc6..7929303c0564 100644
--- a/sdk/kusto/azure-resourcemanager-kusto/pom.xml
+++ b/sdk/kusto/azure-resourcemanager-kusto/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/labservices/azure-resourcemanager-labservices/pom.xml b/sdk/labservices/azure-resourcemanager-labservices/pom.xml
index 68c023872f7a..19c41d147948 100644
--- a/sdk/labservices/azure-resourcemanager-labservices/pom.xml
+++ b/sdk/labservices/azure-resourcemanager-labservices/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/lambdatesthyperexecute/azure-resourcemanager-lambdatesthyperexecute/pom.xml b/sdk/lambdatesthyperexecute/azure-resourcemanager-lambdatesthyperexecute/pom.xml
index e36a43d5b4ba..76e60b17eea9 100644
--- a/sdk/lambdatesthyperexecute/azure-resourcemanager-lambdatesthyperexecute/pom.xml
+++ b/sdk/lambdatesthyperexecute/azure-resourcemanager-lambdatesthyperexecute/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/largeinstance/azure-resourcemanager-largeinstance/pom.xml b/sdk/largeinstance/azure-resourcemanager-largeinstance/pom.xml
index 019d491680f0..410e8c86eeec 100644
--- a/sdk/largeinstance/azure-resourcemanager-largeinstance/pom.xml
+++ b/sdk/largeinstance/azure-resourcemanager-largeinstance/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/loadtesting/azure-developer-loadtesting/pom.xml b/sdk/loadtesting/azure-developer-loadtesting/pom.xml
index fbb6a3d617b8..0fc09e4491be 100644
--- a/sdk/loadtesting/azure-developer-loadtesting/pom.xml
+++ b/sdk/loadtesting/azure-developer-loadtesting/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/loadtesting/azure-resourcemanager-loadtesting/pom.xml b/sdk/loadtesting/azure-resourcemanager-loadtesting/pom.xml
index b06c38f73b53..ded9b0dc6342 100644
--- a/sdk/loadtesting/azure-resourcemanager-loadtesting/pom.xml
+++ b/sdk/loadtesting/azure-resourcemanager-loadtesting/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml b/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml
index 2dc275f368f1..d614282e6a23 100644
--- a/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml
+++ b/sdk/loganalytics/azure-resourcemanager-loganalytics/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/logic/azure-resourcemanager-logic/pom.xml b/sdk/logic/azure-resourcemanager-logic/pom.xml
index f7827460dcd6..b007e3820044 100644
--- a/sdk/logic/azure-resourcemanager-logic/pom.xml
+++ b/sdk/logic/azure-resourcemanager-logic/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/logz/azure-resourcemanager-logz/pom.xml b/sdk/logz/azure-resourcemanager-logz/pom.xml
index ce7b1077bde8..03573f995917 100644
--- a/sdk/logz/azure-resourcemanager-logz/pom.xml
+++ b/sdk/logz/azure-resourcemanager-logz/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml b/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml
index 30ba09f61ab5..f7437f9dc669 100644
--- a/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml
+++ b/sdk/machinelearning/azure-resourcemanager-machinelearning/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml b/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml
index 407f78ea2cd0..db0aa89fe7c3 100644
--- a/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml
+++ b/sdk/maintenance/azure-resourcemanager-maintenance/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml b/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml
index 36c19b01a0e6..f51ecd9ec92d 100644
--- a/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml
+++ b/sdk/managedapplications/azure-resourcemanager-managedapplications/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/managednetworkfabric/azure-resourcemanager-managednetworkfabric/pom.xml b/sdk/managednetworkfabric/azure-resourcemanager-managednetworkfabric/pom.xml
index f91c261360f4..f17e6b7241ab 100644
--- a/sdk/managednetworkfabric/azure-resourcemanager-managednetworkfabric/pom.xml
+++ b/sdk/managednetworkfabric/azure-resourcemanager-managednetworkfabric/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/managementgroups/azure-resourcemanager-managementgroups/pom.xml b/sdk/managementgroups/azure-resourcemanager-managementgroups/pom.xml
index 980c45201a67..8075d5667c01 100644
--- a/sdk/managementgroups/azure-resourcemanager-managementgroups/pom.xml
+++ b/sdk/managementgroups/azure-resourcemanager-managementgroups/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-geolocation/pom.xml b/sdk/maps/azure-maps-geolocation/pom.xml
index beec01c09b16..0066e4c97e42 100644
--- a/sdk/maps/azure-maps-geolocation/pom.xml
+++ b/sdk/maps/azure-maps-geolocation/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-render/pom.xml b/sdk/maps/azure-maps-render/pom.xml
index 7faed76fbd96..52eb35033524 100644
--- a/sdk/maps/azure-maps-render/pom.xml
+++ b/sdk/maps/azure-maps-render/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-route/pom.xml b/sdk/maps/azure-maps-route/pom.xml
index f5617097fd1c..bda421e01a1f 100644
--- a/sdk/maps/azure-maps-route/pom.xml
+++ b/sdk/maps/azure-maps-route/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-search/pom.xml b/sdk/maps/azure-maps-search/pom.xml
index 776c61fdfbca..e89e42b7b99a 100644
--- a/sdk/maps/azure-maps-search/pom.xml
+++ b/sdk/maps/azure-maps-search/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-timezone/pom.xml b/sdk/maps/azure-maps-timezone/pom.xml
index 21170ba6d4f7..f814731cfdd5 100644
--- a/sdk/maps/azure-maps-timezone/pom.xml
+++ b/sdk/maps/azure-maps-timezone/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-traffic/pom.xml b/sdk/maps/azure-maps-traffic/pom.xml
index 5e2b19a1e863..3ff71b7cfed3 100644
--- a/sdk/maps/azure-maps-traffic/pom.xml
+++ b/sdk/maps/azure-maps-traffic/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-maps-weather/pom.xml b/sdk/maps/azure-maps-weather/pom.xml
index 91355b991d27..72191f78ce3b 100644
--- a/sdk/maps/azure-maps-weather/pom.xml
+++ b/sdk/maps/azure-maps-weather/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/maps/azure-resourcemanager-maps/pom.xml b/sdk/maps/azure-resourcemanager-maps/pom.xml
index 3b4df37965f9..3b3776fedd08 100644
--- a/sdk/maps/azure-resourcemanager-maps/pom.xml
+++ b/sdk/maps/azure-resourcemanager-maps/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml b/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml
index 17f3386b928c..e29b2829052e 100644
--- a/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml
+++ b/sdk/mariadb/azure-resourcemanager-mariadb/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml b/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml
index db72fd13d374..ec5e35d875ba 100644
--- a/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml
+++ b/sdk/marketplaceordering/azure-resourcemanager-marketplaceordering/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml b/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml
index 805444602a77..afccafc6af82 100644
--- a/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml
+++ b/sdk/mediaservices/azure-resourcemanager-mediaservices/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
index fc42b2fc1559..24493a79e1ac 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/README.md
@@ -113,7 +113,7 @@ Authentication with AAD requires some initial setup:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml
index 5e2b328148d8..051e9313310b 100644
--- a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml
+++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/migration/azure-resourcemanager-migration-assessment/pom.xml b/sdk/migration/azure-resourcemanager-migration-assessment/pom.xml
index 9cdd3ee6f54a..1c1b54e9b705 100644
--- a/sdk/migration/azure-resourcemanager-migration-assessment/pom.xml
+++ b/sdk/migration/azure-resourcemanager-migration-assessment/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/migrationdiscoverysap/azure-resourcemanager-migrationdiscoverysap/pom.xml b/sdk/migrationdiscoverysap/azure-resourcemanager-migrationdiscoverysap/pom.xml
index 999dd4644693..f6f2579995e9 100644
--- a/sdk/migrationdiscoverysap/azure-resourcemanager-migrationdiscoverysap/pom.xml
+++ b/sdk/migrationdiscoverysap/azure-resourcemanager-migrationdiscoverysap/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml
index 2f0a999319cf..287746908837 100644
--- a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml
+++ b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml b/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml
index be1ba830259b..5840edc3304c 100644
--- a/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml
+++ b/sdk/mixedreality/azure-resourcemanager-mixedreality/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/mobilenetwork/azure-resourcemanager-mobilenetwork/pom.xml b/sdk/mobilenetwork/azure-resourcemanager-mobilenetwork/pom.xml
index 3d223dfbc908..ce4128b6d76b 100644
--- a/sdk/mobilenetwork/azure-resourcemanager-mobilenetwork/pom.xml
+++ b/sdk/mobilenetwork/azure-resourcemanager-mobilenetwork/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml
index 7bbd5cf51739..d94c8adbe615 100644
--- a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml
+++ b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <!-- Appears this requires generic XML parsing not defined in code anywhere -->
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/pom.xml b/sdk/mongocluster/azure-resourcemanager-mongocluster/pom.xml
index c54b6fd13919..213b88ef0e0f 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/pom.xml
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/mongodbatlas/azure-resourcemanager-mongodbatlas/pom.xml b/sdk/mongodbatlas/azure-resourcemanager-mongodbatlas/pom.xml
index e0470d779dba..a553c603ee87 100644
--- a/sdk/mongodbatlas/azure-resourcemanager-mongodbatlas/pom.xml
+++ b/sdk/mongodbatlas/azure-resourcemanager-mongodbatlas/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/monitor/azure-monitor-ingestion-perf/pom.xml b/sdk/monitor/azure-monitor-ingestion-perf/pom.xml
index 5f4512655004..1f0b8e98b803 100644
--- a/sdk/monitor/azure-monitor-ingestion-perf/pom.xml
+++ b/sdk/monitor/azure-monitor-ingestion-perf/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/monitor/azure-monitor-ingestion/README.md b/sdk/monitor/azure-monitor-ingestion/README.md
index de7f222dd14c..1c866b4f5661 100644
--- a/sdk/monitor/azure-monitor-ingestion/README.md
+++ b/sdk/monitor/azure-monitor-ingestion/README.md
@@ -82,7 +82,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/monitor/azure-monitor-ingestion/pom.xml b/sdk/monitor/azure-monitor-ingestion/pom.xml
index 650e71911560..b8f991f99c0e 100644
--- a/sdk/monitor/azure-monitor-ingestion/pom.xml
+++ b/sdk/monitor/azure-monitor-ingestion/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/pom.xml b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/pom.xml
index 2e83e240e114..cbca218823a8 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/pom.xml
+++ b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/pom.xml
@@ -166,7 +166,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java
index 0d3def81aab9..9b9a446e0814 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java
+++ b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java
@@ -14,6 +14,7 @@
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.ContextTagKeys;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ClientAttributes;
+import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.DbAttributes;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.incubating.EnduserIncubatingAttributes;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.ExceptionAttributes;
 import com.azure.monitor.opentelemetry.autoconfigure.implementation.semconv.HttpAttributes;
@@ -61,12 +62,14 @@ public final class SpanDataMapper {
     // visible for testing
     public static final String MS_PROCESSED_BY_METRIC_EXTRACTORS = "_MS.ProcessedByMetricExtractors";
 
-    private static final Set<String> SQL_DB_SYSTEMS = new HashSet<>(asList(DbIncubatingAttributes.DbSystemValues.DB2,
-        DbIncubatingAttributes.DbSystemValues.DERBY, DbIncubatingAttributes.DbSystemValues.MARIADB,
-        DbIncubatingAttributes.DbSystemValues.MSSQL, DbIncubatingAttributes.DbSystemValues.MYSQL,
-        DbIncubatingAttributes.DbSystemValues.ORACLE, DbIncubatingAttributes.DbSystemValues.POSTGRESQL,
-        DbIncubatingAttributes.DbSystemValues.SQLITE, DbIncubatingAttributes.DbSystemValues.OTHER_SQL,
-        DbIncubatingAttributes.DbSystemValues.HSQLDB, DbIncubatingAttributes.DbSystemValues.H2));
+    // the deprecated incubating constants for mariadb, mysql, postgresql had the same values as the stable ones
+    private static final Set<String> SQL_DB_SYSTEMS
+        = new HashSet<>(asList(DbAttributes.DbSystemNameValues.MARIADB, DbAttributes.DbSystemNameValues.MYSQL,
+            DbAttributes.DbSystemNameValues.POSTGRESQL, DbAttributes.DbSystemNameValues.MICROSOFT_SQL_SERVER,
+            DbIncubatingAttributes.DbSystemValues.DB2, DbIncubatingAttributes.DbSystemValues.DERBY,
+            DbIncubatingAttributes.DbSystemValues.MSSQL, DbIncubatingAttributes.DbSystemValues.ORACLE,
+            DbIncubatingAttributes.DbSystemValues.SQLITE, DbIncubatingAttributes.DbSystemValues.OTHER_SQL,
+            DbIncubatingAttributes.DbSystemValues.HSQLDB, DbIncubatingAttributes.DbSystemValues.H2));
 
     // this is needed until Azure SDK moves to latest OTel semantic conventions
     private static final String COSMOS = "Cosmos";
@@ -227,7 +230,8 @@ private static void applySemanticConventions(RemoteDependencyTelemetryBuilder te
             applyRpcClientSpan(telemetryBuilder, rpcSystem, attributes);
             return;
         }
-        String dbSystem = attributes.get(DbIncubatingAttributes.DB_SYSTEM);
+        String dbSystem
+            = getStableOrOldAttribute(attributes, DbAttributes.DB_SYSTEM_NAME, DbIncubatingAttributes.DB_SYSTEM);
         if (dbSystem == null) {
             // special case needed until Azure SDK moves to latest OTel semantic conventions
             dbSystem = attributes.get(AiSemanticAttributes.AZURE_SDK_DB_TYPE);
@@ -402,15 +406,17 @@ private static String getTarget(String host, @Nullable Long port, int defaultPor
 
     private static void applyDatabaseClientSpan(RemoteDependencyTelemetryBuilder telemetryBuilder, String dbSystem,
         Attributes attributes) {
-        String dbStatement = attributes.get(DbIncubatingAttributes.DB_STATEMENT);
+        String dbStatement
+            = getStableOrOldAttribute(attributes, DbAttributes.DB_QUERY_TEXT, DbIncubatingAttributes.DB_STATEMENT);
         if (dbStatement == null) {
-            dbStatement = attributes.get(DbIncubatingAttributes.DB_OPERATION);
+            dbStatement = getStableOrOldAttribute(attributes, DbAttributes.DB_OPERATION_NAME,
+                DbIncubatingAttributes.DB_OPERATION);
         }
         String type;
         if (SQL_DB_SYSTEMS.contains(dbSystem)) {
-            if (dbSystem.equals(DbIncubatingAttributes.DbSystemValues.MYSQL)) {
+            if (dbSystem.equals(DbAttributes.DbSystemNameValues.MYSQL)) { // stable and incubating constants have the same value
                 type = "mysql"; // this has special icon in portal
-            } else if (dbSystem.equals(DbIncubatingAttributes.DbSystemValues.POSTGRESQL)) {
+            } else if (dbSystem.equals(DbAttributes.DbSystemNameValues.POSTGRESQL)) { // stable and incubating constants have the same value
                 type = "postgresql"; // this has special icon in portal
             } else {
                 type = "SQL";
@@ -437,7 +443,7 @@ private static void applyDatabaseClientSpan(RemoteDependencyTelemetryBuilder tel
             dbName = attributes.get(AiSemanticAttributes.AZURE_SDK_DB_INSTANCE);
         } else {
             target = getTargetOrDefault(attributes, getDefaultPortForDbSystem(dbSystem), dbSystem);
-            dbName = attributes.get(DbIncubatingAttributes.DB_NAME);
+            dbName = getStableOrOldAttribute(attributes, DbAttributes.DB_NAMESPACE, DbIncubatingAttributes.DB_NAME);
         }
         target = nullAwareConcat(target, dbName, " | ");
         if (target == null) {
@@ -472,10 +478,11 @@ private static int getDefaultPortForDbSystem(String dbSystem) {
             case DbIncubatingAttributes.DbSystemValues.REDIS:
                 return 6379;
 
-            case DbIncubatingAttributes.DbSystemValues.MARIADB:
-            case DbIncubatingAttributes.DbSystemValues.MYSQL:
+            case DbAttributes.DbSystemNameValues.MARIADB: // deprecated incubating constant had the same value
+            case DbAttributes.DbSystemNameValues.MYSQL: // deprecated incubating constant had the same value
                 return 3306;
 
+            case DbAttributes.DbSystemNameValues.MICROSOFT_SQL_SERVER:
             case DbIncubatingAttributes.DbSystemValues.MSSQL:
                 return 1433;
 
@@ -491,7 +498,7 @@ private static int getDefaultPortForDbSystem(String dbSystem) {
             case DbIncubatingAttributes.DbSystemValues.DERBY:
                 return 1527;
 
-            case DbIncubatingAttributes.DbSystemValues.POSTGRESQL:
+            case DbAttributes.DbSystemNameValues.POSTGRESQL: // deprecated incubating constant had the same value
                 return 5432;
 
             default:
diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
index 5d61be5ff618..33a5172a5473 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
+++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/monitor/azure-monitor-query-logs/README.md b/sdk/monitor/azure-monitor-query-logs/README.md
index 21378d7b28f8..5d45a3b5aeff 100644
--- a/sdk/monitor/azure-monitor-query-logs/README.md
+++ b/sdk/monitor/azure-monitor-query-logs/README.md
@@ -85,7 +85,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/monitor/azure-monitor-query-logs/pom.xml b/sdk/monitor/azure-monitor-query-logs/pom.xml
index 4966cceb73b1..8fc7407c9c63 100644
--- a/sdk/monitor/azure-monitor-query-logs/pom.xml
+++ b/sdk/monitor/azure-monitor-query-logs/pom.xml
@@ -64,7 +64,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/monitor/azure-monitor-query-metrics/README.md b/sdk/monitor/azure-monitor-query-metrics/README.md
index 049c8f18f841..1429714e60c9 100644
--- a/sdk/monitor/azure-monitor-query-metrics/README.md
+++ b/sdk/monitor/azure-monitor-query-metrics/README.md
@@ -81,7 +81,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.16.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/monitor/azure-monitor-query-metrics/pom.xml b/sdk/monitor/azure-monitor-query-metrics/pom.xml
index edfb2eba8ad7..a779fb755a21 100644
--- a/sdk/monitor/azure-monitor-query-metrics/pom.xml
+++ b/sdk/monitor/azure-monitor-query-metrics/pom.xml
@@ -64,7 +64,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/monitor/azure-monitor-query-perf/pom.xml b/sdk/monitor/azure-monitor-query-perf/pom.xml
index d2224da1e665..f8a60c8ad214 100644
--- a/sdk/monitor/azure-monitor-query-perf/pom.xml
+++ b/sdk/monitor/azure-monitor-query-perf/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/monitor/azure-monitor-query/README.md b/sdk/monitor/azure-monitor-query/README.md
index 36b54b918dcd..e4ba0f96926d 100644
--- a/sdk/monitor/azure-monitor-query/README.md
+++ b/sdk/monitor/azure-monitor-query/README.md
@@ -93,7 +93,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/monitor/azure-monitor-query/pom.xml b/sdk/monitor/azure-monitor-query/pom.xml
index 7101282d249c..526d3b276e9f 100644
--- a/sdk/monitor/azure-monitor-query/pom.xml
+++ b/sdk/monitor/azure-monitor-query/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/mysql/azure-resourcemanager-mysql/pom.xml b/sdk/mysql/azure-resourcemanager-mysql/pom.xml
index 1ca67511c6c0..6bfa349524e0 100644
--- a/sdk/mysql/azure-resourcemanager-mysql/pom.xml
+++ b/sdk/mysql/azure-resourcemanager-mysql/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml b/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml
index b693dff13c31..43abbf114492 100644
--- a/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml
+++ b/sdk/mysqlflexibleserver/azure-resourcemanager-mysqlflexibleserver/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/neonpostgres/azure-resourcemanager-neonpostgres/pom.xml b/sdk/neonpostgres/azure-resourcemanager-neonpostgres/pom.xml
index 0f4f1e98b276..bec3c6e50142 100644
--- a/sdk/neonpostgres/azure-resourcemanager-neonpostgres/pom.xml
+++ b/sdk/neonpostgres/azure-resourcemanager-neonpostgres/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md b/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md
index 9842a34344e2..ed4ec6b158c0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md
+++ b/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.10.0-beta.1 (Unreleased)
+## 1.10.0-beta.2 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,141 @@
 
 ### Other Changes
 
+## 1.10.0-beta.1 (2025-10-15)
+
+- Azure Resource Manager NetAppFiles client library for Java. This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-preview-2025-07-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+
+### Breaking Changes
+
+#### `models.ProvisioningState` was removed
+
+#### `models.SubscriptionQuotaItem` was removed
+
+#### `models.SubscriptionQuotaItemList` was removed
+
+#### `models.VolumeQuotaRule` was modified
+
+* `models.ProvisioningState provisioningState()` -> `models.NetAppProvisioningState provisioningState()`
+
+#### `models.VolumeQuotaRulePatch` was modified
+
+* `models.ProvisioningState provisioningState()` -> `models.NetAppProvisioningState provisioningState()`
+
+#### `models.NetAppResourceQuotaLimits` was modified
+
+* `models.SubscriptionQuotaItem get(java.lang.String,java.lang.String)` -> `models.QuotaItem get(java.lang.String,java.lang.String)`
+
+### Features Added
+
+* `models.BucketPatch` was added
+
+* `models.QuotaItemList` was added
+
+* `models.LdapConfiguration` was added
+
+* `models.Bucket$DefinitionStages` was added
+
+* `models.ListQuotaReportResponse` was added
+
+* `models.BucketServerProperties` was added
+
+* `models.LdapServerType` was added
+
+* `models.VolumeLanguage` was added
+
+* `models.BucketPermissions` was added
+
+* `models.BucketPatchPermissions` was added
+
+* `models.Bucket$Definition` was added
+
+* `models.Bucket` was added
+
+* `models.NfsUser` was added
+
+* `models.BucketGenerateCredentials` was added
+
+* `models.BucketCredentialsExpiry` was added
+
+* `models.NetAppProvisioningState` was added
+
+* `models.NetAppResourceQuotaLimitsAccounts` was added
+
+* `models.Bucket$Update` was added
+
+* `models.CifsUser` was added
+
+* `models.QuotaReport` was added
+
+* `models.BucketServerPatchProperties` was added
+
+* `models.CredentialsStatus` was added
+
+* `models.BucketList` was added
+
+* `models.QuotaItem` was added
+
+* `models.ExternalReplicationSetupStatus` was added
+
+* `models.Bucket$UpdateStages` was added
+
+* `models.Buckets` was added
+
+* `models.FileSystemUser` was added
+
+#### `models.NetAppAccount$Definition` was modified
+
+* `withLdapConfiguration(models.LdapConfiguration)` was added
+
+#### `models.Volume$Definition` was modified
+
+* `withLanguage(models.VolumeLanguage)` was added
+* `withLdapServerType(models.LdapServerType)` was added
+
+#### `models.ReplicationObject` was modified
+
+* `externalReplicationSetupStatus()` was added
+* `externalReplicationSetupInfo()` was added
+* `mirrorState()` was added
+* `relationshipStatus()` was added
+
+#### `models.NetAppAccountPatch` was modified
+
+* `ldapConfiguration()` was added
+* `withLdapConfiguration(models.LdapConfiguration)` was added
+
+#### `models.NetAppAccount$Update` was modified
+
+* `withLdapConfiguration(models.LdapConfiguration)` was added
+
+#### `models.VolumeGroupVolumeProperties` was modified
+
+* `withLdapServerType(models.LdapServerType)` was added
+* `withLanguage(models.VolumeLanguage)` was added
+* `language()` was added
+* `ldapServerType()` was added
+
+#### `models.Volume` was modified
+
+* `ldapServerType()` was added
+* `language()` was added
+* `listQuotaReport()` was added
+* `listQuotaReport(com.azure.core.util.Context)` was added
+
+#### `NetAppFilesManager` was modified
+
+* `netAppResourceQuotaLimitsAccounts()` was added
+* `buckets()` was added
+
+#### `models.Volumes` was modified
+
+* `listQuotaReport(java.lang.String,java.lang.String,java.lang.String,java.lang.String,com.azure.core.util.Context)` was added
+* `listQuotaReport(java.lang.String,java.lang.String,java.lang.String,java.lang.String)` was added
+
+#### `models.NetAppAccount` was modified
+
+* `ldapConfiguration()` was added
+
 ## 1.9.0 (2025-08-19)
 
 - Azure Resource Manager NetAppFiles client library for Java. This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-2025-06-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
diff --git a/sdk/netapp/azure-resourcemanager-netapp/README.md b/sdk/netapp/azure-resourcemanager-netapp/README.md
index 35c14121a6d2..ace1f13b15ca 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/README.md
+++ b/sdk/netapp/azure-resourcemanager-netapp/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager NetAppFiles client library for Java.
 
-This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-2025-06-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-preview-2025-07-01-preview. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-netapp</artifactId>
-    <version>1.9.0</version>
+    <version>1.10.0-beta.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/netapp/azure-resourcemanager-netapp/SAMPLE.md b/sdk/netapp/azure-resourcemanager-netapp/SAMPLE.md
index 202b1289fa5b..a3c9de643e67 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/SAMPLE.md
+++ b/sdk/netapp/azure-resourcemanager-netapp/SAMPLE.md
@@ -52,6 +52,15 @@
 
 - [MigrateBackups](#backupsundervolume_migratebackups)
 
+## Buckets
+
+- [CreateOrUpdate](#buckets_createorupdate)
+- [Delete](#buckets_delete)
+- [GenerateCredentials](#buckets_generatecredentials)
+- [Get](#buckets_get)
+- [List](#buckets_list)
+- [Update](#buckets_update)
+
 ## NetAppResource
 
 - [CheckFilePathAvailability](#netappresource_checkfilepathavailability)
@@ -66,6 +75,11 @@
 - [Get](#netappresourcequotalimits_get)
 - [List](#netappresourcequotalimits_list)
 
+## NetAppResourceQuotaLimitsAccount
+
+- [Get](#netappresourcequotalimitsaccount_get)
+- [List](#netappresourcequotalimitsaccount_list)
+
 ## NetAppResourceRegionInfos
 
 - [Get](#netappresourceregioninfos_get)
@@ -144,6 +158,7 @@
 - [Get](#volumes_get)
 - [List](#volumes_list)
 - [ListGetGroupIdListForLdapUser](#volumes_listgetgroupidlistforldapuser)
+- [ListQuotaReport](#volumes_listquotareport)
 - [ListReplications](#volumes_listreplications)
 - [PeerExternalCluster](#volumes_peerexternalcluster)
 - [PerformReplicationTransfer](#volumes_performreplicationtransfer)
@@ -171,8 +186,8 @@ import java.util.Arrays;
  */
 public final class AccountsChangeKeyVaultSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_ChangeKeyVault.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_ChangeKeyVault.json
      */
     /**
      * Sample code: Accounts_ChangeKeyVault.
@@ -204,8 +219,8 @@ import java.util.Arrays;
  */
 public final class AccountsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_CreateOrUpdate.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_CreateOrUpdate.json
      */
     /**
      * Sample code: Accounts_CreateOrUpdate.
@@ -217,8 +232,8 @@ public final class AccountsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_CreateOrUpdateAD.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_CreateOrUpdateAD.json
      */
     /**
      * Sample code: Accounts_CreateOrUpdateWithActiveDirectory.
@@ -255,7 +270,7 @@ public final class AccountsCreateOrUpdateSamples {
 public final class AccountsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_Delete.json
      */
     /**
      * Sample code: Accounts_Delete.
@@ -277,7 +292,7 @@ public final class AccountsDeleteSamples {
 public final class AccountsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_Get.json
      */
     /**
      * Sample code: Accounts_Get.
@@ -298,7 +313,7 @@ public final class AccountsGetByResourceGroupSamples {
  */
 public final class AccountsGetChangeKeyVaultInformationSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Accounts_GetChangeKeyVaultInformation.json
      */
     /**
@@ -321,8 +336,8 @@ public final class AccountsGetChangeKeyVaultInformationSamples {
  */
 public final class AccountsListSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_List.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_ListBySubscription.json
      */
     /**
      * Sample code: Accounts_List.
@@ -344,7 +359,7 @@ public final class AccountsListSamples {
 public final class AccountsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_List.json
      */
     /**
      * Sample code: Accounts_List.
@@ -365,8 +380,8 @@ public final class AccountsListByResourceGroupSamples {
  */
 public final class AccountsRenewCredentialsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_RenewCredentials.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_RenewCredentials.json
      */
     /**
      * Sample code: Accounts_RenewCredentials.
@@ -389,7 +404,7 @@ import com.azure.resourcemanager.netapp.models.EncryptionTransitionRequest;
  */
 public final class AccountsTransitionToCmkSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Accounts_TransitionEncryptionKey.json
      */
     /**
@@ -421,7 +436,7 @@ import java.util.Map;
 public final class AccountsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_Update.json
      */
     /**
      * Sample code: Accounts_Update.
@@ -458,7 +473,8 @@ public final class AccountsUpdateSamples {
 public final class BackupPoliciesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Create.
+     * json
      */
     /**
      * Sample code: BackupPolicies_Create.
@@ -488,7 +504,8 @@ public final class BackupPoliciesCreateSamples {
 public final class BackupPoliciesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Delete.
+     * json
      */
     /**
      * Sample code: BackupPolicies_Delete.
@@ -511,7 +528,8 @@ public final class BackupPoliciesDeleteSamples {
 public final class BackupPoliciesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Get.
+     * json
      */
     /**
      * Sample code: Backups_Get.
@@ -534,7 +552,8 @@ public final class BackupPoliciesGetSamples {
 public final class BackupPoliciesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_List.
+     * json
      */
     /**
      * Sample code: BackupPolicies_List.
@@ -558,7 +577,8 @@ import com.azure.resourcemanager.netapp.models.BackupPolicy;
 public final class BackupPoliciesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Update.
+     * json
      */
     /**
      * Sample code: BackupPolicies_Update.
@@ -588,7 +608,8 @@ public final class BackupPoliciesUpdateSamples {
 public final class BackupVaultsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Create.
+     * json
      */
     /**
      * Sample code: BackupVault_CreateOrUpdate.
@@ -614,7 +635,8 @@ public final class BackupVaultsCreateOrUpdateSamples {
 public final class BackupVaultsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Delete.
+     * json
      */
     /**
      * Sample code: BackupVaults_Delete.
@@ -636,7 +658,7 @@ public final class BackupVaultsDeleteSamples {
 public final class BackupVaultsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Get.json
      */
     /**
      * Sample code: BackupVaults_Get.
@@ -658,7 +680,7 @@ public final class BackupVaultsGetSamples {
 public final class BackupVaultsListByNetAppAccountSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_List.json
      */
     /**
      * Sample code: BackupVaults_List.
@@ -684,7 +706,8 @@ import java.util.Map;
 public final class BackupVaultsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Update.
+     * json
      */
     /**
      * Sample code: BackupVaults_Update.
@@ -720,9 +743,8 @@ public final class BackupVaultsUpdateSamples {
  */
 public final class BackupsCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Create.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Create.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Create.
@@ -749,9 +771,8 @@ public final class BackupsCreateSamples {
  */
 public final class BackupsDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Delete.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Delete.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Delete.
@@ -773,9 +794,8 @@ public final class BackupsDeleteSamples {
  */
 public final class BackupsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Get.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Get.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Get.
@@ -797,8 +817,8 @@ public final class BackupsGetSamples {
  */
 public final class BackupsGetLatestStatusSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_LatestBackupStatus.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_LatestBackupStatus.json
      */
     /**
      * Sample code: Volumes_BackupStatus.
@@ -820,9 +840,8 @@ public final class BackupsGetLatestStatusSamples {
  */
 public final class BackupsGetVolumeLatestRestoreStatusSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_LatestRestoreStatus.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_LatestRestoreStatus.json
      */
     /**
      * Sample code: Volumes_RestoreStatus.
@@ -845,9 +864,8 @@ public final class BackupsGetVolumeLatestRestoreStatusSamples {
  */
 public final class BackupsListByVaultSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_List.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_List.json
      */
     /**
      * Sample code: Backups_List.
@@ -870,9 +888,8 @@ import com.azure.resourcemanager.netapp.models.Backup;
  */
 public final class BackupsUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Update.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Update.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Update.
@@ -898,9 +915,8 @@ import com.azure.resourcemanager.netapp.models.BackupsMigrationRequest;
  */
 public final class BackupsUnderAccountMigrateBackupsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderAccount_Migrate.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderAccount_Migrate.json
      */
     /**
      * Sample code: BackupsUnderAccount_Migrate.
@@ -927,7 +943,7 @@ import java.util.Arrays;
  */
 public final class BackupsUnderBackupVaultRestoreFilesSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * BackupsUnderBackupVault_SingleFileRestore.json
      */
     /**
@@ -956,8 +972,8 @@ import com.azure.resourcemanager.netapp.models.BackupsMigrationRequest;
  */
 public final class BackupsUnderVolumeMigrateBackupsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderVolume_Migrate.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderVolume_Migrate.json
      */
     /**
      * Sample code: BackupsUnderVolume_Migrate.
@@ -973,6 +989,168 @@ public final class BackupsUnderVolumeMigrateBackupsSamples {
 }
 ```
 
+### Buckets_CreateOrUpdate
+
+```java
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+
+/**
+ * Samples for Buckets CreateOrUpdate.
+ */
+public final class BucketsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_CreateOrUpdate
+     * .json
+     */
+    /**
+     * Sample code: Buckets_CreateOrUpdate.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsCreateOrUpdate(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets()
+            .define("bucket1")
+            .withExistingVolume("myRG", "account1", "pool1", "volume1")
+            .withPath("/path")
+            .withFileSystemUser(new FileSystemUser().withNfsUser(new NfsUser().withUserId(1001L).withGroupId(1000L)))
+            .withServer(new BucketServerProperties().withFqdn("fullyqualified.domainname.com")
+                .withCertificateObject("<REDACTED>"))
+            .withPermissions(BucketPermissions.READ_ONLY)
+            .create();
+    }
+}
+```
+
+### Buckets_Delete
+
+```java
+/**
+ * Samples for Buckets Delete.
+ */
+public final class BucketsDeleteSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_Delete.json
+     */
+    /**
+     * Sample code: Buckets_Delete.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsDelete(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets().delete("myRG", "account1", "pool1", "volume1", "bucket1", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### Buckets_GenerateCredentials
+
+```java
+import com.azure.resourcemanager.netapp.models.BucketCredentialsExpiry;
+
+/**
+ * Samples for Buckets GenerateCredentials.
+ */
+public final class BucketsGenerateCredentialsSamples {
+    /*
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Buckets_GenerateCredentials.json
+     */
+    /**
+     * Sample code: Buckets_GenerateCredentials.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsGenerateCredentials(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets()
+            .generateCredentialsWithResponse("myRG", "account1", "pool1", "volume1", "bucket1",
+                new BucketCredentialsExpiry().withKeyPairExpiryDays(3), com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### Buckets_Get
+
+```java
+/**
+ * Samples for Buckets Get.
+ */
+public final class BucketsGetSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_Get.json
+     */
+    /**
+     * Sample code: Buckets_Get.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsGet(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets()
+            .getWithResponse("myRG", "account1", "pool1", "volume1", "bucket1", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### Buckets_List
+
+```java
+/**
+ * Samples for Buckets List.
+ */
+public final class BucketsListSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_List.json
+     */
+    /**
+     * Sample code: Buckets_List.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsList(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets().list("myRG", "account1", "pool1", "volume1", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### Buckets_Update
+
+```java
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketPatchPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+
+/**
+ * Samples for Buckets Update.
+ */
+public final class BucketsUpdateSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_Update.json
+     */
+    /**
+     * Sample code: Buckets_Update.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsUpdate(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        Bucket resource = manager.buckets()
+            .getWithResponse("myRG", "account1", "pool1", "volume1", "bucket1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withServer(new BucketServerPatchProperties().withFqdn("fullyqualified.domainname.com")
+                .withCertificateObject("<REDACTED>"))
+            .withPermissions(BucketPatchPermissions.READ_WRITE)
+            .apply();
+    }
+}
+```
+
 ### NetAppResource_CheckFilePathAvailability
 
 ```java
@@ -983,8 +1161,8 @@ import com.azure.resourcemanager.netapp.models.FilePathAvailabilityRequest;
  */
 public final class NetAppResourceCheckFilePathAvailabilitySamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/CheckFilePathAvailability.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * CheckFilePathAvailability.json
      */
     /**
      * Sample code: CheckFilePathAvailability.
@@ -996,7 +1174,7 @@ public final class NetAppResourceCheckFilePathAvailabilitySamples {
             .checkFilePathAvailabilityWithResponse("eastus", new FilePathAvailabilityRequest()
                 .withName("my-exact-filepth")
                 .withSubnetId(
-                    "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"),
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"),
                 com.azure.core.util.Context.NONE);
     }
 }
@@ -1014,7 +1192,8 @@ import com.azure.resourcemanager.netapp.models.ResourceNameAvailabilityRequest;
 public final class NetAppResourceCheckNameAvailabilitySamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/CheckNameAvailability.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/CheckNameAvailability.
+     * json
      */
     /**
      * Sample code: CheckNameAvailability.
@@ -1044,7 +1223,8 @@ import com.azure.resourcemanager.netapp.models.QuotaAvailabilityRequest;
 public final class NetAppResourceCheckQuotaAvailabilitySamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/CheckQuotaAvailability.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/CheckQuotaAvailability
+     * .json
      */
     /**
      * Sample code: CheckQuotaAvailability.
@@ -1072,8 +1252,8 @@ import com.azure.resourcemanager.netapp.models.QueryNetworkSiblingSetRequest;
  */
 public final class NetAppResourceQueryNetworkSiblingSetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/NetworkSiblingSet_Query.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * NetworkSiblingSet_Query.json
      */
     /**
      * Sample code: NetworkSiblingSet_Query.
@@ -1085,7 +1265,7 @@ public final class NetAppResourceQueryNetworkSiblingSetSamples {
             .queryNetworkSiblingSetWithResponse("eastus", new QueryNetworkSiblingSetRequest()
                 .withNetworkSiblingSetId("9760acf5-4638-11e7-9bdb-020073ca3333")
                 .withSubnetId(
-                    "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet"),
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet"),
                 com.azure.core.util.Context.NONE);
     }
 }
@@ -1100,7 +1280,7 @@ public final class NetAppResourceQueryNetworkSiblingSetSamples {
 public final class NetAppResourceQueryRegionInfoSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/RegionInfo.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/RegionInfo.json
      */
     /**
      * Sample code: RegionInfo_Query.
@@ -1124,8 +1304,8 @@ import com.azure.resourcemanager.netapp.models.UpdateNetworkSiblingSetRequest;
  */
 public final class NetAppResourceUpdateNetworkSiblingSetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/NetworkSiblingSet_Update.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * NetworkSiblingSet_Update.json
      */
     /**
      * Sample code: NetworkFeatures_Update.
@@ -1137,7 +1317,7 @@ public final class NetAppResourceUpdateNetworkSiblingSetSamples {
             .updateNetworkSiblingSet("eastus", new UpdateNetworkSiblingSetRequest()
                 .withNetworkSiblingSetId("9760acf5-4638-11e7-9bdb-020073ca3333")
                 .withSubnetId(
-                    "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet")
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet")
                 .withNetworkSiblingSetStateId("12345_44420.8001578125")
                 .withNetworkFeatures(NetworkFeatures.STANDARD), com.azure.core.util.Context.NONE);
     }
@@ -1153,7 +1333,7 @@ public final class NetAppResourceUpdateNetworkSiblingSetSamples {
 public final class NetAppResourceQuotaLimitsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/QuotaLimits_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/QuotaLimits_Get.json
      */
     /**
      * Sample code: QuotaLimits.
@@ -1176,7 +1356,7 @@ public final class NetAppResourceQuotaLimitsGetSamples {
 public final class NetAppResourceQuotaLimitsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/QuotaLimits_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/QuotaLimits_List.json
      */
     /**
      * Sample code: QuotaLimits.
@@ -1189,6 +1369,52 @@ public final class NetAppResourceQuotaLimitsListSamples {
 }
 ```
 
+### NetAppResourceQuotaLimitsAccount_Get
+
+```java
+/**
+ * Samples for NetAppResourceQuotaLimitsAccount Get.
+ */
+public final class NetAppResourceQuotaLimitsAccountGetSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/QuotaLimitsAccount_Get
+     * .json
+     */
+    /**
+     * Sample code: Volumes_RestoreStatus.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void volumesRestoreStatus(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.netAppResourceQuotaLimitsAccounts()
+            .getWithResponse("myRG", "myAccount", "poolsPerAccount", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### NetAppResourceQuotaLimitsAccount_List
+
+```java
+/**
+ * Samples for NetAppResourceQuotaLimitsAccount List.
+ */
+public final class NetAppResourceQuotaLimitsAccountListSamples {
+    /*
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * QuotaLimitsAccount_List.json
+     */
+    /**
+     * Sample code: QuotaLimitsAccount_List.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void quotaLimitsAccountList(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.netAppResourceQuotaLimitsAccounts().list("myRG", "myAccount", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
 ### NetAppResourceRegionInfos_Get
 
 ```java
@@ -1198,7 +1424,7 @@ public final class NetAppResourceQuotaLimitsListSamples {
 public final class NetAppResourceRegionInfosGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/RegionInfos_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/RegionInfos_Get.json
      */
     /**
      * Sample code: RegionInfos_Get.
@@ -1220,7 +1446,7 @@ public final class NetAppResourceRegionInfosGetSamples {
 public final class NetAppResourceRegionInfosListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/RegionInfos_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/RegionInfos_List.json
      */
     /**
      * Sample code: RegionInfos_List.
@@ -1242,7 +1468,7 @@ public final class NetAppResourceRegionInfosListSamples {
 public final class NetAppResourceUsagesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Usages_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Usages_Get.json
      */
     /**
      * Sample code: Usages_Get.
@@ -1265,7 +1491,7 @@ public final class NetAppResourceUsagesGetSamples {
 public final class NetAppResourceUsagesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Usages_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Usages_List.json
      */
     /**
      * Sample code: Usages_List.
@@ -1287,7 +1513,7 @@ public final class NetAppResourceUsagesListSamples {
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/OperationList.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/OperationList.json
      */
     /**
      * Sample code: OperationList.
@@ -1312,7 +1538,8 @@ import com.azure.resourcemanager.netapp.models.ServiceLevel;
 public final class PoolsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_CreateOrUpdate.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_CreateOrUpdate.
+     * json
      */
     /**
      * Sample code: Pools_CreateOrUpdate.
@@ -1331,7 +1558,7 @@ public final class PoolsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Pools_CreateOrUpdate_CustomThroughput.json
      */
     /**
@@ -1363,7 +1590,7 @@ public final class PoolsCreateOrUpdateSamples {
 public final class PoolsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_Delete.json
      */
     /**
      * Sample code: Pools_Delete.
@@ -1384,8 +1611,8 @@ public final class PoolsDeleteSamples {
  */
 public final class PoolsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Get_CustomThroughput.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Pools_Get_CustomThroughput.json
      */
     /**
      * Sample code: Pools_Get_CustomThroughput.
@@ -1398,7 +1625,7 @@ public final class PoolsGetSamples {
 
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_Get.json
      */
     /**
      * Sample code: Pools_Get.
@@ -1420,7 +1647,7 @@ public final class PoolsGetSamples {
 public final class PoolsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_List.json
      */
     /**
      * Sample code: Pools_List.
@@ -1444,7 +1671,7 @@ import com.azure.resourcemanager.netapp.models.CapacityPool;
 public final class PoolsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_Update.json
      */
     /**
      * Sample code: Pools_Update.
@@ -1458,9 +1685,8 @@ public final class PoolsUpdateSamples {
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Update_CustomThroughput.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Pools_Update_CustomThroughput.json
      */
     /**
      * Sample code: Pools_Update_CustomThroughput.
@@ -1489,8 +1715,8 @@ import com.azure.resourcemanager.netapp.models.WeeklySchedule;
  */
 public final class SnapshotPoliciesCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Create.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_Create.json
      */
     /**
      * Sample code: SnapshotPolicies_Create.
@@ -1522,8 +1748,8 @@ public final class SnapshotPoliciesCreateSamples {
  */
 public final class SnapshotPoliciesDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Delete.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_Delete.json
      */
     /**
      * Sample code: SnapshotPolicies_Delete.
@@ -1546,7 +1772,8 @@ public final class SnapshotPoliciesDeleteSamples {
 public final class SnapshotPoliciesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/SnapshotPolicies_Get.
+     * json
      */
     /**
      * Sample code: SnapshotPolicies_Get.
@@ -1569,7 +1796,8 @@ public final class SnapshotPoliciesGetSamples {
 public final class SnapshotPoliciesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/SnapshotPolicies_List.
+     * json
      */
     /**
      * Sample code: SnapshotPolicies_List.
@@ -1590,9 +1818,8 @@ public final class SnapshotPoliciesListSamples {
  */
 public final class SnapshotPoliciesListVolumesSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_ListVolumes.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_ListVolumes.json
      */
     /**
      * Sample code: SnapshotPolicies_ListVolumes.
@@ -1620,8 +1847,8 @@ import com.azure.resourcemanager.netapp.models.WeeklySchedule;
  */
 public final class SnapshotPoliciesUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Update.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_Update.json
      */
     /**
      * Sample code: SnapshotPolicies_Update.
@@ -1654,7 +1881,7 @@ public final class SnapshotPoliciesUpdateSamples {
 public final class SnapshotsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Create.json
      */
     /**
      * Sample code: Snapshots_Create.
@@ -1680,7 +1907,7 @@ public final class SnapshotsCreateSamples {
 public final class SnapshotsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Delete.json
      */
     /**
      * Sample code: Snapshots_Delete.
@@ -1703,7 +1930,7 @@ public final class SnapshotsDeleteSamples {
 public final class SnapshotsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Get.json
      */
     /**
      * Sample code: Snapshots_Get.
@@ -1726,7 +1953,7 @@ public final class SnapshotsGetSamples {
 public final class SnapshotsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_List.json
      */
     /**
      * Sample code: Snapshots_List.
@@ -1750,9 +1977,8 @@ import java.util.Arrays;
  */
 public final class SnapshotsRestoreFilesSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_SingleFileRestore.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Snapshots_SingleFileRestore.json
      */
     /**
      * Sample code: Snapshots_SingleFileRestore.
@@ -1781,7 +2007,7 @@ import java.io.IOException;
 public final class SnapshotsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Update.json
      */
     /**
      * Sample code: Snapshots_Update.
@@ -1807,7 +2033,7 @@ public final class SnapshotsUpdateSamples {
 public final class SubvolumesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Create.json
      */
     /**
      * Sample code: Subvolumes_Create.
@@ -1833,7 +2059,7 @@ public final class SubvolumesCreateSamples {
 public final class SubvolumesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Delete.json
      */
     /**
      * Sample code: Subvolumes_Delete.
@@ -1856,7 +2082,7 @@ public final class SubvolumesDeleteSamples {
 public final class SubvolumesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Get.json
      */
     /**
      * Sample code: Subvolumes_Get.
@@ -1879,7 +2105,8 @@ public final class SubvolumesGetSamples {
 public final class SubvolumesGetMetadataSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Metadata.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Metadata.
+     * json
      */
     /**
      * Sample code: Subvolumes_Metadata.
@@ -1902,7 +2129,7 @@ public final class SubvolumesGetMetadataSamples {
 public final class SubvolumesListByVolumeSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_List.json
      */
     /**
      * Sample code: Subvolumes_List.
@@ -1926,7 +2153,7 @@ import com.azure.resourcemanager.netapp.models.SubvolumeInfo;
 public final class SubvolumesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Update.json
      */
     /**
      * Sample code: Subvolumes_Update.
@@ -1958,9 +2185,8 @@ import java.util.Arrays;
  */
 public final class VolumeGroupsCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Create_SapHana.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Create_SapHana.json
      */
     /**
      * Sample code: VolumeGroups_Create_SapHana.
@@ -2120,8 +2346,8 @@ public final class VolumeGroupsCreateSamples {
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Create_Oracle.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Create_Oracle.json
      */
     /**
      * Sample code: VolumeGroups_Create_Oracle.
@@ -2475,7 +2701,8 @@ public final class VolumeGroupsCreateSamples {
 public final class VolumeGroupsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/VolumeGroups_Delete.
+     * json
      */
     /**
      * Sample code: VolumeGroups_Delete.
@@ -2496,8 +2723,8 @@ public final class VolumeGroupsDeleteSamples {
  */
 public final class VolumeGroupsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Get_SapHana.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Get_SapHana.json
      */
     /**
      * Sample code: VolumeGroups_Get_SapHana.
@@ -2509,8 +2736,8 @@ public final class VolumeGroupsGetSamples {
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Get_Oracle.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Get_Oracle.json
      */
     /**
      * Sample code: VolumeGroups_Get_Oracle.
@@ -2531,8 +2758,8 @@ public final class VolumeGroupsGetSamples {
  */
 public final class VolumeGroupsListByNetAppAccountSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_List_Oracle.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_List_Oracle.json
      */
     /**
      * Sample code: VolumeGroups_List_Oracle.
@@ -2544,8 +2771,8 @@ public final class VolumeGroupsListByNetAppAccountSamples {
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_List_SapHana.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_List_SapHana.json
      */
     /**
      * Sample code: VolumeGroups_List_SapHana.
@@ -2568,8 +2795,8 @@ import com.azure.resourcemanager.netapp.models.Type;
  */
 public final class VolumeQuotaRulesCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Create.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeQuotaRules_Create.json
      */
     /**
      * Sample code: VolumeQuotaRules_Create.
@@ -2597,8 +2824,8 @@ public final class VolumeQuotaRulesCreateSamples {
  */
 public final class VolumeQuotaRulesDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Delete.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeQuotaRules_Delete.json
      */
     /**
      * Sample code: VolumeQuotaRules_Delete.
@@ -2621,7 +2848,8 @@ public final class VolumeQuotaRulesDeleteSamples {
 public final class VolumeQuotaRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/VolumeQuotaRules_Get.
+     * json
      */
     /**
      * Sample code: VolumeQuotaRules_Get.
@@ -2645,7 +2873,8 @@ public final class VolumeQuotaRulesGetSamples {
 public final class VolumeQuotaRulesListByVolumeSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/VolumeQuotaRules_List.
+     * json
      */
     /**
      * Sample code: VolumeQuotaRules_List.
@@ -2669,8 +2898,8 @@ import com.azure.resourcemanager.netapp.models.VolumeQuotaRule;
  */
 public final class VolumeQuotaRulesUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Update.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeQuotaRules_Update.json
      */
     /**
      * Sample code: VolumeQuotaRules_Update.
@@ -2695,7 +2924,7 @@ public final class VolumeQuotaRulesUpdateSamples {
  */
 public final class VolumesAuthorizeExternalReplicationSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_AuthorizeExternalReplication.json
      */
     /**
@@ -2721,9 +2950,8 @@ import com.azure.resourcemanager.netapp.models.AuthorizeRequest;
  */
 public final class VolumesAuthorizeReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_AuthorizeReplication.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_AuthorizeReplication.json
      */
     /**
      * Sample code: Volumes_AuthorizeReplication.
@@ -2751,7 +2979,8 @@ import com.azure.resourcemanager.netapp.models.BreakFileLocksRequest;
 public final class VolumesBreakFileLocksSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_BreakFileLocks.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_BreakFileLocks
+     * .json
      */
     /**
      * Sample code: Volumes_BreakFileLocks.
@@ -2777,8 +3006,8 @@ import com.azure.resourcemanager.netapp.models.BreakReplicationRequest;
  */
 public final class VolumesBreakReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_BreakReplication.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_BreakReplication.json
      */
     /**
      * Sample code: Volumes_BreakReplication.
@@ -2804,7 +3033,8 @@ import com.azure.resourcemanager.netapp.models.ServiceLevel;
 public final class VolumesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_CreateOrUpdate.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_CreateOrUpdate
+     * .json
      */
     /**
      * Sample code: Volumes_CreateOrUpdate.
@@ -2819,7 +3049,7 @@ public final class VolumesCreateOrUpdateSamples {
             .withCreationToken("my-unique-file-path")
             .withUsageThreshold(107374182400L)
             .withSubnetId(
-                "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3")
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3")
             .withServiceLevel(ServiceLevel.PREMIUM)
             .create();
     }
@@ -2835,7 +3065,7 @@ public final class VolumesCreateOrUpdateSamples {
 public final class VolumesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Delete.json
      */
     /**
      * Sample code: Volumes_Delete.
@@ -2856,8 +3086,8 @@ public final class VolumesDeleteSamples {
  */
 public final class VolumesDeleteReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_DeleteReplication.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_DeleteReplication.json
      */
     /**
      * Sample code: Volumes_DeleteReplication.
@@ -2878,7 +3108,7 @@ public final class VolumesDeleteReplicationSamples {
  */
 public final class VolumesFinalizeExternalReplicationSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_FinalizeExternalReplication.json
      */
     /**
@@ -2901,8 +3131,8 @@ public final class VolumesFinalizeExternalReplicationSamples {
  */
 public final class VolumesFinalizeRelocationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_FinalizeRelocation.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_FinalizeRelocation.json
      */
     /**
      * Sample code: Volumes_FinalizeRelocation.
@@ -2924,7 +3154,7 @@ public final class VolumesFinalizeRelocationSamples {
 public final class VolumesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Get.json
      */
     /**
      * Sample code: Volumes_Get.
@@ -2946,7 +3176,7 @@ public final class VolumesGetSamples {
 public final class VolumesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_List.json
      */
     /**
      * Sample code: Volumes_List.
@@ -2970,7 +3200,8 @@ import com.azure.resourcemanager.netapp.models.GetGroupIdListForLdapUserRequest;
 public final class VolumesListGetGroupIdListForLdapUserSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/GroupIdListForLDAPUser.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/GroupIdListForLDAPUser
+     * .json
      */
     /**
      * Sample code: GetGroupIdListForUser.
@@ -2985,6 +3216,28 @@ public final class VolumesListGetGroupIdListForLdapUserSamples {
 }
 ```
 
+### Volumes_ListQuotaReport
+
+```java
+/**
+ * Samples for Volumes ListQuotaReport.
+ */
+public final class VolumesListQuotaReportSamples {
+    /*
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ListQuotaReport.json
+     */
+    /**
+     * Sample code: ListQuotaReport.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void listQuotaReport(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.volumes().listQuotaReport("myRG", "account1", "pool1", "volume1", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
 ### Volumes_ListReplications
 
 ```java
@@ -2993,8 +3246,8 @@ public final class VolumesListGetGroupIdListForLdapUserSamples {
  */
 public final class VolumesListReplicationsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ListReplications.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ListReplications.json
      */
     /**
      * Sample code: Volumes_ListReplications.
@@ -3018,9 +3271,8 @@ import java.util.Arrays;
  */
 public final class VolumesPeerExternalClusterSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_PeerExternalCluster.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_PeerExternalCluster.json
      */
     /**
      * Sample code: Volumes_PeerExternalCluster.
@@ -3045,7 +3297,7 @@ public final class VolumesPeerExternalClusterSamples {
  */
 public final class VolumesPerformReplicationTransferSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_PerformReplicationTransfer.json
      */
     /**
@@ -3071,7 +3323,8 @@ import com.azure.resourcemanager.netapp.models.PoolChangeRequest;
 public final class VolumesPoolChangeSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_PoolChange.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_PoolChange.
+     * json
      */
     /**
      * Sample code: Volumes_AuthorizeReplication.
@@ -3095,7 +3348,7 @@ public final class VolumesPoolChangeSamples {
  */
 public final class VolumesPopulateAvailabilityZoneSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_PopulateAvailabilityZones.json
      */
     /**
@@ -3118,9 +3371,8 @@ public final class VolumesPopulateAvailabilityZoneSamples {
  */
 public final class VolumesReInitializeReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ReInitializeReplication
-     * .json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ReInitializeReplication.json
      */
     /**
      * Sample code: Volumes_ReInitializeReplication.
@@ -3144,9 +3396,8 @@ import com.azure.resourcemanager.netapp.models.ReestablishReplicationRequest;
  */
 public final class VolumesReestablishReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ReestablishReplication.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ReestablishReplication.json
      */
     /**
      * Sample code: Volumes_ReestablishReplication.
@@ -3174,7 +3425,7 @@ import com.azure.resourcemanager.netapp.models.RelocateVolumeRequest;
 public final class VolumesRelocateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Relocate.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Relocate.json
      */
     /**
      * Sample code: Volumes_Relocate.
@@ -3197,8 +3448,8 @@ public final class VolumesRelocateSamples {
  */
 public final class VolumesReplicationStatusSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ReplicationStatus.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ReplicationStatus.json
      */
     /**
      * Sample code: Volumes_ReplicationStatus.
@@ -3220,8 +3471,8 @@ public final class VolumesReplicationStatusSamples {
  */
 public final class VolumesResetCifsPasswordSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ResetCifsPassword.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ResetCifsPassword.json
      */
     /**
      * Sample code: Volumes_ResetCifsPassword.
@@ -3242,8 +3493,8 @@ public final class VolumesResetCifsPasswordSamples {
  */
 public final class VolumesResyncReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ResyncReplication.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ResyncReplication.json
      */
     /**
      * Sample code: Volumes_ResyncReplication.
@@ -3267,7 +3518,7 @@ import com.azure.resourcemanager.netapp.models.VolumeRevert;
 public final class VolumesRevertSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Revert.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Revert.json
      */
     /**
      * Sample code: Volumes_Revert.
@@ -3291,8 +3542,8 @@ public final class VolumesRevertSamples {
  */
 public final class VolumesRevertRelocationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_RevertRelocation.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_RevertRelocation.json
      */
     /**
      * Sample code: Volumes_RevertRelocation.
@@ -3314,7 +3565,8 @@ public final class VolumesRevertRelocationSamples {
 public final class VolumesSplitCloneFromParentSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_SplitClone.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_SplitClone.
+     * json
      */
     /**
      * Sample code: Volumes_SplitClone.
@@ -3339,7 +3591,7 @@ import com.azure.resourcemanager.netapp.models.Volume;
 public final class VolumesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Update.json
      */
     /**
      * Sample code: Volumes_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/pom.xml b/sdk/netapp/azure-resourcemanager-netapp/pom.xml
index bac7414cfa1a..c9453c1293e8 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/pom.xml
+++ b/sdk/netapp/azure-resourcemanager-netapp/pom.xml
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-netapp</artifactId>
-  <version>1.10.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-netapp;current} -->
+  <version>1.10.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-netapp;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for NetAppFiles Management</name>
-  <description>This package contains Microsoft Azure SDK for NetAppFiles Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-2025-06-01.</description>
+  <description>This package contains Microsoft Azure SDK for NetAppFiles Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-preview-2025-07-01-preview.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -45,6 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jacoco.min.linecoverage>0</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0</jacoco.min.branchcoverage>
+    <revapi.skip>true</revapi.skip>
   </properties>
   <dependencies>
     <dependency>
@@ -66,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java
index 29aad4316559..49115ed7ffa9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java
@@ -32,7 +32,9 @@
 import com.azure.resourcemanager.netapp.implementation.BackupsUnderAccountsImpl;
 import com.azure.resourcemanager.netapp.implementation.BackupsUnderBackupVaultsImpl;
 import com.azure.resourcemanager.netapp.implementation.BackupsUnderVolumesImpl;
+import com.azure.resourcemanager.netapp.implementation.BucketsImpl;
 import com.azure.resourcemanager.netapp.implementation.NetAppManagementClientBuilder;
+import com.azure.resourcemanager.netapp.implementation.NetAppResourceQuotaLimitsAccountsImpl;
 import com.azure.resourcemanager.netapp.implementation.NetAppResourceQuotaLimitsImpl;
 import com.azure.resourcemanager.netapp.implementation.NetAppResourceRegionInfosImpl;
 import com.azure.resourcemanager.netapp.implementation.NetAppResourceUsagesImpl;
@@ -52,7 +54,9 @@
 import com.azure.resourcemanager.netapp.models.BackupsUnderAccounts;
 import com.azure.resourcemanager.netapp.models.BackupsUnderBackupVaults;
 import com.azure.resourcemanager.netapp.models.BackupsUnderVolumes;
+import com.azure.resourcemanager.netapp.models.Buckets;
 import com.azure.resourcemanager.netapp.models.NetAppResourceQuotaLimits;
+import com.azure.resourcemanager.netapp.models.NetAppResourceQuotaLimitsAccounts;
 import com.azure.resourcemanager.netapp.models.NetAppResourceRegionInfos;
 import com.azure.resourcemanager.netapp.models.NetAppResourceUsages;
 import com.azure.resourcemanager.netapp.models.NetAppResources;
@@ -107,6 +111,8 @@ public final class NetAppFilesManager {
 
     private Backups backups;
 
+    private NetAppResourceQuotaLimitsAccounts netAppResourceQuotaLimitsAccounts;
+
     private BackupVaults backupVaults;
 
     private BackupsUnderBackupVaults backupsUnderBackupVaults;
@@ -115,6 +121,8 @@ public final class NetAppFilesManager {
 
     private BackupsUnderAccounts backupsUnderAccounts;
 
+    private Buckets buckets;
+
     private final NetAppManagementClient clientObject;
 
     private NetAppFilesManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
@@ -512,6 +520,19 @@ public Backups backups() {
         return backups;
     }
 
+    /**
+     * Gets the resource collection API of NetAppResourceQuotaLimitsAccounts.
+     * 
+     * @return Resource collection API of NetAppResourceQuotaLimitsAccounts.
+     */
+    public NetAppResourceQuotaLimitsAccounts netAppResourceQuotaLimitsAccounts() {
+        if (this.netAppResourceQuotaLimitsAccounts == null) {
+            this.netAppResourceQuotaLimitsAccounts
+                = new NetAppResourceQuotaLimitsAccountsImpl(clientObject.getNetAppResourceQuotaLimitsAccounts(), this);
+        }
+        return netAppResourceQuotaLimitsAccounts;
+    }
+
     /**
      * Gets the resource collection API of BackupVaults. It manages BackupVault.
      * 
@@ -561,6 +582,18 @@ public BackupsUnderAccounts backupsUnderAccounts() {
         return backupsUnderAccounts;
     }
 
+    /**
+     * Gets the resource collection API of Buckets. It manages Bucket.
+     * 
+     * @return Resource collection API of Buckets.
+     */
+    public Buckets buckets() {
+        if (this.buckets == null) {
+            this.buckets = new BucketsImpl(clientObject.getBuckets(), this);
+        }
+        return buckets;
+    }
+
     /**
      * Gets wrapped service client NetAppManagementClient providing direct access to the underlying auto-generated API
      * implementation, based on Azure REST API.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/BucketsClient.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/BucketsClient.java
new file mode 100644
index 000000000000..d2166a52158d
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/BucketsClient.java
@@ -0,0 +1,396 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.netapp.fluent.models.BucketGenerateCredentialsInner;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import com.azure.resourcemanager.netapp.models.BucketCredentialsExpiry;
+import com.azure.resourcemanager.netapp.models.BucketPatch;
+
+/**
+ * An instance of this class provides access to all the operations defined in BucketsClient.
+ */
+public interface BucketsClient {
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<BucketInner> list(String resourceGroupName, String accountName, String poolName, String volumeName);
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<BucketInner> list(String resourceGroupName, String accountName, String poolName, String volumeName,
+        Context context);
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<BucketInner> getWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, Context context);
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    BucketInner get(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName);
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<BucketInner>, BucketInner> beginCreateOrUpdate(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketInner body);
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<BucketInner>, BucketInner> beginCreateOrUpdate(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketInner body, Context context);
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    BucketInner createOrUpdate(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketInner body);
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    BucketInner createOrUpdate(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketInner body, Context context);
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<BucketInner>, BucketInner> beginUpdate(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketPatch body);
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<BucketInner>, BucketInner> beginUpdate(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketPatch body, Context context);
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    BucketInner update(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketPatch body);
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    BucketInner update(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketPatch body, Context context);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, Context context);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String accountName, String poolName, String volumeName, String bucketName);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String accountName, String poolName, String volumeName, String bucketName,
+        Context context);
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<BucketGenerateCredentialsInner> generateCredentialsWithResponse(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketCredentialsExpiry body,
+        Context context);
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    BucketGenerateCredentialsInner generateCredentials(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketCredentialsExpiry body);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppManagementClient.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppManagementClient.java
index 4cc4a581e50e..290eba0adb2b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppManagementClient.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppManagementClient.java
@@ -151,6 +151,13 @@ public interface NetAppManagementClient {
      */
     BackupsClient getBackups();
 
+    /**
+     * Gets the NetAppResourceQuotaLimitsAccountsClient object to access its operations.
+     * 
+     * @return the NetAppResourceQuotaLimitsAccountsClient object.
+     */
+    NetAppResourceQuotaLimitsAccountsClient getNetAppResourceQuotaLimitsAccounts();
+
     /**
      * Gets the BackupVaultsClient object to access its operations.
      * 
@@ -178,4 +185,11 @@ public interface NetAppManagementClient {
      * @return the BackupsUnderAccountsClient object.
      */
     BackupsUnderAccountsClient getBackupsUnderAccounts();
+
+    /**
+     * Gets the BucketsClient object to access its operations.
+     * 
+     * @return the BucketsClient object.
+     */
+    BucketsClient getBuckets();
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsAccountsClient.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsAccountsClient.java
new file mode 100644
index 000000000000..4168cf6268f0
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsAccountsClient.java
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+
+/**
+ * An instance of this class provides access to all the operations defined in NetAppResourceQuotaLimitsAccountsClient.
+ */
+public interface NetAppResourceQuotaLimitsAccountsClient {
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<QuotaItemInner> list(String resourceGroupName, String accountName);
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<QuotaItemInner> list(String resourceGroupName, String accountName, Context context);
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<QuotaItemInner> getWithResponse(String resourceGroupName, String accountName, String quotaLimitName,
+        Context context);
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    QuotaItemInner get(String resourceGroupName, String accountName, String quotaLimitName);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsClient.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsClient.java
index 370b55680b6f..9c46cb25b567 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsClient.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/NetAppResourceQuotaLimitsClient.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
 
 /**
  * An instance of this class provides access to all the operations defined in NetAppResourceQuotaLimitsClient.
@@ -27,7 +27,7 @@ public interface NetAppResourceQuotaLimitsClient {
      * @return the default and current limits for quotas as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<SubscriptionQuotaItemInner> list(String location);
+    PagedIterable<QuotaItemInner> list(String location);
 
     /**
      * Get quota limits
@@ -42,7 +42,7 @@ public interface NetAppResourceQuotaLimitsClient {
      * @return the default and current limits for quotas as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<SubscriptionQuotaItemInner> list(String location, Context context);
+    PagedIterable<QuotaItemInner> list(String location, Context context);
 
     /**
      * Get quota limits
@@ -58,7 +58,7 @@ public interface NetAppResourceQuotaLimitsClient {
      * @return the default and current subscription quota limit along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    Response<SubscriptionQuotaItemInner> getWithResponse(String location, String quotaLimitName, Context context);
+    Response<QuotaItemInner> getWithResponse(String location, String quotaLimitName, Context context);
 
     /**
      * Get quota limits
@@ -73,5 +73,5 @@ public interface NetAppResourceQuotaLimitsClient {
      * @return the default and current subscription quota limit.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    SubscriptionQuotaItemInner get(String location, String quotaLimitName);
+    QuotaItemInner get(String location, String quotaLimitName);
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/VolumesClient.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/VolumesClient.java
index 5f5410ef608b..17b32ccf48a2 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/VolumesClient.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/VolumesClient.java
@@ -13,6 +13,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.netapp.fluent.models.ClusterPeerCommandResponseInner;
 import com.azure.resourcemanager.netapp.fluent.models.GetGroupIdListForLdapUserResponseInner;
+import com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationInner;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationStatusInner;
 import com.azure.resourcemanager.netapp.fluent.models.SvmPeerCommandResponseInner;
@@ -778,6 +779,80 @@ GetGroupIdListForLdapUserResponseInner listGetGroupIdListForLdapUser(String reso
     GetGroupIdListForLdapUserResponseInner listGetGroupIdListForLdapUser(String resourceGroupName, String accountName,
         String poolName, String volumeName, GetGroupIdListForLdapUserRequest body, Context context);
 
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ListQuotaReportResponseInner>, ListQuotaReportResponseInner>
+        beginListQuotaReport(String resourceGroupName, String accountName, String poolName, String volumeName);
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ListQuotaReportResponseInner>, ListQuotaReportResponseInner> beginListQuotaReport(
+        String resourceGroupName, String accountName, String poolName, String volumeName, Context context);
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ListQuotaReportResponseInner listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName);
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ListQuotaReportResponseInner listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName, Context context);
+
     /**
      * Break volume replication
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/AccountProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/AccountProperties.java
index 66d0e07c8eeb..1c675c89c454 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/AccountProperties.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/AccountProperties.java
@@ -11,6 +11,7 @@
 import com.azure.json.JsonWriter;
 import com.azure.resourcemanager.netapp.models.AccountEncryption;
 import com.azure.resourcemanager.netapp.models.ActiveDirectory;
+import com.azure.resourcemanager.netapp.models.LdapConfiguration;
 import com.azure.resourcemanager.netapp.models.MultiAdStatus;
 import java.io.IOException;
 import java.util.List;
@@ -51,6 +52,11 @@ public final class AccountProperties implements JsonSerializable<AccountProperti
      */
     private MultiAdStatus multiAdStatus;
 
+    /*
+     * LDAP Configuration for the account.
+     */
+    private LdapConfiguration ldapConfiguration;
+
     /**
      * Creates an instance of AccountProperties class.
      */
@@ -147,6 +153,26 @@ public MultiAdStatus multiAdStatus() {
         return this.multiAdStatus;
     }
 
+    /**
+     * Get the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @return the ldapConfiguration value.
+     */
+    public LdapConfiguration ldapConfiguration() {
+        return this.ldapConfiguration;
+    }
+
+    /**
+     * Set the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @param ldapConfiguration the ldapConfiguration value to set.
+     * @return the AccountProperties object itself.
+     */
+    public AccountProperties withLdapConfiguration(LdapConfiguration ldapConfiguration) {
+        this.ldapConfiguration = ldapConfiguration;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -159,6 +185,9 @@ public void validate() {
         if (encryption() != null) {
             encryption().validate();
         }
+        if (ldapConfiguration() != null) {
+            ldapConfiguration().validate();
+        }
     }
 
     /**
@@ -171,6 +200,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             (writer, element) -> writer.writeJson(element));
         jsonWriter.writeJsonField("encryption", this.encryption);
         jsonWriter.writeStringField("nfsV4IDDomain", this.nfsV4IdDomain);
+        jsonWriter.writeJsonField("ldapConfiguration", this.ldapConfiguration);
         return jsonWriter.writeEndObject();
     }
 
@@ -203,6 +233,8 @@ public static AccountProperties fromJson(JsonReader jsonReader) throws IOExcepti
                     deserializedAccountProperties.nfsV4IdDomain = reader.getString();
                 } else if ("multiAdStatus".equals(fieldName)) {
                     deserializedAccountProperties.multiAdStatus = MultiAdStatus.fromString(reader.getString());
+                } else if ("ldapConfiguration".equals(fieldName)) {
+                    deserializedAccountProperties.ldapConfiguration = LdapConfiguration.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BackupStatusInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BackupStatusInner.java
index 0b1efdba68bd..88cd9f57546d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BackupStatusInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BackupStatusInner.java
@@ -29,7 +29,9 @@ public final class BackupStatusInner implements JsonSerializable<BackupStatusInn
     private RelationshipStatus relationshipStatus;
 
     /*
-     * The status of the backup
+     * The mirror state property describes the current status of data replication for a backup. It provides insight into
+     * whether the data is actively being mirrored, if the replication process has been paused, or if it has yet to be
+     * initialized.
      */
     private MirrorState mirrorState;
 
@@ -88,7 +90,9 @@ public RelationshipStatus relationshipStatus() {
     }
 
     /**
-     * Get the mirrorState property: The status of the backup.
+     * Get the mirrorState property: The mirror state property describes the current status of data replication for a
+     * backup. It provides insight into whether the data is actively being mirrored, if the replication process has been
+     * paused, or if it has yet to be initialized.
      * 
      * @return the mirrorState value.
      */
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketGenerateCredentialsInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketGenerateCredentialsInner.java
new file mode 100644
index 000000000000..daf84854e395
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketGenerateCredentialsInner.java
@@ -0,0 +1,117 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.util.CoreUtils;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+
+/**
+ * Bucket Access Key, Secret Key, and Expiry date and time of the key pair.
+ */
+@Immutable
+public final class BucketGenerateCredentialsInner implements JsonSerializable<BucketGenerateCredentialsInner> {
+    /*
+     * The Access Key that is required along with the Secret Key to access the bucket.
+     */
+    private String accessKey;
+
+    /*
+     * The Secret Key that is required along with the Access Key to access the bucket.
+     */
+    private String secretKey;
+
+    /*
+     * The bucket's Access and Secret key pair expiry date and time (in UTC).
+     */
+    private OffsetDateTime keyPairExpiry;
+
+    /**
+     * Creates an instance of BucketGenerateCredentialsInner class.
+     */
+    public BucketGenerateCredentialsInner() {
+    }
+
+    /**
+     * Get the accessKey property: The Access Key that is required along with the Secret Key to access the bucket.
+     * 
+     * @return the accessKey value.
+     */
+    public String accessKey() {
+        return this.accessKey;
+    }
+
+    /**
+     * Get the secretKey property: The Secret Key that is required along with the Access Key to access the bucket.
+     * 
+     * @return the secretKey value.
+     */
+    public String secretKey() {
+        return this.secretKey;
+    }
+
+    /**
+     * Get the keyPairExpiry property: The bucket's Access and Secret key pair expiry date and time (in UTC).
+     * 
+     * @return the keyPairExpiry value.
+     */
+    public OffsetDateTime keyPairExpiry() {
+        return this.keyPairExpiry;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketGenerateCredentialsInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketGenerateCredentialsInner if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the BucketGenerateCredentialsInner.
+     */
+    public static BucketGenerateCredentialsInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketGenerateCredentialsInner deserializedBucketGenerateCredentialsInner
+                = new BucketGenerateCredentialsInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("accessKey".equals(fieldName)) {
+                    deserializedBucketGenerateCredentialsInner.accessKey = reader.getString();
+                } else if ("secretKey".equals(fieldName)) {
+                    deserializedBucketGenerateCredentialsInner.secretKey = reader.getString();
+                } else if ("keyPairExpiry".equals(fieldName)) {
+                    deserializedBucketGenerateCredentialsInner.keyPairExpiry = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketGenerateCredentialsInner;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketInner.java
new file mode 100644
index 000000000000..ca5e1e0eaff0
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketInner.java
@@ -0,0 +1,281 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CredentialsStatus;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
+import java.io.IOException;
+
+/**
+ * Bucket resource.
+ */
+@Fluent
+public final class BucketInner extends ProxyResource {
+    /*
+     * Bucket properties
+     */
+    private BucketProperties innerProperties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of BucketInner class.
+     */
+    public BucketInner() {
+    }
+
+    /**
+     * Get the innerProperties property: Bucket properties.
+     * 
+     * @return the innerProperties value.
+     */
+    private BucketProperties innerProperties() {
+        return this.innerProperties;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the path property: The volume path mounted inside the bucket. The default is the root path '/' if no value is
+     * provided when the bucket is created.
+     * 
+     * @return the path value.
+     */
+    public String path() {
+        return this.innerProperties() == null ? null : this.innerProperties().path();
+    }
+
+    /**
+     * Set the path property: The volume path mounted inside the bucket. The default is the root path '/' if no value is
+     * provided when the bucket is created.
+     * 
+     * @param path the path value to set.
+     * @return the BucketInner object itself.
+     */
+    public BucketInner withPath(String path) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketProperties();
+        }
+        this.innerProperties().withPath(path);
+        return this;
+    }
+
+    /**
+     * Get the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @return the fileSystemUser value.
+     */
+    public FileSystemUser fileSystemUser() {
+        return this.innerProperties() == null ? null : this.innerProperties().fileSystemUser();
+    }
+
+    /**
+     * Set the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @param fileSystemUser the fileSystemUser value to set.
+     * @return the BucketInner object itself.
+     */
+    public BucketInner withFileSystemUser(FileSystemUser fileSystemUser) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketProperties();
+        }
+        this.innerProperties().withFileSystemUser(fileSystemUser);
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: Provisioning state of the resource.
+     * 
+     * @return the provisioningState value.
+     */
+    public NetAppProvisioningState provisioningState() {
+        return this.innerProperties() == null ? null : this.innerProperties().provisioningState();
+    }
+
+    /**
+     * Get the status property: The bucket credentials status. There states:
+     * 
+     * "NoCredentialsSet": Access and Secret key pair have not been generated.
+     * "CredentialsExpired": Access and Secret key pair have expired.
+     * "Active": The certificate has been installed and credentials are unexpired.
+     * 
+     * @return the status value.
+     */
+    public CredentialsStatus status() {
+        return this.innerProperties() == null ? null : this.innerProperties().status();
+    }
+
+    /**
+     * Get the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @return the server value.
+     */
+    public BucketServerProperties server() {
+        return this.innerProperties() == null ? null : this.innerProperties().server();
+    }
+
+    /**
+     * Set the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @param server the server value to set.
+     * @return the BucketInner object itself.
+     */
+    public BucketInner withServer(BucketServerProperties server) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketProperties();
+        }
+        this.innerProperties().withServer(server);
+        return this;
+    }
+
+    /**
+     * Get the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is
+     * ReadOnly if no value is provided during bucket creation.
+     * 
+     * @return the permissions value.
+     */
+    public BucketPermissions permissions() {
+        return this.innerProperties() == null ? null : this.innerProperties().permissions();
+    }
+
+    /**
+     * Set the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is
+     * ReadOnly if no value is provided during bucket creation.
+     * 
+     * @param permissions the permissions value to set.
+     * @return the BucketInner object itself.
+     */
+    public BucketInner withPermissions(BucketPermissions permissions) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketProperties();
+        }
+        this.innerProperties().withPermissions(permissions);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (innerProperties() != null) {
+            innerProperties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.innerProperties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the BucketInner.
+     */
+    public static BucketInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketInner deserializedBucketInner = new BucketInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedBucketInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedBucketInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedBucketInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedBucketInner.innerProperties = BucketProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedBucketInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketInner;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketPatchProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketPatchProperties.java
new file mode 100644
index 000000000000..408833693534
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketPatchProperties.java
@@ -0,0 +1,211 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.netapp.models.BucketPatchPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
+import java.io.IOException;
+
+/**
+ * Bucket resource properties for a Patch operation.
+ */
+@Fluent
+public final class BucketPatchProperties implements JsonSerializable<BucketPatchProperties> {
+    /*
+     * The volume path mounted inside the bucket.
+     */
+    private String path;
+
+    /*
+     * File System user having access to volume data. For Unix, this is the user's uid and gid. For Windows, this is the
+     * user's username. Note that the Unix and Windows user details are mutually exclusive, meaning one or other must be
+     * supplied, but not both.
+     */
+    private FileSystemUser fileSystemUser;
+
+    /*
+     * Provisioning state of the resource
+     */
+    private NetAppProvisioningState provisioningState;
+
+    /*
+     * Properties of the server managing the lifecycle of volume buckets
+     */
+    private BucketServerPatchProperties server;
+
+    /*
+     * Access permissions for the bucket. Either ReadOnly or ReadWrite.
+     */
+    private BucketPatchPermissions permissions;
+
+    /**
+     * Creates an instance of BucketPatchProperties class.
+     */
+    public BucketPatchProperties() {
+    }
+
+    /**
+     * Get the path property: The volume path mounted inside the bucket.
+     * 
+     * @return the path value.
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set the path property: The volume path mounted inside the bucket.
+     * 
+     * @param path the path value to set.
+     * @return the BucketPatchProperties object itself.
+     */
+    public BucketPatchProperties withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @return the fileSystemUser value.
+     */
+    public FileSystemUser fileSystemUser() {
+        return this.fileSystemUser;
+    }
+
+    /**
+     * Set the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @param fileSystemUser the fileSystemUser value to set.
+     * @return the BucketPatchProperties object itself.
+     */
+    public BucketPatchProperties withFileSystemUser(FileSystemUser fileSystemUser) {
+        this.fileSystemUser = fileSystemUser;
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: Provisioning state of the resource.
+     * 
+     * @return the provisioningState value.
+     */
+    public NetAppProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @return the server value.
+     */
+    public BucketServerPatchProperties server() {
+        return this.server;
+    }
+
+    /**
+     * Set the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @param server the server value to set.
+     * @return the BucketPatchProperties object itself.
+     */
+    public BucketPatchProperties withServer(BucketServerPatchProperties server) {
+        this.server = server;
+        return this;
+    }
+
+    /**
+     * Get the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite.
+     * 
+     * @return the permissions value.
+     */
+    public BucketPatchPermissions permissions() {
+        return this.permissions;
+    }
+
+    /**
+     * Set the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite.
+     * 
+     * @param permissions the permissions value to set.
+     * @return the BucketPatchProperties object itself.
+     */
+    public BucketPatchProperties withPermissions(BucketPatchPermissions permissions) {
+        this.permissions = permissions;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (fileSystemUser() != null) {
+            fileSystemUser().validate();
+        }
+        if (server() != null) {
+            server().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("path", this.path);
+        jsonWriter.writeJsonField("fileSystemUser", this.fileSystemUser);
+        jsonWriter.writeJsonField("server", this.server);
+        jsonWriter.writeStringField("permissions", this.permissions == null ? null : this.permissions.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketPatchProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketPatchProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the BucketPatchProperties.
+     */
+    public static BucketPatchProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketPatchProperties deserializedBucketPatchProperties = new BucketPatchProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("path".equals(fieldName)) {
+                    deserializedBucketPatchProperties.path = reader.getString();
+                } else if ("fileSystemUser".equals(fieldName)) {
+                    deserializedBucketPatchProperties.fileSystemUser = FileSystemUser.fromJson(reader);
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedBucketPatchProperties.provisioningState
+                        = NetAppProvisioningState.fromString(reader.getString());
+                } else if ("server".equals(fieldName)) {
+                    deserializedBucketPatchProperties.server = BucketServerPatchProperties.fromJson(reader);
+                } else if ("permissions".equals(fieldName)) {
+                    deserializedBucketPatchProperties.permissions
+                        = BucketPatchPermissions.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketPatchProperties;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketProperties.java
new file mode 100644
index 000000000000..466d226ad0cc
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/BucketProperties.java
@@ -0,0 +1,241 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CredentialsStatus;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
+import java.io.IOException;
+
+/**
+ * Bucket resource properties.
+ */
+@Fluent
+public final class BucketProperties implements JsonSerializable<BucketProperties> {
+    /*
+     * The volume path mounted inside the bucket. The default is the root path '/' if no value is provided when the
+     * bucket is created.
+     */
+    private String path;
+
+    /*
+     * File System user having access to volume data. For Unix, this is the user's uid and gid. For Windows, this is the
+     * user's username. Note that the Unix and Windows user details are mutually exclusive, meaning one or other must be
+     * supplied, but not both.
+     */
+    private FileSystemUser fileSystemUser;
+
+    /*
+     * Provisioning state of the resource
+     */
+    private NetAppProvisioningState provisioningState;
+
+    /*
+     * The bucket credentials status. There states:
+     * 
+     * "NoCredentialsSet": Access and Secret key pair have not been generated.
+     * "CredentialsExpired": Access and Secret key pair have expired.
+     * "Active": The certificate has been installed and credentials are unexpired.
+     */
+    private CredentialsStatus status;
+
+    /*
+     * Properties of the server managing the lifecycle of volume buckets
+     */
+    private BucketServerProperties server;
+
+    /*
+     * Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is ReadOnly if no value is provided
+     * during bucket creation.
+     */
+    private BucketPermissions permissions;
+
+    /**
+     * Creates an instance of BucketProperties class.
+     */
+    public BucketProperties() {
+    }
+
+    /**
+     * Get the path property: The volume path mounted inside the bucket. The default is the root path '/' if no value is
+     * provided when the bucket is created.
+     * 
+     * @return the path value.
+     */
+    public String path() {
+        return this.path;
+    }
+
+    /**
+     * Set the path property: The volume path mounted inside the bucket. The default is the root path '/' if no value is
+     * provided when the bucket is created.
+     * 
+     * @param path the path value to set.
+     * @return the BucketProperties object itself.
+     */
+    public BucketProperties withPath(String path) {
+        this.path = path;
+        return this;
+    }
+
+    /**
+     * Get the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @return the fileSystemUser value.
+     */
+    public FileSystemUser fileSystemUser() {
+        return this.fileSystemUser;
+    }
+
+    /**
+     * Set the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @param fileSystemUser the fileSystemUser value to set.
+     * @return the BucketProperties object itself.
+     */
+    public BucketProperties withFileSystemUser(FileSystemUser fileSystemUser) {
+        this.fileSystemUser = fileSystemUser;
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: Provisioning state of the resource.
+     * 
+     * @return the provisioningState value.
+     */
+    public NetAppProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the status property: The bucket credentials status. There states:
+     * 
+     * "NoCredentialsSet": Access and Secret key pair have not been generated.
+     * "CredentialsExpired": Access and Secret key pair have expired.
+     * "Active": The certificate has been installed and credentials are unexpired.
+     * 
+     * @return the status value.
+     */
+    public CredentialsStatus status() {
+        return this.status;
+    }
+
+    /**
+     * Get the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @return the server value.
+     */
+    public BucketServerProperties server() {
+        return this.server;
+    }
+
+    /**
+     * Set the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @param server the server value to set.
+     * @return the BucketProperties object itself.
+     */
+    public BucketProperties withServer(BucketServerProperties server) {
+        this.server = server;
+        return this;
+    }
+
+    /**
+     * Get the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is
+     * ReadOnly if no value is provided during bucket creation.
+     * 
+     * @return the permissions value.
+     */
+    public BucketPermissions permissions() {
+        return this.permissions;
+    }
+
+    /**
+     * Set the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is
+     * ReadOnly if no value is provided during bucket creation.
+     * 
+     * @param permissions the permissions value to set.
+     * @return the BucketProperties object itself.
+     */
+    public BucketProperties withPermissions(BucketPermissions permissions) {
+        this.permissions = permissions;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (fileSystemUser() != null) {
+            fileSystemUser().validate();
+        }
+        if (server() != null) {
+            server().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("path", this.path);
+        jsonWriter.writeJsonField("fileSystemUser", this.fileSystemUser);
+        jsonWriter.writeJsonField("server", this.server);
+        jsonWriter.writeStringField("permissions", this.permissions == null ? null : this.permissions.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketProperties if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the BucketProperties.
+     */
+    public static BucketProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketProperties deserializedBucketProperties = new BucketProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("path".equals(fieldName)) {
+                    deserializedBucketProperties.path = reader.getString();
+                } else if ("fileSystemUser".equals(fieldName)) {
+                    deserializedBucketProperties.fileSystemUser = FileSystemUser.fromJson(reader);
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedBucketProperties.provisioningState
+                        = NetAppProvisioningState.fromString(reader.getString());
+                } else if ("status".equals(fieldName)) {
+                    deserializedBucketProperties.status = CredentialsStatus.fromString(reader.getString());
+                } else if ("server".equals(fieldName)) {
+                    deserializedBucketProperties.server = BucketServerProperties.fromJson(reader);
+                } else if ("permissions".equals(fieldName)) {
+                    deserializedBucketProperties.permissions = BucketPermissions.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketProperties;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ListQuotaReportResponseInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ListQuotaReportResponseInner.java
new file mode 100644
index 000000000000..6110b6f711ed
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ListQuotaReportResponseInner.java
@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.netapp.models.QuotaReport;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Quota Report for volume.
+ */
+@Fluent
+public final class ListQuotaReportResponseInner implements JsonSerializable<ListQuotaReportResponseInner> {
+    /*
+     * List of volume quota report records
+     */
+    private List<QuotaReport> value;
+
+    /**
+     * Creates an instance of ListQuotaReportResponseInner class.
+     */
+    public ListQuotaReportResponseInner() {
+    }
+
+    /**
+     * Get the value property: List of volume quota report records.
+     * 
+     * @return the value value.
+     */
+    public List<QuotaReport> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: List of volume quota report records.
+     * 
+     * @param value the value value to set.
+     * @return the ListQuotaReportResponseInner object itself.
+     */
+    public ListQuotaReportResponseInner withValue(List<QuotaReport> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ListQuotaReportResponseInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ListQuotaReportResponseInner if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ListQuotaReportResponseInner.
+     */
+    public static ListQuotaReportResponseInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ListQuotaReportResponseInner deserializedListQuotaReportResponseInner = new ListQuotaReportResponseInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<QuotaReport> value = reader.readArray(reader1 -> QuotaReport.fromJson(reader1));
+                    deserializedListQuotaReportResponseInner.value = value;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedListQuotaReportResponseInner;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/NetAppAccountInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/NetAppAccountInner.java
index 830537031c17..292b52b4750f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/NetAppAccountInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/NetAppAccountInner.java
@@ -12,6 +12,7 @@
 import com.azure.json.JsonWriter;
 import com.azure.resourcemanager.netapp.models.AccountEncryption;
 import com.azure.resourcemanager.netapp.models.ActiveDirectory;
+import com.azure.resourcemanager.netapp.models.LdapConfiguration;
 import com.azure.resourcemanager.netapp.models.ManagedServiceIdentity;
 import com.azure.resourcemanager.netapp.models.MultiAdStatus;
 import java.io.IOException;
@@ -258,6 +259,29 @@ public MultiAdStatus multiAdStatus() {
         return this.innerProperties() == null ? null : this.innerProperties().multiAdStatus();
     }
 
+    /**
+     * Get the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @return the ldapConfiguration value.
+     */
+    public LdapConfiguration ldapConfiguration() {
+        return this.innerProperties() == null ? null : this.innerProperties().ldapConfiguration();
+    }
+
+    /**
+     * Set the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @param ldapConfiguration the ldapConfiguration value to set.
+     * @return the NetAppAccountInner object itself.
+     */
+    public NetAppAccountInner withLdapConfiguration(LdapConfiguration ldapConfiguration) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new AccountProperties();
+        }
+        this.innerProperties().withLdapConfiguration(ldapConfiguration);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/SubscriptionQuotaItemInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/QuotaItemInner.java
similarity index 71%
rename from sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/SubscriptionQuotaItemInner.java
rename to sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/QuotaItemInner.java
index 0e79c3380396..718bcd255216 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/SubscriptionQuotaItemInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/QuotaItemInner.java
@@ -13,14 +13,14 @@
 import java.io.IOException;
 
 /**
- * Information regarding Subscription Quota Item.
+ * Information regarding Quota Item.
  */
 @Immutable
-public final class SubscriptionQuotaItemInner extends ProxyResource {
+public final class QuotaItemInner extends ProxyResource {
     /*
-     * SubscriptionQuotaItem properties
+     * QuotaItem properties
      */
-    private SubscriptionQuotaItemProperties innerProperties;
+    private QuotaItemProperties innerProperties;
 
     /*
      * Azure Resource Manager metadata containing createdBy and modifiedBy information.
@@ -43,17 +43,17 @@ public final class SubscriptionQuotaItemInner extends ProxyResource {
     private String id;
 
     /**
-     * Creates an instance of SubscriptionQuotaItemInner class.
+     * Creates an instance of QuotaItemInner class.
      */
-    public SubscriptionQuotaItemInner() {
+    public QuotaItemInner() {
     }
 
     /**
-     * Get the innerProperties property: SubscriptionQuotaItem properties.
+     * Get the innerProperties property: QuotaItem properties.
      * 
      * @return the innerProperties value.
      */
-    private SubscriptionQuotaItemProperties innerProperties() {
+    private QuotaItemProperties innerProperties() {
         return this.innerProperties;
     }
 
@@ -114,6 +114,15 @@ public Integer defaultProperty() {
         return this.innerProperties() == null ? null : this.innerProperties().defaultProperty();
     }
 
+    /**
+     * Get the usage property: The usage quota value.
+     * 
+     * @return the usage value.
+     */
+    public Integer usage() {
+        return this.innerProperties() == null ? null : this.innerProperties().usage();
+    }
+
     /**
      * Validates the instance.
      * 
@@ -136,38 +145,37 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     }
 
     /**
-     * Reads an instance of SubscriptionQuotaItemInner from the JsonReader.
+     * Reads an instance of QuotaItemInner from the JsonReader.
      * 
      * @param jsonReader The JsonReader being read.
-     * @return An instance of SubscriptionQuotaItemInner if the JsonReader was pointing to an instance of it, or null if
-     * it was pointing to JSON null.
+     * @return An instance of QuotaItemInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
      * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the SubscriptionQuotaItemInner.
+     * @throws IOException If an error occurs while reading the QuotaItemInner.
      */
-    public static SubscriptionQuotaItemInner fromJson(JsonReader jsonReader) throws IOException {
+    public static QuotaItemInner fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            SubscriptionQuotaItemInner deserializedSubscriptionQuotaItemInner = new SubscriptionQuotaItemInner();
+            QuotaItemInner deserializedQuotaItemInner = new QuotaItemInner();
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
                 if ("id".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemInner.id = reader.getString();
+                    deserializedQuotaItemInner.id = reader.getString();
                 } else if ("name".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemInner.name = reader.getString();
+                    deserializedQuotaItemInner.name = reader.getString();
                 } else if ("type".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemInner.type = reader.getString();
+                    deserializedQuotaItemInner.type = reader.getString();
                 } else if ("properties".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemInner.innerProperties
-                        = SubscriptionQuotaItemProperties.fromJson(reader);
+                    deserializedQuotaItemInner.innerProperties = QuotaItemProperties.fromJson(reader);
                 } else if ("systemData".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemInner.systemData = SystemData.fromJson(reader);
+                    deserializedQuotaItemInner.systemData = SystemData.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
             }
 
-            return deserializedSubscriptionQuotaItemInner;
+            return deserializedQuotaItemInner;
         });
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/SubscriptionQuotaItemProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/QuotaItemProperties.java
similarity index 60%
rename from sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/SubscriptionQuotaItemProperties.java
rename to sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/QuotaItemProperties.java
index 659af2269886..c4b3cfd4d4b3 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/SubscriptionQuotaItemProperties.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/QuotaItemProperties.java
@@ -12,10 +12,10 @@
 import java.io.IOException;
 
 /**
- * SubscriptionQuotaItem Properties.
+ * QuotaItem Properties.
  */
 @Immutable
-public final class SubscriptionQuotaItemProperties implements JsonSerializable<SubscriptionQuotaItemProperties> {
+public final class QuotaItemProperties implements JsonSerializable<QuotaItemProperties> {
     /*
      * The current quota value.
      */
@@ -26,10 +26,15 @@ public final class SubscriptionQuotaItemProperties implements JsonSerializable<S
      */
     private Integer defaultProperty;
 
+    /*
+     * The usage quota value.
+     */
+    private Integer usage;
+
     /**
-     * Creates an instance of SubscriptionQuotaItemProperties class.
+     * Creates an instance of QuotaItemProperties class.
      */
-    public SubscriptionQuotaItemProperties() {
+    public QuotaItemProperties() {
     }
 
     /**
@@ -50,6 +55,15 @@ public Integer defaultProperty() {
         return this.defaultProperty;
     }
 
+    /**
+     * Get the usage property: The usage quota value.
+     * 
+     * @return the usage value.
+     */
+    public Integer usage() {
+        return this.usage;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -68,32 +82,32 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     }
 
     /**
-     * Reads an instance of SubscriptionQuotaItemProperties from the JsonReader.
+     * Reads an instance of QuotaItemProperties from the JsonReader.
      * 
      * @param jsonReader The JsonReader being read.
-     * @return An instance of SubscriptionQuotaItemProperties if the JsonReader was pointing to an instance of it, or
-     * null if it was pointing to JSON null.
-     * @throws IOException If an error occurs while reading the SubscriptionQuotaItemProperties.
+     * @return An instance of QuotaItemProperties if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the QuotaItemProperties.
      */
-    public static SubscriptionQuotaItemProperties fromJson(JsonReader jsonReader) throws IOException {
+    public static QuotaItemProperties fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            SubscriptionQuotaItemProperties deserializedSubscriptionQuotaItemProperties
-                = new SubscriptionQuotaItemProperties();
+            QuotaItemProperties deserializedQuotaItemProperties = new QuotaItemProperties();
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
                 if ("current".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemProperties.current = reader.getNullable(JsonReader::getInt);
+                    deserializedQuotaItemProperties.current = reader.getNullable(JsonReader::getInt);
                 } else if ("default".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemProperties.defaultProperty
-                        = reader.getNullable(JsonReader::getInt);
+                    deserializedQuotaItemProperties.defaultProperty = reader.getNullable(JsonReader::getInt);
+                } else if ("usage".equals(fieldName)) {
+                    deserializedQuotaItemProperties.usage = reader.getNullable(JsonReader::getInt);
                 } else {
                     reader.skipChildren();
                 }
             }
 
-            return deserializedSubscriptionQuotaItemProperties;
+            return deserializedQuotaItemProperties;
         });
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ReplicationStatusInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ReplicationStatusInner.java
index 7bca2ec9f399..cb450d4a138d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ReplicationStatusInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/ReplicationStatusInner.java
@@ -29,7 +29,9 @@ public final class ReplicationStatusInner implements JsonSerializable<Replicatio
     private RelationshipStatus relationshipStatus;
 
     /*
-     * The status of the replication
+     * The mirror state property describes the current status of data replication for a replication. It provides insight
+     * into whether the data is actively being mirrored, if the replication process has been paused, or if it has yet to
+     * be initialized.
      */
     private MirrorState mirrorState;
 
@@ -90,7 +92,9 @@ public ReplicationStatusInner withRelationshipStatus(RelationshipStatus relation
     }
 
     /**
-     * Get the mirrorState property: The status of the replication.
+     * Get the mirrorState property: The mirror state property describes the current status of data replication for a
+     * replication. It provides insight into whether the data is actively being mirrored, if the replication process has
+     * been paused, or if it has yet to be initialized.
      * 
      * @return the mirrorState value.
      */
@@ -98,17 +102,6 @@ public MirrorState mirrorState() {
         return this.mirrorState;
     }
 
-    /**
-     * Set the mirrorState property: The status of the replication.
-     * 
-     * @param mirrorState the mirrorState value to set.
-     * @return the ReplicationStatusInner object itself.
-     */
-    public ReplicationStatusInner withMirrorState(MirrorState mirrorState) {
-        this.mirrorState = mirrorState;
-        return this;
-    }
-
     /**
      * Get the totalProgress property: The progress of the replication.
      * 
@@ -166,7 +159,6 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeBooleanField("healthy", this.healthy);
         jsonWriter.writeStringField("relationshipStatus",
             this.relationshipStatus == null ? null : this.relationshipStatus.toString());
-        jsonWriter.writeStringField("mirrorState", this.mirrorState == null ? null : this.mirrorState.toString());
         jsonWriter.writeStringField("totalProgress", this.totalProgress);
         jsonWriter.writeStringField("errorMessage", this.errorMessage);
         return jsonWriter.writeEndObject();
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/RestoreStatusInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/RestoreStatusInner.java
index bde47b115f42..9e8f8d5613aa 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/RestoreStatusInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/RestoreStatusInner.java
@@ -29,7 +29,9 @@ public final class RestoreStatusInner implements JsonSerializable<RestoreStatusI
     private RelationshipStatus relationshipStatus;
 
     /*
-     * The status of the restore
+     * The mirror state property describes the current status of data replication for a restore. It provides insight
+     * into whether the data is actively being mirrored, if the replication process has been paused, or if it has yet to
+     * be initialized.
      */
     private MirrorState mirrorState;
 
@@ -73,7 +75,9 @@ public RelationshipStatus relationshipStatus() {
     }
 
     /**
-     * Get the mirrorState property: The status of the restore.
+     * Get the mirrorState property: The mirror state property describes the current status of data replication for a
+     * restore. It provides insight into whether the data is actively being mirrored, if the replication process has
+     * been paused, or if it has yet to be initialized.
      * 
      * @return the mirrorState value.
      */
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeInner.java
index 6fa84004c37d..14ec0043fdef 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeInner.java
@@ -18,12 +18,14 @@
 import com.azure.resourcemanager.netapp.models.EnableSubvolumes;
 import com.azure.resourcemanager.netapp.models.EncryptionKeySource;
 import com.azure.resourcemanager.netapp.models.FileAccessLogs;
+import com.azure.resourcemanager.netapp.models.LdapServerType;
 import com.azure.resourcemanager.netapp.models.NetworkFeatures;
 import com.azure.resourcemanager.netapp.models.PlacementKeyValuePairs;
 import com.azure.resourcemanager.netapp.models.SecurityStyle;
 import com.azure.resourcemanager.netapp.models.ServiceLevel;
 import com.azure.resourcemanager.netapp.models.SmbAccessBasedEnumeration;
 import com.azure.resourcemanager.netapp.models.SmbNonBrowsable;
+import com.azure.resourcemanager.netapp.models.VolumeLanguage;
 import com.azure.resourcemanager.netapp.models.VolumePropertiesDataProtection;
 import com.azure.resourcemanager.netapp.models.VolumePropertiesExportPolicy;
 import com.azure.resourcemanager.netapp.models.VolumeStorageToNetworkProximity;
@@ -481,7 +483,7 @@ public List<MountTargetProperties> mountTargets() {
 
     /**
      * Get the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @return the volumeType value.
      */
@@ -491,7 +493,7 @@ public String volumeType() {
 
     /**
      * Set the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @param volumeType the volumeType value to set.
      * @return the VolumeInner object itself.
@@ -857,6 +859,29 @@ public VolumeInner withLdapEnabled(Boolean ldapEnabled) {
         return this;
     }
 
+    /**
+     * Get the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @return the ldapServerType value.
+     */
+    public LdapServerType ldapServerType() {
+        return this.innerProperties() == null ? null : this.innerProperties().ldapServerType();
+    }
+
+    /**
+     * Set the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @param ldapServerType the ldapServerType value to set.
+     * @return the VolumeInner object itself.
+     */
+    public VolumeInner withLdapServerType(LdapServerType ldapServerType) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new VolumeProperties();
+        }
+        this.innerProperties().withLdapServerType(ldapServerType);
+        return this;
+    }
+
     /**
      * Get the coolAccess property: Specifies whether Cool Access(tiering) is enabled for the volume.
      * 
@@ -974,7 +999,10 @@ public VolumeInner withCoolAccessTieringPolicy(CoolAccessTieringPolicy coolAcces
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @return the unixPermissions value.
      */
@@ -987,7 +1015,10 @@ public String unixPermissions() {
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @param unixPermissions the unixPermissions value to set.
      * @return the VolumeInner object itself.
@@ -1334,6 +1365,29 @@ public Long inheritedSizeInBytes() {
         return this.innerProperties() == null ? null : this.innerProperties().inheritedSizeInBytes();
     }
 
+    /**
+     * Get the language property: Language supported for volume.
+     * 
+     * @return the language value.
+     */
+    public VolumeLanguage language() {
+        return this.innerProperties() == null ? null : this.innerProperties().language();
+    }
+
+    /**
+     * Set the language property: Language supported for volume.
+     * 
+     * @param language the language value to set.
+     * @return the VolumeInner object itself.
+     */
+    public VolumeInner withLanguage(VolumeLanguage language) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new VolumeProperties();
+        }
+        this.innerProperties().withLanguage(language);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeProperties.java
index 28b850308ee5..5b358004b2d1 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeProperties.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeProperties.java
@@ -17,12 +17,14 @@
 import com.azure.resourcemanager.netapp.models.EnableSubvolumes;
 import com.azure.resourcemanager.netapp.models.EncryptionKeySource;
 import com.azure.resourcemanager.netapp.models.FileAccessLogs;
+import com.azure.resourcemanager.netapp.models.LdapServerType;
 import com.azure.resourcemanager.netapp.models.NetworkFeatures;
 import com.azure.resourcemanager.netapp.models.PlacementKeyValuePairs;
 import com.azure.resourcemanager.netapp.models.SecurityStyle;
 import com.azure.resourcemanager.netapp.models.ServiceLevel;
 import com.azure.resourcemanager.netapp.models.SmbAccessBasedEnumeration;
 import com.azure.resourcemanager.netapp.models.SmbNonBrowsable;
+import com.azure.resourcemanager.netapp.models.VolumeLanguage;
 import com.azure.resourcemanager.netapp.models.VolumePropertiesDataProtection;
 import com.azure.resourcemanager.netapp.models.VolumePropertiesExportPolicy;
 import com.azure.resourcemanager.netapp.models.VolumeStorageToNetworkProximity;
@@ -124,7 +126,8 @@ public final class VolumeProperties implements JsonSerializable<VolumeProperties
     private List<MountTargetProperties> mountTargets;
 
     /*
-     * What type of volume is this. For destination volumes in Cross Region Replication, set type to DataProtection
+     * What type of volume is this. For destination volumes in Cross Region Replication, set type to DataProtection. For
+     * creating clone volume, set type to ShortTermClone
      */
     private String volumeType;
 
@@ -210,6 +213,11 @@ public final class VolumeProperties implements JsonSerializable<VolumeProperties
      */
     private Boolean ldapEnabled;
 
+    /*
+     * Specifies the type of LDAP server for a given NFS volume.
+     */
+    private LdapServerType ldapServerType;
+
     /*
      * Specifies whether Cool Access(tiering) is enabled for the volume.
      */
@@ -243,7 +251,10 @@ public final class VolumeProperties implements JsonSerializable<VolumeProperties
      * group ID (2) and sticky (1) attributes. Second digit selects permission for the owner of the file: read (4),
      * write (2) and execute (1). Third selects permissions for other users in the same group. the fourth for other
      * users not in the group. 0755 - gives read/write/execute permissions to owner and read/execute to group and other
-     * users.
+     * users. Avoid passing null value for unixPermissions in volume update operation, As per the behavior, If Null
+     * value is passed then user-visible unixPermissions value will became null, and user will not be able to get
+     * unixPermissions value. On safer side, actual unixPermissions value on volume will remain as its last saved value
+     * only.
      */
     private String unixPermissions;
 
@@ -353,6 +364,11 @@ public final class VolumeProperties implements JsonSerializable<VolumeProperties
      */
     private Long inheritedSizeInBytes;
 
+    /*
+     * Language supported for volume.
+     */
+    private VolumeLanguage language;
+
     /**
      * Creates an instance of VolumeProperties class.
      */
@@ -638,7 +654,7 @@ public List<MountTargetProperties> mountTargets() {
 
     /**
      * Get the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @return the volumeType value.
      */
@@ -648,7 +664,7 @@ public String volumeType() {
 
     /**
      * Set the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @param volumeType the volumeType value to set.
      * @return the VolumeProperties object itself.
@@ -969,6 +985,26 @@ public VolumeProperties withLdapEnabled(Boolean ldapEnabled) {
         return this;
     }
 
+    /**
+     * Get the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @return the ldapServerType value.
+     */
+    public LdapServerType ldapServerType() {
+        return this.ldapServerType;
+    }
+
+    /**
+     * Set the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @param ldapServerType the ldapServerType value to set.
+     * @return the VolumeProperties object itself.
+     */
+    public VolumeProperties withLdapServerType(LdapServerType ldapServerType) {
+        this.ldapServerType = ldapServerType;
+        return this;
+    }
+
     /**
      * Get the coolAccess property: Specifies whether Cool Access(tiering) is enabled for the volume.
      * 
@@ -1074,7 +1110,10 @@ public VolumeProperties withCoolAccessTieringPolicy(CoolAccessTieringPolicy cool
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @return the unixPermissions value.
      */
@@ -1087,7 +1126,10 @@ public String unixPermissions() {
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @param unixPermissions the unixPermissions value to set.
      * @return the VolumeProperties object itself.
@@ -1401,6 +1443,26 @@ public Long inheritedSizeInBytes() {
         return this.inheritedSizeInBytes;
     }
 
+    /**
+     * Get the language property: Language supported for volume.
+     * 
+     * @return the language value.
+     */
+    public VolumeLanguage language() {
+        return this.language;
+    }
+
+    /**
+     * Set the language property: Language supported for volume.
+     * 
+     * @param language the language value to set.
+     * @return the VolumeProperties object itself.
+     */
+    public VolumeProperties withLanguage(VolumeLanguage language) {
+        this.language = language;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -1469,6 +1531,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             this.encryptionKeySource == null ? null : this.encryptionKeySource.toString());
         jsonWriter.writeStringField("keyVaultPrivateEndpointResourceId", this.keyVaultPrivateEndpointResourceId);
         jsonWriter.writeBooleanField("ldapEnabled", this.ldapEnabled);
+        jsonWriter.writeStringField("ldapServerType",
+            this.ldapServerType == null ? null : this.ldapServerType.toString());
         jsonWriter.writeBooleanField("coolAccess", this.coolAccess);
         jsonWriter.writeNumberField("coolnessPeriod", this.coolnessPeriod);
         jsonWriter.writeStringField("coolAccessRetrievalPolicy",
@@ -1488,6 +1552,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("enableSubvolumes",
             this.enableSubvolumes == null ? null : this.enableSubvolumes.toString());
         jsonWriter.writeBooleanField("isLargeVolume", this.isLargeVolume);
+        jsonWriter.writeStringField("language", this.language == null ? null : this.language.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -1581,6 +1646,8 @@ public static VolumeProperties fromJson(JsonReader jsonReader) throws IOExceptio
                     deserializedVolumeProperties.keyVaultPrivateEndpointResourceId = reader.getString();
                 } else if ("ldapEnabled".equals(fieldName)) {
                     deserializedVolumeProperties.ldapEnabled = reader.getNullable(JsonReader::getBoolean);
+                } else if ("ldapServerType".equals(fieldName)) {
+                    deserializedVolumeProperties.ldapServerType = LdapServerType.fromString(reader.getString());
                 } else if ("coolAccess".equals(fieldName)) {
                     deserializedVolumeProperties.coolAccess = reader.getNullable(JsonReader::getBoolean);
                 } else if ("coolnessPeriod".equals(fieldName)) {
@@ -1636,6 +1703,8 @@ public static VolumeProperties fromJson(JsonReader jsonReader) throws IOExceptio
                     deserializedVolumeProperties.originatingResourceId = reader.getString();
                 } else if ("inheritedSizeInBytes".equals(fieldName)) {
                     deserializedVolumeProperties.inheritedSizeInBytes = reader.getNullable(JsonReader::getLong);
+                } else if ("language".equals(fieldName)) {
+                    deserializedVolumeProperties.language = VolumeLanguage.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRuleInner.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRuleInner.java
index b9a8b005238e..01ded2008e0b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRuleInner.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRuleInner.java
@@ -10,7 +10,7 @@
 import com.azure.json.JsonReader;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.netapp.models.ProvisioningState;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
 import com.azure.resourcemanager.netapp.models.Type;
 import java.io.IOException;
 import java.util.Map;
@@ -118,11 +118,11 @@ public VolumeQuotaRuleInner withTags(Map<String, String> tags) {
     }
 
     /**
-     * Get the provisioningState property: Gets the status of the VolumeQuotaRule at the time the operation was called.
+     * Get the provisioningState property: Provisioning state of the resource.
      * 
      * @return the provisioningState value.
      */
-    public ProvisioningState provisioningState() {
+    public NetAppProvisioningState provisioningState() {
         return this.innerProperties() == null ? null : this.innerProperties().provisioningState();
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRulesProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRulesProperties.java
index 832ca6f6d73d..fcd2904ec53e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRulesProperties.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/VolumeQuotaRulesProperties.java
@@ -9,7 +9,7 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.netapp.models.ProvisioningState;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
 import com.azure.resourcemanager.netapp.models.Type;
 import java.io.IOException;
 
@@ -19,9 +19,9 @@
 @Fluent
 public final class VolumeQuotaRulesProperties implements JsonSerializable<VolumeQuotaRulesProperties> {
     /*
-     * Gets the status of the VolumeQuotaRule at the time the operation was called.
+     * Provisioning state of the resource
      */
-    private ProvisioningState provisioningState;
+    private NetAppProvisioningState provisioningState;
 
     /*
      * Size of quota
@@ -46,11 +46,11 @@ public VolumeQuotaRulesProperties() {
     }
 
     /**
-     * Get the provisioningState property: Gets the status of the VolumeQuotaRule at the time the operation was called.
+     * Get the provisioningState property: Provisioning state of the resource.
      * 
      * @return the provisioningState value.
      */
-    public ProvisioningState provisioningState() {
+    public NetAppProvisioningState provisioningState() {
         return this.provisioningState;
     }
 
@@ -155,7 +155,7 @@ public static VolumeQuotaRulesProperties fromJson(JsonReader jsonReader) throws
 
                 if ("provisioningState".equals(fieldName)) {
                     deserializedVolumeQuotaRulesProperties.provisioningState
-                        = ProvisioningState.fromString(reader.getString());
+                        = NetAppProvisioningState.fromString(reader.getString());
                 } else if ("quotaSizeInKiBs".equals(fieldName)) {
                     deserializedVolumeQuotaRulesProperties.quotaSizeInKiBs = reader.getNullable(JsonReader::getLong);
                 } else if ("quotaType".equals(fieldName)) {
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketGenerateCredentialsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketGenerateCredentialsImpl.java
new file mode 100644
index 000000000000..2e637c0db77c
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketGenerateCredentialsImpl.java
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.resourcemanager.netapp.fluent.models.BucketGenerateCredentialsInner;
+import com.azure.resourcemanager.netapp.models.BucketGenerateCredentials;
+import java.time.OffsetDateTime;
+
+public final class BucketGenerateCredentialsImpl implements BucketGenerateCredentials {
+    private BucketGenerateCredentialsInner innerObject;
+
+    private final com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager;
+
+    BucketGenerateCredentialsImpl(BucketGenerateCredentialsInner innerObject,
+        com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+    }
+
+    public String accessKey() {
+        return this.innerModel().accessKey();
+    }
+
+    public String secretKey() {
+        return this.innerModel().secretKey();
+    }
+
+    public OffsetDateTime keyPairExpiry() {
+        return this.innerModel().keyPairExpiry();
+    }
+
+    public BucketGenerateCredentialsInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.netapp.NetAppFilesManager manager() {
+        return this.serviceManager;
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketImpl.java
new file mode 100644
index 000000000000..0af86045e3c2
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketImpl.java
@@ -0,0 +1,223 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketCredentialsExpiry;
+import com.azure.resourcemanager.netapp.models.BucketGenerateCredentials;
+import com.azure.resourcemanager.netapp.models.BucketPatch;
+import com.azure.resourcemanager.netapp.models.BucketPatchPermissions;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CredentialsStatus;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
+
+public final class BucketImpl implements Bucket, Bucket.Definition, Bucket.Update {
+    private BucketInner innerObject;
+
+    private final com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager;
+
+    public String id() {
+        return this.innerModel().id();
+    }
+
+    public String name() {
+        return this.innerModel().name();
+    }
+
+    public String type() {
+        return this.innerModel().type();
+    }
+
+    public SystemData systemData() {
+        return this.innerModel().systemData();
+    }
+
+    public String path() {
+        return this.innerModel().path();
+    }
+
+    public FileSystemUser fileSystemUser() {
+        return this.innerModel().fileSystemUser();
+    }
+
+    public NetAppProvisioningState provisioningState() {
+        return this.innerModel().provisioningState();
+    }
+
+    public CredentialsStatus status() {
+        return this.innerModel().status();
+    }
+
+    public BucketServerProperties server() {
+        return this.innerModel().server();
+    }
+
+    public BucketPermissions permissions() {
+        return this.innerModel().permissions();
+    }
+
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public BucketInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.netapp.NetAppFilesManager manager() {
+        return this.serviceManager;
+    }
+
+    private String resourceGroupName;
+
+    private String accountName;
+
+    private String poolName;
+
+    private String volumeName;
+
+    private String bucketName;
+
+    private BucketPatch updateBody;
+
+    public BucketImpl withExistingVolume(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        this.resourceGroupName = resourceGroupName;
+        this.accountName = accountName;
+        this.poolName = poolName;
+        this.volumeName = volumeName;
+        return this;
+    }
+
+    public Bucket create() {
+        this.innerObject = serviceManager.serviceClient()
+            .getBuckets()
+            .createOrUpdate(resourceGroupName, accountName, poolName, volumeName, bucketName, this.innerModel(),
+                Context.NONE);
+        return this;
+    }
+
+    public Bucket create(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getBuckets()
+            .createOrUpdate(resourceGroupName, accountName, poolName, volumeName, bucketName, this.innerModel(),
+                context);
+        return this;
+    }
+
+    BucketImpl(String name, com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+        this.innerObject = new BucketInner();
+        this.serviceManager = serviceManager;
+        this.bucketName = name;
+    }
+
+    public BucketImpl update() {
+        this.updateBody = new BucketPatch();
+        return this;
+    }
+
+    public Bucket apply() {
+        this.innerObject = serviceManager.serviceClient()
+            .getBuckets()
+            .update(resourceGroupName, accountName, poolName, volumeName, bucketName, updateBody, Context.NONE);
+        return this;
+    }
+
+    public Bucket apply(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getBuckets()
+            .update(resourceGroupName, accountName, poolName, volumeName, bucketName, updateBody, context);
+        return this;
+    }
+
+    BucketImpl(BucketInner innerObject, com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+        this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
+        this.accountName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "netAppAccounts");
+        this.poolName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "capacityPools");
+        this.volumeName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "volumes");
+        this.bucketName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "buckets");
+    }
+
+    public Bucket refresh() {
+        this.innerObject = serviceManager.serviceClient()
+            .getBuckets()
+            .getWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, Context.NONE)
+            .getValue();
+        return this;
+    }
+
+    public Bucket refresh(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getBuckets()
+            .getWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, context)
+            .getValue();
+        return this;
+    }
+
+    public Response<BucketGenerateCredentials> generateCredentialsWithResponse(BucketCredentialsExpiry body,
+        Context context) {
+        return serviceManager.buckets()
+            .generateCredentialsWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, body,
+                context);
+    }
+
+    public BucketGenerateCredentials generateCredentials(BucketCredentialsExpiry body) {
+        return serviceManager.buckets()
+            .generateCredentials(resourceGroupName, accountName, poolName, volumeName, bucketName, body);
+    }
+
+    public BucketImpl withPath(String path) {
+        if (isInCreateMode()) {
+            this.innerModel().withPath(path);
+            return this;
+        } else {
+            this.updateBody.withPath(path);
+            return this;
+        }
+    }
+
+    public BucketImpl withFileSystemUser(FileSystemUser fileSystemUser) {
+        if (isInCreateMode()) {
+            this.innerModel().withFileSystemUser(fileSystemUser);
+            return this;
+        } else {
+            this.updateBody.withFileSystemUser(fileSystemUser);
+            return this;
+        }
+    }
+
+    public BucketImpl withServer(BucketServerProperties server) {
+        this.innerModel().withServer(server);
+        return this;
+    }
+
+    public BucketImpl withPermissions(BucketPermissions permissions) {
+        this.innerModel().withPermissions(permissions);
+        return this;
+    }
+
+    public BucketImpl withServer(BucketServerPatchProperties server) {
+        this.updateBody.withServer(server);
+        return this;
+    }
+
+    public BucketImpl withPermissions(BucketPatchPermissions permissions) {
+        this.updateBody.withPermissions(permissions);
+        return this;
+    }
+
+    private boolean isInCreateMode() {
+        return this.innerModel() == null || this.innerModel().id() == null;
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketsClientImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketsClientImpl.java
new file mode 100644
index 000000000000..43506d08204d
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketsClientImpl.java
@@ -0,0 +1,1814 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.Patch;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Post;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.netapp.fluent.BucketsClient;
+import com.azure.resourcemanager.netapp.fluent.models.BucketGenerateCredentialsInner;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import com.azure.resourcemanager.netapp.models.BucketCredentialsExpiry;
+import com.azure.resourcemanager.netapp.models.BucketList;
+import com.azure.resourcemanager.netapp.models.BucketPatch;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in BucketsClient.
+ */
+public final class BucketsClientImpl implements BucketsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final BucketsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final NetAppManagementClientImpl client;
+
+    /**
+     * Initializes an instance of BucketsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    BucketsClientImpl(NetAppManagementClientImpl client) {
+        this.service = RestProxy.create(BucketsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetAppManagementClientBuckets to be used by the proxy service to
+     * perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "NetAppManagementClientBuckets")
+    public interface BucketsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<BucketList>> list(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BucketList> listSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<BucketInner>> get(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BucketInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") BucketInner body, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createOrUpdateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") BucketInner body, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> update(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") BucketPatch body, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") BucketPatch body, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}/generateCredentials")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<BucketGenerateCredentialsInner>> generateCredentials(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") BucketCredentialsExpiry body, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/buckets/{bucketName}/generateCredentials")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BucketGenerateCredentialsInner> generateCredentialsSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @PathParam("bucketName") String bucketName, @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") BucketCredentialsExpiry body, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<BucketList>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BucketList> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<BucketInner>> listSinglePageAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
+                resourceGroupName, accountName, poolName, volumeName, this.client.getApiVersion(), accept, context))
+            .<PagedResponse<BucketInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<BucketInner> listAsync(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, accountName, poolName, volumeName),
+            nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<BucketInner> listSinglePage(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<BucketList> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, poolName, volumeName, this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<BucketInner> listSinglePage(String resourceGroupName, String accountName, String poolName,
+        String volumeName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<BucketList> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, poolName, volumeName, this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<BucketInner> list(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, accountName, poolName, volumeName),
+            nextLink -> listNextSinglePage(nextLink));
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<BucketInner> list(String resourceGroupName, String accountName, String poolName,
+        String volumeName, Context context) {
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, accountName, poolName, volumeName, context),
+            nextLink -> listNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket along with {@link Response} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<BucketInner>> getWithResponseAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                    accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<BucketInner> getAsync(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName) {
+        return getWithResponseAsync(resourceGroupName, accountName, poolName, volumeName, bucketName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<BucketInner> getWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), accept, context);
+    }
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BucketInner get(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName) {
+        return getWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, Context.NONE)
+            .getValue();
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketInner body) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            return Mono.error(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
+                resourceGroupName, accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body,
+                accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketInner body) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body, accept, Context.NONE);
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketInner body, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body, accept, context);
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<BucketInner>, BucketInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketInner body) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, accountName, poolName, volumeName, bucketName, body);
+        return this.client.<BucketInner, BucketInner>getLroResult(mono, this.client.getHttpPipeline(),
+            BucketInner.class, BucketInner.class, this.client.getContext());
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<BucketInner>, BucketInner> beginCreateOrUpdate(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketInner body) {
+        Response<BinaryData> response
+            = createOrUpdateWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, body);
+        return this.client.<BucketInner, BucketInner>getLroResult(response, BucketInner.class, BucketInner.class,
+            Context.NONE);
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<BucketInner>, BucketInner> beginCreateOrUpdate(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketInner body, Context context) {
+        Response<BinaryData> response = createOrUpdateWithResponse(resourceGroupName, accountName, poolName, volumeName,
+            bucketName, body, context);
+        return this.client.<BucketInner, BucketInner>getLroResult(response, BucketInner.class, BucketInner.class,
+            context);
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<BucketInner> createOrUpdateAsync(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketInner body) {
+        return beginCreateOrUpdateAsync(resourceGroupName, accountName, poolName, volumeName, bucketName, body).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BucketInner createOrUpdate(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketInner body) {
+        return beginCreateOrUpdate(resourceGroupName, accountName, poolName, volumeName, bucketName, body)
+            .getFinalResult();
+    }
+
+    /**
+     * Creates or updates a bucket for a volume
+     * 
+     * Creates or updates a bucket for a volume. A bucket allows additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BucketInner createOrUpdate(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketInner body, Context context) {
+        return beginCreateOrUpdate(resourceGroupName, accountName, poolName, volumeName, bucketName, body, context)
+            .getFinalResult();
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketPatch body) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            return Mono.error(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.update(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                    accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketPatch body) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body, accept, Context.NONE);
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketPatch body, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body, accept, context);
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<BucketInner>, BucketInner> beginUpdateAsync(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketPatch body) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = updateWithResponseAsync(resourceGroupName, accountName, poolName, volumeName, bucketName, body);
+        return this.client.<BucketInner, BucketInner>getLroResult(mono, this.client.getHttpPipeline(),
+            BucketInner.class, BucketInner.class, this.client.getContext());
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<BucketInner>, BucketInner> beginUpdate(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketPatch body) {
+        Response<BinaryData> response
+            = updateWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, body);
+        return this.client.<BucketInner, BucketInner>getLroResult(response, BucketInner.class, BucketInner.class,
+            Context.NONE);
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<BucketInner>, BucketInner> beginUpdate(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketPatch body, Context context) {
+        Response<BinaryData> response
+            = updateWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, body, context);
+        return this.client.<BucketInner, BucketInner>getLroResult(response, BucketInner.class, BucketInner.class,
+            context);
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<BucketInner> updateAsync(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketPatch body) {
+        return beginUpdateAsync(resourceGroupName, accountName, poolName, volumeName, bucketName, body).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BucketInner update(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketPatch body) {
+        return beginUpdate(resourceGroupName, accountName, poolName, volumeName, bucketName, body).getFinalResult();
+    }
+
+    /**
+     * Updates a bucket for a volume
+     * 
+     * Updates the details of a volume bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket details including user details, and the volume path that should be mounted inside the
+     * bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket resource.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BucketInner update(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, BucketPatch body, Context context) {
+        return beginUpdate(resourceGroupName, accountName, poolName, volumeName, bucketName, body, context)
+            .getFinalResult();
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+                    accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), accept, Context.NONE);
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), accept, context);
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, accountName, poolName, volumeName, bucketName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName) {
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, Context context) {
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName) {
+        return beginDeleteAsync(resourceGroupName, accountName, poolName, volumeName, bucketName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName) {
+        beginDelete(resourceGroupName, accountName, poolName, volumeName, bucketName).getFinalResult();
+    }
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, Context context) {
+        beginDelete(resourceGroupName, accountName, poolName, volumeName, bucketName, context).getFinalResult();
+    }
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair along with {@link Response} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<BucketGenerateCredentialsInner>> generateCredentialsWithResponseAsync(
+        String resourceGroupName, String accountName, String poolName, String volumeName, String bucketName,
+        BucketCredentialsExpiry body) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            return Mono.error(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.generateCredentials(this.client.getEndpoint(),
+                this.client.getSubscriptionId(), resourceGroupName, accountName, poolName, volumeName, bucketName,
+                this.client.getApiVersion(), body, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<BucketGenerateCredentialsInner> generateCredentialsAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketCredentialsExpiry body) {
+        return generateCredentialsWithResponseAsync(resourceGroupName, accountName, poolName, volumeName, bucketName,
+            body).flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<BucketGenerateCredentialsInner> generateCredentialsWithResponse(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketCredentialsExpiry body,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        if (bucketName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter bucketName is required and cannot be null."));
+        }
+        if (body == null) {
+            throw LOGGER.atError().log(new IllegalArgumentException("Parameter body is required and cannot be null."));
+        } else {
+            body.validate();
+        }
+        final String accept = "application/json";
+        return service.generateCredentialsSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, poolName, volumeName, bucketName, this.client.getApiVersion(), body, accept,
+            context);
+    }
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public BucketGenerateCredentialsInner generateCredentials(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketCredentialsExpiry body) {
+        return generateCredentialsWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, body,
+            Context.NONE).getValue();
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<BucketInner>> listNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<BucketInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<BucketInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<BucketList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<BucketInner> listNextSinglePage(String nextLink, Context context) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<BucketList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(BucketsClientImpl.class);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketsImpl.java
new file mode 100644
index 000000000000..e5b7191e4e79
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BucketsImpl.java
@@ -0,0 +1,231 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.netapp.fluent.BucketsClient;
+import com.azure.resourcemanager.netapp.fluent.models.BucketGenerateCredentialsInner;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketCredentialsExpiry;
+import com.azure.resourcemanager.netapp.models.BucketGenerateCredentials;
+import com.azure.resourcemanager.netapp.models.Buckets;
+
+public final class BucketsImpl implements Buckets {
+    private static final ClientLogger LOGGER = new ClientLogger(BucketsImpl.class);
+
+    private final BucketsClient innerClient;
+
+    private final com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager;
+
+    public BucketsImpl(BucketsClient innerClient, com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public PagedIterable<Bucket> list(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        PagedIterable<BucketInner> inner
+            = this.serviceClient().list(resourceGroupName, accountName, poolName, volumeName);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new BucketImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<Bucket> list(String resourceGroupName, String accountName, String poolName, String volumeName,
+        Context context) {
+        PagedIterable<BucketInner> inner
+            = this.serviceClient().list(resourceGroupName, accountName, poolName, volumeName, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new BucketImpl(inner1, this.manager()));
+    }
+
+    public Response<Bucket> getWithResponse(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, Context context) {
+        Response<BucketInner> inner = this.serviceClient()
+            .getWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new BucketImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public Bucket get(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName) {
+        BucketInner inner = this.serviceClient().get(resourceGroupName, accountName, poolName, volumeName, bucketName);
+        if (inner != null) {
+            return new BucketImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public void delete(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName) {
+        this.serviceClient().delete(resourceGroupName, accountName, poolName, volumeName, bucketName);
+    }
+
+    public void delete(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, Context context) {
+        this.serviceClient().delete(resourceGroupName, accountName, poolName, volumeName, bucketName, context);
+    }
+
+    public Response<BucketGenerateCredentials> generateCredentialsWithResponse(String resourceGroupName,
+        String accountName, String poolName, String volumeName, String bucketName, BucketCredentialsExpiry body,
+        Context context) {
+        Response<BucketGenerateCredentialsInner> inner = this.serviceClient()
+            .generateCredentialsWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, body,
+                context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new BucketGenerateCredentialsImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public BucketGenerateCredentials generateCredentials(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketCredentialsExpiry body) {
+        BucketGenerateCredentialsInner inner = this.serviceClient()
+            .generateCredentials(resourceGroupName, accountName, poolName, volumeName, bucketName, body);
+        if (inner != null) {
+            return new BucketGenerateCredentialsImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public Bucket getById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String accountName = ResourceManagerUtils.getValueFromIdByName(id, "netAppAccounts");
+        if (accountName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'netAppAccounts'.", id)));
+        }
+        String poolName = ResourceManagerUtils.getValueFromIdByName(id, "capacityPools");
+        if (poolName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'capacityPools'.", id)));
+        }
+        String volumeName = ResourceManagerUtils.getValueFromIdByName(id, "volumes");
+        if (volumeName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'volumes'.", id)));
+        }
+        String bucketName = ResourceManagerUtils.getValueFromIdByName(id, "buckets");
+        if (bucketName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'buckets'.", id)));
+        }
+        return this.getWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, Context.NONE)
+            .getValue();
+    }
+
+    public Response<Bucket> getByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String accountName = ResourceManagerUtils.getValueFromIdByName(id, "netAppAccounts");
+        if (accountName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'netAppAccounts'.", id)));
+        }
+        String poolName = ResourceManagerUtils.getValueFromIdByName(id, "capacityPools");
+        if (poolName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'capacityPools'.", id)));
+        }
+        String volumeName = ResourceManagerUtils.getValueFromIdByName(id, "volumes");
+        if (volumeName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'volumes'.", id)));
+        }
+        String bucketName = ResourceManagerUtils.getValueFromIdByName(id, "buckets");
+        if (bucketName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'buckets'.", id)));
+        }
+        return this.getWithResponse(resourceGroupName, accountName, poolName, volumeName, bucketName, context);
+    }
+
+    public void deleteById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String accountName = ResourceManagerUtils.getValueFromIdByName(id, "netAppAccounts");
+        if (accountName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'netAppAccounts'.", id)));
+        }
+        String poolName = ResourceManagerUtils.getValueFromIdByName(id, "capacityPools");
+        if (poolName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'capacityPools'.", id)));
+        }
+        String volumeName = ResourceManagerUtils.getValueFromIdByName(id, "volumes");
+        if (volumeName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'volumes'.", id)));
+        }
+        String bucketName = ResourceManagerUtils.getValueFromIdByName(id, "buckets");
+        if (bucketName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'buckets'.", id)));
+        }
+        this.delete(resourceGroupName, accountName, poolName, volumeName, bucketName, Context.NONE);
+    }
+
+    public void deleteByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String accountName = ResourceManagerUtils.getValueFromIdByName(id, "netAppAccounts");
+        if (accountName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'netAppAccounts'.", id)));
+        }
+        String poolName = ResourceManagerUtils.getValueFromIdByName(id, "capacityPools");
+        if (poolName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'capacityPools'.", id)));
+        }
+        String volumeName = ResourceManagerUtils.getValueFromIdByName(id, "volumes");
+        if (volumeName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'volumes'.", id)));
+        }
+        String bucketName = ResourceManagerUtils.getValueFromIdByName(id, "buckets");
+        if (bucketName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'buckets'.", id)));
+        }
+        this.delete(resourceGroupName, accountName, poolName, volumeName, bucketName, context);
+    }
+
+    private BucketsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.netapp.NetAppFilesManager manager() {
+        return this.serviceManager;
+    }
+
+    public BucketImpl define(String name) {
+        return new BucketImpl(name, this.manager());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ListQuotaReportResponseImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ListQuotaReportResponseImpl.java
new file mode 100644
index 000000000000..ec3e3a9a6a02
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ListQuotaReportResponseImpl.java
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner;
+import com.azure.resourcemanager.netapp.models.ListQuotaReportResponse;
+import com.azure.resourcemanager.netapp.models.QuotaReport;
+import java.util.Collections;
+import java.util.List;
+
+public final class ListQuotaReportResponseImpl implements ListQuotaReportResponse {
+    private ListQuotaReportResponseInner innerObject;
+
+    private final com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager;
+
+    ListQuotaReportResponseImpl(ListQuotaReportResponseInner innerObject,
+        com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+    }
+
+    public List<QuotaReport> value() {
+        List<QuotaReport> inner = this.innerModel().value();
+        if (inner != null) {
+            return Collections.unmodifiableList(inner);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    public ListQuotaReportResponseInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.netapp.NetAppFilesManager manager() {
+        return this.serviceManager;
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java
index d8a4c6a6ab7a..1ee92f3c0762 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.netapp.models.ChangeKeyVault;
 import com.azure.resourcemanager.netapp.models.EncryptionTransitionRequest;
 import com.azure.resourcemanager.netapp.models.GetKeyVaultStatusResponse;
+import com.azure.resourcemanager.netapp.models.LdapConfiguration;
 import com.azure.resourcemanager.netapp.models.ManagedServiceIdentity;
 import com.azure.resourcemanager.netapp.models.MultiAdStatus;
 import com.azure.resourcemanager.netapp.models.NetAppAccount;
@@ -92,6 +93,10 @@ public MultiAdStatus multiAdStatus() {
         return this.innerModel().multiAdStatus();
     }
 
+    public LdapConfiguration ldapConfiguration() {
+        return this.innerModel().ldapConfiguration();
+    }
+
     public Region region() {
         return Region.fromName(this.regionName());
     }
@@ -277,6 +282,16 @@ public NetAppAccountImpl withNfsV4IdDomain(String nfsV4IdDomain) {
         }
     }
 
+    public NetAppAccountImpl withLdapConfiguration(LdapConfiguration ldapConfiguration) {
+        if (isInCreateMode()) {
+            this.innerModel().withLdapConfiguration(ldapConfiguration);
+            return this;
+        } else {
+            this.updateBody.withLdapConfiguration(ldapConfiguration);
+            return this;
+        }
+    }
+
     private boolean isInCreateMode() {
         return this.innerModel() == null || this.innerModel().id() == null;
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppManagementClientImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppManagementClientImpl.java
index cf3ae3f3d40f..d3af04263a8a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppManagementClientImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppManagementClientImpl.java
@@ -33,7 +33,9 @@
 import com.azure.resourcemanager.netapp.fluent.BackupsUnderAccountsClient;
 import com.azure.resourcemanager.netapp.fluent.BackupsUnderBackupVaultsClient;
 import com.azure.resourcemanager.netapp.fluent.BackupsUnderVolumesClient;
+import com.azure.resourcemanager.netapp.fluent.BucketsClient;
 import com.azure.resourcemanager.netapp.fluent.NetAppManagementClient;
+import com.azure.resourcemanager.netapp.fluent.NetAppResourceQuotaLimitsAccountsClient;
 import com.azure.resourcemanager.netapp.fluent.NetAppResourceQuotaLimitsClient;
 import com.azure.resourcemanager.netapp.fluent.NetAppResourceRegionInfosClient;
 import com.azure.resourcemanager.netapp.fluent.NetAppResourceUsagesClient;
@@ -354,6 +356,20 @@ public BackupsClient getBackups() {
         return this.backups;
     }
 
+    /**
+     * The NetAppResourceQuotaLimitsAccountsClient object to access its operations.
+     */
+    private final NetAppResourceQuotaLimitsAccountsClient netAppResourceQuotaLimitsAccounts;
+
+    /**
+     * Gets the NetAppResourceQuotaLimitsAccountsClient object to access its operations.
+     * 
+     * @return the NetAppResourceQuotaLimitsAccountsClient object.
+     */
+    public NetAppResourceQuotaLimitsAccountsClient getNetAppResourceQuotaLimitsAccounts() {
+        return this.netAppResourceQuotaLimitsAccounts;
+    }
+
     /**
      * The BackupVaultsClient object to access its operations.
      */
@@ -410,6 +426,20 @@ public BackupsUnderAccountsClient getBackupsUnderAccounts() {
         return this.backupsUnderAccounts;
     }
 
+    /**
+     * The BucketsClient object to access its operations.
+     */
+    private final BucketsClient buckets;
+
+    /**
+     * Gets the BucketsClient object to access its operations.
+     * 
+     * @return the BucketsClient object.
+     */
+    public BucketsClient getBuckets() {
+        return this.buckets;
+    }
+
     /**
      * Initializes an instance of NetAppManagementClient client.
      * 
@@ -427,7 +457,7 @@ public BackupsUnderAccountsClient getBackupsUnderAccounts() {
         this.defaultPollInterval = defaultPollInterval;
         this.subscriptionId = subscriptionId;
         this.endpoint = endpoint;
-        this.apiVersion = "2025-06-01";
+        this.apiVersion = "2025-07-01-preview";
         this.operations = new OperationsClientImpl(this);
         this.netAppResources = new NetAppResourcesClientImpl(this);
         this.netAppResourceUsages = new NetAppResourceUsagesClientImpl(this);
@@ -443,10 +473,12 @@ public BackupsUnderAccountsClient getBackupsUnderAccounts() {
         this.volumeGroups = new VolumeGroupsClientImpl(this);
         this.subvolumes = new SubvolumesClientImpl(this);
         this.backups = new BackupsClientImpl(this);
+        this.netAppResourceQuotaLimitsAccounts = new NetAppResourceQuotaLimitsAccountsClientImpl(this);
         this.backupVaults = new BackupVaultsClientImpl(this);
         this.backupsUnderBackupVaults = new BackupsUnderBackupVaultsClientImpl(this);
         this.backupsUnderVolumes = new BackupsUnderVolumesClientImpl(this);
         this.backupsUnderAccounts = new BackupsUnderAccountsClientImpl(this);
+        this.buckets = new BucketsClientImpl(this);
     }
 
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsAccountsClientImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsAccountsClientImpl.java
new file mode 100644
index 000000000000..dc5e955c7640
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsAccountsClientImpl.java
@@ -0,0 +1,505 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.netapp.fluent.NetAppResourceQuotaLimitsAccountsClient;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+import com.azure.resourcemanager.netapp.models.QuotaItemList;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in NetAppResourceQuotaLimitsAccountsClient.
+ */
+public final class NetAppResourceQuotaLimitsAccountsClientImpl implements NetAppResourceQuotaLimitsAccountsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final NetAppResourceQuotaLimitsAccountsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final NetAppManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetAppResourceQuotaLimitsAccountsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    NetAppResourceQuotaLimitsAccountsClientImpl(NetAppManagementClientImpl client) {
+        this.service = RestProxy.create(NetAppResourceQuotaLimitsAccountsService.class, client.getHttpPipeline(),
+            client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetAppManagementClientNetAppResourceQuotaLimitsAccounts to be used by
+     * the proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "NetAppManagementClientNetAppResourceQuotaLimitsAccounts")
+    public interface NetAppResourceQuotaLimitsAccountsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/quotaLimits")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<QuotaItemList>> list(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/quotaLimits")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<QuotaItemList> listSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/quotaLimits/{quotaLimitName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<QuotaItemInner>> get(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("quotaLimitName") String quotaLimitName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/quotaLimits/{quotaLimitName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<QuotaItemInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("quotaLimitName") String quotaLimitName, @QueryParam("api-version") String apiVersion,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<QuotaItemList>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<QuotaItemList> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<QuotaItemInner>> listSinglePageAsync(String resourceGroupName, String accountName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
+                resourceGroupName, accountName, this.client.getApiVersion(), accept, context))
+            .<PagedResponse<QuotaItemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<QuotaItemInner> listAsync(String resourceGroupName, String accountName) {
+        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, accountName),
+            nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<QuotaItemInner> listSinglePage(String resourceGroupName, String accountName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<QuotaItemList> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<QuotaItemInner> listSinglePage(String resourceGroupName, String accountName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<QuotaItemList> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<QuotaItemInner> list(String resourceGroupName, String accountName) {
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, accountName),
+            nextLink -> listNextSinglePage(nextLink));
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<QuotaItemInner> list(String resourceGroupName, String accountName, Context context) {
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, accountName, context),
+            nextLink -> listNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit along with {@link Response} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<QuotaItemInner>> getWithResponseAsync(String resourceGroupName, String accountName,
+        String quotaLimitName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (quotaLimitName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter quotaLimitName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
+                resourceGroupName, accountName, quotaLimitName, this.client.getApiVersion(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<QuotaItemInner> getAsync(String resourceGroupName, String accountName, String quotaLimitName) {
+        return getWithResponseAsync(resourceGroupName, accountName, quotaLimitName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<QuotaItemInner> getWithResponse(String resourceGroupName, String accountName, String quotaLimitName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (quotaLimitName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter quotaLimitName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            accountName, quotaLimitName, this.client.getApiVersion(), accept, context);
+    }
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public QuotaItemInner get(String resourceGroupName, String accountName, String quotaLimitName) {
+        return getWithResponse(resourceGroupName, accountName, quotaLimitName, Context.NONE).getValue();
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<QuotaItemInner>> listNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<QuotaItemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<QuotaItemInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<QuotaItemList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<QuotaItemInner> listNextSinglePage(String nextLink, Context context) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<QuotaItemList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    private static final ClientLogger LOGGER = new ClientLogger(NetAppResourceQuotaLimitsAccountsClientImpl.class);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsAccountsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsAccountsImpl.java
new file mode 100644
index 000000000000..dee5d469e586
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsAccountsImpl.java
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.netapp.fluent.NetAppResourceQuotaLimitsAccountsClient;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+import com.azure.resourcemanager.netapp.models.NetAppResourceQuotaLimitsAccounts;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
+
+public final class NetAppResourceQuotaLimitsAccountsImpl implements NetAppResourceQuotaLimitsAccounts {
+    private static final ClientLogger LOGGER = new ClientLogger(NetAppResourceQuotaLimitsAccountsImpl.class);
+
+    private final NetAppResourceQuotaLimitsAccountsClient innerClient;
+
+    private final com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager;
+
+    public NetAppResourceQuotaLimitsAccountsImpl(NetAppResourceQuotaLimitsAccountsClient innerClient,
+        com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public PagedIterable<QuotaItem> list(String resourceGroupName, String accountName) {
+        PagedIterable<QuotaItemInner> inner = this.serviceClient().list(resourceGroupName, accountName);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new QuotaItemImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<QuotaItem> list(String resourceGroupName, String accountName, Context context) {
+        PagedIterable<QuotaItemInner> inner = this.serviceClient().list(resourceGroupName, accountName, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new QuotaItemImpl(inner1, this.manager()));
+    }
+
+    public Response<QuotaItem> getWithResponse(String resourceGroupName, String accountName, String quotaLimitName,
+        Context context) {
+        Response<QuotaItemInner> inner
+            = this.serviceClient().getWithResponse(resourceGroupName, accountName, quotaLimitName, context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new QuotaItemImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public QuotaItem get(String resourceGroupName, String accountName, String quotaLimitName) {
+        QuotaItemInner inner = this.serviceClient().get(resourceGroupName, accountName, quotaLimitName);
+        if (inner != null) {
+            return new QuotaItemImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    private NetAppResourceQuotaLimitsAccountsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.netapp.NetAppFilesManager manager() {
+        return this.serviceManager;
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsClientImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsClientImpl.java
index 2af3ab7e1e84..8f294889e7da 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsClientImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsClientImpl.java
@@ -27,8 +27,8 @@
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.netapp.fluent.NetAppResourceQuotaLimitsClient;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
-import com.azure.resourcemanager.netapp.models.SubscriptionQuotaItemList;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+import com.azure.resourcemanager.netapp.models.QuotaItemList;
 import reactor.core.publisher.Mono;
 
 /**
@@ -67,7 +67,7 @@ public interface NetAppResourceQuotaLimitsService {
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/locations/{location}/quotaLimits")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Mono<Response<SubscriptionQuotaItemList>> list(@HostParam("$host") String endpoint,
+        Mono<Response<QuotaItemList>> list(@HostParam("$host") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
@@ -75,7 +75,7 @@ Mono<Response<SubscriptionQuotaItemList>> list(@HostParam("$host") String endpoi
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/locations/{location}/quotaLimits")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Response<SubscriptionQuotaItemList> listSync(@HostParam("$host") String endpoint,
+        Response<QuotaItemList> listSync(@HostParam("$host") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
@@ -83,7 +83,7 @@ Response<SubscriptionQuotaItemList> listSync(@HostParam("$host") String endpoint
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/locations/{location}/quotaLimits/{quotaLimitName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Mono<Response<SubscriptionQuotaItemInner>> get(@HostParam("$host") String endpoint,
+        Mono<Response<QuotaItemInner>> get(@HostParam("$host") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @PathParam("quotaLimitName") String quotaLimitName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
@@ -92,7 +92,7 @@ Mono<Response<SubscriptionQuotaItemInner>> get(@HostParam("$host") String endpoi
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.NetApp/locations/{location}/quotaLimits/{quotaLimitName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Response<SubscriptionQuotaItemInner> getSync(@HostParam("$host") String endpoint,
+        Response<QuotaItemInner> getSync(@HostParam("$host") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
             @PathParam("quotaLimitName") String quotaLimitName, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
@@ -101,15 +101,14 @@ Response<SubscriptionQuotaItemInner> getSync(@HostParam("$host") String endpoint
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Mono<Response<SubscriptionQuotaItemList>> listNext(
-            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
-            @HeaderParam("Accept") String accept, Context context);
+        Mono<Response<QuotaItemList>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
-        Response<SubscriptionQuotaItemList> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+        Response<QuotaItemList> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
             @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
@@ -126,7 +125,7 @@ Response<SubscriptionQuotaItemList> listNextSync(@PathParam(value = "nextLink",
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<SubscriptionQuotaItemInner>> listSinglePageAsync(String location) {
+    private Mono<PagedResponse<QuotaItemInner>> listSinglePageAsync(String location) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -142,8 +141,8 @@ private Mono<PagedResponse<SubscriptionQuotaItemInner>> listSinglePageAsync(Stri
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
                 this.client.getApiVersion(), accept, context))
-            .<PagedResponse<SubscriptionQuotaItemInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
-                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .<PagedResponse<QuotaItemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -159,7 +158,7 @@ private Mono<PagedResponse<SubscriptionQuotaItemInner>> listSinglePageAsync(Stri
      * @return the default and current limits for quotas as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<SubscriptionQuotaItemInner> listAsync(String location) {
+    private PagedFlux<QuotaItemInner> listAsync(String location) {
         return new PagedFlux<>(() -> listSinglePageAsync(location), nextLink -> listNextSinglePageAsync(nextLink));
     }
 
@@ -175,7 +174,7 @@ private PagedFlux<SubscriptionQuotaItemInner> listAsync(String location) {
      * @return the default and current limits for quotas along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<SubscriptionQuotaItemInner> listSinglePage(String location) {
+    private PagedResponse<QuotaItemInner> listSinglePage(String location) {
         if (this.client.getEndpoint() == null) {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException(
@@ -191,8 +190,8 @@ private PagedResponse<SubscriptionQuotaItemInner> listSinglePage(String location
                 .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
         final String accept = "application/json";
-        Response<SubscriptionQuotaItemList> res = service.listSync(this.client.getEndpoint(),
-            this.client.getSubscriptionId(), location, this.client.getApiVersion(), accept, Context.NONE);
+        Response<QuotaItemList> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            location, this.client.getApiVersion(), accept, Context.NONE);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -210,7 +209,7 @@ private PagedResponse<SubscriptionQuotaItemInner> listSinglePage(String location
      * @return the default and current limits for quotas along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<SubscriptionQuotaItemInner> listSinglePage(String location, Context context) {
+    private PagedResponse<QuotaItemInner> listSinglePage(String location, Context context) {
         if (this.client.getEndpoint() == null) {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException(
@@ -226,8 +225,8 @@ private PagedResponse<SubscriptionQuotaItemInner> listSinglePage(String location
                 .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
         final String accept = "application/json";
-        Response<SubscriptionQuotaItemList> res = service.listSync(this.client.getEndpoint(),
-            this.client.getSubscriptionId(), location, this.client.getApiVersion(), accept, context);
+        Response<QuotaItemList> res = service.listSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            location, this.client.getApiVersion(), accept, context);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -244,7 +243,7 @@ private PagedResponse<SubscriptionQuotaItemInner> listSinglePage(String location
      * @return the default and current limits for quotas as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<SubscriptionQuotaItemInner> list(String location) {
+    public PagedIterable<QuotaItemInner> list(String location) {
         return new PagedIterable<>(() -> listSinglePage(location), nextLink -> listNextSinglePage(nextLink));
     }
 
@@ -261,7 +260,7 @@ public PagedIterable<SubscriptionQuotaItemInner> list(String location) {
      * @return the default and current limits for quotas as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<SubscriptionQuotaItemInner> list(String location, Context context) {
+    public PagedIterable<QuotaItemInner> list(String location, Context context) {
         return new PagedIterable<>(() -> listSinglePage(location, context),
             nextLink -> listNextSinglePage(nextLink, context));
     }
@@ -280,7 +279,7 @@ public PagedIterable<SubscriptionQuotaItemInner> list(String location, Context c
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<SubscriptionQuotaItemInner>> getWithResponseAsync(String location, String quotaLimitName) {
+    private Mono<Response<QuotaItemInner>> getWithResponseAsync(String location, String quotaLimitName) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -315,7 +314,7 @@ private Mono<Response<SubscriptionQuotaItemInner>> getWithResponseAsync(String l
      * @return the default and current subscription quota limit on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<SubscriptionQuotaItemInner> getAsync(String location, String quotaLimitName) {
+    private Mono<QuotaItemInner> getAsync(String location, String quotaLimitName) {
         return getWithResponseAsync(location, quotaLimitName).flatMap(res -> Mono.justOrEmpty(res.getValue()));
     }
 
@@ -333,8 +332,7 @@ private Mono<SubscriptionQuotaItemInner> getAsync(String location, String quotaL
      * @return the default and current subscription quota limit along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<SubscriptionQuotaItemInner> getWithResponse(String location, String quotaLimitName,
-        Context context) {
+    public Response<QuotaItemInner> getWithResponse(String location, String quotaLimitName, Context context) {
         if (this.client.getEndpoint() == null) {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException(
@@ -371,7 +369,7 @@ public Response<SubscriptionQuotaItemInner> getWithResponse(String location, Str
      * @return the default and current subscription quota limit.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    public SubscriptionQuotaItemInner get(String location, String quotaLimitName) {
+    public QuotaItemInner get(String location, String quotaLimitName) {
         return getWithResponse(location, quotaLimitName, Context.NONE).getValue();
     }
 
@@ -388,7 +386,7 @@ public SubscriptionQuotaItemInner get(String location, String quotaLimitName) {
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<SubscriptionQuotaItemInner>> listNextSinglePageAsync(String nextLink) {
+    private Mono<PagedResponse<QuotaItemInner>> listNextSinglePageAsync(String nextLink) {
         if (nextLink == null) {
             return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
@@ -398,8 +396,8 @@ private Mono<PagedResponse<SubscriptionQuotaItemInner>> listNextSinglePageAsync(
         }
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
-            .<PagedResponse<SubscriptionQuotaItemInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
-                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .<PagedResponse<QuotaItemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -415,7 +413,7 @@ private Mono<PagedResponse<SubscriptionQuotaItemInner>> listNextSinglePageAsync(
      * @return the default and current limits for quotas along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<SubscriptionQuotaItemInner> listNextSinglePage(String nextLink) {
+    private PagedResponse<QuotaItemInner> listNextSinglePage(String nextLink) {
         if (nextLink == null) {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
@@ -426,8 +424,7 @@ private PagedResponse<SubscriptionQuotaItemInner> listNextSinglePage(String next
                     "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        Response<SubscriptionQuotaItemList> res
-            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        Response<QuotaItemList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -445,7 +442,7 @@ private PagedResponse<SubscriptionQuotaItemInner> listNextSinglePage(String next
      * @return the default and current limits for quotas along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<SubscriptionQuotaItemInner> listNextSinglePage(String nextLink, Context context) {
+    private PagedResponse<QuotaItemInner> listNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
             throw LOGGER.atError()
                 .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
@@ -456,8 +453,7 @@ private PagedResponse<SubscriptionQuotaItemInner> listNextSinglePage(String next
                     "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        Response<SubscriptionQuotaItemList> res
-            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        Response<QuotaItemList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsImpl.java
index 0b3b0931de89..5e1797966d34 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourceQuotaLimitsImpl.java
@@ -10,9 +10,9 @@
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.netapp.fluent.NetAppResourceQuotaLimitsClient;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
 import com.azure.resourcemanager.netapp.models.NetAppResourceQuotaLimits;
-import com.azure.resourcemanager.netapp.models.SubscriptionQuotaItem;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
 
 public final class NetAppResourceQuotaLimitsImpl implements NetAppResourceQuotaLimits {
     private static final ClientLogger LOGGER = new ClientLogger(NetAppResourceQuotaLimitsImpl.class);
@@ -27,31 +27,30 @@ public NetAppResourceQuotaLimitsImpl(NetAppResourceQuotaLimitsClient innerClient
         this.serviceManager = serviceManager;
     }
 
-    public PagedIterable<SubscriptionQuotaItem> list(String location) {
-        PagedIterable<SubscriptionQuotaItemInner> inner = this.serviceClient().list(location);
-        return ResourceManagerUtils.mapPage(inner, inner1 -> new SubscriptionQuotaItemImpl(inner1, this.manager()));
+    public PagedIterable<QuotaItem> list(String location) {
+        PagedIterable<QuotaItemInner> inner = this.serviceClient().list(location);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new QuotaItemImpl(inner1, this.manager()));
     }
 
-    public PagedIterable<SubscriptionQuotaItem> list(String location, Context context) {
-        PagedIterable<SubscriptionQuotaItemInner> inner = this.serviceClient().list(location, context);
-        return ResourceManagerUtils.mapPage(inner, inner1 -> new SubscriptionQuotaItemImpl(inner1, this.manager()));
+    public PagedIterable<QuotaItem> list(String location, Context context) {
+        PagedIterable<QuotaItemInner> inner = this.serviceClient().list(location, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new QuotaItemImpl(inner1, this.manager()));
     }
 
-    public Response<SubscriptionQuotaItem> getWithResponse(String location, String quotaLimitName, Context context) {
-        Response<SubscriptionQuotaItemInner> inner
-            = this.serviceClient().getWithResponse(location, quotaLimitName, context);
+    public Response<QuotaItem> getWithResponse(String location, String quotaLimitName, Context context) {
+        Response<QuotaItemInner> inner = this.serviceClient().getWithResponse(location, quotaLimitName, context);
         if (inner != null) {
             return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
-                new SubscriptionQuotaItemImpl(inner.getValue(), this.manager()));
+                new QuotaItemImpl(inner.getValue(), this.manager()));
         } else {
             return null;
         }
     }
 
-    public SubscriptionQuotaItem get(String location, String quotaLimitName) {
-        SubscriptionQuotaItemInner inner = this.serviceClient().get(location, quotaLimitName);
+    public QuotaItem get(String location, String quotaLimitName) {
+        QuotaItemInner inner = this.serviceClient().get(location, quotaLimitName);
         if (inner != null) {
-            return new SubscriptionQuotaItemImpl(inner, this.manager());
+            return new QuotaItemImpl(inner, this.manager());
         } else {
             return null;
         }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SubscriptionQuotaItemImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/QuotaItemImpl.java
similarity index 69%
rename from sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SubscriptionQuotaItemImpl.java
rename to sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/QuotaItemImpl.java
index 70b6ad3a4355..ae9c81194bad 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SubscriptionQuotaItemImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/QuotaItemImpl.java
@@ -5,16 +5,15 @@
 package com.azure.resourcemanager.netapp.implementation;
 
 import com.azure.core.management.SystemData;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
-import com.azure.resourcemanager.netapp.models.SubscriptionQuotaItem;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
 
-public final class SubscriptionQuotaItemImpl implements SubscriptionQuotaItem {
-    private SubscriptionQuotaItemInner innerObject;
+public final class QuotaItemImpl implements QuotaItem {
+    private QuotaItemInner innerObject;
 
     private final com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager;
 
-    SubscriptionQuotaItemImpl(SubscriptionQuotaItemInner innerObject,
-        com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
+    QuotaItemImpl(QuotaItemInner innerObject, com.azure.resourcemanager.netapp.NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -43,7 +42,11 @@ public Integer defaultProperty() {
         return this.innerModel().defaultProperty();
     }
 
-    public SubscriptionQuotaItemInner innerModel() {
+    public Integer usage() {
+        return this.innerModel().usage();
+    }
+
+    public QuotaItemInner innerModel() {
         return this.innerObject;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java
index b0c597406415..8ff8762a212b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java
@@ -23,6 +23,8 @@
 import com.azure.resourcemanager.netapp.models.FileAccessLogs;
 import com.azure.resourcemanager.netapp.models.GetGroupIdListForLdapUserRequest;
 import com.azure.resourcemanager.netapp.models.GetGroupIdListForLdapUserResponse;
+import com.azure.resourcemanager.netapp.models.LdapServerType;
+import com.azure.resourcemanager.netapp.models.ListQuotaReportResponse;
 import com.azure.resourcemanager.netapp.models.NetworkFeatures;
 import com.azure.resourcemanager.netapp.models.PeerClusterForVolumeMigrationRequest;
 import com.azure.resourcemanager.netapp.models.PlacementKeyValuePairs;
@@ -36,6 +38,7 @@
 import com.azure.resourcemanager.netapp.models.SmbNonBrowsable;
 import com.azure.resourcemanager.netapp.models.SvmPeerCommandResponse;
 import com.azure.resourcemanager.netapp.models.Volume;
+import com.azure.resourcemanager.netapp.models.VolumeLanguage;
 import com.azure.resourcemanager.netapp.models.VolumePatch;
 import com.azure.resourcemanager.netapp.models.VolumePatchPropertiesDataProtection;
 import com.azure.resourcemanager.netapp.models.VolumePatchPropertiesExportPolicy;
@@ -236,6 +239,10 @@ public Boolean ldapEnabled() {
         return this.innerModel().ldapEnabled();
     }
 
+    public LdapServerType ldapServerType() {
+        return this.innerModel().ldapServerType();
+    }
+
     public Boolean coolAccess() {
         return this.innerModel().coolAccess();
     }
@@ -346,6 +353,10 @@ public Long inheritedSizeInBytes() {
         return this.innerModel().inheritedSizeInBytes();
     }
 
+    public VolumeLanguage language() {
+        return this.innerModel().language();
+    }
+
     public Region region() {
         return Region.fromName(this.regionName());
     }
@@ -500,6 +511,14 @@ public GetGroupIdListForLdapUserResponse listGetGroupIdListForLdapUser(GetGroupI
             .listGetGroupIdListForLdapUser(resourceGroupName, accountName, poolName, volumeName, body, context);
     }
 
+    public ListQuotaReportResponse listQuotaReport() {
+        return serviceManager.volumes().listQuotaReport(resourceGroupName, accountName, poolName, volumeName);
+    }
+
+    public ListQuotaReportResponse listQuotaReport(Context context) {
+        return serviceManager.volumes().listQuotaReport(resourceGroupName, accountName, poolName, volumeName, context);
+    }
+
     public void breakReplication() {
         serviceManager.volumes().breakReplication(resourceGroupName, accountName, poolName, volumeName);
     }
@@ -804,6 +823,11 @@ public VolumeImpl withLdapEnabled(Boolean ldapEnabled) {
         return this;
     }
 
+    public VolumeImpl withLdapServerType(LdapServerType ldapServerType) {
+        this.innerModel().withLdapServerType(ldapServerType);
+        return this;
+    }
+
     public VolumeImpl withCoolAccess(Boolean coolAccess) {
         if (isInCreateMode()) {
             this.innerModel().withCoolAccess(coolAccess);
@@ -919,6 +943,11 @@ public VolumeImpl withIsLargeVolume(Boolean isLargeVolume) {
         return this;
     }
 
+    public VolumeImpl withLanguage(VolumeLanguage language) {
+        this.innerModel().withLanguage(language);
+        return this;
+    }
+
     public VolumeImpl withUsageThreshold(Long usageThreshold) {
         this.updateBody.withUsageThreshold(usageThreshold);
         return this;
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeQuotaRuleImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeQuotaRuleImpl.java
index eace91240e1f..d5a80a03b8f7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeQuotaRuleImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeQuotaRuleImpl.java
@@ -8,7 +8,7 @@
 import com.azure.core.management.SystemData;
 import com.azure.core.util.Context;
 import com.azure.resourcemanager.netapp.fluent.models.VolumeQuotaRuleInner;
-import com.azure.resourcemanager.netapp.models.ProvisioningState;
+import com.azure.resourcemanager.netapp.models.NetAppProvisioningState;
 import com.azure.resourcemanager.netapp.models.Type;
 import com.azure.resourcemanager.netapp.models.VolumeQuotaRule;
 import com.azure.resourcemanager.netapp.models.VolumeQuotaRulePatch;
@@ -49,7 +49,7 @@ public SystemData systemData() {
         return this.innerModel().systemData();
     }
 
-    public ProvisioningState provisioningState() {
+    public NetAppProvisioningState provisioningState() {
         return this.innerModel().provisioningState();
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesClientImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesClientImpl.java
index 4eb018b75893..9ed13910774a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesClientImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesClientImpl.java
@@ -38,6 +38,7 @@
 import com.azure.resourcemanager.netapp.fluent.VolumesClient;
 import com.azure.resourcemanager.netapp.fluent.models.ClusterPeerCommandResponseInner;
 import com.azure.resourcemanager.netapp.fluent.models.GetGroupIdListForLdapUserResponseInner;
+import com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationInner;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationStatusInner;
 import com.azure.resourcemanager.netapp.fluent.models.SvmPeerCommandResponseInner;
@@ -323,6 +324,26 @@ Response<BinaryData> listGetGroupIdListForLdapUserSync(@HostParam("$host") Strin
             @BodyParam("application/json") GetGroupIdListForLdapUserRequest body, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/listQuotaReport")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> listQuotaReport(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/listQuotaReport")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> listQuotaReportSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("accountName") String accountName,
+            @PathParam("poolName") String poolName, @PathParam("volumeName") String volumeName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/breakReplication")
         @ExpectedResponses({ 200, 202 })
@@ -3736,6 +3757,281 @@ public GetGroupIdListForLdapUserResponseInner listGetGroupIdListForLdapUser(Stri
             .getFinalResult();
     }
 
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> listQuotaReportWithResponseAsync(String resourceGroupName,
+        String accountName, String poolName, String volumeName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            return Mono.error(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listQuotaReport(this.client.getEndpoint(), this.client.getSubscriptionId(),
+                resourceGroupName, accountName, poolName, volumeName, this.client.getApiVersion(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> listQuotaReportWithResponse(String resourceGroupName, String accountName,
+        String poolName, String volumeName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listQuotaReportSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, poolName, volumeName, this.client.getApiVersion(), accept, Context.NONE);
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> listQuotaReportWithResponse(String resourceGroupName, String accountName,
+        String poolName, String volumeName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (accountName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter accountName is required and cannot be null."));
+        }
+        if (poolName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
+        }
+        if (volumeName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter volumeName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listQuotaReportSync(this.client.getEndpoint(), this.client.getSubscriptionId(),
+            resourceGroupName, accountName, poolName, volumeName, this.client.getApiVersion(), accept, context);
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<ListQuotaReportResponseInner>, ListQuotaReportResponseInner>
+        beginListQuotaReportAsync(String resourceGroupName, String accountName, String poolName, String volumeName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = listQuotaReportWithResponseAsync(resourceGroupName, accountName, poolName, volumeName);
+        return this.client.<ListQuotaReportResponseInner, ListQuotaReportResponseInner>getLroResult(mono,
+            this.client.getHttpPipeline(), ListQuotaReportResponseInner.class, ListQuotaReportResponseInner.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ListQuotaReportResponseInner>, ListQuotaReportResponseInner>
+        beginListQuotaReport(String resourceGroupName, String accountName, String poolName, String volumeName) {
+        Response<BinaryData> response
+            = listQuotaReportWithResponse(resourceGroupName, accountName, poolName, volumeName);
+        return this.client.<ListQuotaReportResponseInner, ListQuotaReportResponseInner>getLroResult(response,
+            ListQuotaReportResponseInner.class, ListQuotaReportResponseInner.class, Context.NONE);
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ListQuotaReportResponseInner>, ListQuotaReportResponseInner> beginListQuotaReport(
+        String resourceGroupName, String accountName, String poolName, String volumeName, Context context) {
+        Response<BinaryData> response
+            = listQuotaReportWithResponse(resourceGroupName, accountName, poolName, volumeName, context);
+        return this.client.<ListQuotaReportResponseInner, ListQuotaReportResponseInner>getLroResult(response,
+            ListQuotaReportResponseInner.class, ListQuotaReportResponseInner.class, context);
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<ListQuotaReportResponseInner> listQuotaReportAsync(String resourceGroupName, String accountName,
+        String poolName, String volumeName) {
+        return beginListQuotaReportAsync(resourceGroupName, accountName, poolName, volumeName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ListQuotaReportResponseInner listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        return beginListQuotaReport(resourceGroupName, accountName, poolName, volumeName).getFinalResult();
+    }
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ListQuotaReportResponseInner listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName, Context context) {
+        return beginListQuotaReport(resourceGroupName, accountName, poolName, volumeName, context).getFinalResult();
+    }
+
     /**
      * Break volume replication
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java
index 1e3a90572d58..4c31736a9c7a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java
@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.netapp.fluent.VolumesClient;
 import com.azure.resourcemanager.netapp.fluent.models.ClusterPeerCommandResponseInner;
 import com.azure.resourcemanager.netapp.fluent.models.GetGroupIdListForLdapUserResponseInner;
+import com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationInner;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationStatusInner;
 import com.azure.resourcemanager.netapp.fluent.models.SvmPeerCommandResponseInner;
@@ -22,6 +23,7 @@
 import com.azure.resourcemanager.netapp.models.ClusterPeerCommandResponse;
 import com.azure.resourcemanager.netapp.models.GetGroupIdListForLdapUserRequest;
 import com.azure.resourcemanager.netapp.models.GetGroupIdListForLdapUserResponse;
+import com.azure.resourcemanager.netapp.models.ListQuotaReportResponse;
 import com.azure.resourcemanager.netapp.models.PeerClusterForVolumeMigrationRequest;
 import com.azure.resourcemanager.netapp.models.PoolChangeRequest;
 import com.azure.resourcemanager.netapp.models.ReestablishReplicationRequest;
@@ -179,6 +181,28 @@ public GetGroupIdListForLdapUserResponse listGetGroupIdListForLdapUser(String re
         }
     }
 
+    public ListQuotaReportResponse listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName) {
+        ListQuotaReportResponseInner inner
+            = this.serviceClient().listQuotaReport(resourceGroupName, accountName, poolName, volumeName);
+        if (inner != null) {
+            return new ListQuotaReportResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public ListQuotaReportResponse listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName, Context context) {
+        ListQuotaReportResponseInner inner
+            = this.serviceClient().listQuotaReport(resourceGroupName, accountName, poolName, volumeName, context);
+        if (inner != null) {
+            return new ListQuotaReportResponseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public void breakReplication(String resourceGroupName, String accountName, String poolName, String volumeName) {
         this.serviceClient().breakReplication(resourceGroupName, accountName, poolName, volumeName);
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BackupStatus.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BackupStatus.java
index 7b5447a254d9..2e810896fb75 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BackupStatus.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BackupStatus.java
@@ -25,7 +25,9 @@ public interface BackupStatus {
     RelationshipStatus relationshipStatus();
 
     /**
-     * Gets the mirrorState property: The status of the backup.
+     * Gets the mirrorState property: The mirror state property describes the current status of data replication for a
+     * backup. It provides insight into whether the data is actively being mirrored, if the replication process has been
+     * paused, or if it has yet to be initialized.
      * 
      * @return the mirrorState value.
      */
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Bucket.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Bucket.java
new file mode 100644
index 000000000000..0d260b271299
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Bucket.java
@@ -0,0 +1,357 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+
+/**
+ * An immutable client-side representation of Bucket.
+ */
+public interface Bucket {
+    /**
+     * Gets the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * Gets the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * Gets the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    SystemData systemData();
+
+    /**
+     * Gets the path property: The volume path mounted inside the bucket. The default is the root path '/' if no value
+     * is provided when the bucket is created.
+     * 
+     * @return the path value.
+     */
+    String path();
+
+    /**
+     * Gets the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @return the fileSystemUser value.
+     */
+    FileSystemUser fileSystemUser();
+
+    /**
+     * Gets the provisioningState property: Provisioning state of the resource.
+     * 
+     * @return the provisioningState value.
+     */
+    NetAppProvisioningState provisioningState();
+
+    /**
+     * Gets the status property: The bucket credentials status. There states:
+     * 
+     * "NoCredentialsSet": Access and Secret key pair have not been generated.
+     * "CredentialsExpired": Access and Secret key pair have expired.
+     * "Active": The certificate has been installed and credentials are unexpired.
+     * 
+     * @return the status value.
+     */
+    CredentialsStatus status();
+
+    /**
+     * Gets the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @return the server value.
+     */
+    BucketServerProperties server();
+
+    /**
+     * Gets the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is
+     * ReadOnly if no value is provided during bucket creation.
+     * 
+     * @return the permissions value.
+     */
+    BucketPermissions permissions();
+
+    /**
+     * Gets the name of the resource group.
+     * 
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.netapp.fluent.models.BucketInner object.
+     * 
+     * @return the inner object.
+     */
+    BucketInner innerModel();
+
+    /**
+     * The entirety of the Bucket definition.
+     */
+    interface Definition
+        extends DefinitionStages.Blank, DefinitionStages.WithParentResource, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * The Bucket definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of the Bucket definition.
+         */
+        interface Blank extends WithParentResource {
+        }
+
+        /**
+         * The stage of the Bucket definition allowing to specify parent resource.
+         */
+        interface WithParentResource {
+            /**
+             * Specifies resourceGroupName, accountName, poolName, volumeName.
+             * 
+             * @param resourceGroupName The name of the resource group. The name is case insensitive.
+             * @param accountName The name of the NetApp account.
+             * @param poolName The name of the capacity pool.
+             * @param volumeName The name of the volume.
+             * @return the next definition stage.
+             */
+            WithCreate withExistingVolume(String resourceGroupName, String accountName, String poolName,
+                String volumeName);
+        }
+
+        /**
+         * The stage of the Bucket definition which contains all the minimum required properties for the resource to be
+         * created, but also allows for any other optional properties to be specified.
+         */
+        interface WithCreate extends DefinitionStages.WithPath, DefinitionStages.WithFileSystemUser,
+            DefinitionStages.WithServer, DefinitionStages.WithPermissions {
+            /**
+             * Executes the create request.
+             * 
+             * @return the created resource.
+             */
+            Bucket create();
+
+            /**
+             * Executes the create request.
+             * 
+             * @param context The context to associate with this operation.
+             * @return the created resource.
+             */
+            Bucket create(Context context);
+        }
+
+        /**
+         * The stage of the Bucket definition allowing to specify path.
+         */
+        interface WithPath {
+            /**
+             * Specifies the path property: The volume path mounted inside the bucket. The default is the root path '/'
+             * if no value is provided when the bucket is created..
+             * 
+             * @param path The volume path mounted inside the bucket. The default is the root path '/' if no value is
+             * provided when the bucket is created.
+             * @return the next definition stage.
+             */
+            WithCreate withPath(String path);
+        }
+
+        /**
+         * The stage of the Bucket definition allowing to specify fileSystemUser.
+         */
+        interface WithFileSystemUser {
+            /**
+             * Specifies the fileSystemUser property: File System user having access to volume data. For Unix, this is
+             * the user's uid and gid. For Windows, this is the user's username. Note that the Unix and Windows user
+             * details are mutually exclusive, meaning one or other must be supplied, but not both..
+             * 
+             * @param fileSystemUser File System user having access to volume data. For Unix, this is the user's uid and
+             * gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+             * exclusive, meaning one or other must be supplied, but not both.
+             * @return the next definition stage.
+             */
+            WithCreate withFileSystemUser(FileSystemUser fileSystemUser);
+        }
+
+        /**
+         * The stage of the Bucket definition allowing to specify server.
+         */
+        interface WithServer {
+            /**
+             * Specifies the server property: Properties of the server managing the lifecycle of volume buckets.
+             * 
+             * @param server Properties of the server managing the lifecycle of volume buckets.
+             * @return the next definition stage.
+             */
+            WithCreate withServer(BucketServerProperties server);
+        }
+
+        /**
+         * The stage of the Bucket definition allowing to specify permissions.
+         */
+        interface WithPermissions {
+            /**
+             * Specifies the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite. The
+             * default is ReadOnly if no value is provided during bucket creation..
+             * 
+             * @param permissions Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is
+             * ReadOnly if no value is provided during bucket creation.
+             * @return the next definition stage.
+             */
+            WithCreate withPermissions(BucketPermissions permissions);
+        }
+    }
+
+    /**
+     * Begins update for the Bucket resource.
+     * 
+     * @return the stage of resource update.
+     */
+    Bucket.Update update();
+
+    /**
+     * The template for Bucket update.
+     */
+    interface Update extends UpdateStages.WithPath, UpdateStages.WithFileSystemUser, UpdateStages.WithServer,
+        UpdateStages.WithPermissions {
+        /**
+         * Executes the update request.
+         * 
+         * @return the updated resource.
+         */
+        Bucket apply();
+
+        /**
+         * Executes the update request.
+         * 
+         * @param context The context to associate with this operation.
+         * @return the updated resource.
+         */
+        Bucket apply(Context context);
+    }
+
+    /**
+     * The Bucket update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the Bucket update allowing to specify path.
+         */
+        interface WithPath {
+            /**
+             * Specifies the path property: The volume path mounted inside the bucket..
+             * 
+             * @param path The volume path mounted inside the bucket.
+             * @return the next definition stage.
+             */
+            Update withPath(String path);
+        }
+
+        /**
+         * The stage of the Bucket update allowing to specify fileSystemUser.
+         */
+        interface WithFileSystemUser {
+            /**
+             * Specifies the fileSystemUser property: File System user having access to volume data. For Unix, this is
+             * the user's uid and gid. For Windows, this is the user's username. Note that the Unix and Windows user
+             * details are mutually exclusive, meaning one or other must be supplied, but not both..
+             * 
+             * @param fileSystemUser File System user having access to volume data. For Unix, this is the user's uid and
+             * gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+             * exclusive, meaning one or other must be supplied, but not both.
+             * @return the next definition stage.
+             */
+            Update withFileSystemUser(FileSystemUser fileSystemUser);
+        }
+
+        /**
+         * The stage of the Bucket update allowing to specify server.
+         */
+        interface WithServer {
+            /**
+             * Specifies the server property: Properties of the server managing the lifecycle of volume buckets.
+             * 
+             * @param server Properties of the server managing the lifecycle of volume buckets.
+             * @return the next definition stage.
+             */
+            Update withServer(BucketServerPatchProperties server);
+        }
+
+        /**
+         * The stage of the Bucket update allowing to specify permissions.
+         */
+        interface WithPermissions {
+            /**
+             * Specifies the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite..
+             * 
+             * @param permissions Access permissions for the bucket. Either ReadOnly or ReadWrite.
+             * @return the next definition stage.
+             */
+            Update withPermissions(BucketPatchPermissions permissions);
+        }
+    }
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @return the refreshed resource.
+     */
+    Bucket refresh();
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @param context The context to associate with this operation.
+     * @return the refreshed resource.
+     */
+    Bucket refresh(Context context);
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair along with {@link Response}.
+     */
+    Response<BucketGenerateCredentials> generateCredentialsWithResponse(BucketCredentialsExpiry body, Context context);
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair.
+     */
+    BucketGenerateCredentials generateCredentials(BucketCredentialsExpiry body);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketCredentialsExpiry.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketCredentialsExpiry.java
new file mode 100644
index 000000000000..88e56fa0d68b
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketCredentialsExpiry.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The bucket's Access and Secret key pair Expiry Time expressed as the number of days from now.
+ */
+@Fluent
+public final class BucketCredentialsExpiry implements JsonSerializable<BucketCredentialsExpiry> {
+    /*
+     * The number of days from now until the newly generated Access and Secret key pair will expire.
+     */
+    private Integer keyPairExpiryDays;
+
+    /**
+     * Creates an instance of BucketCredentialsExpiry class.
+     */
+    public BucketCredentialsExpiry() {
+    }
+
+    /**
+     * Get the keyPairExpiryDays property: The number of days from now until the newly generated Access and Secret key
+     * pair will expire.
+     * 
+     * @return the keyPairExpiryDays value.
+     */
+    public Integer keyPairExpiryDays() {
+        return this.keyPairExpiryDays;
+    }
+
+    /**
+     * Set the keyPairExpiryDays property: The number of days from now until the newly generated Access and Secret key
+     * pair will expire.
+     * 
+     * @param keyPairExpiryDays the keyPairExpiryDays value to set.
+     * @return the BucketCredentialsExpiry object itself.
+     */
+    public BucketCredentialsExpiry withKeyPairExpiryDays(Integer keyPairExpiryDays) {
+        this.keyPairExpiryDays = keyPairExpiryDays;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeNumberField("keyPairExpiryDays", this.keyPairExpiryDays);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketCredentialsExpiry from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketCredentialsExpiry if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the BucketCredentialsExpiry.
+     */
+    public static BucketCredentialsExpiry fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketCredentialsExpiry deserializedBucketCredentialsExpiry = new BucketCredentialsExpiry();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("keyPairExpiryDays".equals(fieldName)) {
+                    deserializedBucketCredentialsExpiry.keyPairExpiryDays = reader.getNullable(JsonReader::getInt);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketCredentialsExpiry;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketGenerateCredentials.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketGenerateCredentials.java
new file mode 100644
index 000000000000..6709ee4b86c2
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketGenerateCredentials.java
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.resourcemanager.netapp.fluent.models.BucketGenerateCredentialsInner;
+import java.time.OffsetDateTime;
+
+/**
+ * An immutable client-side representation of BucketGenerateCredentials.
+ */
+public interface BucketGenerateCredentials {
+    /**
+     * Gets the accessKey property: The Access Key that is required along with the Secret Key to access the bucket.
+     * 
+     * @return the accessKey value.
+     */
+    String accessKey();
+
+    /**
+     * Gets the secretKey property: The Secret Key that is required along with the Access Key to access the bucket.
+     * 
+     * @return the secretKey value.
+     */
+    String secretKey();
+
+    /**
+     * Gets the keyPairExpiry property: The bucket's Access and Secret key pair expiry date and time (in UTC).
+     * 
+     * @return the keyPairExpiry value.
+     */
+    OffsetDateTime keyPairExpiry();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.netapp.fluent.models.BucketGenerateCredentialsInner object.
+     * 
+     * @return the inner object.
+     */
+    BucketGenerateCredentialsInner innerModel();
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketList.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketList.java
new file mode 100644
index 000000000000..c7c82d490b11
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketList.java
@@ -0,0 +1,127 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * List of volume bucket resources.
+ */
+@Fluent
+public final class BucketList implements JsonSerializable<BucketList> {
+    /*
+     * List of volume buckets
+     */
+    private List<BucketInner> value;
+
+    /*
+     * URL to get the next set of results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of BucketList class.
+     */
+    public BucketList() {
+    }
+
+    /**
+     * Get the value property: List of volume buckets.
+     * 
+     * @return the value value.
+     */
+    public List<BucketInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: List of volume buckets.
+     * 
+     * @param value the value value to set.
+     * @return the BucketList object itself.
+     */
+    public BucketList withValue(List<BucketInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: URL to get the next set of results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the nextLink property: URL to get the next set of results.
+     * 
+     * @param nextLink the nextLink value to set.
+     * @return the BucketList object itself.
+     */
+    public BucketList withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketList from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketList if the JsonReader was pointing to an instance of it, or null if it was pointing
+     * to JSON null.
+     * @throws IOException If an error occurs while reading the BucketList.
+     */
+    public static BucketList fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketList deserializedBucketList = new BucketList();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<BucketInner> value = reader.readArray(reader1 -> BucketInner.fromJson(reader1));
+                    deserializedBucketList.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedBucketList.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketList;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPatch.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPatch.java
new file mode 100644
index 000000000000..14aa5396c86b
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPatch.java
@@ -0,0 +1,260 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.netapp.fluent.models.BucketPatchProperties;
+import java.io.IOException;
+
+/**
+ * Bucket resource.
+ */
+@Fluent
+public final class BucketPatch extends ProxyResource {
+    /*
+     * Bucket properties
+     */
+    private BucketPatchProperties innerProperties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of BucketPatch class.
+     */
+    public BucketPatch() {
+    }
+
+    /**
+     * Get the innerProperties property: Bucket properties.
+     * 
+     * @return the innerProperties value.
+     */
+    private BucketPatchProperties innerProperties() {
+        return this.innerProperties;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Get the path property: The volume path mounted inside the bucket.
+     * 
+     * @return the path value.
+     */
+    public String path() {
+        return this.innerProperties() == null ? null : this.innerProperties().path();
+    }
+
+    /**
+     * Set the path property: The volume path mounted inside the bucket.
+     * 
+     * @param path the path value to set.
+     * @return the BucketPatch object itself.
+     */
+    public BucketPatch withPath(String path) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketPatchProperties();
+        }
+        this.innerProperties().withPath(path);
+        return this;
+    }
+
+    /**
+     * Get the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @return the fileSystemUser value.
+     */
+    public FileSystemUser fileSystemUser() {
+        return this.innerProperties() == null ? null : this.innerProperties().fileSystemUser();
+    }
+
+    /**
+     * Set the fileSystemUser property: File System user having access to volume data. For Unix, this is the user's uid
+     * and gid. For Windows, this is the user's username. Note that the Unix and Windows user details are mutually
+     * exclusive, meaning one or other must be supplied, but not both.
+     * 
+     * @param fileSystemUser the fileSystemUser value to set.
+     * @return the BucketPatch object itself.
+     */
+    public BucketPatch withFileSystemUser(FileSystemUser fileSystemUser) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketPatchProperties();
+        }
+        this.innerProperties().withFileSystemUser(fileSystemUser);
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: Provisioning state of the resource.
+     * 
+     * @return the provisioningState value.
+     */
+    public NetAppProvisioningState provisioningState() {
+        return this.innerProperties() == null ? null : this.innerProperties().provisioningState();
+    }
+
+    /**
+     * Get the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @return the server value.
+     */
+    public BucketServerPatchProperties server() {
+        return this.innerProperties() == null ? null : this.innerProperties().server();
+    }
+
+    /**
+     * Set the server property: Properties of the server managing the lifecycle of volume buckets.
+     * 
+     * @param server the server value to set.
+     * @return the BucketPatch object itself.
+     */
+    public BucketPatch withServer(BucketServerPatchProperties server) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketPatchProperties();
+        }
+        this.innerProperties().withServer(server);
+        return this;
+    }
+
+    /**
+     * Get the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite.
+     * 
+     * @return the permissions value.
+     */
+    public BucketPatchPermissions permissions() {
+        return this.innerProperties() == null ? null : this.innerProperties().permissions();
+    }
+
+    /**
+     * Set the permissions property: Access permissions for the bucket. Either ReadOnly or ReadWrite.
+     * 
+     * @param permissions the permissions value to set.
+     * @return the BucketPatch object itself.
+     */
+    public BucketPatch withPermissions(BucketPatchPermissions permissions) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new BucketPatchProperties();
+        }
+        this.innerProperties().withPermissions(permissions);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (innerProperties() != null) {
+            innerProperties().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.innerProperties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketPatch from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketPatch if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the BucketPatch.
+     */
+    public static BucketPatch fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketPatch deserializedBucketPatch = new BucketPatch();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedBucketPatch.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedBucketPatch.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedBucketPatch.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedBucketPatch.innerProperties = BucketPatchProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedBucketPatch.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketPatch;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPatchPermissions.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPatchPermissions.java
new file mode 100644
index 000000000000..0b7038c7ebb2
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPatchPermissions.java
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Bucket Permissions
+ * 
+ * Access permissions for the bucket. Either ReadOnly or ReadWrite.
+ */
+public final class BucketPatchPermissions extends ExpandableStringEnum<BucketPatchPermissions> {
+    /**
+     * Static value ReadOnly for BucketPatchPermissions.
+     */
+    public static final BucketPatchPermissions READ_ONLY = fromString("ReadOnly");
+
+    /**
+     * Static value ReadWrite for BucketPatchPermissions.
+     */
+    public static final BucketPatchPermissions READ_WRITE = fromString("ReadWrite");
+
+    /**
+     * Creates a new instance of BucketPatchPermissions value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public BucketPatchPermissions() {
+    }
+
+    /**
+     * Creates or finds a BucketPatchPermissions from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding BucketPatchPermissions.
+     */
+    public static BucketPatchPermissions fromString(String name) {
+        return fromString(name, BucketPatchPermissions.class);
+    }
+
+    /**
+     * Gets known BucketPatchPermissions values.
+     * 
+     * @return known BucketPatchPermissions values.
+     */
+    public static Collection<BucketPatchPermissions> values() {
+        return values(BucketPatchPermissions.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPermissions.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPermissions.java
new file mode 100644
index 000000000000..6ce95609b2c4
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketPermissions.java
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Bucket Permissions
+ * 
+ * Access permissions for the bucket. Either ReadOnly or ReadWrite. The default is ReadOnly if no value is provided
+ * during bucket creation.
+ */
+public final class BucketPermissions extends ExpandableStringEnum<BucketPermissions> {
+    /**
+     * Static value ReadOnly for BucketPermissions.
+     */
+    public static final BucketPermissions READ_ONLY = fromString("ReadOnly");
+
+    /**
+     * Static value ReadWrite for BucketPermissions.
+     */
+    public static final BucketPermissions READ_WRITE = fromString("ReadWrite");
+
+    /**
+     * Creates a new instance of BucketPermissions value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public BucketPermissions() {
+    }
+
+    /**
+     * Creates or finds a BucketPermissions from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding BucketPermissions.
+     */
+    public static BucketPermissions fromString(String name) {
+        return fromString(name, BucketPermissions.class);
+    }
+
+    /**
+     * Gets known BucketPermissions values.
+     * 
+     * @return known BucketPermissions values.
+     */
+    public static Collection<BucketPermissions> values() {
+        return values(BucketPermissions.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketServerPatchProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketServerPatchProperties.java
new file mode 100644
index 000000000000..fb2ac45421c2
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketServerPatchProperties.java
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Properties of the server managing the lifecycle of volume buckets.
+ */
+@Fluent
+public final class BucketServerPatchProperties implements JsonSerializable<BucketServerPatchProperties> {
+    /*
+     * The host part of the bucket URL, resolving to the bucket IP address and allowed by the server certificate.
+     */
+    private String fqdn;
+
+    /*
+     * A base64-encoded PEM file, which includes both the bucket server's certificate and private key. It is used to
+     * authenticate the user and allows access to volume data in a read-only manner.
+     */
+    private String certificateObject;
+
+    /**
+     * Creates an instance of BucketServerPatchProperties class.
+     */
+    public BucketServerPatchProperties() {
+    }
+
+    /**
+     * Get the fqdn property: The host part of the bucket URL, resolving to the bucket IP address and allowed by the
+     * server certificate.
+     * 
+     * @return the fqdn value.
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set the fqdn property: The host part of the bucket URL, resolving to the bucket IP address and allowed by the
+     * server certificate.
+     * 
+     * @param fqdn the fqdn value to set.
+     * @return the BucketServerPatchProperties object itself.
+     */
+    public BucketServerPatchProperties withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get the certificateObject property: A base64-encoded PEM file, which includes both the bucket server's
+     * certificate and private key. It is used to authenticate the user and allows access to volume data in a read-only
+     * manner.
+     * 
+     * @return the certificateObject value.
+     */
+    public String certificateObject() {
+        return this.certificateObject;
+    }
+
+    /**
+     * Set the certificateObject property: A base64-encoded PEM file, which includes both the bucket server's
+     * certificate and private key. It is used to authenticate the user and allows access to volume data in a read-only
+     * manner.
+     * 
+     * @param certificateObject the certificateObject value to set.
+     * @return the BucketServerPatchProperties object itself.
+     */
+    public BucketServerPatchProperties withCertificateObject(String certificateObject) {
+        this.certificateObject = certificateObject;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("fqdn", this.fqdn);
+        jsonWriter.writeStringField("certificateObject", this.certificateObject);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketServerPatchProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketServerPatchProperties if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the BucketServerPatchProperties.
+     */
+    public static BucketServerPatchProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketServerPatchProperties deserializedBucketServerPatchProperties = new BucketServerPatchProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("fqdn".equals(fieldName)) {
+                    deserializedBucketServerPatchProperties.fqdn = reader.getString();
+                } else if ("certificateObject".equals(fieldName)) {
+                    deserializedBucketServerPatchProperties.certificateObject = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketServerPatchProperties;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketServerProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketServerProperties.java
new file mode 100644
index 000000000000..79299bb8a4ea
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/BucketServerProperties.java
@@ -0,0 +1,180 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.util.CoreUtils;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.time.OffsetDateTime;
+
+/**
+ * Properties of the server managing the lifecycle of volume buckets.
+ */
+@Fluent
+public final class BucketServerProperties implements JsonSerializable<BucketServerProperties> {
+    /*
+     * The host part of the bucket URL, resolving to the bucket IP address and allowed by the server certificate.
+     */
+    private String fqdn;
+
+    /*
+     * Certificate Common Name taken from the certificate installed on the bucket server
+     */
+    private String certificateCommonName;
+
+    /*
+     * The bucket server's certificate expiry date.
+     */
+    private OffsetDateTime certificateExpiryDate;
+
+    /*
+     * The bucket server's IPv4 address
+     */
+    private String ipAddress;
+
+    /*
+     * A base64-encoded PEM file, which includes both the bucket server's certificate and private key. It is used to
+     * authenticate the user and allows access to volume data in a read-only manner.
+     */
+    private String certificateObject;
+
+    /**
+     * Creates an instance of BucketServerProperties class.
+     */
+    public BucketServerProperties() {
+    }
+
+    /**
+     * Get the fqdn property: The host part of the bucket URL, resolving to the bucket IP address and allowed by the
+     * server certificate.
+     * 
+     * @return the fqdn value.
+     */
+    public String fqdn() {
+        return this.fqdn;
+    }
+
+    /**
+     * Set the fqdn property: The host part of the bucket URL, resolving to the bucket IP address and allowed by the
+     * server certificate.
+     * 
+     * @param fqdn the fqdn value to set.
+     * @return the BucketServerProperties object itself.
+     */
+    public BucketServerProperties withFqdn(String fqdn) {
+        this.fqdn = fqdn;
+        return this;
+    }
+
+    /**
+     * Get the certificateCommonName property: Certificate Common Name taken from the certificate installed on the
+     * bucket server.
+     * 
+     * @return the certificateCommonName value.
+     */
+    public String certificateCommonName() {
+        return this.certificateCommonName;
+    }
+
+    /**
+     * Get the certificateExpiryDate property: The bucket server's certificate expiry date.
+     * 
+     * @return the certificateExpiryDate value.
+     */
+    public OffsetDateTime certificateExpiryDate() {
+        return this.certificateExpiryDate;
+    }
+
+    /**
+     * Get the ipAddress property: The bucket server's IPv4 address.
+     * 
+     * @return the ipAddress value.
+     */
+    public String ipAddress() {
+        return this.ipAddress;
+    }
+
+    /**
+     * Get the certificateObject property: A base64-encoded PEM file, which includes both the bucket server's
+     * certificate and private key. It is used to authenticate the user and allows access to volume data in a read-only
+     * manner.
+     * 
+     * @return the certificateObject value.
+     */
+    public String certificateObject() {
+        return this.certificateObject;
+    }
+
+    /**
+     * Set the certificateObject property: A base64-encoded PEM file, which includes both the bucket server's
+     * certificate and private key. It is used to authenticate the user and allows access to volume data in a read-only
+     * manner.
+     * 
+     * @param certificateObject the certificateObject value to set.
+     * @return the BucketServerProperties object itself.
+     */
+    public BucketServerProperties withCertificateObject(String certificateObject) {
+        this.certificateObject = certificateObject;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("fqdn", this.fqdn);
+        jsonWriter.writeStringField("certificateObject", this.certificateObject);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of BucketServerProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of BucketServerProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the BucketServerProperties.
+     */
+    public static BucketServerProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            BucketServerProperties deserializedBucketServerProperties = new BucketServerProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("fqdn".equals(fieldName)) {
+                    deserializedBucketServerProperties.fqdn = reader.getString();
+                } else if ("certificateCommonName".equals(fieldName)) {
+                    deserializedBucketServerProperties.certificateCommonName = reader.getString();
+                } else if ("certificateExpiryDate".equals(fieldName)) {
+                    deserializedBucketServerProperties.certificateExpiryDate = reader
+                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
+                } else if ("ipAddress".equals(fieldName)) {
+                    deserializedBucketServerProperties.ipAddress = reader.getString();
+                } else if ("certificateObject".equals(fieldName)) {
+                    deserializedBucketServerProperties.certificateObject = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedBucketServerProperties;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Buckets.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Buckets.java
new file mode 100644
index 000000000000..2d41eb260979
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Buckets.java
@@ -0,0 +1,225 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/**
+ * Resource collection API of Buckets.
+ */
+public interface Buckets {
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<Bucket> list(String resourceGroupName, String accountName, String poolName, String volumeName);
+
+    /**
+     * Describes all buckets belonging to a volume
+     * 
+     * Describes all buckets belonging to a volume. Buckets allow additional services, such as AI services, connect to
+     * the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of volume bucket resources as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<Bucket> list(String resourceGroupName, String accountName, String poolName, String volumeName,
+        Context context);
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket along with {@link Response}.
+     */
+    Response<Bucket> getWithResponse(String resourceGroupName, String accountName, String poolName, String volumeName,
+        String bucketName, Context context);
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket.
+     */
+    Bucket get(String resourceGroupName, String accountName, String poolName, String volumeName, String bucketName);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String accountName, String poolName, String volumeName, String bucketName);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String accountName, String poolName, String volumeName, String bucketName,
+        Context context);
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair along with {@link Response}.
+     */
+    Response<BucketGenerateCredentials> generateCredentialsWithResponse(String resourceGroupName, String accountName,
+        String poolName, String volumeName, String bucketName, BucketCredentialsExpiry body, Context context);
+
+    /**
+     * Generate bucket access credentials
+     * 
+     * Generate the access key and secret key used for accessing the specified volume bucket. Also return expiry date
+     * and time of key pair (in UTC).
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param bucketName The name of the bucket.
+     * @param body The bucket's Access and Secret key pair expiry time expressed as the number of days from now.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return bucket Access Key, Secret Key, and Expiry date and time of the key pair.
+     */
+    BucketGenerateCredentials generateCredentials(String resourceGroupName, String accountName, String poolName,
+        String volumeName, String bucketName, BucketCredentialsExpiry body);
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket along with {@link Response}.
+     */
+    Bucket getById(String id);
+
+    /**
+     * Describe a volume's bucket
+     * 
+     * Get the details of the specified volume's bucket. A bucket allows additional services, such as AI services,
+     * connect to the volume data contained in those buckets.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the details of the specified volume's bucket along with {@link Response}.
+     */
+    Response<Bucket> getByIdWithResponse(String id, Context context);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteById(String id);
+
+    /**
+     * Delete a volume's bucket
+     * 
+     * Delete a volume's bucket.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByIdWithResponse(String id, Context context);
+
+    /**
+     * Begins definition for a new Bucket resource.
+     * 
+     * @param name resource name.
+     * @return the first stage of the new Bucket definition.
+     */
+    Bucket.DefinitionStages.Blank define(String name);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/CifsUser.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/CifsUser.java
new file mode 100644
index 000000000000..01333bd46b4b
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/CifsUser.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * CIFS username
+ * 
+ * The effective CIFS username when accessing the volume data.
+ */
+@Fluent
+public final class CifsUser implements JsonSerializable<CifsUser> {
+    /*
+     * The CIFS user's username
+     */
+    private String username;
+
+    /**
+     * Creates an instance of CifsUser class.
+     */
+    public CifsUser() {
+    }
+
+    /**
+     * Get the username property: The CIFS user's username.
+     * 
+     * @return the username value.
+     */
+    public String username() {
+        return this.username;
+    }
+
+    /**
+     * Set the username property: The CIFS user's username.
+     * 
+     * @param username the username value to set.
+     * @return the CifsUser object itself.
+     */
+    public CifsUser withUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("username", this.username);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of CifsUser from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of CifsUser if the JsonReader was pointing to an instance of it, or null if it was pointing
+     * to JSON null.
+     * @throws IOException If an error occurs while reading the CifsUser.
+     */
+    public static CifsUser fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            CifsUser deserializedCifsUser = new CifsUser();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("username".equals(fieldName)) {
+                    deserializedCifsUser.username = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedCifsUser;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/CredentialsStatus.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/CredentialsStatus.java
new file mode 100644
index 000000000000..3c623824d7cf
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/CredentialsStatus.java
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The bucket credentials status. There states:
+ * 
+ * "NoCredentialsSet": Access and Secret key pair have not been generated.
+ * "CredentialsExpired": Access and Secret key pair have expired.
+ * "Active": The certificate has been installed and credentials are unexpired.
+ */
+public final class CredentialsStatus extends ExpandableStringEnum<CredentialsStatus> {
+    /**
+     * Static value NoCredentialsSet for CredentialsStatus.
+     */
+    public static final CredentialsStatus NO_CREDENTIALS_SET = fromString("NoCredentialsSet");
+
+    /**
+     * Static value CredentialsExpired for CredentialsStatus.
+     */
+    public static final CredentialsStatus CREDENTIALS_EXPIRED = fromString("CredentialsExpired");
+
+    /**
+     * Static value Active for CredentialsStatus.
+     */
+    public static final CredentialsStatus ACTIVE = fromString("Active");
+
+    /**
+     * Creates a new instance of CredentialsStatus value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public CredentialsStatus() {
+    }
+
+    /**
+     * Creates or finds a CredentialsStatus from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding CredentialsStatus.
+     */
+    public static CredentialsStatus fromString(String name) {
+        return fromString(name, CredentialsStatus.class);
+    }
+
+    /**
+     * Gets known CredentialsStatus values.
+     * 
+     * @return known CredentialsStatus values.
+     */
+    public static Collection<CredentialsStatus> values() {
+        return values(CredentialsStatus.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/EncryptionIdentity.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/EncryptionIdentity.java
index 17b1dee29db3..15b02e5e0e29 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/EncryptionIdentity.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/EncryptionIdentity.java
@@ -28,7 +28,7 @@ public final class EncryptionIdentity implements JsonSerializable<EncryptionIden
     private String userAssignedIdentity;
 
     /*
-     * ClientId of the multi-tenant AAD Application. Used to access cross-tenant keyvaults.
+     * ClientId of the multi-tenant AAD Application. Used to access cross-tenant KeyVaults.
      */
     private String federatedClientId;
 
@@ -74,7 +74,7 @@ public EncryptionIdentity withUserAssignedIdentity(String userAssignedIdentity)
 
     /**
      * Get the federatedClientId property: ClientId of the multi-tenant AAD Application. Used to access cross-tenant
-     * keyvaults.
+     * KeyVaults.
      * 
      * @return the federatedClientId value.
      */
@@ -84,7 +84,7 @@ public String federatedClientId() {
 
     /**
      * Set the federatedClientId property: ClientId of the multi-tenant AAD Application. Used to access cross-tenant
-     * keyvaults.
+     * KeyVaults.
      * 
      * @param federatedClientId the federatedClientId value to set.
      * @return the EncryptionIdentity object itself.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ExternalReplicationSetupStatus.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ExternalReplicationSetupStatus.java
new file mode 100644
index 000000000000..13dd3bab4fd4
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ExternalReplicationSetupStatus.java
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Property that only applies to external replications. Provides a machine-readable value for the status of the external
+ * replication setup.
+ */
+public final class ExternalReplicationSetupStatus extends ExpandableStringEnum<ExternalReplicationSetupStatus> {
+    /**
+     * Static value ClusterPeerRequired for ExternalReplicationSetupStatus.
+     */
+    public static final ExternalReplicationSetupStatus CLUSTER_PEER_REQUIRED = fromString("ClusterPeerRequired");
+
+    /**
+     * Static value ClusterPeerPending for ExternalReplicationSetupStatus.
+     */
+    public static final ExternalReplicationSetupStatus CLUSTER_PEER_PENDING = fromString("ClusterPeerPending");
+
+    /**
+     * Static value VServerPeerRequired for ExternalReplicationSetupStatus.
+     */
+    public static final ExternalReplicationSetupStatus VSERVER_PEER_REQUIRED = fromString("VServerPeerRequired");
+
+    /**
+     * Static value ReplicationCreateRequired for ExternalReplicationSetupStatus.
+     */
+    public static final ExternalReplicationSetupStatus REPLICATION_CREATE_REQUIRED
+        = fromString("ReplicationCreateRequired");
+
+    /**
+     * Static value NoActionRequired for ExternalReplicationSetupStatus.
+     */
+    public static final ExternalReplicationSetupStatus NO_ACTION_REQUIRED = fromString("NoActionRequired");
+
+    /**
+     * Creates a new instance of ExternalReplicationSetupStatus value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ExternalReplicationSetupStatus() {
+    }
+
+    /**
+     * Creates or finds a ExternalReplicationSetupStatus from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ExternalReplicationSetupStatus.
+     */
+    public static ExternalReplicationSetupStatus fromString(String name) {
+        return fromString(name, ExternalReplicationSetupStatus.class);
+    }
+
+    /**
+     * Gets known ExternalReplicationSetupStatus values.
+     * 
+     * @return known ExternalReplicationSetupStatus values.
+     */
+    public static Collection<ExternalReplicationSetupStatus> values() {
+        return values(ExternalReplicationSetupStatus.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/FileSystemUser.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/FileSystemUser.java
new file mode 100644
index 000000000000..b5524b65a138
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/FileSystemUser.java
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * File System User
+ * 
+ * File System user having access to volume data. For Unix, this is the user's uid and gid. For Windows, this is the
+ * user's username. Note that the Unix and Windows user details are mutually exclusive, meaning one or other must be
+ * supplied, but not both.
+ */
+@Fluent
+public final class FileSystemUser implements JsonSerializable<FileSystemUser> {
+    /*
+     * The effective NFS User ID and Group ID when accessing the volume data.
+     */
+    private NfsUser nfsUser;
+
+    /*
+     * The effective CIFS username when accessing the volume data.
+     */
+    private CifsUser cifsUser;
+
+    /**
+     * Creates an instance of FileSystemUser class.
+     */
+    public FileSystemUser() {
+    }
+
+    /**
+     * Get the nfsUser property: The effective NFS User ID and Group ID when accessing the volume data.
+     * 
+     * @return the nfsUser value.
+     */
+    public NfsUser nfsUser() {
+        return this.nfsUser;
+    }
+
+    /**
+     * Set the nfsUser property: The effective NFS User ID and Group ID when accessing the volume data.
+     * 
+     * @param nfsUser the nfsUser value to set.
+     * @return the FileSystemUser object itself.
+     */
+    public FileSystemUser withNfsUser(NfsUser nfsUser) {
+        this.nfsUser = nfsUser;
+        return this;
+    }
+
+    /**
+     * Get the cifsUser property: The effective CIFS username when accessing the volume data.
+     * 
+     * @return the cifsUser value.
+     */
+    public CifsUser cifsUser() {
+        return this.cifsUser;
+    }
+
+    /**
+     * Set the cifsUser property: The effective CIFS username when accessing the volume data.
+     * 
+     * @param cifsUser the cifsUser value to set.
+     * @return the FileSystemUser object itself.
+     */
+    public FileSystemUser withCifsUser(CifsUser cifsUser) {
+        this.cifsUser = cifsUser;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (nfsUser() != null) {
+            nfsUser().validate();
+        }
+        if (cifsUser() != null) {
+            cifsUser().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("nfsUser", this.nfsUser);
+        jsonWriter.writeJsonField("cifsUser", this.cifsUser);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of FileSystemUser from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of FileSystemUser if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the FileSystemUser.
+     */
+    public static FileSystemUser fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            FileSystemUser deserializedFileSystemUser = new FileSystemUser();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("nfsUser".equals(fieldName)) {
+                    deserializedFileSystemUser.nfsUser = NfsUser.fromJson(reader);
+                } else if ("cifsUser".equals(fieldName)) {
+                    deserializedFileSystemUser.cifsUser = CifsUser.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedFileSystemUser;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/LdapConfiguration.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/LdapConfiguration.java
new file mode 100644
index 000000000000..9d83b80b7f02
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/LdapConfiguration.java
@@ -0,0 +1,213 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * LDAP configuration.
+ */
+@Fluent
+public final class LdapConfiguration implements JsonSerializable<LdapConfiguration> {
+    /*
+     * Name of the LDAP configuration domain
+     */
+    private String domain;
+
+    /*
+     * List of LDAP server IP addresses (IPv4 only) for the LDAP domain.
+     */
+    private List<String> ldapServers;
+
+    /*
+     * Specifies whether or not the LDAP traffic needs to be secured via TLS.
+     */
+    private Boolean ldapOverTls;
+
+    /*
+     * When LDAP over SSL/TLS is enabled, the LDAP client is required to have base64 encoded ldap servers CA
+     * certificate.
+     */
+    private String serverCACertificate;
+
+    /*
+     * The CN host name used while generating the certificate, LDAP Over TLS requires the CN host name to create DNS
+     * host entry.
+     */
+    private String certificateCNHost;
+
+    /**
+     * Creates an instance of LdapConfiguration class.
+     */
+    public LdapConfiguration() {
+    }
+
+    /**
+     * Get the domain property: Name of the LDAP configuration domain.
+     * 
+     * @return the domain value.
+     */
+    public String domain() {
+        return this.domain;
+    }
+
+    /**
+     * Set the domain property: Name of the LDAP configuration domain.
+     * 
+     * @param domain the domain value to set.
+     * @return the LdapConfiguration object itself.
+     */
+    public LdapConfiguration withDomain(String domain) {
+        this.domain = domain;
+        return this;
+    }
+
+    /**
+     * Get the ldapServers property: List of LDAP server IP addresses (IPv4 only) for the LDAP domain.
+     * 
+     * @return the ldapServers value.
+     */
+    public List<String> ldapServers() {
+        return this.ldapServers;
+    }
+
+    /**
+     * Set the ldapServers property: List of LDAP server IP addresses (IPv4 only) for the LDAP domain.
+     * 
+     * @param ldapServers the ldapServers value to set.
+     * @return the LdapConfiguration object itself.
+     */
+    public LdapConfiguration withLdapServers(List<String> ldapServers) {
+        this.ldapServers = ldapServers;
+        return this;
+    }
+
+    /**
+     * Get the ldapOverTls property: Specifies whether or not the LDAP traffic needs to be secured via TLS.
+     * 
+     * @return the ldapOverTls value.
+     */
+    public Boolean ldapOverTls() {
+        return this.ldapOverTls;
+    }
+
+    /**
+     * Set the ldapOverTls property: Specifies whether or not the LDAP traffic needs to be secured via TLS.
+     * 
+     * @param ldapOverTls the ldapOverTls value to set.
+     * @return the LdapConfiguration object itself.
+     */
+    public LdapConfiguration withLdapOverTls(Boolean ldapOverTls) {
+        this.ldapOverTls = ldapOverTls;
+        return this;
+    }
+
+    /**
+     * Get the serverCACertificate property: When LDAP over SSL/TLS is enabled, the LDAP client is required to have
+     * base64 encoded ldap servers CA certificate.
+     * 
+     * @return the serverCACertificate value.
+     */
+    public String serverCACertificate() {
+        return this.serverCACertificate;
+    }
+
+    /**
+     * Set the serverCACertificate property: When LDAP over SSL/TLS is enabled, the LDAP client is required to have
+     * base64 encoded ldap servers CA certificate.
+     * 
+     * @param serverCACertificate the serverCACertificate value to set.
+     * @return the LdapConfiguration object itself.
+     */
+    public LdapConfiguration withServerCACertificate(String serverCACertificate) {
+        this.serverCACertificate = serverCACertificate;
+        return this;
+    }
+
+    /**
+     * Get the certificateCNHost property: The CN host name used while generating the certificate, LDAP Over TLS
+     * requires the CN host name to create DNS host entry.
+     * 
+     * @return the certificateCNHost value.
+     */
+    public String certificateCNHost() {
+        return this.certificateCNHost;
+    }
+
+    /**
+     * Set the certificateCNHost property: The CN host name used while generating the certificate, LDAP Over TLS
+     * requires the CN host name to create DNS host entry.
+     * 
+     * @param certificateCNHost the certificateCNHost value to set.
+     * @return the LdapConfiguration object itself.
+     */
+    public LdapConfiguration withCertificateCNHost(String certificateCNHost) {
+        this.certificateCNHost = certificateCNHost;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("domain", this.domain);
+        jsonWriter.writeArrayField("ldapServers", this.ldapServers, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeBooleanField("ldapOverTLS", this.ldapOverTls);
+        jsonWriter.writeStringField("serverCACertificate", this.serverCACertificate);
+        jsonWriter.writeStringField("certificateCNHost", this.certificateCNHost);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of LdapConfiguration from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of LdapConfiguration if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the LdapConfiguration.
+     */
+    public static LdapConfiguration fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            LdapConfiguration deserializedLdapConfiguration = new LdapConfiguration();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("domain".equals(fieldName)) {
+                    deserializedLdapConfiguration.domain = reader.getString();
+                } else if ("ldapServers".equals(fieldName)) {
+                    List<String> ldapServers = reader.readArray(reader1 -> reader1.getString());
+                    deserializedLdapConfiguration.ldapServers = ldapServers;
+                } else if ("ldapOverTLS".equals(fieldName)) {
+                    deserializedLdapConfiguration.ldapOverTls = reader.getNullable(JsonReader::getBoolean);
+                } else if ("serverCACertificate".equals(fieldName)) {
+                    deserializedLdapConfiguration.serverCACertificate = reader.getString();
+                } else if ("certificateCNHost".equals(fieldName)) {
+                    deserializedLdapConfiguration.certificateCNHost = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedLdapConfiguration;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/LdapServerType.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/LdapServerType.java
new file mode 100644
index 000000000000..05b5a0f91593
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/LdapServerType.java
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * ldapServerType
+ * 
+ * The type of the LDAP server.
+ */
+public final class LdapServerType extends ExpandableStringEnum<LdapServerType> {
+    /**
+     * Static value ActiveDirectory for LdapServerType.
+     */
+    public static final LdapServerType ACTIVE_DIRECTORY = fromString("ActiveDirectory");
+
+    /**
+     * Static value OpenLDAP for LdapServerType.
+     */
+    public static final LdapServerType OPEN_LDAP = fromString("OpenLDAP");
+
+    /**
+     * Creates a new instance of LdapServerType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public LdapServerType() {
+    }
+
+    /**
+     * Creates or finds a LdapServerType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding LdapServerType.
+     */
+    public static LdapServerType fromString(String name) {
+        return fromString(name, LdapServerType.class);
+    }
+
+    /**
+     * Gets known LdapServerType values.
+     * 
+     * @return known LdapServerType values.
+     */
+    public static Collection<LdapServerType> values() {
+        return values(LdapServerType.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ListQuotaReportResponse.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ListQuotaReportResponse.java
new file mode 100644
index 000000000000..d98672a0505e
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ListQuotaReportResponse.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner;
+import java.util.List;
+
+/**
+ * An immutable client-side representation of ListQuotaReportResponse.
+ */
+public interface ListQuotaReportResponse {
+    /**
+     * Gets the value property: List of volume quota report records.
+     * 
+     * @return the value value.
+     */
+    List<QuotaReport> value();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner object.
+     * 
+     * @return the inner object.
+     */
+    ListQuotaReportResponseInner innerModel();
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/MirrorState.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/MirrorState.java
index 7ffd1fc156b3..ded90d8976eb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/MirrorState.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/MirrorState.java
@@ -8,7 +8,9 @@
 import java.util.Collection;
 
 /**
- * The status of the replication.
+ * The mirror state property describes the current status of data replication for a resource. It provides insight into
+ * whether the data is actively being mirrored, if the replication process has been paused, or if it has yet to be
+ * initialized.
  */
 public final class MirrorState extends ExpandableStringEnum<MirrorState> {
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccount.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccount.java
index 44c090b35043..92a4dfe306b4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccount.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccount.java
@@ -115,6 +115,13 @@ public interface NetAppAccount {
      */
     MultiAdStatus multiAdStatus();
 
+    /**
+     * Gets the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @return the ldapConfiguration value.
+     */
+    LdapConfiguration ldapConfiguration();
+
     /**
      * Gets the region of the resource.
      * 
@@ -198,9 +205,9 @@ interface WithResourceGroup {
          * The stage of the NetAppAccount definition which contains all the minimum required properties for the resource
          * to be created, but also allows for any other optional properties to be specified.
          */
-        interface WithCreate
-            extends DefinitionStages.WithTags, DefinitionStages.WithIdentity, DefinitionStages.WithActiveDirectories,
-            DefinitionStages.WithEncryption, DefinitionStages.WithNfsV4IdDomain {
+        interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithIdentity,
+            DefinitionStages.WithActiveDirectories, DefinitionStages.WithEncryption, DefinitionStages.WithNfsV4IdDomain,
+            DefinitionStages.WithLdapConfiguration {
             /**
              * Executes the create request.
              * 
@@ -283,6 +290,19 @@ interface WithNfsV4IdDomain {
              */
             WithCreate withNfsV4IdDomain(String nfsV4IdDomain);
         }
+
+        /**
+         * The stage of the NetAppAccount definition allowing to specify ldapConfiguration.
+         */
+        interface WithLdapConfiguration {
+            /**
+             * Specifies the ldapConfiguration property: LDAP Configuration for the account..
+             * 
+             * @param ldapConfiguration LDAP Configuration for the account.
+             * @return the next definition stage.
+             */
+            WithCreate withLdapConfiguration(LdapConfiguration ldapConfiguration);
+        }
     }
 
     /**
@@ -296,7 +316,7 @@ interface WithNfsV4IdDomain {
      * The template for NetAppAccount update.
      */
     interface Update extends UpdateStages.WithTags, UpdateStages.WithIdentity, UpdateStages.WithActiveDirectories,
-        UpdateStages.WithEncryption, UpdateStages.WithNfsV4IdDomain {
+        UpdateStages.WithEncryption, UpdateStages.WithNfsV4IdDomain, UpdateStages.WithLdapConfiguration {
         /**
          * Executes the update request.
          * 
@@ -383,6 +403,19 @@ interface WithNfsV4IdDomain {
              */
             Update withNfsV4IdDomain(String nfsV4IdDomain);
         }
+
+        /**
+         * The stage of the NetAppAccount update allowing to specify ldapConfiguration.
+         */
+        interface WithLdapConfiguration {
+            /**
+             * Specifies the ldapConfiguration property: LDAP Configuration for the account..
+             * 
+             * @param ldapConfiguration LDAP Configuration for the account.
+             * @return the next definition stage.
+             */
+            Update withLdapConfiguration(LdapConfiguration ldapConfiguration);
+        }
     }
 
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccountPatch.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccountPatch.java
index a38c7cff66f3..02f096ae13ff 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccountPatch.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppAccountPatch.java
@@ -226,6 +226,29 @@ public MultiAdStatus multiAdStatus() {
         return this.innerProperties() == null ? null : this.innerProperties().multiAdStatus();
     }
 
+    /**
+     * Get the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @return the ldapConfiguration value.
+     */
+    public LdapConfiguration ldapConfiguration() {
+        return this.innerProperties() == null ? null : this.innerProperties().ldapConfiguration();
+    }
+
+    /**
+     * Set the ldapConfiguration property: LDAP Configuration for the account.
+     * 
+     * @param ldapConfiguration the ldapConfiguration value to set.
+     * @return the NetAppAccountPatch object itself.
+     */
+    public NetAppAccountPatch withLdapConfiguration(LdapConfiguration ldapConfiguration) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new AccountProperties();
+        }
+        this.innerProperties().withLdapConfiguration(ldapConfiguration);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppProvisioningState.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppProvisioningState.java
new file mode 100644
index 000000000000..16e82e7d8ba1
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppProvisioningState.java
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Provisioning state of the resource.
+ */
+public final class NetAppProvisioningState extends ExpandableStringEnum<NetAppProvisioningState> {
+    /**
+     * Static value Succeeded for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState SUCCEEDED = fromString("Succeeded");
+
+    /**
+     * Static value Failed for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState FAILED = fromString("Failed");
+
+    /**
+     * Static value Canceled for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState CANCELED = fromString("Canceled");
+
+    /**
+     * Static value Provisioning for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState PROVISIONING = fromString("Provisioning");
+
+    /**
+     * Static value Moving for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState MOVING = fromString("Moving");
+
+    /**
+     * Static value Updating for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState UPDATING = fromString("Updating");
+
+    /**
+     * Static value Deleting for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState DELETING = fromString("Deleting");
+
+    /**
+     * Static value Accepted for NetAppProvisioningState.
+     */
+    public static final NetAppProvisioningState ACCEPTED = fromString("Accepted");
+
+    /**
+     * Creates a new instance of NetAppProvisioningState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public NetAppProvisioningState() {
+    }
+
+    /**
+     * Creates or finds a NetAppProvisioningState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding NetAppProvisioningState.
+     */
+    public static NetAppProvisioningState fromString(String name) {
+        return fromString(name, NetAppProvisioningState.class);
+    }
+
+    /**
+     * Gets known NetAppProvisioningState values.
+     * 
+     * @return known NetAppProvisioningState values.
+     */
+    public static Collection<NetAppProvisioningState> values() {
+        return values(NetAppProvisioningState.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimits.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimits.java
index 5cf1dcac7d97..18b63483f609 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimits.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimits.java
@@ -23,7 +23,7 @@ public interface NetAppResourceQuotaLimits {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the default and current limits for quotas as paginated response with {@link PagedIterable}.
      */
-    PagedIterable<SubscriptionQuotaItem> list(String location);
+    PagedIterable<QuotaItem> list(String location);
 
     /**
      * Get quota limits
@@ -37,7 +37,7 @@ public interface NetAppResourceQuotaLimits {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the default and current limits for quotas as paginated response with {@link PagedIterable}.
      */
-    PagedIterable<SubscriptionQuotaItem> list(String location, Context context);
+    PagedIterable<QuotaItem> list(String location, Context context);
 
     /**
      * Get quota limits
@@ -52,7 +52,7 @@ public interface NetAppResourceQuotaLimits {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the default and current subscription quota limit along with {@link Response}.
      */
-    Response<SubscriptionQuotaItem> getWithResponse(String location, String quotaLimitName, Context context);
+    Response<QuotaItem> getWithResponse(String location, String quotaLimitName, Context context);
 
     /**
      * Get quota limits
@@ -66,5 +66,5 @@ public interface NetAppResourceQuotaLimits {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the default and current subscription quota limit.
      */
-    SubscriptionQuotaItem get(String location, String quotaLimitName);
+    QuotaItem get(String location, String quotaLimitName);
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimitsAccounts.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimitsAccounts.java
new file mode 100644
index 000000000000..e4b1e46d3fd1
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NetAppResourceQuotaLimitsAccounts.java
@@ -0,0 +1,77 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/**
+ * Resource collection API of NetAppResourceQuotaLimitsAccounts.
+ */
+public interface NetAppResourceQuotaLimitsAccounts {
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedIterable}.
+     */
+    PagedIterable<QuotaItem> list(String resourceGroupName, String accountName);
+
+    /**
+     * Gets a list of quota limits for all quotas that are under account.
+     * 
+     * Gets a list of quota limits for all quotas that are under account. Currently PoolsPerAccount is the only one.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of quota limits for all quotas that are under account as paginated response with
+     * {@link PagedIterable}.
+     */
+    PagedIterable<QuotaItem> list(String resourceGroupName, String accountName, Context context);
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit along with {@link Response}.
+     */
+    Response<QuotaItem> getWithResponse(String resourceGroupName, String accountName, String quotaLimitName,
+        Context context);
+
+    /**
+     * Gets the quota limits for the specific quota that is provided under the account.
+     * 
+     * Get the default, current and usages account quota limit.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param quotaLimitName The name of the Quota Limit.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the default, current and usages account quota limit.
+     */
+    QuotaItem get(String resourceGroupName, String accountName, String quotaLimitName);
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NfsUser.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NfsUser.java
new file mode 100644
index 000000000000..961a42b40f06
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/NfsUser.java
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * NFS user details
+ * 
+ * The effective NFS User ID and Group ID when accessing the volume data.
+ */
+@Fluent
+public final class NfsUser implements JsonSerializable<NfsUser> {
+    /*
+     * The NFS user's UID
+     */
+    private Long userId;
+
+    /*
+     * The NFS user's GID
+     */
+    private Long groupId;
+
+    /**
+     * Creates an instance of NfsUser class.
+     */
+    public NfsUser() {
+    }
+
+    /**
+     * Get the userId property: The NFS user's UID.
+     * 
+     * @return the userId value.
+     */
+    public Long userId() {
+        return this.userId;
+    }
+
+    /**
+     * Set the userId property: The NFS user's UID.
+     * 
+     * @param userId the userId value to set.
+     * @return the NfsUser object itself.
+     */
+    public NfsUser withUserId(Long userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    /**
+     * Get the groupId property: The NFS user's GID.
+     * 
+     * @return the groupId value.
+     */
+    public Long groupId() {
+        return this.groupId;
+    }
+
+    /**
+     * Set the groupId property: The NFS user's GID.
+     * 
+     * @param groupId the groupId value to set.
+     * @return the NfsUser object itself.
+     */
+    public NfsUser withGroupId(Long groupId) {
+        this.groupId = groupId;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeNumberField("userId", this.userId);
+        jsonWriter.writeNumberField("groupId", this.groupId);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NfsUser from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NfsUser if the JsonReader was pointing to an instance of it, or null if it was pointing to
+     * JSON null.
+     * @throws IOException If an error occurs while reading the NfsUser.
+     */
+    public static NfsUser fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NfsUser deserializedNfsUser = new NfsUser();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("userId".equals(fieldName)) {
+                    deserializedNfsUser.userId = reader.getNullable(JsonReader::getLong);
+                } else if ("groupId".equals(fieldName)) {
+                    deserializedNfsUser.groupId = reader.getNullable(JsonReader::getLong);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNfsUser;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ProvisioningState.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ProvisioningState.java
deleted file mode 100644
index 9c5edaf61771..000000000000
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ProvisioningState.java
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.resourcemanager.netapp.models;
-
-/**
- * Gets the status of the VolumeQuotaRule at the time the operation was called.
- */
-public enum ProvisioningState {
-    /**
-     * Enum value Accepted.
-     */
-    ACCEPTED("Accepted"),
-
-    /**
-     * Enum value Creating.
-     */
-    CREATING("Creating"),
-
-    /**
-     * Enum value Patching.
-     */
-    PATCHING("Patching"),
-
-    /**
-     * Enum value Deleting.
-     */
-    DELETING("Deleting"),
-
-    /**
-     * Enum value Moving.
-     */
-    MOVING("Moving"),
-
-    /**
-     * Enum value Failed.
-     */
-    FAILED("Failed"),
-
-    /**
-     * Enum value Succeeded.
-     */
-    SUCCEEDED("Succeeded");
-
-    /**
-     * The actual serialized value for a ProvisioningState instance.
-     */
-    private final String value;
-
-    ProvisioningState(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Parses a serialized value to a ProvisioningState instance.
-     * 
-     * @param value the serialized value to parse.
-     * @return the parsed ProvisioningState object, or null if unable to parse.
-     */
-    public static ProvisioningState fromString(String value) {
-        if (value == null) {
-            return null;
-        }
-        ProvisioningState[] items = ProvisioningState.values();
-        for (ProvisioningState item : items) {
-            if (item.toString().equalsIgnoreCase(value)) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return this.value;
-    }
-}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/SubscriptionQuotaItem.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaItem.java
similarity index 78%
rename from sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/SubscriptionQuotaItem.java
rename to sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaItem.java
index 82460e375806..8cf335327eee 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/SubscriptionQuotaItem.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaItem.java
@@ -5,12 +5,12 @@
 package com.azure.resourcemanager.netapp.models;
 
 import com.azure.core.management.SystemData;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
 
 /**
- * An immutable client-side representation of SubscriptionQuotaItem.
+ * An immutable client-side representation of QuotaItem.
  */
-public interface SubscriptionQuotaItem {
+public interface QuotaItem {
     /**
      * Gets the id property: Fully qualified resource Id for the resource.
      * 
@@ -54,9 +54,16 @@ public interface SubscriptionQuotaItem {
     Integer defaultProperty();
 
     /**
-     * Gets the inner com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner object.
+     * Gets the usage property: The usage quota value.
+     * 
+     * @return the usage value.
+     */
+    Integer usage();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner object.
      * 
      * @return the inner object.
      */
-    SubscriptionQuotaItemInner innerModel();
+    QuotaItemInner innerModel();
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/SubscriptionQuotaItemList.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaItemList.java
similarity index 58%
rename from sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/SubscriptionQuotaItemList.java
rename to sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaItemList.java
index eda0ee451f6c..c3619941bd17 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/SubscriptionQuotaItemList.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaItemList.java
@@ -9,19 +9,19 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
 import java.io.IOException;
 import java.util.List;
 
 /**
- * List of Subscription Quota Items.
+ * List of Quota Items.
  */
 @Fluent
-public final class SubscriptionQuotaItemList implements JsonSerializable<SubscriptionQuotaItemList> {
+public final class QuotaItemList implements JsonSerializable<QuotaItemList> {
     /*
-     * A list of SubscriptionQuotaItems
+     * A list of QuotaItems
      */
-    private List<SubscriptionQuotaItemInner> value;
+    private List<QuotaItemInner> value;
 
     /*
      * URL to get the next set of results.
@@ -29,27 +29,27 @@ public final class SubscriptionQuotaItemList implements JsonSerializable<Subscri
     private String nextLink;
 
     /**
-     * Creates an instance of SubscriptionQuotaItemList class.
+     * Creates an instance of QuotaItemList class.
      */
-    public SubscriptionQuotaItemList() {
+    public QuotaItemList() {
     }
 
     /**
-     * Get the value property: A list of SubscriptionQuotaItems.
+     * Get the value property: A list of QuotaItems.
      * 
      * @return the value value.
      */
-    public List<SubscriptionQuotaItemInner> value() {
+    public List<QuotaItemInner> value() {
         return this.value;
     }
 
     /**
-     * Set the value property: A list of SubscriptionQuotaItems.
+     * Set the value property: A list of QuotaItems.
      * 
      * @param value the value value to set.
-     * @return the SubscriptionQuotaItemList object itself.
+     * @return the QuotaItemList object itself.
      */
-    public SubscriptionQuotaItemList withValue(List<SubscriptionQuotaItemInner> value) {
+    public QuotaItemList withValue(List<QuotaItemInner> value) {
         this.value = value;
         return this;
     }
@@ -67,9 +67,9 @@ public String nextLink() {
      * Set the nextLink property: URL to get the next set of results.
      * 
      * @param nextLink the nextLink value to set.
-     * @return the SubscriptionQuotaItemList object itself.
+     * @return the QuotaItemList object itself.
      */
-    public SubscriptionQuotaItemList withNextLink(String nextLink) {
+    public QuotaItemList withNextLink(String nextLink) {
         this.nextLink = nextLink;
         return this;
     }
@@ -97,32 +97,31 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     }
 
     /**
-     * Reads an instance of SubscriptionQuotaItemList from the JsonReader.
+     * Reads an instance of QuotaItemList from the JsonReader.
      * 
      * @param jsonReader The JsonReader being read.
-     * @return An instance of SubscriptionQuotaItemList if the JsonReader was pointing to an instance of it, or null if
-     * it was pointing to JSON null.
-     * @throws IOException If an error occurs while reading the SubscriptionQuotaItemList.
+     * @return An instance of QuotaItemList if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the QuotaItemList.
      */
-    public static SubscriptionQuotaItemList fromJson(JsonReader jsonReader) throws IOException {
+    public static QuotaItemList fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            SubscriptionQuotaItemList deserializedSubscriptionQuotaItemList = new SubscriptionQuotaItemList();
+            QuotaItemList deserializedQuotaItemList = new QuotaItemList();
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
                 if ("value".equals(fieldName)) {
-                    List<SubscriptionQuotaItemInner> value
-                        = reader.readArray(reader1 -> SubscriptionQuotaItemInner.fromJson(reader1));
-                    deserializedSubscriptionQuotaItemList.value = value;
+                    List<QuotaItemInner> value = reader.readArray(reader1 -> QuotaItemInner.fromJson(reader1));
+                    deserializedQuotaItemList.value = value;
                 } else if ("nextLink".equals(fieldName)) {
-                    deserializedSubscriptionQuotaItemList.nextLink = reader.getString();
+                    deserializedQuotaItemList.nextLink = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
             }
 
-            return deserializedSubscriptionQuotaItemList;
+            return deserializedQuotaItemList;
         });
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaReport.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaReport.java
new file mode 100644
index 000000000000..a30e5c5d9e71
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/QuotaReport.java
@@ -0,0 +1,238 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Quota report record properties.
+ */
+@Fluent
+public final class QuotaReport implements JsonSerializable<QuotaReport> {
+    /*
+     * Type of quota
+     */
+    private Type quotaType;
+
+    /*
+     * UserID/GroupID/SID based on the quota target type. UserID and groupID can be found by running ‘id’ or ‘getent’
+     * command for the user or group and SID can be found by running <wmic useraccount where name='user-name' get sid>
+     */
+    private String quotaTarget;
+
+    /*
+     * Specifies the current usage in kibibytes for the user/group quota.
+     */
+    private Long quotaLimitUsedInKiBs;
+
+    /*
+     * Specifies the total size limit in kibibytes for the user/group quota.
+     */
+    private Long quotaLimitTotalInKiBs;
+
+    /*
+     * Percentage of used size compared to total size.
+     */
+    private Float percentageUsed;
+
+    /*
+     * Flag to indicate whether the quota is derived from default quota.
+     */
+    private Boolean isDerivedQuota;
+
+    /**
+     * Creates an instance of QuotaReport class.
+     */
+    public QuotaReport() {
+    }
+
+    /**
+     * Get the quotaType property: Type of quota.
+     * 
+     * @return the quotaType value.
+     */
+    public Type quotaType() {
+        return this.quotaType;
+    }
+
+    /**
+     * Set the quotaType property: Type of quota.
+     * 
+     * @param quotaType the quotaType value to set.
+     * @return the QuotaReport object itself.
+     */
+    public QuotaReport withQuotaType(Type quotaType) {
+        this.quotaType = quotaType;
+        return this;
+    }
+
+    /**
+     * Get the quotaTarget property: UserID/GroupID/SID based on the quota target type. UserID and groupID can be found
+     * by running ‘id’ or ‘getent’ command for the user or group and SID can be found by running &lt;wmic useraccount
+     * where name='user-name' get sid&gt;.
+     * 
+     * @return the quotaTarget value.
+     */
+    public String quotaTarget() {
+        return this.quotaTarget;
+    }
+
+    /**
+     * Set the quotaTarget property: UserID/GroupID/SID based on the quota target type. UserID and groupID can be found
+     * by running ‘id’ or ‘getent’ command for the user or group and SID can be found by running &lt;wmic useraccount
+     * where name='user-name' get sid&gt;.
+     * 
+     * @param quotaTarget the quotaTarget value to set.
+     * @return the QuotaReport object itself.
+     */
+    public QuotaReport withQuotaTarget(String quotaTarget) {
+        this.quotaTarget = quotaTarget;
+        return this;
+    }
+
+    /**
+     * Get the quotaLimitUsedInKiBs property: Specifies the current usage in kibibytes for the user/group quota.
+     * 
+     * @return the quotaLimitUsedInKiBs value.
+     */
+    public Long quotaLimitUsedInKiBs() {
+        return this.quotaLimitUsedInKiBs;
+    }
+
+    /**
+     * Set the quotaLimitUsedInKiBs property: Specifies the current usage in kibibytes for the user/group quota.
+     * 
+     * @param quotaLimitUsedInKiBs the quotaLimitUsedInKiBs value to set.
+     * @return the QuotaReport object itself.
+     */
+    public QuotaReport withQuotaLimitUsedInKiBs(Long quotaLimitUsedInKiBs) {
+        this.quotaLimitUsedInKiBs = quotaLimitUsedInKiBs;
+        return this;
+    }
+
+    /**
+     * Get the quotaLimitTotalInKiBs property: Specifies the total size limit in kibibytes for the user/group quota.
+     * 
+     * @return the quotaLimitTotalInKiBs value.
+     */
+    public Long quotaLimitTotalInKiBs() {
+        return this.quotaLimitTotalInKiBs;
+    }
+
+    /**
+     * Set the quotaLimitTotalInKiBs property: Specifies the total size limit in kibibytes for the user/group quota.
+     * 
+     * @param quotaLimitTotalInKiBs the quotaLimitTotalInKiBs value to set.
+     * @return the QuotaReport object itself.
+     */
+    public QuotaReport withQuotaLimitTotalInKiBs(Long quotaLimitTotalInKiBs) {
+        this.quotaLimitTotalInKiBs = quotaLimitTotalInKiBs;
+        return this;
+    }
+
+    /**
+     * Get the percentageUsed property: Percentage of used size compared to total size.
+     * 
+     * @return the percentageUsed value.
+     */
+    public Float percentageUsed() {
+        return this.percentageUsed;
+    }
+
+    /**
+     * Set the percentageUsed property: Percentage of used size compared to total size.
+     * 
+     * @param percentageUsed the percentageUsed value to set.
+     * @return the QuotaReport object itself.
+     */
+    public QuotaReport withPercentageUsed(Float percentageUsed) {
+        this.percentageUsed = percentageUsed;
+        return this;
+    }
+
+    /**
+     * Get the isDerivedQuota property: Flag to indicate whether the quota is derived from default quota.
+     * 
+     * @return the isDerivedQuota value.
+     */
+    public Boolean isDerivedQuota() {
+        return this.isDerivedQuota;
+    }
+
+    /**
+     * Set the isDerivedQuota property: Flag to indicate whether the quota is derived from default quota.
+     * 
+     * @param isDerivedQuota the isDerivedQuota value to set.
+     * @return the QuotaReport object itself.
+     */
+    public QuotaReport withIsDerivedQuota(Boolean isDerivedQuota) {
+        this.isDerivedQuota = isDerivedQuota;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("quotaType", this.quotaType == null ? null : this.quotaType.toString());
+        jsonWriter.writeStringField("quotaTarget", this.quotaTarget);
+        jsonWriter.writeNumberField("quotaLimitUsedInKiBs", this.quotaLimitUsedInKiBs);
+        jsonWriter.writeNumberField("quotaLimitTotalInKiBs", this.quotaLimitTotalInKiBs);
+        jsonWriter.writeNumberField("percentageUsed", this.percentageUsed);
+        jsonWriter.writeBooleanField("isDerivedQuota", this.isDerivedQuota);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of QuotaReport from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of QuotaReport if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the QuotaReport.
+     */
+    public static QuotaReport fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            QuotaReport deserializedQuotaReport = new QuotaReport();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("quotaType".equals(fieldName)) {
+                    deserializedQuotaReport.quotaType = Type.fromString(reader.getString());
+                } else if ("quotaTarget".equals(fieldName)) {
+                    deserializedQuotaReport.quotaTarget = reader.getString();
+                } else if ("quotaLimitUsedInKiBs".equals(fieldName)) {
+                    deserializedQuotaReport.quotaLimitUsedInKiBs = reader.getNullable(JsonReader::getLong);
+                } else if ("quotaLimitTotalInKiBs".equals(fieldName)) {
+                    deserializedQuotaReport.quotaLimitTotalInKiBs = reader.getNullable(JsonReader::getLong);
+                } else if ("percentageUsed".equals(fieldName)) {
+                    deserializedQuotaReport.percentageUsed = reader.getNullable(JsonReader::getFloat);
+                } else if ("isDerivedQuota".equals(fieldName)) {
+                    deserializedQuotaReport.isDerivedQuota = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedQuotaReport;
+        });
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RelationshipStatus.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RelationshipStatus.java
index 2e347844f6f2..114413a28050 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RelationshipStatus.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RelationshipStatus.java
@@ -8,7 +8,7 @@
 import java.util.Collection;
 
 /**
- * Status of the mirror relationship.
+ * The status of the Volume Replication.
  */
 public final class RelationshipStatus extends ExpandableStringEnum<RelationshipStatus> {
     /**
@@ -21,16 +21,6 @@ public final class RelationshipStatus extends ExpandableStringEnum<RelationshipS
      */
     public static final RelationshipStatus TRANSFERRING = fromString("Transferring");
 
-    /**
-     * Static value Failed for RelationshipStatus.
-     */
-    public static final RelationshipStatus FAILED = fromString("Failed");
-
-    /**
-     * Static value Unknown for RelationshipStatus.
-     */
-    public static final RelationshipStatus UNKNOWN = fromString("Unknown");
-
     /**
      * Creates a new instance of RelationshipStatus value.
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationObject.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationObject.java
index e9434fa528c5..26b4c06a9094 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationObject.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationObject.java
@@ -52,6 +52,29 @@ public final class ReplicationObject implements JsonSerializable<ReplicationObje
      */
     private List<DestinationReplication> destinationReplications;
 
+    /*
+     * Property that only applies to external replications. Provides a machine-readable value for the status of the
+     * external replication setup.
+     */
+    private ExternalReplicationSetupStatus externalReplicationSetupStatus;
+
+    /*
+     * Contains human-readable instructions on what the next step is to finish the external replication setup.
+     */
+    private String externalReplicationSetupInfo;
+
+    /*
+     * The mirror state property describes the current status of data replication for a replication. It provides insight
+     * into whether the data is actively being mirrored, if the replication process has been paused, or if it has yet to
+     * be initialized.
+     */
+    private MirrorState mirrorState;
+
+    /*
+     * The status of the Volume Replication
+     */
+    private RelationshipStatus relationshipStatus;
+
     /**
      * Creates an instance of ReplicationObject class.
      */
@@ -170,6 +193,46 @@ public List<DestinationReplication> destinationReplications() {
         return this.destinationReplications;
     }
 
+    /**
+     * Get the externalReplicationSetupStatus property: Property that only applies to external replications. Provides a
+     * machine-readable value for the status of the external replication setup.
+     * 
+     * @return the externalReplicationSetupStatus value.
+     */
+    public ExternalReplicationSetupStatus externalReplicationSetupStatus() {
+        return this.externalReplicationSetupStatus;
+    }
+
+    /**
+     * Get the externalReplicationSetupInfo property: Contains human-readable instructions on what the next step is to
+     * finish the external replication setup.
+     * 
+     * @return the externalReplicationSetupInfo value.
+     */
+    public String externalReplicationSetupInfo() {
+        return this.externalReplicationSetupInfo;
+    }
+
+    /**
+     * Get the mirrorState property: The mirror state property describes the current status of data replication for a
+     * replication. It provides insight into whether the data is actively being mirrored, if the replication process has
+     * been paused, or if it has yet to be initialized.
+     * 
+     * @return the mirrorState value.
+     */
+    public MirrorState mirrorState() {
+        return this.mirrorState;
+    }
+
+    /**
+     * Get the relationshipStatus property: The status of the Volume Replication.
+     * 
+     * @return the relationshipStatus value.
+     */
+    public RelationshipStatus relationshipStatus() {
+        return this.relationshipStatus;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -230,6 +293,16 @@ public static ReplicationObject fromJson(JsonReader jsonReader) throws IOExcepti
                     List<DestinationReplication> destinationReplications
                         = reader.readArray(reader1 -> DestinationReplication.fromJson(reader1));
                     deserializedReplicationObject.destinationReplications = destinationReplications;
+                } else if ("externalReplicationSetupStatus".equals(fieldName)) {
+                    deserializedReplicationObject.externalReplicationSetupStatus
+                        = ExternalReplicationSetupStatus.fromString(reader.getString());
+                } else if ("externalReplicationSetupInfo".equals(fieldName)) {
+                    deserializedReplicationObject.externalReplicationSetupInfo = reader.getString();
+                } else if ("mirrorState".equals(fieldName)) {
+                    deserializedReplicationObject.mirrorState = MirrorState.fromString(reader.getString());
+                } else if ("relationshipStatus".equals(fieldName)) {
+                    deserializedReplicationObject.relationshipStatus
+                        = RelationshipStatus.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationStatus.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationStatus.java
index 10bb4adbc94d..8f171a7ef9aa 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationStatus.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/ReplicationStatus.java
@@ -25,7 +25,9 @@ public interface ReplicationStatus {
     RelationshipStatus relationshipStatus();
 
     /**
-     * Gets the mirrorState property: The status of the replication.
+     * Gets the mirrorState property: The mirror state property describes the current status of data replication for a
+     * replication. It provides insight into whether the data is actively being mirrored, if the replication process has
+     * been paused, or if it has yet to be initialized.
      * 
      * @return the mirrorState value.
      */
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RestoreStatus.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RestoreStatus.java
index 34a1370fea0c..02bdc4f5ebd6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RestoreStatus.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/RestoreStatus.java
@@ -25,7 +25,9 @@ public interface RestoreStatus {
     RelationshipStatus relationshipStatus();
 
     /**
-     * Gets the mirrorState property: The status of the restore.
+     * Gets the mirrorState property: The mirror state property describes the current status of data replication for a
+     * restore. It provides insight into whether the data is actively being mirrored, if the replication process has
+     * been paused, or if it has yet to be initialized.
      * 
      * @return the mirrorState value.
      */
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Type.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Type.java
index 7e6c467bdb64..abe9a850b6b0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Type.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Type.java
@@ -10,7 +10,7 @@
 /**
  * quotaType
  * 
- * Type of quota.
+ * Type of quota rule.
  */
 public final class Type extends ExpandableStringEnum<Type> {
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volume.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volume.java
index e0e8d54a8adc..f67a551fd938 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volume.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volume.java
@@ -202,7 +202,7 @@ public interface Volume {
 
     /**
      * Gets the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @return the volumeType value.
      */
@@ -329,6 +329,13 @@ public interface Volume {
      */
     Boolean ldapEnabled();
 
+    /**
+     * Gets the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @return the ldapServerType value.
+     */
+    LdapServerType ldapServerType();
+
     /**
      * Gets the coolAccess property: Specifies whether Cool Access(tiering) is enabled for the volume.
      * 
@@ -372,7 +379,10 @@ public interface Volume {
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @return the unixPermissions value.
      */
@@ -529,6 +539,13 @@ public interface Volume {
      */
     Long inheritedSizeInBytes();
 
+    /**
+     * Gets the language property: Language supported for volume.
+     * 
+     * @return the language value.
+     */
+    VolumeLanguage language();
+
     /**
      * Gets the region of the resource.
      * 
@@ -673,14 +690,14 @@ interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithZon
             DefinitionStages.WithSmbAccessBasedEnumeration, DefinitionStages.WithSmbNonBrowsable,
             DefinitionStages.WithSmbContinuouslyAvailable, DefinitionStages.WithThroughputMibps,
             DefinitionStages.WithEncryptionKeySource, DefinitionStages.WithKeyVaultPrivateEndpointResourceId,
-            DefinitionStages.WithLdapEnabled, DefinitionStages.WithCoolAccess, DefinitionStages.WithCoolnessPeriod,
-            DefinitionStages.WithCoolAccessRetrievalPolicy, DefinitionStages.WithCoolAccessTieringPolicy,
-            DefinitionStages.WithUnixPermissions, DefinitionStages.WithAvsDataStore,
-            DefinitionStages.WithIsDefaultQuotaEnabled, DefinitionStages.WithDefaultUserQuotaInKiBs,
-            DefinitionStages.WithDefaultGroupQuotaInKiBs, DefinitionStages.WithCapacityPoolResourceId,
-            DefinitionStages.WithProximityPlacementGroup, DefinitionStages.WithVolumeSpecName,
-            DefinitionStages.WithPlacementRules, DefinitionStages.WithEnableSubvolumes,
-            DefinitionStages.WithIsLargeVolume {
+            DefinitionStages.WithLdapEnabled, DefinitionStages.WithLdapServerType, DefinitionStages.WithCoolAccess,
+            DefinitionStages.WithCoolnessPeriod, DefinitionStages.WithCoolAccessRetrievalPolicy,
+            DefinitionStages.WithCoolAccessTieringPolicy, DefinitionStages.WithUnixPermissions,
+            DefinitionStages.WithAvsDataStore, DefinitionStages.WithIsDefaultQuotaEnabled,
+            DefinitionStages.WithDefaultUserQuotaInKiBs, DefinitionStages.WithDefaultGroupQuotaInKiBs,
+            DefinitionStages.WithCapacityPoolResourceId, DefinitionStages.WithProximityPlacementGroup,
+            DefinitionStages.WithVolumeSpecName, DefinitionStages.WithPlacementRules,
+            DefinitionStages.WithEnableSubvolumes, DefinitionStages.WithIsLargeVolume, DefinitionStages.WithLanguage {
             /**
              * Executes the create request.
              * 
@@ -824,10 +841,10 @@ interface WithNetworkFeatures {
         interface WithVolumeType {
             /**
              * Specifies the volumeType property: What type of volume is this. For destination volumes in Cross Region
-             * Replication, set type to DataProtection.
+             * Replication, set type to DataProtection. For creating clone volume, set type to ShortTermClone.
              * 
              * @param volumeType What type of volume is this. For destination volumes in Cross Region Replication, set
-             * type to DataProtection.
+             * type to DataProtection. For creating clone volume, set type to ShortTermClone.
              * @return the next definition stage.
              */
             WithCreate withVolumeType(String volumeType);
@@ -1034,6 +1051,19 @@ interface WithLdapEnabled {
             WithCreate withLdapEnabled(Boolean ldapEnabled);
         }
 
+        /**
+         * The stage of the Volume definition allowing to specify ldapServerType.
+         */
+        interface WithLdapServerType {
+            /**
+             * Specifies the ldapServerType property: Specifies the type of LDAP server for a given NFS volume..
+             * 
+             * @param ldapServerType Specifies the type of LDAP server for a given NFS volume.
+             * @return the next definition stage.
+             */
+            WithCreate withLdapServerType(LdapServerType ldapServerType);
+        }
+
         /**
          * The stage of the Volume definition allowing to specify coolAccess.
          */
@@ -1119,13 +1149,19 @@ interface WithUnixPermissions {
              * First digit selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects
              * permission for the owner of the file: read (4), write (2) and execute (1). Third selects permissions for
              * other users in the same group. the fourth for other users not in the group. 0755 - gives
-             * read/write/execute permissions to owner and read/execute to group and other users..
+             * read/write/execute permissions to owner and read/execute to group and other users. Avoid passing null
+             * value for unixPermissions in volume update operation, As per the behavior, If Null value is passed then
+             * user-visible unixPermissions value will became null, and user will not be able to get unixPermissions
+             * value. On safer side, actual unixPermissions value on volume will remain as its last saved value only..
              * 
              * @param unixPermissions UNIX permissions for NFS volume accepted in octal 4 digit format. First digit
              * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission
              * for the owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users
              * in the same group. the fourth for other users not in the group. 0755 - gives read/write/execute
-             * permissions to owner and read/execute to group and other users.
+             * permissions to owner and read/execute to group and other users. Avoid passing null value for
+             * unixPermissions in volume update operation, As per the behavior, If Null value is passed then
+             * user-visible unixPermissions value will became null, and user will not be able to get unixPermissions
+             * value. On safer side, actual unixPermissions value on volume will remain as its last saved value only.
              * @return the next definition stage.
              */
             WithCreate withUnixPermissions(String unixPermissions);
@@ -1270,6 +1306,19 @@ interface WithIsLargeVolume {
              */
             WithCreate withIsLargeVolume(Boolean isLargeVolume);
         }
+
+        /**
+         * The stage of the Volume definition allowing to specify language.
+         */
+        interface WithLanguage {
+            /**
+             * Specifies the language property: Language supported for volume..
+             * 
+             * @param language Language supported for volume.
+             * @return the next definition stage.
+             */
+            WithCreate withLanguage(VolumeLanguage language);
+        }
     }
 
     /**
@@ -1758,6 +1807,30 @@ interface WithSmbNonBrowsable {
     GetGroupIdListForLdapUserResponse listGetGroupIdListForLdapUser(GetGroupIdListForLdapUserRequest body,
         Context context);
 
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    ListQuotaReportResponse listQuotaReport();
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    ListQuotaReportResponse listQuotaReport(Context context);
+
     /**
      * Break volume replication
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeGroupVolumeProperties.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeGroupVolumeProperties.java
index 51118e6b82ea..677f458dd39f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeGroupVolumeProperties.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeGroupVolumeProperties.java
@@ -455,7 +455,7 @@ public List<MountTargetProperties> mountTargets() {
 
     /**
      * Get the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @return the volumeType value.
      */
@@ -465,7 +465,7 @@ public String volumeType() {
 
     /**
      * Set the volumeType property: What type of volume is this. For destination volumes in Cross Region Replication,
-     * set type to DataProtection.
+     * set type to DataProtection. For creating clone volume, set type to ShortTermClone.
      * 
      * @param volumeType the volumeType value to set.
      * @return the VolumeGroupVolumeProperties object itself.
@@ -832,6 +832,29 @@ public VolumeGroupVolumeProperties withLdapEnabled(Boolean ldapEnabled) {
         return this;
     }
 
+    /**
+     * Get the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @return the ldapServerType value.
+     */
+    public LdapServerType ldapServerType() {
+        return this.innerProperties() == null ? null : this.innerProperties().ldapServerType();
+    }
+
+    /**
+     * Set the ldapServerType property: Specifies the type of LDAP server for a given NFS volume.
+     * 
+     * @param ldapServerType the ldapServerType value to set.
+     * @return the VolumeGroupVolumeProperties object itself.
+     */
+    public VolumeGroupVolumeProperties withLdapServerType(LdapServerType ldapServerType) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new VolumeProperties();
+        }
+        this.innerProperties().withLdapServerType(ldapServerType);
+        return this;
+    }
+
     /**
      * Get the coolAccess property: Specifies whether Cool Access(tiering) is enabled for the volume.
      * 
@@ -950,7 +973,10 @@ public VolumeGroupVolumeProperties withCoolAccessTieringPolicy(CoolAccessTiering
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @return the unixPermissions value.
      */
@@ -963,7 +989,10 @@ public String unixPermissions() {
      * selects the set user ID(4), set group ID (2) and sticky (1) attributes. Second digit selects permission for the
      * owner of the file: read (4), write (2) and execute (1). Third selects permissions for other users in the same
      * group. the fourth for other users not in the group. 0755 - gives read/write/execute permissions to owner and
-     * read/execute to group and other users.
+     * read/execute to group and other users. Avoid passing null value for unixPermissions in volume update operation,
+     * As per the behavior, If Null value is passed then user-visible unixPermissions value will became null, and user
+     * will not be able to get unixPermissions value. On safer side, actual unixPermissions value on volume will remain
+     * as its last saved value only.
      * 
      * @param unixPermissions the unixPermissions value to set.
      * @return the VolumeGroupVolumeProperties object itself.
@@ -1310,6 +1339,29 @@ public Long inheritedSizeInBytes() {
         return this.innerProperties() == null ? null : this.innerProperties().inheritedSizeInBytes();
     }
 
+    /**
+     * Get the language property: Language supported for volume.
+     * 
+     * @return the language value.
+     */
+    public VolumeLanguage language() {
+        return this.innerProperties() == null ? null : this.innerProperties().language();
+    }
+
+    /**
+     * Set the language property: Language supported for volume.
+     * 
+     * @param language the language value to set.
+     * @return the VolumeGroupVolumeProperties object itself.
+     */
+    public VolumeGroupVolumeProperties withLanguage(VolumeLanguage language) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new VolumeProperties();
+        }
+        this.innerProperties().withLanguage(language);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeLanguage.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeLanguage.java
new file mode 100644
index 000000000000..02c49feff81b
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeLanguage.java
@@ -0,0 +1,388 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * VolumeLanguage
+ * 
+ * Language supported for volume.
+ */
+public final class VolumeLanguage extends ExpandableStringEnum<VolumeLanguage> {
+    /**
+     * Static value c.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage C_UTF_8 = fromString("c.utf-8");
+
+    /**
+     * Static value utf8mb4 for VolumeLanguage.
+     */
+    public static final VolumeLanguage UTF8MB4 = fromString("utf8mb4");
+
+    /**
+     * Static value ar for VolumeLanguage.
+     */
+    public static final VolumeLanguage AR = fromString("ar");
+
+    /**
+     * Static value ar.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage AR_UTF_8 = fromString("ar.utf-8");
+
+    /**
+     * Static value hr for VolumeLanguage.
+     */
+    public static final VolumeLanguage HR = fromString("hr");
+
+    /**
+     * Static value hr.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage HR_UTF_8 = fromString("hr.utf-8");
+
+    /**
+     * Static value cs for VolumeLanguage.
+     */
+    public static final VolumeLanguage CS = fromString("cs");
+
+    /**
+     * Static value cs.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage CS_UTF_8 = fromString("cs.utf-8");
+
+    /**
+     * Static value da for VolumeLanguage.
+     */
+    public static final VolumeLanguage DA = fromString("da");
+
+    /**
+     * Static value da.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage DA_UTF_8 = fromString("da.utf-8");
+
+    /**
+     * Static value nl for VolumeLanguage.
+     */
+    public static final VolumeLanguage NL = fromString("nl");
+
+    /**
+     * Static value nl.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage NL_UTF_8 = fromString("nl.utf-8");
+
+    /**
+     * Static value en for VolumeLanguage.
+     */
+    public static final VolumeLanguage EN = fromString("en");
+
+    /**
+     * Static value en.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage EN_UTF_8 = fromString("en.utf-8");
+
+    /**
+     * Static value fi for VolumeLanguage.
+     */
+    public static final VolumeLanguage FI = fromString("fi");
+
+    /**
+     * Static value fi.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage FI_UTF_8 = fromString("fi.utf-8");
+
+    /**
+     * Static value fr for VolumeLanguage.
+     */
+    public static final VolumeLanguage FR = fromString("fr");
+
+    /**
+     * Static value fr.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage FR_UTF_8 = fromString("fr.utf-8");
+
+    /**
+     * Static value de for VolumeLanguage.
+     */
+    public static final VolumeLanguage DE = fromString("de");
+
+    /**
+     * Static value de.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage DE_UTF_8 = fromString("de.utf-8");
+
+    /**
+     * Static value he for VolumeLanguage.
+     */
+    public static final VolumeLanguage HE = fromString("he");
+
+    /**
+     * Static value he.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage HE_UTF_8 = fromString("he.utf-8");
+
+    /**
+     * Static value hu for VolumeLanguage.
+     */
+    public static final VolumeLanguage HU = fromString("hu");
+
+    /**
+     * Static value hu.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage HU_UTF_8 = fromString("hu.utf-8");
+
+    /**
+     * Static value it for VolumeLanguage.
+     */
+    public static final VolumeLanguage IT = fromString("it");
+
+    /**
+     * Static value it.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage IT_UTF_8 = fromString("it.utf-8");
+
+    /**
+     * Static value ja for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA = fromString("ja");
+
+    /**
+     * Static value ja.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_UTF_8 = fromString("ja.utf-8");
+
+    /**
+     * Static value ja-v1 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_V1 = fromString("ja-v1");
+
+    /**
+     * Static value ja-v1.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_V1_UTF_8 = fromString("ja-v1.utf-8");
+
+    /**
+     * Static value ja-jp.pck for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_JP_PCK = fromString("ja-jp.pck");
+
+    /**
+     * Static value ja-jp.pck.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_JP_PCK_UTF_8 = fromString("ja-jp.pck.utf-8");
+
+    /**
+     * Static value ja-jp.932 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_JP_932 = fromString("ja-jp.932");
+
+    /**
+     * Static value ja-jp.932.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_JP_932_UTF_8 = fromString("ja-jp.932.utf-8");
+
+    /**
+     * Static value ja-jp.pck-v2 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_JP_PCK_V2 = fromString("ja-jp.pck-v2");
+
+    /**
+     * Static value ja-jp.pck-v2.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage JA_JP_PCK_V2_UTF_8 = fromString("ja-jp.pck-v2.utf-8");
+
+    /**
+     * Static value ko for VolumeLanguage.
+     */
+    public static final VolumeLanguage KO = fromString("ko");
+
+    /**
+     * Static value ko.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage KO_UTF_8 = fromString("ko.utf-8");
+
+    /**
+     * Static value no for VolumeLanguage.
+     */
+    public static final VolumeLanguage NO = fromString("no");
+
+    /**
+     * Static value no.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage NO_UTF_8 = fromString("no.utf-8");
+
+    /**
+     * Static value pl for VolumeLanguage.
+     */
+    public static final VolumeLanguage PL = fromString("pl");
+
+    /**
+     * Static value pl.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage PL_UTF_8 = fromString("pl.utf-8");
+
+    /**
+     * Static value pt for VolumeLanguage.
+     */
+    public static final VolumeLanguage PT = fromString("pt");
+
+    /**
+     * Static value pt.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage PT_UTF_8 = fromString("pt.utf-8");
+
+    /**
+     * Static value c for VolumeLanguage.
+     */
+    public static final VolumeLanguage C = fromString("c");
+
+    /**
+     * Static value ro for VolumeLanguage.
+     */
+    public static final VolumeLanguage RO = fromString("ro");
+
+    /**
+     * Static value ro.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage RO_UTF_8 = fromString("ro.utf-8");
+
+    /**
+     * Static value ru for VolumeLanguage.
+     */
+    public static final VolumeLanguage RU = fromString("ru");
+
+    /**
+     * Static value ru.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage RU_UTF_8 = fromString("ru.utf-8");
+
+    /**
+     * Static value zh for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH = fromString("zh");
+
+    /**
+     * Static value zh.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_UTF_8 = fromString("zh.utf-8");
+
+    /**
+     * Static value zh.gbk for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_GBK = fromString("zh.gbk");
+
+    /**
+     * Static value zh.gbk.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_GBK_UTF_8 = fromString("zh.gbk.utf-8");
+
+    /**
+     * Static value zh-tw.big5 for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_TW_BIG5 = fromString("zh-tw.big5");
+
+    /**
+     * Static value zh-tw.big5.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_TW_BIG5_UTF_8 = fromString("zh-tw.big5.utf-8");
+
+    /**
+     * Static value zh-tw for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_TW = fromString("zh-tw");
+
+    /**
+     * Static value zh-tw.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage ZH_TW_UTF_8 = fromString("zh-tw.utf-8");
+
+    /**
+     * Static value sk for VolumeLanguage.
+     */
+    public static final VolumeLanguage SK = fromString("sk");
+
+    /**
+     * Static value sk.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage SK_UTF_8 = fromString("sk.utf-8");
+
+    /**
+     * Static value sl for VolumeLanguage.
+     */
+    public static final VolumeLanguage SL = fromString("sl");
+
+    /**
+     * Static value sl.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage SL_UTF_8 = fromString("sl.utf-8");
+
+    /**
+     * Static value es for VolumeLanguage.
+     */
+    public static final VolumeLanguage ES = fromString("es");
+
+    /**
+     * Static value es.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage ES_UTF_8 = fromString("es.utf-8");
+
+    /**
+     * Static value sv for VolumeLanguage.
+     */
+    public static final VolumeLanguage SV = fromString("sv");
+
+    /**
+     * Static value sv.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage SV_UTF_8 = fromString("sv.utf-8");
+
+    /**
+     * Static value tr for VolumeLanguage.
+     */
+    public static final VolumeLanguage TR = fromString("tr");
+
+    /**
+     * Static value tr.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage TR_UTF_8 = fromString("tr.utf-8");
+
+    /**
+     * Static value en-us for VolumeLanguage.
+     */
+    public static final VolumeLanguage EN_US = fromString("en-us");
+
+    /**
+     * Static value en-us.utf-8 for VolumeLanguage.
+     */
+    public static final VolumeLanguage EN_US_UTF_8 = fromString("en-us.utf-8");
+
+    /**
+     * Creates a new instance of VolumeLanguage value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public VolumeLanguage() {
+    }
+
+    /**
+     * Creates or finds a VolumeLanguage from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding VolumeLanguage.
+     */
+    public static VolumeLanguage fromString(String name) {
+        return fromString(name, VolumeLanguage.class);
+    }
+
+    /**
+     * Gets known VolumeLanguage values.
+     * 
+     * @return known VolumeLanguage values.
+     */
+    public static Collection<VolumeLanguage> values() {
+        return values(VolumeLanguage.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRule.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRule.java
index 1dcfaf018806..1b7e421b838c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRule.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRule.java
@@ -57,11 +57,11 @@ public interface VolumeQuotaRule {
     SystemData systemData();
 
     /**
-     * Gets the provisioningState property: Gets the status of the VolumeQuotaRule at the time the operation was called.
+     * Gets the provisioningState property: Provisioning state of the resource.
      * 
      * @return the provisioningState value.
      */
-    ProvisioningState provisioningState();
+    NetAppProvisioningState provisioningState();
 
     /**
      * Gets the quotaSizeInKiBs property: Size of quota.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRulePatch.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRulePatch.java
index 316252150249..d54f1771d3cc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRulePatch.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/VolumeQuotaRulePatch.java
@@ -64,11 +64,11 @@ private VolumeQuotaRulesProperties innerProperties() {
     }
 
     /**
-     * Get the provisioningState property: Gets the status of the VolumeQuotaRule at the time the operation was called.
+     * Get the provisioningState property: Provisioning state of the resource.
      * 
      * @return the provisioningState value.
      */
-    public ProvisioningState provisioningState() {
+    public NetAppProvisioningState provisioningState() {
         return this.innerProperties() == null ? null : this.innerProperties().provisioningState();
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volumes.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volumes.java
index b51681361387..f7e4794e8334 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volumes.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/Volumes.java
@@ -315,6 +315,41 @@ GetGroupIdListForLdapUserResponse listGetGroupIdListForLdapUser(String resourceG
     GetGroupIdListForLdapUserResponse listGetGroupIdListForLdapUser(String resourceGroupName, String accountName,
         String poolName, String volumeName, GetGroupIdListForLdapUserRequest body, Context context);
 
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    ListQuotaReportResponse listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName);
+
+    /**
+     * Lists Quota Report for the volume
+     * 
+     * Returns report of quotas for the volume.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param accountName The name of the NetApp account.
+     * @param poolName The name of the capacity pool.
+     * @param volumeName The name of the volume.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return quota Report for volume.
+     */
+    ListQuotaReportResponse listQuotaReport(String resourceGroupName, String accountName, String poolName,
+        String volumeName, Context context);
+
     /**
      * Break volume replication
      * 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-netapp/proxy-config.json b/sdk/netapp/azure-resourcemanager-netapp/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-netapp/proxy-config.json
index 3034bc7a5894..183452463677 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-netapp/proxy-config.json
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-netapp/proxy-config.json
@@ -1 +1 @@
-[["com.azure.resourcemanager.netapp.implementation.AccountsClientImpl$AccountsService"],["com.azure.resourcemanager.netapp.implementation.BackupPoliciesClientImpl$BackupPoliciesService"],["com.azure.resourcemanager.netapp.implementation.BackupVaultsClientImpl$BackupVaultsService"],["com.azure.resourcemanager.netapp.implementation.BackupsClientImpl$BackupsService"],["com.azure.resourcemanager.netapp.implementation.BackupsUnderAccountsClientImpl$BackupsUnderAccountsService"],["com.azure.resourcemanager.netapp.implementation.BackupsUnderBackupVaultsClientImpl$BackupsUnderBackupVaultsService"],["com.azure.resourcemanager.netapp.implementation.BackupsUnderVolumesClientImpl$BackupsUnderVolumesService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceQuotaLimitsClientImpl$NetAppResourceQuotaLimitsService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceRegionInfosClientImpl$NetAppResourceRegionInfosService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceUsagesClientImpl$NetAppResourceUsagesService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourcesClientImpl$NetAppResourcesService"],["com.azure.resourcemanager.netapp.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.netapp.implementation.PoolsClientImpl$PoolsService"],["com.azure.resourcemanager.netapp.implementation.SnapshotPoliciesClientImpl$SnapshotPoliciesService"],["com.azure.resourcemanager.netapp.implementation.SnapshotsClientImpl$SnapshotsService"],["com.azure.resourcemanager.netapp.implementation.SubvolumesClientImpl$SubvolumesService"],["com.azure.resourcemanager.netapp.implementation.VolumeGroupsClientImpl$VolumeGroupsService"],["com.azure.resourcemanager.netapp.implementation.VolumeQuotaRulesClientImpl$VolumeQuotaRulesService"],["com.azure.resourcemanager.netapp.implementation.VolumesClientImpl$VolumesService"]]
\ No newline at end of file
+[["com.azure.resourcemanager.netapp.implementation.AccountsClientImpl$AccountsService"],["com.azure.resourcemanager.netapp.implementation.BackupPoliciesClientImpl$BackupPoliciesService"],["com.azure.resourcemanager.netapp.implementation.BackupVaultsClientImpl$BackupVaultsService"],["com.azure.resourcemanager.netapp.implementation.BackupsClientImpl$BackupsService"],["com.azure.resourcemanager.netapp.implementation.BackupsUnderAccountsClientImpl$BackupsUnderAccountsService"],["com.azure.resourcemanager.netapp.implementation.BackupsUnderBackupVaultsClientImpl$BackupsUnderBackupVaultsService"],["com.azure.resourcemanager.netapp.implementation.BackupsUnderVolumesClientImpl$BackupsUnderVolumesService"],["com.azure.resourcemanager.netapp.implementation.BucketsClientImpl$BucketsService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceQuotaLimitsAccountsClientImpl$NetAppResourceQuotaLimitsAccountsService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceQuotaLimitsClientImpl$NetAppResourceQuotaLimitsService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceRegionInfosClientImpl$NetAppResourceRegionInfosService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourceUsagesClientImpl$NetAppResourceUsagesService"],["com.azure.resourcemanager.netapp.implementation.NetAppResourcesClientImpl$NetAppResourcesService"],["com.azure.resourcemanager.netapp.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.netapp.implementation.PoolsClientImpl$PoolsService"],["com.azure.resourcemanager.netapp.implementation.SnapshotPoliciesClientImpl$SnapshotPoliciesService"],["com.azure.resourcemanager.netapp.implementation.SnapshotsClientImpl$SnapshotsService"],["com.azure.resourcemanager.netapp.implementation.SubvolumesClientImpl$SubvolumesService"],["com.azure.resourcemanager.netapp.implementation.VolumeGroupsClientImpl$VolumeGroupsService"],["com.azure.resourcemanager.netapp.implementation.VolumeQuotaRulesClientImpl$VolumeQuotaRulesService"],["com.azure.resourcemanager.netapp.implementation.VolumesClientImpl$VolumesService"]]
\ No newline at end of file
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsChangeKeyVaultSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsChangeKeyVaultSamples.java
index df0ccfb63890..ea0a151792e4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsChangeKeyVaultSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsChangeKeyVaultSamples.java
@@ -13,8 +13,8 @@
  */
 public final class AccountsChangeKeyVaultSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_ChangeKeyVault.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_ChangeKeyVault.json
      */
     /**
      * Sample code: Accounts_ChangeKeyVault.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsCreateOrUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsCreateOrUpdateSamples.java
index 1b340f71be06..079d8394dba9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsCreateOrUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsCreateOrUpdateSamples.java
@@ -12,8 +12,8 @@
  */
 public final class AccountsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_CreateOrUpdate.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_CreateOrUpdate.json
      */
     /**
      * Sample code: Accounts_CreateOrUpdate.
@@ -25,8 +25,8 @@ public static void accountsCreateOrUpdate(com.azure.resourcemanager.netapp.NetAp
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_CreateOrUpdateAD.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_CreateOrUpdateAD.json
      */
     /**
      * Sample code: Accounts_CreateOrUpdateWithActiveDirectory.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsDeleteSamples.java
index 78686c3a8a83..5ee532903ccd 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class AccountsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_Delete.json
      */
     /**
      * Sample code: Accounts_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetByResourceGroupSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetByResourceGroupSamples.java
index 6234dde59861..3410f933dd94 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetByResourceGroupSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class AccountsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_Get.json
      */
     /**
      * Sample code: Accounts_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetChangeKeyVaultInformationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetChangeKeyVaultInformationSamples.java
index 6fcc7001ae1a..f9744a3298ff 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetChangeKeyVaultInformationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsGetChangeKeyVaultInformationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AccountsGetChangeKeyVaultInformationSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Accounts_GetChangeKeyVaultInformation.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListByResourceGroupSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListByResourceGroupSamples.java
index 5c5b6d5ef87b..76a9bd2a0072 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListByResourceGroupSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class AccountsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_List.json
      */
     /**
      * Sample code: Accounts_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListSamples.java
index dc51dcb78f7c..f2e244c44afd 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsListSamples.java
@@ -9,8 +9,8 @@
  */
 public final class AccountsListSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_List.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_ListBySubscription.json
      */
     /**
      * Sample code: Accounts_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsSamples.java
index 056b7e128982..bf7b5b8098f7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsSamples.java
@@ -9,8 +9,8 @@
  */
 public final class AccountsRenewCredentialsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_RenewCredentials.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Accounts_RenewCredentials.json
      */
     /**
      * Sample code: Accounts_RenewCredentials.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsTransitionToCmkSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsTransitionToCmkSamples.java
index c8b1bbba3170..50f8735e7245 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsTransitionToCmkSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsTransitionToCmkSamples.java
@@ -11,7 +11,7 @@
  */
 public final class AccountsTransitionToCmkSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Accounts_TransitionEncryptionKey.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsUpdateSamples.java
index c2b862c55c99..2ccf687e7fdb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/AccountsUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class AccountsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Accounts_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Accounts_Update.json
      */
     /**
      * Sample code: Accounts_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesCreateSamples.java
index 368bc34bbb54..03cd61f28911 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesCreateSamples.java
@@ -10,7 +10,8 @@
 public final class BackupPoliciesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Create.
+     * json
      */
     /**
      * Sample code: BackupPolicies_Create.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesDeleteSamples.java
index 62e8bce28efa..43730df5bcad 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesDeleteSamples.java
@@ -10,7 +10,8 @@
 public final class BackupPoliciesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Delete.
+     * json
      */
     /**
      * Sample code: BackupPolicies_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetSamples.java
index bd98da428ed7..e48c1c94f07b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetSamples.java
@@ -10,7 +10,8 @@
 public final class BackupPoliciesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Get.
+     * json
      */
     /**
      * Sample code: Backups_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListSamples.java
index eaa286582a5b..d9012114e75e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListSamples.java
@@ -10,7 +10,8 @@
 public final class BackupPoliciesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_List.
+     * json
      */
     /**
      * Sample code: BackupPolicies_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesUpdateSamples.java
index 33c553e2a4be..70814d9bcb78 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesUpdateSamples.java
@@ -12,7 +12,8 @@
 public final class BackupPoliciesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupPolicies_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupPolicies_Update.
+     * json
      */
     /**
      * Sample code: BackupPolicies_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateSamples.java
index d4f74406f535..aeabb7a50e56 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateSamples.java
@@ -10,7 +10,8 @@
 public final class BackupVaultsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Create.
+     * json
      */
     /**
      * Sample code: BackupVault_CreateOrUpdate.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsDeleteSamples.java
index d963d7962ac2..8f8cdfd78209 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsDeleteSamples.java
@@ -10,7 +10,8 @@
 public final class BackupVaultsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Delete.
+     * json
      */
     /**
      * Sample code: BackupVaults_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetSamples.java
index fa20f74df226..f8205f7feb01 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetSamples.java
@@ -10,7 +10,7 @@
 public final class BackupVaultsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Get.json
      */
     /**
      * Sample code: BackupVaults_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountSamples.java
index 988542d0d1f7..0fb8cb0a0e04 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountSamples.java
@@ -10,7 +10,7 @@
 public final class BackupVaultsListByNetAppAccountSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_List.json
      */
     /**
      * Sample code: BackupVaults_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsUpdateSamples.java
index 1ff82b414d1b..0ac2a29485d8 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupVaultsUpdateSamples.java
@@ -14,7 +14,8 @@
 public final class BackupVaultsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupVaults_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/BackupVaults_Update.
+     * json
      */
     /**
      * Sample code: BackupVaults_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsCreateSamples.java
index 3538aeb0e22f..9a7a4581ea58 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsCreateSamples.java
@@ -9,9 +9,8 @@
  */
 public final class BackupsCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Create.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Create.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Create.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsDeleteSamples.java
index 6829e762c1b6..89a16853567b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsDeleteSamples.java
@@ -9,9 +9,8 @@
  */
 public final class BackupsDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Delete.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Delete.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusSamples.java
index ac97fffeb5df..c93b8dbf7d7e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusSamples.java
@@ -9,8 +9,8 @@
  */
 public final class BackupsGetLatestStatusSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_LatestBackupStatus.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_LatestBackupStatus.json
      */
     /**
      * Sample code: Volumes_BackupStatus.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetSamples.java
index 1384cec3ebdc..ccface4e05d9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetSamples.java
@@ -9,9 +9,8 @@
  */
 public final class BackupsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Get.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Get.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetVolumeLatestRestoreStatusSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetVolumeLatestRestoreStatusSamples.java
index ef876682204e..3be9322b0b9c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetVolumeLatestRestoreStatusSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsGetVolumeLatestRestoreStatusSamples.java
@@ -9,9 +9,8 @@
  */
 public final class BackupsGetVolumeLatestRestoreStatusSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_LatestRestoreStatus.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_LatestRestoreStatus.json
      */
     /**
      * Sample code: Volumes_RestoreStatus.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsListByVaultSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsListByVaultSamples.java
index 3ccd79d3e021..0b8b7930534e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsListByVaultSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsListByVaultSamples.java
@@ -9,9 +9,8 @@
  */
 public final class BackupsListByVaultSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_List.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_List.json
      */
     /**
      * Sample code: Backups_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderAccountMigrateBackupsSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderAccountMigrateBackupsSamples.java
index aa80bed3402d..1647dd16baf0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderAccountMigrateBackupsSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderAccountMigrateBackupsSamples.java
@@ -11,9 +11,8 @@
  */
 public final class BackupsUnderAccountMigrateBackupsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderAccount_Migrate.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderAccount_Migrate.json
      */
     /**
      * Sample code: BackupsUnderAccount_Migrate.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderBackupVaultRestoreFilesSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderBackupVaultRestoreFilesSamples.java
index 4bb01ac22779..0d7f47a7c784 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderBackupVaultRestoreFilesSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderBackupVaultRestoreFilesSamples.java
@@ -12,7 +12,7 @@
  */
 public final class BackupsUnderBackupVaultRestoreFilesSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * BackupsUnderBackupVault_SingleFileRestore.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderVolumeMigrateBackupsSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderVolumeMigrateBackupsSamples.java
index bafa5ccf49dd..563c9369ed8e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderVolumeMigrateBackupsSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUnderVolumeMigrateBackupsSamples.java
@@ -11,8 +11,8 @@
  */
 public final class BackupsUnderVolumeMigrateBackupsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderVolume_Migrate.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderVolume_Migrate.json
      */
     /**
      * Sample code: BackupsUnderVolume_Migrate.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUpdateSamples.java
index b8b60e66000c..7aa17e40afc8 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BackupsUpdateSamples.java
@@ -11,9 +11,8 @@
  */
 public final class BackupsUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/BackupsUnderBackupVault_Update.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * BackupsUnderBackupVault_Update.json
      */
     /**
      * Sample code: BackupsUnderBackupVault_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsCreateOrUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsCreateOrUpdateSamples.java
new file mode 100644
index 000000000000..423f43860877
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsCreateOrUpdateSamples.java
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+
+/**
+ * Samples for Buckets CreateOrUpdate.
+ */
+public final class BucketsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_CreateOrUpdate
+     * .json
+     */
+    /**
+     * Sample code: Buckets_CreateOrUpdate.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsCreateOrUpdate(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets()
+            .define("bucket1")
+            .withExistingVolume("myRG", "account1", "pool1", "volume1")
+            .withPath("/path")
+            .withFileSystemUser(new FileSystemUser().withNfsUser(new NfsUser().withUserId(1001L).withGroupId(1000L)))
+            .withServer(new BucketServerProperties().withFqdn("fullyqualified.domainname.com")
+                .withCertificateObject("<REDACTED>"))
+            .withPermissions(BucketPermissions.READ_ONLY)
+            .create();
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsDeleteSamples.java
new file mode 100644
index 000000000000..b6ad4616c9a6
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsDeleteSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+/**
+ * Samples for Buckets Delete.
+ */
+public final class BucketsDeleteSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_Delete.json
+     */
+    /**
+     * Sample code: Buckets_Delete.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsDelete(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets().delete("myRG", "account1", "pool1", "volume1", "bucket1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsGenerateCredentialsSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsGenerateCredentialsSamples.java
new file mode 100644
index 000000000000..86eb76453b49
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsGenerateCredentialsSamples.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.resourcemanager.netapp.models.BucketCredentialsExpiry;
+
+/**
+ * Samples for Buckets GenerateCredentials.
+ */
+public final class BucketsGenerateCredentialsSamples {
+    /*
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Buckets_GenerateCredentials.json
+     */
+    /**
+     * Sample code: Buckets_GenerateCredentials.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsGenerateCredentials(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets()
+            .generateCredentialsWithResponse("myRG", "account1", "pool1", "volume1", "bucket1",
+                new BucketCredentialsExpiry().withKeyPairExpiryDays(3), com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsGetSamples.java
new file mode 100644
index 000000000000..67c714913a2c
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsGetSamples.java
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+/**
+ * Samples for Buckets Get.
+ */
+public final class BucketsGetSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_Get.json
+     */
+    /**
+     * Sample code: Buckets_Get.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsGet(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets()
+            .getWithResponse("myRG", "account1", "pool1", "volume1", "bucket1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsListSamples.java
new file mode 100644
index 000000000000..908f02d3da20
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsListSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+/**
+ * Samples for Buckets List.
+ */
+public final class BucketsListSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_List.json
+     */
+    /**
+     * Sample code: Buckets_List.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsList(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.buckets().list("myRG", "account1", "pool1", "volume1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsUpdateSamples.java
new file mode 100644
index 000000000000..5a9e868b044f
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/BucketsUpdateSamples.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketPatchPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+
+/**
+ * Samples for Buckets Update.
+ */
+public final class BucketsUpdateSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Buckets_Update.json
+     */
+    /**
+     * Sample code: Buckets_Update.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void bucketsUpdate(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        Bucket resource = manager.buckets()
+            .getWithResponse("myRG", "account1", "pool1", "volume1", "bucket1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withServer(new BucketServerPatchProperties().withFqdn("fullyqualified.domainname.com")
+                .withCertificateObject("<REDACTED>"))
+            .withPermissions(BucketPatchPermissions.READ_WRITE)
+            .apply();
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckFilePathAvailabilitySamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckFilePathAvailabilitySamples.java
index fae73be50014..bf3bfd4f27c5 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckFilePathAvailabilitySamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckFilePathAvailabilitySamples.java
@@ -11,8 +11,8 @@
  */
 public final class NetAppResourceCheckFilePathAvailabilitySamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/CheckFilePathAvailability.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * CheckFilePathAvailability.json
      */
     /**
      * Sample code: CheckFilePathAvailability.
@@ -24,7 +24,7 @@ public static void checkFilePathAvailability(com.azure.resourcemanager.netapp.Ne
             .checkFilePathAvailabilityWithResponse("eastus", new FilePathAvailabilityRequest()
                 .withName("my-exact-filepth")
                 .withSubnetId(
-                    "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"),
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"),
                 com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckNameAvailabilitySamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckNameAvailabilitySamples.java
index 5032d57bb3a1..283d7d6f7f29 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckNameAvailabilitySamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckNameAvailabilitySamples.java
@@ -13,7 +13,8 @@
 public final class NetAppResourceCheckNameAvailabilitySamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/CheckNameAvailability.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/CheckNameAvailability.
+     * json
      */
     /**
      * Sample code: CheckNameAvailability.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckQuotaAvailabilitySamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckQuotaAvailabilitySamples.java
index b7017ea2ef09..105b897bdde6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckQuotaAvailabilitySamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceCheckQuotaAvailabilitySamples.java
@@ -13,7 +13,8 @@
 public final class NetAppResourceCheckQuotaAvailabilitySamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/CheckQuotaAvailability.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/CheckQuotaAvailability
+     * .json
      */
     /**
      * Sample code: CheckQuotaAvailability.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryNetworkSiblingSetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryNetworkSiblingSetSamples.java
index f56ccdb07b4c..d3263447ae6e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryNetworkSiblingSetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryNetworkSiblingSetSamples.java
@@ -11,8 +11,8 @@
  */
 public final class NetAppResourceQueryNetworkSiblingSetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/NetworkSiblingSet_Query.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * NetworkSiblingSet_Query.json
      */
     /**
      * Sample code: NetworkSiblingSet_Query.
@@ -24,7 +24,7 @@ public static void networkSiblingSetQuery(com.azure.resourcemanager.netapp.NetAp
             .queryNetworkSiblingSetWithResponse("eastus", new QueryNetworkSiblingSetRequest()
                 .withNetworkSiblingSetId("9760acf5-4638-11e7-9bdb-020073ca3333")
                 .withSubnetId(
-                    "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet"),
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet"),
                 com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryRegionInfoSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryRegionInfoSamples.java
index f7c14cb587c0..0f527304974b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryRegionInfoSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQueryRegionInfoSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceQueryRegionInfoSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/RegionInfo.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/RegionInfo.json
      */
     /**
      * Sample code: RegionInfo_Query.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountGetSamples.java
new file mode 100644
index 000000000000..da8e1cde8fe8
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountGetSamples.java
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+/**
+ * Samples for NetAppResourceQuotaLimitsAccount Get.
+ */
+public final class NetAppResourceQuotaLimitsAccountGetSamples {
+    /*
+     * x-ms-original-file:
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/QuotaLimitsAccount_Get
+     * .json
+     */
+    /**
+     * Sample code: Volumes_RestoreStatus.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void volumesRestoreStatus(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.netAppResourceQuotaLimitsAccounts()
+            .getWithResponse("myRG", "myAccount", "poolsPerAccount", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountListSamples.java
new file mode 100644
index 000000000000..beb8b303f39e
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountListSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+/**
+ * Samples for NetAppResourceQuotaLimitsAccount List.
+ */
+public final class NetAppResourceQuotaLimitsAccountListSamples {
+    /*
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * QuotaLimitsAccount_List.json
+     */
+    /**
+     * Sample code: QuotaLimitsAccount_List.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void quotaLimitsAccountList(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.netAppResourceQuotaLimitsAccounts().list("myRG", "myAccount", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetSamples.java
index b62d66728f45..a87eb512b2b9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceQuotaLimitsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/QuotaLimits_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/QuotaLimits_Get.json
      */
     /**
      * Sample code: QuotaLimits.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListSamples.java
index bde60810d128..a60dc5246746 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceQuotaLimitsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/QuotaLimits_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/QuotaLimits_List.json
      */
     /**
      * Sample code: QuotaLimits.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetSamples.java
index 9e733a7670a6..63ca2d75691b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceRegionInfosGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/RegionInfos_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/RegionInfos_Get.json
      */
     /**
      * Sample code: RegionInfos_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListSamples.java
index f61f7a5d551b..a93a5bccf00f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceRegionInfosListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/RegionInfos_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/RegionInfos_List.json
      */
     /**
      * Sample code: RegionInfos_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUpdateNetworkSiblingSetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUpdateNetworkSiblingSetSamples.java
index f20010b3c5be..ff19b050266c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUpdateNetworkSiblingSetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUpdateNetworkSiblingSetSamples.java
@@ -12,8 +12,8 @@
  */
 public final class NetAppResourceUpdateNetworkSiblingSetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/NetworkSiblingSet_Update.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * NetworkSiblingSet_Update.json
      */
     /**
      * Sample code: NetworkFeatures_Update.
@@ -25,7 +25,7 @@ public static void networkFeaturesUpdate(com.azure.resourcemanager.netapp.NetApp
             .updateNetworkSiblingSet("eastus", new UpdateNetworkSiblingSetRequest()
                 .withNetworkSiblingSetId("9760acf5-4638-11e7-9bdb-020073ca3333")
                 .withSubnetId(
-                    "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet")
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testVnet/subnets/testSubnet")
                 .withNetworkSiblingSetStateId("12345_44420.8001578125")
                 .withNetworkFeatures(NetworkFeatures.STANDARD), com.azure.core.util.Context.NONE);
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetSamples.java
index ac8c42f38a5e..9db462c7c202 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceUsagesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Usages_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Usages_Get.json
      */
     /**
      * Sample code: Usages_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListSamples.java
index 52513f710734..605d6443794b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListSamples.java
@@ -10,7 +10,7 @@
 public final class NetAppResourceUsagesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Usages_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Usages_List.json
      */
     /**
      * Sample code: Usages_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/OperationsListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/OperationsListSamples.java
index 5e19116cd146..51b1242f8c6d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/OperationsListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/OperationsListSamples.java
@@ -10,7 +10,7 @@
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/OperationList.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/OperationList.json
      */
     /**
      * Sample code: OperationList.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateSamples.java
index 92918c7781b5..4d76139ab4c0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateSamples.java
@@ -13,7 +13,8 @@
 public final class PoolsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_CreateOrUpdate.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_CreateOrUpdate.
+     * json
      */
     /**
      * Sample code: Pools_CreateOrUpdate.
@@ -32,7 +33,7 @@ public static void poolsCreateOrUpdate(com.azure.resourcemanager.netapp.NetAppFi
     }
 
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Pools_CreateOrUpdate_CustomThroughput.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsDeleteSamples.java
index e4830663190f..4d5a212c7938 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PoolsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_Delete.json
      */
     /**
      * Sample code: Pools_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsGetSamples.java
index 84a92957ac4f..d83231483bcf 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsGetSamples.java
@@ -9,8 +9,8 @@
  */
 public final class PoolsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Get_CustomThroughput.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Pools_Get_CustomThroughput.json
      */
     /**
      * Sample code: Pools_Get_CustomThroughput.
@@ -23,7 +23,7 @@ public static void poolsGetCustomThroughput(com.azure.resourcemanager.netapp.Net
 
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_Get.json
      */
     /**
      * Sample code: Pools_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsListSamples.java
index c3c482fff3e5..693cb71ff302 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsListSamples.java
@@ -10,7 +10,7 @@
 public final class PoolsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_List.json
      */
     /**
      * Sample code: Pools_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsUpdateSamples.java
index 00007feb0a69..922d64016c6d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/PoolsUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class PoolsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Pools_Update.json
      */
     /**
      * Sample code: Pools_Update.
@@ -26,9 +26,8 @@ public static void poolsUpdate(com.azure.resourcemanager.netapp.NetAppFilesManag
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Pools_Update_CustomThroughput.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Pools_Update_CustomThroughput.json
      */
     /**
      * Sample code: Pools_Update_CustomThroughput.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateSamples.java
index f3f4ef186fdb..0b08bd5a0e03 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateSamples.java
@@ -14,8 +14,8 @@
  */
 public final class SnapshotPoliciesCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Create.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_Create.json
      */
     /**
      * Sample code: SnapshotPolicies_Create.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteSamples.java
index 66aeb326bb26..52873241572a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteSamples.java
@@ -9,8 +9,8 @@
  */
 public final class SnapshotPoliciesDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Delete.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_Delete.json
      */
     /**
      * Sample code: SnapshotPolicies_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetSamples.java
index 28838d29ca93..d5d1e6fd510f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetSamples.java
@@ -10,7 +10,8 @@
 public final class SnapshotPoliciesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/SnapshotPolicies_Get.
+     * json
      */
     /**
      * Sample code: SnapshotPolicies_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListSamples.java
index bb1e62c775c2..d8cdbe54903d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListSamples.java
@@ -10,7 +10,8 @@
 public final class SnapshotPoliciesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/SnapshotPolicies_List.
+     * json
      */
     /**
      * Sample code: SnapshotPolicies_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListVolumesSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListVolumesSamples.java
index a248e4ed8559..b5356bde84e6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListVolumesSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListVolumesSamples.java
@@ -9,9 +9,8 @@
  */
 public final class SnapshotPoliciesListVolumesSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_ListVolumes.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_ListVolumes.json
      */
     /**
      * Sample code: SnapshotPolicies_ListVolumes.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesUpdateSamples.java
index f071929e67c2..a553016ec2d4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesUpdateSamples.java
@@ -15,8 +15,8 @@
  */
 public final class SnapshotPoliciesUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/SnapshotPolicies_Update.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * SnapshotPolicies_Update.json
      */
     /**
      * Sample code: SnapshotPolicies_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsCreateSamples.java
index f22bf1fa80cc..533e090faacc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsCreateSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Create.json
      */
     /**
      * Sample code: Snapshots_Create.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteSamples.java
index 261a17468988..256cd1623748 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Delete.json
      */
     /**
      * Sample code: Snapshots_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetSamples.java
index 9bd4f8bcbdda..3102ce560668 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Get.json
      */
     /**
      * Sample code: Snapshots_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsListSamples.java
index 5a9fd90728c6..56bd082e773a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsListSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_List.json
      */
     /**
      * Sample code: Snapshots_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesSamples.java
index 40720a823f23..e26ea6afbd18 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesSamples.java
@@ -12,9 +12,8 @@
  */
 public final class SnapshotsRestoreFilesSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_SingleFileRestore.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Snapshots_SingleFileRestore.json
      */
     /**
      * Sample code: Snapshots_SingleFileRestore.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateSamples.java
index 5ee646e3630c..febf6176b6a4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class SnapshotsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Snapshots_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Snapshots_Update.json
      */
     /**
      * Sample code: Snapshots_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesCreateSamples.java
index 0160afef9ec7..c0e99e338a3c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesCreateSamples.java
@@ -10,7 +10,7 @@
 public final class SubvolumesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Create.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Create.json
      */
     /**
      * Sample code: Subvolumes_Create.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesDeleteSamples.java
index 940cf86ed054..24d47cc53119 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class SubvolumesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Delete.json
      */
     /**
      * Sample code: Subvolumes_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetMetadataSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetMetadataSamples.java
index 0cc65f1d3588..f8f3e3b8b820 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetMetadataSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetMetadataSamples.java
@@ -10,7 +10,8 @@
 public final class SubvolumesGetMetadataSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Metadata.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Metadata.
+     * json
      */
     /**
      * Sample code: Subvolumes_Metadata.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetSamples.java
index d0c68e8bf374..86fca1a31a5e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesGetSamples.java
@@ -10,7 +10,7 @@
 public final class SubvolumesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Get.json
      */
     /**
      * Sample code: Subvolumes_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesListByVolumeSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesListByVolumeSamples.java
index d74a6ab6998a..b3c713e69bfb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesListByVolumeSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesListByVolumeSamples.java
@@ -10,7 +10,7 @@
 public final class SubvolumesListByVolumeSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_List.json
      */
     /**
      * Sample code: Subvolumes_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesUpdateSamples.java
index f49b67cb2511..5ddd0e109c47 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/SubvolumesUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class SubvolumesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Subvolumes_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Subvolumes_Update.json
      */
     /**
      * Sample code: Subvolumes_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsCreateSamples.java
index 6319717454e5..5b60033448bc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsCreateSamples.java
@@ -17,9 +17,8 @@
  */
 public final class VolumeGroupsCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Create_SapHana.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Create_SapHana.json
      */
     /**
      * Sample code: VolumeGroups_Create_SapHana.
@@ -179,8 +178,8 @@ public static void volumeGroupsCreateSapHana(com.azure.resourcemanager.netapp.Ne
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Create_Oracle.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Create_Oracle.json
      */
     /**
      * Sample code: VolumeGroups_Create_Oracle.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsDeleteSamples.java
index 6522e71b750a..fe0bf4ccbe27 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsDeleteSamples.java
@@ -10,7 +10,8 @@
 public final class VolumeGroupsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/VolumeGroups_Delete.
+     * json
      */
     /**
      * Sample code: VolumeGroups_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsGetSamples.java
index fe9b96bc21ec..1910a1bd2c40 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsGetSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumeGroupsGetSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Get_SapHana.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Get_SapHana.json
      */
     /**
      * Sample code: VolumeGroups_Get_SapHana.
@@ -22,8 +22,8 @@ public static void volumeGroupsGetSapHana(com.azure.resourcemanager.netapp.NetAp
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_Get_Oracle.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_Get_Oracle.json
      */
     /**
      * Sample code: VolumeGroups_Get_Oracle.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsListByNetAppAccountSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsListByNetAppAccountSamples.java
index 6627342b5851..92e44c6815da 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsListByNetAppAccountSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeGroupsListByNetAppAccountSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumeGroupsListByNetAppAccountSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_List_Oracle.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_List_Oracle.json
      */
     /**
      * Sample code: VolumeGroups_List_Oracle.
@@ -22,8 +22,8 @@ public static void volumeGroupsListOracle(com.azure.resourcemanager.netapp.NetAp
     }
 
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeGroups_List_SapHana.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeGroups_List_SapHana.json
      */
     /**
      * Sample code: VolumeGroups_List_SapHana.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesCreateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesCreateSamples.java
index 161251af5b17..bbec7f9e022c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesCreateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesCreateSamples.java
@@ -11,8 +11,8 @@
  */
 public final class VolumeQuotaRulesCreateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Create.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeQuotaRules_Create.json
      */
     /**
      * Sample code: VolumeQuotaRules_Create.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesDeleteSamples.java
index 76a129e7b89d..f6ea1b11d14d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesDeleteSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumeQuotaRulesDeleteSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Delete.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeQuotaRules_Delete.json
      */
     /**
      * Sample code: VolumeQuotaRules_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetSamples.java
index e5b5245c150a..49025ac287d9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetSamples.java
@@ -10,7 +10,8 @@
 public final class VolumeQuotaRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/VolumeQuotaRules_Get.
+     * json
      */
     /**
      * Sample code: VolumeQuotaRules_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeSamples.java
index e46524da3166..b12ec70e655e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeSamples.java
@@ -10,7 +10,8 @@
 public final class VolumeQuotaRulesListByVolumeSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/VolumeQuotaRules_List.
+     * json
      */
     /**
      * Sample code: VolumeQuotaRules_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesUpdateSamples.java
index b8c84e13d60c..9519747e2475 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesUpdateSamples.java
@@ -11,8 +11,8 @@
  */
 public final class VolumeQuotaRulesUpdateSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/VolumeQuotaRules_Update.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * VolumeQuotaRules_Update.json
      */
     /**
      * Sample code: VolumeQuotaRules_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationSamples.java
index 79b4b8afd3d2..05418e8c397d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VolumesAuthorizeExternalReplicationSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_AuthorizeExternalReplication.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationSamples.java
index e27ce6e0fe5b..c57443452564 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationSamples.java
@@ -11,9 +11,8 @@
  */
 public final class VolumesAuthorizeReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_AuthorizeReplication.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_AuthorizeReplication.json
      */
     /**
      * Sample code: Volumes_AuthorizeReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksSamples.java
index 9df5cca84ac2..2b32ca0823dd 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksSamples.java
@@ -12,7 +12,8 @@
 public final class VolumesBreakFileLocksSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_BreakFileLocks.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_BreakFileLocks
+     * .json
      */
     /**
      * Sample code: Volumes_BreakFileLocks.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationSamples.java
index d79a85a4fe13..3cb3e2efd0eb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationSamples.java
@@ -11,8 +11,8 @@
  */
 public final class VolumesBreakReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_BreakReplication.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_BreakReplication.json
      */
     /**
      * Sample code: Volumes_BreakReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesCreateOrUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesCreateOrUpdateSamples.java
index 242aad25e4c9..b81e6126fb7a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesCreateOrUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesCreateOrUpdateSamples.java
@@ -12,7 +12,8 @@
 public final class VolumesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_CreateOrUpdate.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_CreateOrUpdate
+     * .json
      */
     /**
      * Sample code: Volumes_CreateOrUpdate.
@@ -27,7 +28,7 @@ public static void volumesCreateOrUpdate(com.azure.resourcemanager.netapp.NetApp
             .withCreationToken("my-unique-file-path")
             .withUsageThreshold(107374182400L)
             .withSubnetId(
-                "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3")
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3")
             .withServiceLevel(ServiceLevel.PREMIUM)
             .create();
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationSamples.java
index c3f0433495e3..cacf2e9ebf86 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesDeleteReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_DeleteReplication.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_DeleteReplication.json
      */
     /**
      * Sample code: Volumes_DeleteReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteSamples.java
index ddef10852e09..a7e453fd736f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VolumesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Delete.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Delete.json
      */
     /**
      * Sample code: Volumes_Delete.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeExternalReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeExternalReplicationSamples.java
index 616f86ae36ea..c61a9526d20a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeExternalReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeExternalReplicationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VolumesFinalizeExternalReplicationSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_FinalizeExternalReplication.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationSamples.java
index 809caa5d607f..292a61db67e9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesFinalizeRelocationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_FinalizeRelocation.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_FinalizeRelocation.json
      */
     /**
      * Sample code: Volumes_FinalizeRelocation.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesGetSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesGetSamples.java
index e38c70a4561e..968ea6a1b95e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesGetSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesGetSamples.java
@@ -10,7 +10,7 @@
 public final class VolumesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Get.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Get.json
      */
     /**
      * Sample code: Volumes_Get.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserSamples.java
index db0ee9f0fb84..49c174d9e73f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserSamples.java
@@ -12,7 +12,8 @@
 public final class VolumesListGetGroupIdListForLdapUserSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/GroupIdListForLDAPUser.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/GroupIdListForLDAPUser
+     * .json
      */
     /**
      * Sample code: GetGroupIdListForUser.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListQuotaReportSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListQuotaReportSamples.java
new file mode 100644
index 000000000000..ee38f054b905
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListQuotaReportSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+/**
+ * Samples for Volumes ListQuotaReport.
+ */
+public final class VolumesListQuotaReportSamples {
+    /*
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ListQuotaReport.json
+     */
+    /**
+     * Sample code: ListQuotaReport.
+     * 
+     * @param manager Entry point to NetAppFilesManager.
+     */
+    public static void listQuotaReport(com.azure.resourcemanager.netapp.NetAppFilesManager manager) {
+        manager.volumes().listQuotaReport("myRG", "account1", "pool1", "volume1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsSamples.java
index 4be71d37556f..669fc07e12ca 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesListReplicationsSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ListReplications.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ListReplications.json
      */
     /**
      * Sample code: Volumes_ListReplications.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListSamples.java
index 0b385ba1a0c0..575011b6766f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesListSamples.java
@@ -10,7 +10,7 @@
 public final class VolumesListSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_List.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_List.json
      */
     /**
      * Sample code: Volumes_List.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterSamples.java
index 81823ef25812..41b5270e141e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterSamples.java
@@ -12,9 +12,8 @@
  */
 public final class VolumesPeerExternalClusterSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_PeerExternalCluster.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_PeerExternalCluster.json
      */
     /**
      * Sample code: Volumes_PeerExternalCluster.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPerformReplicationTransferSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPerformReplicationTransferSamples.java
index dee5852d0471..93407f20e05a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPerformReplicationTransferSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPerformReplicationTransferSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VolumesPerformReplicationTransferSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_PerformReplicationTransfer.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeSamples.java
index 34a64ae7d13d..d81cb4bc8539 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeSamples.java
@@ -12,7 +12,8 @@
 public final class VolumesPoolChangeSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_PoolChange.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_PoolChange.
+     * json
      */
     /**
      * Sample code: Volumes_AuthorizeReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPopulateAvailabilityZoneSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPopulateAvailabilityZoneSamples.java
index fe7a62ffc48f..c2de920977d9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPopulateAvailabilityZoneSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesPopulateAvailabilityZoneSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VolumesPopulateAvailabilityZoneSamples {
     /*
-     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
      * Volumes_PopulateAvailabilityZones.json
      */
     /**
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationSamples.java
index bc1a709d19da..6a771c0d9f0a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationSamples.java
@@ -9,9 +9,8 @@
  */
 public final class VolumesReInitializeReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ReInitializeReplication
-     * .json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ReInitializeReplication.json
      */
     /**
      * Sample code: Volumes_ReInitializeReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReestablishReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReestablishReplicationSamples.java
index 6fcdc0358c8f..f5c12c2e5d41 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReestablishReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReestablishReplicationSamples.java
@@ -11,9 +11,8 @@
  */
 public final class VolumesReestablishReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ReestablishReplication.
-     * json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ReestablishReplication.json
      */
     /**
      * Sample code: Volumes_ReestablishReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRelocateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRelocateSamples.java
index 6b951bb51b67..c8fa6be032b9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRelocateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRelocateSamples.java
@@ -12,7 +12,7 @@
 public final class VolumesRelocateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Relocate.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Relocate.json
      */
     /**
      * Sample code: Volumes_Relocate.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusSamples.java
index ea09d9ed0ad6..f27220ce25b8 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesReplicationStatusSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ReplicationStatus.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ReplicationStatus.json
      */
     /**
      * Sample code: Volumes_ReplicationStatus.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResetCifsPasswordSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResetCifsPasswordSamples.java
index bb4d597e4ab3..41d63a3379f4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResetCifsPasswordSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResetCifsPasswordSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesResetCifsPasswordSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ResetCifsPassword.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ResetCifsPassword.json
      */
     /**
      * Sample code: Volumes_ResetCifsPassword.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationSamples.java
index bca2f6ab4951..d9f36c873151 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesResyncReplicationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_ResyncReplication.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_ResyncReplication.json
      */
     /**
      * Sample code: Volumes_ResyncReplication.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationSamples.java
index aa85e0ab8026..c2c5929bd3be 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationSamples.java
@@ -9,8 +9,8 @@
  */
 public final class VolumesRevertRelocationSamples {
     /*
-     * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_RevertRelocation.json
+     * x-ms-original-file: specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/
+     * Volumes_RevertRelocation.json
      */
     /**
      * Sample code: Volumes_RevertRelocation.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertSamples.java
index b04c61cf5e89..73c28d1cc9c7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesRevertSamples.java
@@ -12,7 +12,7 @@
 public final class VolumesRevertSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Revert.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Revert.json
      */
     /**
      * Sample code: Volumes_Revert.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesSplitCloneFromParentSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesSplitCloneFromParentSamples.java
index f4d19c99eef7..ff56e0ed200f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesSplitCloneFromParentSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesSplitCloneFromParentSamples.java
@@ -10,7 +10,8 @@
 public final class VolumesSplitCloneFromParentSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_SplitClone.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_SplitClone.
+     * json
      */
     /**
      * Sample code: Volumes_SplitClone.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesUpdateSamples.java b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesUpdateSamples.java
index e8ea4b8d350e..4d055e67e0d7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesUpdateSamples.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/samples/java/com/azure/resourcemanager/netapp/generated/VolumesUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class VolumesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/netapp/resource-manager/Microsoft.NetApp/stable/2025-06-01/examples/Volumes_Update.json
+     * specification/netapp/resource-manager/Microsoft.NetApp/preview/2025-07-01-preview/examples/Volumes_Update.json
      */
     /**
      * Sample code: Volumes_Update.
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsMockTests.java
index a188aa828a61..6bb44c8f7a8c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AccountsRenewCredentialsMockTests.java
@@ -27,7 +27,7 @@ public void testRenewCredentials() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.accounts().renewCredentials("ieekpndzaa", "mudqmeq", com.azure.core.util.Context.NONE);
+        manager.accounts().renewCredentials("vasylwxdzau", "weoohguufuzboyj", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AuthorizeRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AuthorizeRequestTests.java
index 81bb8766ab8e..9340e5c8a899 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AuthorizeRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/AuthorizeRequestTests.java
@@ -12,14 +12,14 @@ public final class AuthorizeRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AuthorizeRequest model
-            = BinaryData.fromString("{\"remoteVolumeResourceId\":\"v\"}").toObject(AuthorizeRequest.class);
-        Assertions.assertEquals("v", model.remoteVolumeResourceId());
+            = BinaryData.fromString("{\"remoteVolumeResourceId\":\"kkpwdreqnovvq\"}").toObject(AuthorizeRequest.class);
+        Assertions.assertEquals("kkpwdreqnovvq", model.remoteVolumeResourceId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AuthorizeRequest model = new AuthorizeRequest().withRemoteVolumeResourceId("v");
+        AuthorizeRequest model = new AuthorizeRequest().withRemoteVolumeResourceId("kkpwdreqnovvq");
         model = BinaryData.fromObject(model).toObject(AuthorizeRequest.class);
-        Assertions.assertEquals("v", model.remoteVolumeResourceId());
+        Assertions.assertEquals("kkpwdreqnovvq", model.remoteVolumeResourceId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupInnerTests.java
index bab28de36929..a64bbb2ee648 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupInnerTests.java
@@ -12,24 +12,24 @@ public final class BackupInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupInner model = BinaryData.fromString(
-            "{\"properties\":{\"backupId\":\"eqvldspast\",\"creationDate\":\"2021-01-19T22:38:17Z\",\"snapshotCreationDate\":\"2021-10-15T15:13:50Z\",\"completionDate\":\"2021-04-22T20:49:12Z\",\"provisioningState\":\"vestmjl\",\"size\":2570785226241708791,\"label\":\"ozapeew\",\"backupType\":\"Scheduled\",\"failureReason\":\"lktwkuziycslev\",\"volumeResourceId\":\"f\",\"useExistingSnapshot\":true,\"snapshotName\":\"ktyhjt\",\"backupPolicyResourceId\":\"dcgzul\",\"isLargeVolume\":true},\"id\":\"qzz\",\"name\":\"rjvpglydzgkrvqee\",\"type\":\"toepryu\"}")
+            "{\"properties\":{\"backupId\":\"ork\",\"creationDate\":\"2021-07-22T12:33Z\",\"snapshotCreationDate\":\"2021-03-04T00:16:10Z\",\"completionDate\":\"2021-04-15T08:16:25Z\",\"provisioningState\":\"gdnhxmsiv\",\"size\":8636347780875926393,\"label\":\"ox\",\"backupType\":\"Manual\",\"failureReason\":\"fi\",\"volumeResourceId\":\"ndieuzaofj\",\"useExistingSnapshot\":false,\"snapshotName\":\"yyysfgdotcubi\",\"backupPolicyResourceId\":\"uipwoqonmacje\",\"isLargeVolume\":false},\"id\":\"shqvcimpev\",\"name\":\"gmblrri\",\"type\":\"bywdxsmicc\"}")
             .toObject(BackupInner.class);
-        Assertions.assertEquals("ozapeew", model.label());
-        Assertions.assertEquals("f", model.volumeResourceId());
-        Assertions.assertTrue(model.useExistingSnapshot());
-        Assertions.assertEquals("ktyhjt", model.snapshotName());
+        Assertions.assertEquals("ox", model.label());
+        Assertions.assertEquals("ndieuzaofj", model.volumeResourceId());
+        Assertions.assertFalse(model.useExistingSnapshot());
+        Assertions.assertEquals("yyysfgdotcubi", model.snapshotName());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupInner model = new BackupInner().withLabel("ozapeew")
-            .withVolumeResourceId("f")
-            .withUseExistingSnapshot(true)
-            .withSnapshotName("ktyhjt");
+        BackupInner model = new BackupInner().withLabel("ox")
+            .withVolumeResourceId("ndieuzaofj")
+            .withUseExistingSnapshot(false)
+            .withSnapshotName("yyysfgdotcubi");
         model = BinaryData.fromObject(model).toObject(BackupInner.class);
-        Assertions.assertEquals("ozapeew", model.label());
-        Assertions.assertEquals("f", model.volumeResourceId());
-        Assertions.assertTrue(model.useExistingSnapshot());
-        Assertions.assertEquals("ktyhjt", model.snapshotName());
+        Assertions.assertEquals("ox", model.label());
+        Assertions.assertEquals("ndieuzaofj", model.volumeResourceId());
+        Assertions.assertFalse(model.useExistingSnapshot());
+        Assertions.assertEquals("yyysfgdotcubi", model.snapshotName());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchPropertiesTests.java
index a0c6cad8fbf0..dac1649d7621 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchPropertiesTests.java
@@ -11,14 +11,15 @@
 public final class BackupPatchPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        BackupPatchProperties model = BinaryData.fromString("{\"label\":\"ho\"}").toObject(BackupPatchProperties.class);
-        Assertions.assertEquals("ho", model.label());
+        BackupPatchProperties model
+            = BinaryData.fromString("{\"label\":\"fbkjubdyhgkfmi\"}").toObject(BackupPatchProperties.class);
+        Assertions.assertEquals("fbkjubdyhgkfmi", model.label());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupPatchProperties model = new BackupPatchProperties().withLabel("ho");
+        BackupPatchProperties model = new BackupPatchProperties().withLabel("fbkjubdyhgkfmi");
         model = BinaryData.fromObject(model).toObject(BackupPatchProperties.class);
-        Assertions.assertEquals("ho", model.label());
+        Assertions.assertEquals("fbkjubdyhgkfmi", model.label());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchTests.java
index 58c6730a9707..2494262b59ab 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPatchTests.java
@@ -12,14 +12,14 @@ public final class BackupPatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupPatch model
-            = BinaryData.fromString("{\"properties\":{\"label\":\"lboxqvkjl\"}}").toObject(BackupPatch.class);
-        Assertions.assertEquals("lboxqvkjl", model.label());
+            = BinaryData.fromString("{\"properties\":{\"label\":\"vwlyoup\"}}").toObject(BackupPatch.class);
+        Assertions.assertEquals("vwlyoup", model.label());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupPatch model = new BackupPatch().withLabel("lboxqvkjl");
+        BackupPatch model = new BackupPatch().withLabel("vwlyoup");
         model = BinaryData.fromObject(model).toObject(BackupPatch.class);
-        Assertions.assertEquals("lboxqvkjl", model.label());
+        Assertions.assertEquals("vwlyoup", model.label());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetWithResponseMockTests.java
index 80be45d48135..6855946c80ea 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class BackupPoliciesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"etag\":\"ohzjqatucoigeb\",\"properties\":{\"backupPolicyId\":\"cnwfepbnwgfmxjg\",\"provisioningState\":\"bjb\",\"dailyBackupsToKeep\":1945298143,\"weeklyBackupsToKeep\":197594994,\"monthlyBackupsToKeep\":1320191378,\"volumesAssigned\":1356398469,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"lqbctqhamzjrw\",\"volumeResourceId\":\"qzeqyjleziunjxdf\",\"backupsCount\":1904404893,\"policyEnabled\":true},{\"volumeName\":\"cegyamlbnseqacj\",\"volumeResourceId\":\"pilguooqjag\",\"backupsCount\":1068210919,\"policyEnabled\":true}]},\"location\":\"eiookjbsah\",\"tags\":{\"slmot\":\"tpdelqa\"},\"id\":\"ebnfxofvc\",\"name\":\"k\",\"type\":\"dirazf\"}";
+            = "{\"etag\":\"nwfepbnwg\",\"properties\":{\"backupPolicyId\":\"xjg\",\"provisioningState\":\"bjb\",\"dailyBackupsToKeep\":1945298143,\"weeklyBackupsToKeep\":197594994,\"monthlyBackupsToKeep\":1320191378,\"volumesAssigned\":1356398469,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"lqbctqhamzjrw\",\"volumeResourceId\":\"qzeqyjleziunjxdf\",\"backupsCount\":1904404893,\"policyEnabled\":true},{\"volumeName\":\"cegyamlbnseqacj\",\"volumeResourceId\":\"pilguooqjag\",\"backupsCount\":1068210919,\"policyEnabled\":true}]},\"location\":\"eiookjbsah\",\"tags\":{\"slmot\":\"tpdelqa\"},\"id\":\"ebnfxofvc\",\"name\":\"k\",\"type\":\"dirazf\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,9 +30,8 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        BackupPolicy response = manager.backupPolicies()
-            .getWithResponse("ic", "uewmrswnjlxuzrhw", "usxjbaqehg", com.azure.core.util.Context.NONE)
-            .getValue();
+        BackupPolicy response
+            = manager.backupPolicies().getWithResponse("tu", "o", "gebx", com.azure.core.util.Context.NONE).getValue();
 
         Assertions.assertEquals("eiookjbsah", response.location());
         Assertions.assertEquals("tpdelqa", response.tags().get("slmot"));
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListMockTests.java
index a888db041760..0082b1e71bd5 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListMockTests.java
@@ -22,7 +22,7 @@ public final class BackupPoliciesListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"etag\":\"pqafgfugsnnfhy\",\"properties\":{\"backupPolicyId\":\"efy\",\"provisioningState\":\"coc\",\"dailyBackupsToKeep\":1575776706,\"weeklyBackupsToKeep\":824379360,\"monthlyBackupsToKeep\":1261981805,\"volumesAssigned\":1163986546,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"urmlmuo\",\"volumeResourceId\":\"lbau\",\"backupsCount\":139700298,\"policyEnabled\":true},{\"volumeName\":\"nszonwpngaj\",\"volumeResourceId\":\"nixjawrtmjfjmy\",\"backupsCount\":1315835072,\"policyEnabled\":true},{\"volumeName\":\"coxovn\",\"volumeResourceId\":\"henlusfnr\",\"backupsCount\":1821687022,\"policyEnabled\":true}]},\"location\":\"r\",\"tags\":{\"gepuslvyjtc\":\"tjvidt\"},\"id\":\"uwkasiz\",\"name\":\"esfuught\",\"type\":\"qfecjxeygtuhx\"}]}";
+            = "{\"value\":[{\"etag\":\"nw\",\"properties\":{\"backupPolicyId\":\"gajinnixjawrtmj\",\"provisioningState\":\"myccx\",\"dailyBackupsToKeep\":1452842923,\"weeklyBackupsToKeep\":1559080880,\"monthlyBackupsToKeep\":963389591,\"volumesAssigned\":1682316966,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"lusfnrdtjxtxrdcq\",\"volumeResourceId\":\"vidttgepuslvyjt\",\"backupsCount\":1750462834,\"policyEnabled\":false},{\"volumeName\":\"s\",\"volumeResourceId\":\"iesfuug\",\"backupsCount\":1608993191,\"policyEnabled\":true}]},\"location\":\"cjxeygt\",\"tags\":{\"jlxuz\":\"uicbuewmrsw\"},\"id\":\"hwpusxj\",\"name\":\"aqehg\",\"type\":\"dohzjq\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,13 +32,13 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<BackupPolicy> response
-            = manager.backupPolicies().list("whslwkoj", "llndnpd", com.azure.core.util.Context.NONE);
+            = manager.backupPolicies().list("olbauirop", "ons", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("r", response.iterator().next().location());
-        Assertions.assertEquals("tjvidt", response.iterator().next().tags().get("gepuslvyjtc"));
-        Assertions.assertEquals(1575776706, response.iterator().next().dailyBackupsToKeep());
-        Assertions.assertEquals(824379360, response.iterator().next().weeklyBackupsToKeep());
-        Assertions.assertEquals(1261981805, response.iterator().next().monthlyBackupsToKeep());
+        Assertions.assertEquals("cjxeygt", response.iterator().next().location());
+        Assertions.assertEquals("uicbuewmrsw", response.iterator().next().tags().get("jlxuz"));
+        Assertions.assertEquals(1452842923, response.iterator().next().dailyBackupsToKeep());
+        Assertions.assertEquals(1559080880, response.iterator().next().weeklyBackupsToKeep());
+        Assertions.assertEquals(963389591, response.iterator().next().monthlyBackupsToKeep());
         Assertions.assertFalse(response.iterator().next().enabled());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListTests.java
index 122f988d64e6..d75d57015af7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPoliciesListTests.java
@@ -16,43 +16,39 @@ public final class BackupPoliciesListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupPoliciesList model = BinaryData.fromString(
-            "{\"value\":[{\"etag\":\"ikayuhqlbjbsybb\",\"properties\":{\"backupPolicyId\":\"r\",\"provisioningState\":\"ldgmfpgvmpip\",\"dailyBackupsToKeep\":1000390440,\"weeklyBackupsToKeep\":753407395,\"monthlyBackupsToKeep\":522033644,\"volumesAssigned\":178976731,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"twbdsrezpdrhn\",\"volumeResourceId\":\"yowqkdwytisibir\",\"backupsCount\":1229797985,\"policyEnabled\":false},{\"volumeName\":\"zimejzanlfzx\",\"volumeResourceId\":\"vrmbzono\",\"backupsCount\":1961298292,\"policyEnabled\":false},{\"volumeName\":\"cirgzp\",\"volumeResourceId\":\"lazszrn\",\"backupsCount\":755855856,\"policyEnabled\":false}]},\"location\":\"fpwpjylwbt\",\"tags\":{\"dhszfjv\":\"lsj\",\"qmqhldvriii\":\"bgofeljag\"},\"id\":\"jnalghf\",\"name\":\"vtvsexsowueluq\",\"type\":\"hahhxvrhmzkwpj\"},{\"etag\":\"wspughftqsxhqx\",\"properties\":{\"backupPolicyId\":\"xukndxdigr\",\"provisioningState\":\"uufzdmsyqtfihw\",\"dailyBackupsToKeep\":970693674,\"weeklyBackupsToKeep\":110136090,\"monthlyBackupsToKeep\":562718876,\"volumesAssigned\":1709728841,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"o\",\"volumeResourceId\":\"qzudphq\",\"backupsCount\":1375292829,\"policyEnabled\":false},{\"volumeName\":\"wynwcvtbvkayhm\",\"volumeResourceId\":\"vyqia\",\"backupsCount\":1548045664,\"policyEnabled\":false}]},\"location\":\"npwzcjaes\",\"tags\":{\"wygzlvdnkfxusem\":\"sccyajguqf\"},\"id\":\"wzrmuh\",\"name\":\"pfcqdp\",\"type\":\"qxqvpsvuoymgc\"},{\"etag\":\"lvez\",\"properties\":{\"backupPolicyId\":\"pqlmfe\",\"provisioningState\":\"erqwkyhkobopg\",\"dailyBackupsToKeep\":899879665,\"weeklyBackupsToKeep\":1041237961,\"monthlyBackupsToKeep\":615107136,\"volumesAssigned\":818081451,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"kbwcc\",\"volumeResourceId\":\"jvcdwxlpqekf\",\"backupsCount\":839437170,\"policyEnabled\":false},{\"volumeName\":\"syingwfqatmtdht\",\"volumeResourceId\":\"vypgikdg\",\"backupsCount\":2142197435,\"policyEnabled\":false},{\"volumeName\":\"irryuzhlh\",\"volumeResourceId\":\"oqrvqqaatjin\",\"backupsCount\":634846959,\"policyEnabled\":true},{\"volumeName\":\"mfiibfggj\",\"volumeResourceId\":\"olvrw\",\"backupsCount\":148831092,\"policyEnabled\":false}]},\"location\":\"gllqwjy\",\"tags\":{\"vyhgs\":\"ayvblmhvkzuhbx\",\"wz\":\"pbyrqufegxu\",\"l\":\"bnhlmc\"},\"id\":\"dn\",\"name\":\"itvgbmhrixkwm\",\"type\":\"ijejvegrhbpn\"}]}")
+            "{\"value\":[{\"etag\":\"ab\",\"properties\":{\"backupPolicyId\":\"oefki\",\"provisioningState\":\"vtpuqujmqlgk\",\"dailyBackupsToKeep\":604272323,\"weeklyBackupsToKeep\":1252448159,\"monthlyBackupsToKeep\":1601819937,\"volumesAssigned\":146248988,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"tujitcjedft\",\"volumeResourceId\":\"ae\",\"backupsCount\":565058049,\"policyEnabled\":false}]},\"location\":\"c\",\"tags\":{\"oxciqopidoamcio\":\"oqouicybxarzgszu\",\"zxkhnzbonlwnto\":\"hkh\",\"zcmrvexztvb\":\"gokdwbwhks\"},\"id\":\"qgsfraoyzkoow\",\"name\":\"lmnguxaw\",\"type\":\"aldsy\"},{\"etag\":\"ximerqfobwyznk\",\"properties\":{\"backupPolicyId\":\"kutwpf\",\"provisioningState\":\"a\",\"dailyBackupsToKeep\":71172193,\"weeklyBackupsToKeep\":1165571898,\"monthlyBackupsToKeep\":1595958724,\"volumesAssigned\":803916344,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"akgtdlmkkzevdlh\",\"volumeResourceId\":\"pusdstt\",\"backupsCount\":1072941550,\"policyEnabled\":true},{\"volumeName\":\"bejdcn\",\"volumeResourceId\":\"qmoa\",\"backupsCount\":840228808,\"policyEnabled\":false},{\"volumeName\":\"zr\",\"volumeResourceId\":\"dgrtwaenuuzkopbm\",\"backupsCount\":1777677122,\"policyEnabled\":true},{\"volumeName\":\"oyuhhziui\",\"volumeResourceId\":\"ozbhdmsmlmzq\",\"backupsCount\":280296096,\"policyEnabled\":false}]},\"location\":\"ae\",\"tags\":{\"icslfaoq\":\"ah\",\"kaivwit\":\"piyylhalnswhccsp\"},\"id\":\"scywuggwoluhc\",\"name\":\"bwemhairs\",\"type\":\"rgzdwmsweyp\"}]}")
             .toObject(BackupPoliciesList.class);
-        Assertions.assertEquals("fpwpjylwbt", model.value().get(0).location());
-        Assertions.assertEquals("lsj", model.value().get(0).tags().get("dhszfjv"));
-        Assertions.assertEquals(1000390440, model.value().get(0).dailyBackupsToKeep());
-        Assertions.assertEquals(753407395, model.value().get(0).weeklyBackupsToKeep());
-        Assertions.assertEquals(522033644, model.value().get(0).monthlyBackupsToKeep());
+        Assertions.assertEquals("c", model.value().get(0).location());
+        Assertions.assertEquals("oqouicybxarzgszu", model.value().get(0).tags().get("oxciqopidoamcio"));
+        Assertions.assertEquals(604272323, model.value().get(0).dailyBackupsToKeep());
+        Assertions.assertEquals(1252448159, model.value().get(0).weeklyBackupsToKeep());
+        Assertions.assertEquals(1601819937, model.value().get(0).monthlyBackupsToKeep());
         Assertions.assertTrue(model.value().get(0).enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupPoliciesList model = new BackupPoliciesList().withValue(Arrays.asList(
-            new BackupPolicyInner().withLocation("fpwpjylwbt")
-                .withTags(mapOf("dhszfjv", "lsj", "qmqhldvriii", "bgofeljag"))
-                .withDailyBackupsToKeep(1000390440)
-                .withWeeklyBackupsToKeep(753407395)
-                .withMonthlyBackupsToKeep(522033644)
-                .withEnabled(true),
-            new BackupPolicyInner().withLocation("npwzcjaes")
-                .withTags(mapOf("wygzlvdnkfxusem", "sccyajguqf"))
-                .withDailyBackupsToKeep(970693674)
-                .withWeeklyBackupsToKeep(110136090)
-                .withMonthlyBackupsToKeep(562718876)
-                .withEnabled(false),
-            new BackupPolicyInner().withLocation("gllqwjy")
-                .withTags(mapOf("vyhgs", "ayvblmhvkzuhbx", "wz", "pbyrqufegxu", "l", "bnhlmc"))
-                .withDailyBackupsToKeep(899879665)
-                .withWeeklyBackupsToKeep(1041237961)
-                .withMonthlyBackupsToKeep(615107136)
-                .withEnabled(false)));
+        BackupPoliciesList model
+            = new BackupPoliciesList().withValue(Arrays.asList(
+                new BackupPolicyInner().withLocation("c")
+                    .withTags(mapOf("oxciqopidoamcio", "oqouicybxarzgszu", "zxkhnzbonlwnto", "hkh", "zcmrvexztvb",
+                        "gokdwbwhks"))
+                    .withDailyBackupsToKeep(604272323)
+                    .withWeeklyBackupsToKeep(1252448159)
+                    .withMonthlyBackupsToKeep(1601819937)
+                    .withEnabled(true),
+                new BackupPolicyInner().withLocation("ae")
+                    .withTags(mapOf("icslfaoq", "ah", "kaivwit", "piyylhalnswhccsp"))
+                    .withDailyBackupsToKeep(71172193)
+                    .withWeeklyBackupsToKeep(1165571898)
+                    .withMonthlyBackupsToKeep(1595958724)
+                    .withEnabled(true)));
         model = BinaryData.fromObject(model).toObject(BackupPoliciesList.class);
-        Assertions.assertEquals("fpwpjylwbt", model.value().get(0).location());
-        Assertions.assertEquals("lsj", model.value().get(0).tags().get("dhszfjv"));
-        Assertions.assertEquals(1000390440, model.value().get(0).dailyBackupsToKeep());
-        Assertions.assertEquals(753407395, model.value().get(0).weeklyBackupsToKeep());
-        Assertions.assertEquals(522033644, model.value().get(0).monthlyBackupsToKeep());
+        Assertions.assertEquals("c", model.value().get(0).location());
+        Assertions.assertEquals("oqouicybxarzgszu", model.value().get(0).tags().get("oxciqopidoamcio"));
+        Assertions.assertEquals(604272323, model.value().get(0).dailyBackupsToKeep());
+        Assertions.assertEquals(1252448159, model.value().get(0).weeklyBackupsToKeep());
+        Assertions.assertEquals(1601819937, model.value().get(0).monthlyBackupsToKeep());
         Assertions.assertTrue(model.value().get(0).enabled());
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyInnerTests.java
index 87b87cb34e94..6a07a0326e5e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyInnerTests.java
@@ -14,30 +14,30 @@ public final class BackupPolicyInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupPolicyInner model = BinaryData.fromString(
-            "{\"etag\":\"xexccbdreaxhcexd\",\"properties\":{\"backupPolicyId\":\"vqahqkghtpwi\",\"provisioningState\":\"hyjsvfycx\",\"dailyBackupsToKeep\":1220802910,\"weeklyBackupsToKeep\":1564652638,\"monthlyBackupsToKeep\":1626035296,\"volumesAssigned\":1844906639,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"qp\",\"volumeResourceId\":\"ostronz\",\"backupsCount\":856785773,\"policyEnabled\":false},{\"volumeName\":\"pnsxkmcwaek\",\"volumeResourceId\":\"jreafxtsgum\",\"backupsCount\":1019109775,\"policyEnabled\":false}]},\"location\":\"kxw\",\"tags\":{\"tgp\":\"lbqpvuzlmvfelf\"},\"id\":\"crpw\",\"name\":\"xeznoi\",\"type\":\"brnjwmw\"}")
+            "{\"etag\":\"dxggicccnxqhuexm\",\"properties\":{\"backupPolicyId\":\"tlstvlzywem\",\"provisioningState\":\"rncsdtclu\",\"dailyBackupsToKeep\":2121256273,\"weeklyBackupsToKeep\":1137275627,\"monthlyBackupsToKeep\":1674447280,\"volumesAssigned\":1861224364,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"feadcygq\",\"volumeResourceId\":\"yhejhzisxgfp\",\"backupsCount\":1351567723,\"policyEnabled\":false}]},\"location\":\"vk\",\"tags\":{\"swibyr\":\"qvujzraehtwdwrf\",\"h\":\"dl\",\"khevxccedc\":\"hfwpracstwit\",\"jc\":\"nmdyodnwzxl\"},\"id\":\"nhltiugcxn\",\"name\":\"vvwxqi\",\"type\":\"y\"}")
             .toObject(BackupPolicyInner.class);
-        Assertions.assertEquals("kxw", model.location());
-        Assertions.assertEquals("lbqpvuzlmvfelf", model.tags().get("tgp"));
-        Assertions.assertEquals(1220802910, model.dailyBackupsToKeep());
-        Assertions.assertEquals(1564652638, model.weeklyBackupsToKeep());
-        Assertions.assertEquals(1626035296, model.monthlyBackupsToKeep());
+        Assertions.assertEquals("vk", model.location());
+        Assertions.assertEquals("qvujzraehtwdwrf", model.tags().get("swibyr"));
+        Assertions.assertEquals(2121256273, model.dailyBackupsToKeep());
+        Assertions.assertEquals(1137275627, model.weeklyBackupsToKeep());
+        Assertions.assertEquals(1674447280, model.monthlyBackupsToKeep());
         Assertions.assertFalse(model.enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupPolicyInner model = new BackupPolicyInner().withLocation("kxw")
-            .withTags(mapOf("tgp", "lbqpvuzlmvfelf"))
-            .withDailyBackupsToKeep(1220802910)
-            .withWeeklyBackupsToKeep(1564652638)
-            .withMonthlyBackupsToKeep(1626035296)
+        BackupPolicyInner model = new BackupPolicyInner().withLocation("vk")
+            .withTags(mapOf("swibyr", "qvujzraehtwdwrf", "h", "dl", "khevxccedc", "hfwpracstwit", "jc", "nmdyodnwzxl"))
+            .withDailyBackupsToKeep(2121256273)
+            .withWeeklyBackupsToKeep(1137275627)
+            .withMonthlyBackupsToKeep(1674447280)
             .withEnabled(false);
         model = BinaryData.fromObject(model).toObject(BackupPolicyInner.class);
-        Assertions.assertEquals("kxw", model.location());
-        Assertions.assertEquals("lbqpvuzlmvfelf", model.tags().get("tgp"));
-        Assertions.assertEquals(1220802910, model.dailyBackupsToKeep());
-        Assertions.assertEquals(1564652638, model.weeklyBackupsToKeep());
-        Assertions.assertEquals(1626035296, model.monthlyBackupsToKeep());
+        Assertions.assertEquals("vk", model.location());
+        Assertions.assertEquals("qvujzraehtwdwrf", model.tags().get("swibyr"));
+        Assertions.assertEquals(2121256273, model.dailyBackupsToKeep());
+        Assertions.assertEquals(1137275627, model.weeklyBackupsToKeep());
+        Assertions.assertEquals(1674447280, model.monthlyBackupsToKeep());
         Assertions.assertFalse(model.enabled());
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPatchTests.java
index a2c59ceda1fb..41ac8bb83a63 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPatchTests.java
@@ -14,30 +14,31 @@ public final class BackupPolicyPatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupPolicyPatch model = BinaryData.fromString(
-            "{\"properties\":{\"backupPolicyId\":\"evzhfsto\",\"provisioningState\":\"hojujbypelmcuv\",\"dailyBackupsToKeep\":1912851765,\"weeklyBackupsToKeep\":1882216522,\"monthlyBackupsToKeep\":1696706590,\"volumesAssigned\":12838706,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"ool\",\"volumeResourceId\":\"tpkiwkkbnujry\",\"backupsCount\":1368964811,\"policyEnabled\":true}]},\"location\":\"bfpncurdo\",\"tags\":{\"xcbihw\":\"ithtywu\",\"twjchrdg\":\"knfd\"},\"id\":\"ihxumwctondzj\",\"name\":\"uu\",\"type\":\"fdlwg\"}")
+            "{\"properties\":{\"backupPolicyId\":\"vfxzsjab\",\"provisioningState\":\"systawfsdjp\",\"dailyBackupsToKeep\":387671304,\"weeklyBackupsToKeep\":250834954,\"monthlyBackupsToKeep\":911357247,\"volumesAssigned\":1795251983,\"enabled\":false,\"volumeBackups\":[{\"volumeName\":\"vncjabudurgk\",\"volumeResourceId\":\"mokzhjjklf\",\"backupsCount\":1604322971,\"policyEnabled\":true}]},\"location\":\"wqlgzrf\",\"tags\":{\"lbjbsyb\":\"yebizikayuh\",\"vm\":\"qwrvtldgmfp\",\"wbdsr\":\"ipaslthaqfxssmwu\",\"owqkdwytisi\":\"zpdrhneu\"},\"id\":\"ircgpikpz\",\"name\":\"mejzanlfzxia\",\"type\":\"rmbzo\"}")
             .toObject(BackupPolicyPatch.class);
-        Assertions.assertEquals("bfpncurdo", model.location());
-        Assertions.assertEquals("ithtywu", model.tags().get("xcbihw"));
-        Assertions.assertEquals(1912851765, model.dailyBackupsToKeep());
-        Assertions.assertEquals(1882216522, model.weeklyBackupsToKeep());
-        Assertions.assertEquals(1696706590, model.monthlyBackupsToKeep());
+        Assertions.assertEquals("wqlgzrf", model.location());
+        Assertions.assertEquals("yebizikayuh", model.tags().get("lbjbsyb"));
+        Assertions.assertEquals(387671304, model.dailyBackupsToKeep());
+        Assertions.assertEquals(250834954, model.weeklyBackupsToKeep());
+        Assertions.assertEquals(911357247, model.monthlyBackupsToKeep());
         Assertions.assertFalse(model.enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupPolicyPatch model = new BackupPolicyPatch().withLocation("bfpncurdo")
-            .withTags(mapOf("xcbihw", "ithtywu", "twjchrdg", "knfd"))
-            .withDailyBackupsToKeep(1912851765)
-            .withWeeklyBackupsToKeep(1882216522)
-            .withMonthlyBackupsToKeep(1696706590)
+        BackupPolicyPatch model = new BackupPolicyPatch().withLocation("wqlgzrf")
+            .withTags(mapOf("lbjbsyb", "yebizikayuh", "vm", "qwrvtldgmfp", "wbdsr", "ipaslthaqfxssmwu", "owqkdwytisi",
+                "zpdrhneu"))
+            .withDailyBackupsToKeep(387671304)
+            .withWeeklyBackupsToKeep(250834954)
+            .withMonthlyBackupsToKeep(911357247)
             .withEnabled(false);
         model = BinaryData.fromObject(model).toObject(BackupPolicyPatch.class);
-        Assertions.assertEquals("bfpncurdo", model.location());
-        Assertions.assertEquals("ithtywu", model.tags().get("xcbihw"));
-        Assertions.assertEquals(1912851765, model.dailyBackupsToKeep());
-        Assertions.assertEquals(1882216522, model.weeklyBackupsToKeep());
-        Assertions.assertEquals(1696706590, model.monthlyBackupsToKeep());
+        Assertions.assertEquals("wqlgzrf", model.location());
+        Assertions.assertEquals("yebizikayuh", model.tags().get("lbjbsyb"));
+        Assertions.assertEquals(387671304, model.dailyBackupsToKeep());
+        Assertions.assertEquals(250834954, model.weeklyBackupsToKeep());
+        Assertions.assertEquals(911357247, model.monthlyBackupsToKeep());
         Assertions.assertFalse(model.enabled());
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPropertiesTests.java
index 708d6b72444a..e15f8d3195be 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPolicyPropertiesTests.java
@@ -12,24 +12,24 @@ public final class BackupPolicyPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupPolicyProperties model = BinaryData.fromString(
-            "{\"backupPolicyId\":\"nbsazejjoqkag\",\"provisioningState\":\"sxtta\",\"dailyBackupsToKeep\":1689987065,\"weeklyBackupsToKeep\":1620389391,\"monthlyBackupsToKeep\":288495023,\"volumesAssigned\":1224578213,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"kdmkqjjlwuenvrkp\",\"volumeResourceId\":\"uaibrebqaaysj\",\"backupsCount\":1330578772,\"policyEnabled\":true},{\"volumeName\":\"qttezlwfffiakpjp\",\"volumeResourceId\":\"m\",\"backupsCount\":147103484,\"policyEnabled\":true}]}")
+            "{\"backupPolicyId\":\"nyowxwlmdjrkvfg\",\"provisioningState\":\"fvpdbo\",\"dailyBackupsToKeep\":2095776205,\"weeklyBackupsToKeep\":1592823352,\"monthlyBackupsToKeep\":218756340,\"volumesAssigned\":1933405509,\"enabled\":true,\"volumeBackups\":[{\"volumeName\":\"bdeibqipqk\",\"volumeResourceId\":\"vxndz\",\"backupsCount\":74498684,\"policyEnabled\":false}]}")
             .toObject(BackupPolicyProperties.class);
-        Assertions.assertEquals(1689987065, model.dailyBackupsToKeep());
-        Assertions.assertEquals(1620389391, model.weeklyBackupsToKeep());
-        Assertions.assertEquals(288495023, model.monthlyBackupsToKeep());
+        Assertions.assertEquals(2095776205, model.dailyBackupsToKeep());
+        Assertions.assertEquals(1592823352, model.weeklyBackupsToKeep());
+        Assertions.assertEquals(218756340, model.monthlyBackupsToKeep());
         Assertions.assertTrue(model.enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupPolicyProperties model = new BackupPolicyProperties().withDailyBackupsToKeep(1689987065)
-            .withWeeklyBackupsToKeep(1620389391)
-            .withMonthlyBackupsToKeep(288495023)
+        BackupPolicyProperties model = new BackupPolicyProperties().withDailyBackupsToKeep(2095776205)
+            .withWeeklyBackupsToKeep(1592823352)
+            .withMonthlyBackupsToKeep(218756340)
             .withEnabled(true);
         model = BinaryData.fromObject(model).toObject(BackupPolicyProperties.class);
-        Assertions.assertEquals(1689987065, model.dailyBackupsToKeep());
-        Assertions.assertEquals(1620389391, model.weeklyBackupsToKeep());
-        Assertions.assertEquals(288495023, model.monthlyBackupsToKeep());
+        Assertions.assertEquals(2095776205, model.dailyBackupsToKeep());
+        Assertions.assertEquals(1592823352, model.weeklyBackupsToKeep());
+        Assertions.assertEquals(218756340, model.monthlyBackupsToKeep());
         Assertions.assertTrue(model.enabled());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPropertiesTests.java
index 010b3f5b3442..9b0c9faa48d4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupPropertiesTests.java
@@ -12,24 +12,24 @@ public final class BackupPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupProperties model = BinaryData.fromString(
-            "{\"backupId\":\"wytpzdmovz\",\"creationDate\":\"2021-08-04T02:37:03Z\",\"snapshotCreationDate\":\"2021-04-03T17:18:44Z\",\"completionDate\":\"2021-10-04T03:30Z\",\"provisioningState\":\"adflgzu\",\"size\":4584433852798118541,\"label\":\"ecxn\",\"backupType\":\"Manual\",\"failureReason\":\"okpvzm\",\"volumeResourceId\":\"qtmldgxo\",\"useExistingSnapshot\":false,\"snapshotName\":\"clnpkci\",\"backupPolicyResourceId\":\"zriykhy\",\"isLargeVolume\":true}")
+            "{\"backupId\":\"wfscjfn\",\"creationDate\":\"2021-07-26T17:01:13Z\",\"snapshotCreationDate\":\"2021-06-16T16:28:25Z\",\"completionDate\":\"2021-11-10T04:53:36Z\",\"provisioningState\":\"zdvoqytibyowbb\",\"size\":6726059527948715904,\"label\":\"utp\",\"backupType\":\"Manual\",\"failureReason\":\"xoi\",\"volumeResourceId\":\"msksbp\",\"useExistingSnapshot\":false,\"snapshotName\":\"oljxkcgx\",\"backupPolicyResourceId\":\"xsffgcviz\",\"isLargeVolume\":false}")
             .toObject(BackupProperties.class);
-        Assertions.assertEquals("ecxn", model.label());
-        Assertions.assertEquals("qtmldgxo", model.volumeResourceId());
+        Assertions.assertEquals("utp", model.label());
+        Assertions.assertEquals("msksbp", model.volumeResourceId());
         Assertions.assertFalse(model.useExistingSnapshot());
-        Assertions.assertEquals("clnpkci", model.snapshotName());
+        Assertions.assertEquals("oljxkcgx", model.snapshotName());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupProperties model = new BackupProperties().withLabel("ecxn")
-            .withVolumeResourceId("qtmldgxo")
+        BackupProperties model = new BackupProperties().withLabel("utp")
+            .withVolumeResourceId("msksbp")
             .withUseExistingSnapshot(false)
-            .withSnapshotName("clnpkci");
+            .withSnapshotName("oljxkcgx");
         model = BinaryData.fromObject(model).toObject(BackupProperties.class);
-        Assertions.assertEquals("ecxn", model.label());
-        Assertions.assertEquals("qtmldgxo", model.volumeResourceId());
+        Assertions.assertEquals("utp", model.label());
+        Assertions.assertEquals("msksbp", model.volumeResourceId());
         Assertions.assertFalse(model.useExistingSnapshot());
-        Assertions.assertEquals("clnpkci", model.snapshotName());
+        Assertions.assertEquals("oljxkcgx", model.snapshotName());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupRestoreFilesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupRestoreFilesTests.java
index 8558309efa6c..7096ed354f51 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupRestoreFilesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupRestoreFilesTests.java
@@ -13,22 +13,22 @@ public final class BackupRestoreFilesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupRestoreFiles model = BinaryData.fromString(
-            "{\"fileList\":[\"vqikfxcvhrfsphu\",\"grttikteusqczk\",\"yklxubyjaffmmfbl\"],\"restoreFilePath\":\"cuubgq\",\"destinationVolumeId\":\"brta\"}")
+            "{\"fileList\":[\"tcyohpfkyrk\",\"bdgiogsjk\",\"nwqjnoba\",\"yhddvia\"],\"restoreFilePath\":\"gfnmntfpmvmemfnc\",\"destinationVolumeId\":\"dwvvba\"}")
             .toObject(BackupRestoreFiles.class);
-        Assertions.assertEquals("vqikfxcvhrfsphu", model.fileList().get(0));
-        Assertions.assertEquals("cuubgq", model.restoreFilePath());
-        Assertions.assertEquals("brta", model.destinationVolumeId());
+        Assertions.assertEquals("tcyohpfkyrk", model.fileList().get(0));
+        Assertions.assertEquals("gfnmntfpmvmemfnc", model.restoreFilePath());
+        Assertions.assertEquals("dwvvba", model.destinationVolumeId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupRestoreFiles model = new BackupRestoreFiles()
-            .withFileList(Arrays.asList("vqikfxcvhrfsphu", "grttikteusqczk", "yklxubyjaffmmfbl"))
-            .withRestoreFilePath("cuubgq")
-            .withDestinationVolumeId("brta");
+        BackupRestoreFiles model
+            = new BackupRestoreFiles().withFileList(Arrays.asList("tcyohpfkyrk", "bdgiogsjk", "nwqjnoba", "yhddvia"))
+                .withRestoreFilePath("gfnmntfpmvmemfnc")
+                .withDestinationVolumeId("dwvvba");
         model = BinaryData.fromObject(model).toObject(BackupRestoreFiles.class);
-        Assertions.assertEquals("vqikfxcvhrfsphu", model.fileList().get(0));
-        Assertions.assertEquals("cuubgq", model.restoreFilePath());
-        Assertions.assertEquals("brta", model.destinationVolumeId());
+        Assertions.assertEquals("tcyohpfkyrk", model.fileList().get(0));
+        Assertions.assertEquals("gfnmntfpmvmemfnc", model.restoreFilePath());
+        Assertions.assertEquals("dwvvba", model.destinationVolumeId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupStatusInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupStatusInnerTests.java
index 59f7d68a21e1..220debc3be52 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupStatusInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupStatusInnerTests.java
@@ -11,7 +11,7 @@ public final class BackupStatusInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupStatusInner model = BinaryData.fromString(
-            "{\"healthy\":true,\"relationshipStatus\":\"Unknown\",\"mirrorState\":\"Broken\",\"unhealthyReason\":\"jlfrq\",\"errorMessage\":\"bajlka\",\"lastTransferSize\":3281733425649589029,\"lastTransferType\":\"iopid\",\"totalTransferBytes\":4942011391135790969,\"transferProgressBytes\":4633898061175838368}")
+            "{\"healthy\":true,\"relationshipStatus\":\"Idle\",\"mirrorState\":\"Broken\",\"unhealthyReason\":\"xcv\",\"errorMessage\":\"rhnj\",\"lastTransferSize\":4416106020884010184,\"lastTransferType\":\"tnovqfzgemjdftul\",\"totalTransferBytes\":9148960841724922095,\"transferProgressBytes\":6160828479857694240}")
             .toObject(BackupStatusInner.class);
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultInnerTests.java
index ef7f2d9006ec..4cad8866e3e4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultInnerTests.java
@@ -14,20 +14,19 @@ public final class BackupVaultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupVaultInner model = BinaryData.fromString(
-            "{\"properties\":{\"provisioningState\":\"faxvxil\"},\"location\":\"tg\",\"tags\":{\"vodggxdbee\":\"zeyqxtjjfzqlqhyc\",\"wiuagydwqf\":\"mieknlraria\",\"ocqwogfnzjvus\":\"ylyrfgiagtco\"},\"id\":\"zldmozuxy\",\"name\":\"fsbtkad\",\"type\":\"ysownbtgkbug\"}")
+            "{\"properties\":{\"provisioningState\":\"fku\"},\"location\":\"cxkdmligovi\",\"tags\":{\"uruocbgo\":\"kpmloa\"},\"id\":\"rb\",\"name\":\"eoybfhjxakvvjgs\",\"type\":\"ordilmywwtkgkxny\"}")
             .toObject(BackupVaultInner.class);
-        Assertions.assertEquals("tg", model.location());
-        Assertions.assertEquals("zeyqxtjjfzqlqhyc", model.tags().get("vodggxdbee"));
+        Assertions.assertEquals("cxkdmligovi", model.location());
+        Assertions.assertEquals("kpmloa", model.tags().get("uruocbgo"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupVaultInner model = new BackupVaultInner().withLocation("tg")
-            .withTags(
-                mapOf("vodggxdbee", "zeyqxtjjfzqlqhyc", "wiuagydwqf", "mieknlraria", "ocqwogfnzjvus", "ylyrfgiagtco"));
+        BackupVaultInner model
+            = new BackupVaultInner().withLocation("cxkdmligovi").withTags(mapOf("uruocbgo", "kpmloa"));
         model = BinaryData.fromObject(model).toObject(BackupVaultInner.class);
-        Assertions.assertEquals("tg", model.location());
-        Assertions.assertEquals("zeyqxtjjfzqlqhyc", model.tags().get("vodggxdbee"));
+        Assertions.assertEquals("cxkdmligovi", model.location());
+        Assertions.assertEquals("kpmloa", model.tags().get("uruocbgo"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPatchTests.java
index 0a4e843fd62d..5c583ca1b795 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPatchTests.java
@@ -13,18 +13,18 @@
 public final class BackupVaultPatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        BackupVaultPatch model = BinaryData.fromString(
-            "{\"tags\":{\"ojyqdhcuplcplcw\":\"pe\",\"nowc\":\"hihihlhzdsqtzbsr\",\"oteyowc\":\"hfgmvecactxm\",\"mpjw\":\"uqovekqvgqouwif\"}}")
-            .toObject(BackupVaultPatch.class);
-        Assertions.assertEquals("pe", model.tags().get("ojyqdhcuplcplcw"));
+        BackupVaultPatch model
+            = BinaryData.fromString("{\"tags\":{\"j\":\"wbcihxuuwh\",\"akkud\":\"xccybvpa\",\"wjplma\":\"px\"}}")
+                .toObject(BackupVaultPatch.class);
+        Assertions.assertEquals("wbcihxuuwh", model.tags().get("j"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupVaultPatch model = new BackupVaultPatch().withTags(mapOf("ojyqdhcuplcplcw", "pe", "nowc",
-            "hihihlhzdsqtzbsr", "oteyowc", "hfgmvecactxm", "mpjw", "uqovekqvgqouwif"));
+        BackupVaultPatch model
+            = new BackupVaultPatch().withTags(mapOf("j", "wbcihxuuwh", "akkud", "xccybvpa", "wjplma", "px"));
         model = BinaryData.fromObject(model).toObject(BackupVaultPatch.class);
-        Assertions.assertEquals("pe", model.tags().get("ojyqdhcuplcplcw"));
+        Assertions.assertEquals("wbcihxuuwh", model.tags().get("j"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPropertiesTests.java
index 6c7fc64ed9e8..100f7fab3371 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultPropertiesTests.java
@@ -11,7 +11,7 @@ public final class BackupVaultPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupVaultProperties model
-            = BinaryData.fromString("{\"provisioningState\":\"qctojcmisof\"}").toObject(BackupVaultProperties.class);
+            = BinaryData.fromString("{\"provisioningState\":\"abgyvudt\"}").toObject(BackupVaultProperties.class);
     }
 
     @org.junit.jupiter.api.Test
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateMockTests.java
index 3d02fd7e999e..6e46dc1aa5a5 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsCreateOrUpdateMockTests.java
@@ -23,7 +23,7 @@ public final class BackupVaultsCreateOrUpdateMockTests {
     @Test
     public void testCreateOrUpdate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Succeeded\"},\"location\":\"wggahttzlswvaj\",\"tags\":{\"x\":\"t\",\"unwqr\":\"oqza\",\"uocnjrohmbpyr\":\"zfrgqhaohcm\",\"ocxnehvsmtodl\":\"xameblydyvkfkm\"},\"id\":\"pyapucygvoav\",\"name\":\"unssxlghieegjl\",\"type\":\"vvpa\"}";
+            = "{\"properties\":{\"provisioningState\":\"Succeeded\"},\"location\":\"wrq\",\"tags\":{\"k\":\"lopmjnlexwhcbjpi\",\"intqpbrlcyr\":\"phuuuerctato\",\"crrpcjttbstvje\":\"uczkgofxyfsruc\",\"mlghktuidvrmazlp\":\"qnrmvvfko\"},\"id\":\"wwexymzvlazipbh\",\"name\":\"wvqsgny\",\"type\":\"uuzivensrpmeyyvp\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,14 +33,14 @@ public void testCreateOrUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         BackupVault response = manager.backupVaults()
-            .define("jxcx")
-            .withRegion("tzqdd")
-            .withExistingNetAppAccount("qvapcohhoucq", "q")
-            .withTags(mapOf("mzwcjjncqt", "fljhznamtua"))
+            .define("ajqfutlx")
+            .withRegion("ohcmbu")
+            .withExistingNetAppAccount("uuvbx", "grebwggahttzlsw")
+            .withTags(mapOf("ydyvkfkmro", "jrohmbpyryxameb", "v", "xne", "pyapucygvoav", "mtodl"))
             .create();
 
-        Assertions.assertEquals("wggahttzlswvaj", response.location());
-        Assertions.assertEquals("t", response.tags().get("x"));
+        Assertions.assertEquals("wrq", response.location());
+        Assertions.assertEquals("lopmjnlexwhcbjpi", response.tags().get("k"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetWithResponseMockTests.java
index ab859f958ec4..16c98a2dfd2a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class BackupVaultsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"ptsoqfyiase\"},\"location\":\"hkrttzrazis\",\"tags\":{\"xbsojkli\":\"iuemvanbwzohmnr\",\"ysprq\":\"hmdp\"},\"id\":\"gnzxojpslsvj\",\"name\":\"pli\",\"type\":\"fiqwoy\"}";
+            = "{\"properties\":{\"provisioningState\":\"qwoyxqvapco\"},\"location\":\"oucqpqojx\",\"tags\":{\"tzqdd\":\"rzdcgdzbenribcaw\",\"mzwcjjncqt\":\"jwfljhznamtua\"},\"id\":\"z\",\"name\":\"izvg\",\"type\":\"gat\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         BackupVault response = manager.backupVaults()
-            .getWithResponse("hdbvqvwzkjop", "beonrlkwzdq", "bxcea", com.azure.core.util.Context.NONE)
+            .getWithResponse("klinhmdptysprq", "gnzxojpslsvj", "pli", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("hkrttzrazis", response.location());
-        Assertions.assertEquals("iuemvanbwzohmnr", response.tags().get("xbsojkli"));
+        Assertions.assertEquals("oucqpqojx", response.location());
+        Assertions.assertEquals("rzdcgdzbenribcaw", response.tags().get("tzqdd"));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountMockTests.java
index 28994af91676..28271cb314b0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListByNetAppAccountMockTests.java
@@ -22,7 +22,7 @@ public final class BackupVaultsListByNetAppAccountMockTests {
     @Test
     public void testListByNetAppAccount() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"nepzwakls\"},\"location\":\"bqqqagwwrxa\",\"tags\":{\"ezkhhltnjadhqo\":\"isglrrc\",\"ueayfbpcmsplb\":\"wjqo\",\"mbscbbx\":\"rrueqthwmg\",\"d\":\"gdhxi\"},\"id\":\"opedbwdpyqyybxub\",\"name\":\"dnafcbqwre\",\"type\":\"jelaqacigele\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"mjel\"},\"location\":\"acigel\",\"tags\":{\"vqvwzkjopwbe\":\"d\",\"x\":\"nrlkwzdqy\",\"seqchkrt\":\"eakxcptsoqfyi\"},\"id\":\"zrazisgyk\",\"name\":\"uem\",\"type\":\"anbwzohmnrxxbso\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,9 +32,9 @@ public void testListByNetAppAccount() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<BackupVault> response
-            = manager.backupVaults().listByNetAppAccount("wxihs", "nxw", com.azure.core.util.Context.NONE);
+            = manager.backupVaults().listByNetAppAccount("bxubmdna", "cbq", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("bqqqagwwrxa", response.iterator().next().location());
-        Assertions.assertEquals("isglrrc", response.iterator().next().tags().get("ezkhhltnjadhqo"));
+        Assertions.assertEquals("acigel", response.iterator().next().location());
+        Assertions.assertEquals("d", response.iterator().next().tags().get("vqvwzkjopwbe"));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListTests.java
index f65e52c04e80..f83ff61cf425 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupVaultsListTests.java
@@ -16,27 +16,23 @@ public final class BackupVaultsListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupVaultsList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"provisioningState\":\"dwdigumb\"},\"location\":\"aauzzptjazysd\",\"tags\":{\"qyuvvfonkp\":\"zwwva\",\"auy\":\"hqyikvy\"},\"id\":\"vluwmncsttij\",\"name\":\"y\",\"type\":\"vpo\"},{\"properties\":{\"provisioningState\":\"sgsgbdhu\"},\"location\":\"gnjdgkynscliqhz\",\"tags\":{\"mtk\":\"nk\",\"ppnvdxz\":\"bo\",\"hlfkqojpy\":\"hihfrbbcevqagtlt\"},\"id\":\"vgtrdcnifmzzs\",\"name\":\"ymbrnysuxmpraf\",\"type\":\"g\"},{\"properties\":{\"provisioningState\":\"ocxvdfffwafqr\"},\"location\":\"daspavehhrvk\",\"tags\":{\"dhcxgkmoy\":\"zoz\"},\"id\":\"cdyuibhmfdnbzyd\",\"name\":\"f\",\"type\":\"fcjnaeoisrvhmgor\"}],\"nextLink\":\"ukiscvwmzhw\"}")
+            "{\"value\":[{\"properties\":{\"provisioningState\":\"zfttsttktlahb\"},\"location\":\"ctxtgzukxi\",\"tags\":{\"cpjuisa\":\"qtgqqqxhrnxr\"},\"id\":\"okqdzfvaz\",\"name\":\"vjlfrqtt\",\"type\":\"ajlkatnw\"}],\"nextLink\":\"iopid\"}")
             .toObject(BackupVaultsList.class);
-        Assertions.assertEquals("aauzzptjazysd", model.value().get(0).location());
-        Assertions.assertEquals("zwwva", model.value().get(0).tags().get("qyuvvfonkp"));
-        Assertions.assertEquals("ukiscvwmzhw", model.nextLink());
+        Assertions.assertEquals("ctxtgzukxi", model.value().get(0).location());
+        Assertions.assertEquals("qtgqqqxhrnxr", model.value().get(0).tags().get("cpjuisa"));
+        Assertions.assertEquals("iopid", model.nextLink());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         BackupVaultsList model = new BackupVaultsList()
-            .withValue(Arrays.asList(
-                new BackupVaultInner().withLocation("aauzzptjazysd")
-                    .withTags(mapOf("qyuvvfonkp", "zwwva", "auy", "hqyikvy")),
-                new BackupVaultInner().withLocation("gnjdgkynscliqhz")
-                    .withTags(mapOf("mtk", "nk", "ppnvdxz", "bo", "hlfkqojpy", "hihfrbbcevqagtlt")),
-                new BackupVaultInner().withLocation("daspavehhrvk").withTags(mapOf("dhcxgkmoy", "zoz"))))
-            .withNextLink("ukiscvwmzhw");
+            .withValue(Arrays
+                .asList(new BackupVaultInner().withLocation("ctxtgzukxi").withTags(mapOf("cpjuisa", "qtgqqqxhrnxr"))))
+            .withNextLink("iopid");
         model = BinaryData.fromObject(model).toObject(BackupVaultsList.class);
-        Assertions.assertEquals("aauzzptjazysd", model.value().get(0).location());
-        Assertions.assertEquals("zwwva", model.value().get(0).tags().get("qyuvvfonkp"));
-        Assertions.assertEquals("ukiscvwmzhw", model.nextLink());
+        Assertions.assertEquals("ctxtgzukxi", model.value().get(0).location());
+        Assertions.assertEquals("qtgqqqxhrnxr", model.value().get(0).tags().get("cpjuisa"));
+        Assertions.assertEquals("iopid", model.nextLink());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusWithResponseMockTests.java
index ea8efdc0879c..2c21d8060d7e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsGetLatestStatusWithResponseMockTests.java
@@ -20,7 +20,7 @@ public final class BackupsGetLatestStatusWithResponseMockTests {
     @Test
     public void testGetLatestStatusWithResponse() throws Exception {
         String responseStr
-            = "{\"healthy\":false,\"relationshipStatus\":\"Transferring\",\"mirrorState\":\"Uninitialized\",\"unhealthyReason\":\"t\",\"errorMessage\":\"wxvgpiudeugfsxze\",\"lastTransferSize\":4398452965731029485,\"lastTransferType\":\"kufykhvu\",\"totalTransferBytes\":6780132883179901729,\"transferProgressBytes\":7620434324373710563}";
+            = "{\"healthy\":false,\"relationshipStatus\":\"Idle\",\"mirrorState\":\"Uninitialized\",\"unhealthyReason\":\"t\",\"errorMessage\":\"wxvgpiudeugfsxze\",\"lastTransferSize\":4398452965731029485,\"lastTransferType\":\"kufykhvu\",\"totalTransferBytes\":6780132883179901729,\"transferProgressBytes\":7620434324373710563}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsListTests.java
index 6e137736bdf0..b9a348deb236 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsListTests.java
@@ -14,36 +14,40 @@ public final class BackupsListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupsList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"backupId\":\"ruocbgo\",\"creationDate\":\"2021-09-09T07:59:53Z\",\"snapshotCreationDate\":\"2021-06-09T05:18:29Z\",\"completionDate\":\"2021-10-30T08:46:10Z\",\"provisioningState\":\"fhjxakvvjgs\",\"size\":158425814591742958,\"label\":\"lmywwtkgkxnyed\",\"backupType\":\"Scheduled\",\"failureReason\":\"vudtjuewbcihx\",\"volumeResourceId\":\"uwhcjyxccybv\",\"useExistingSnapshot\":false,\"snapshotName\":\"kkudzp\",\"backupPolicyResourceId\":\"wjplma\",\"isLargeVolume\":true},\"id\":\"yohpfkyrkdbdgiog\",\"name\":\"jkmnwq\",\"type\":\"nobaiyhddviacegf\"},{\"properties\":{\"backupId\":\"ntfpmvmemfnc\",\"creationDate\":\"2021-04-11T13:12:11Z\",\"snapshotCreationDate\":\"2021-06-14T22:03:09Z\",\"completionDate\":\"2021-05-11T22:31:41Z\",\"provisioningState\":\"xlllchp\",\"size\":6992539715692685627,\"label\":\"vwrdnhfukuvsj\",\"backupType\":\"Scheduled\",\"failureReason\":\"myst\",\"volumeResourceId\":\"luqypfcvlerch\",\"useExistingSnapshot\":false,\"snapshotName\":\"f\",\"backupPolicyResourceId\":\"babwidfcxss\",\"isLargeVolume\":false},\"id\":\"noxyhkx\",\"name\":\"qddrihpfhoqcaae\",\"type\":\"dao\"},{\"properties\":{\"backupId\":\"jvlpjxxkzbr\",\"creationDate\":\"2021-03-11T14:16:56Z\",\"snapshotCreationDate\":\"2021-11-12T11:21:56Z\",\"completionDate\":\"2021-02-25T10:11:49Z\",\"provisioningState\":\"ykzkdncjdxo\",\"size\":1505765482746886279,\"label\":\"gculap\",\"backupType\":\"Manual\",\"failureReason\":\"pgogtqxepny\",\"volumeResourceId\":\"b\",\"useExistingSnapshot\":true,\"snapshotName\":\"lyjt\",\"backupPolicyResourceId\":\"of\",\"isLargeVolume\":true},\"id\":\"fcibyfmowuxrkj\",\"name\":\"vdwxfzwi\",\"type\":\"vwzjbhyz\"}],\"nextLink\":\"jrkambtrnegvmnv\"}")
+            "{\"value\":[{\"properties\":{\"backupId\":\"nssxmojmsvpk\",\"creationDate\":\"2021-06-06T17:21:37Z\",\"snapshotCreationDate\":\"2021-09-03T19:15:23Z\",\"completionDate\":\"2021-06-29T06:50:32Z\",\"provisioningState\":\"zqljyxgtczh\",\"size\":7400057251495207075,\"label\":\"dshmkxmaehvbbx\",\"backupType\":\"Manual\",\"failureReason\":\"ltfnhtbaxkgx\",\"volumeResourceId\":\"wrck\",\"useExistingSnapshot\":false,\"snapshotName\":\"yhpluodpvruudlgz\",\"backupPolicyResourceId\":\"thost\",\"isLargeVolume\":true},\"id\":\"tvdxeclzedqb\",\"name\":\"vh\",\"type\":\"lhpl\"},{\"properties\":{\"backupId\":\"qkdlw\",\"creationDate\":\"2021-06-02T22:55:20Z\",\"snapshotCreationDate\":\"2021-04-24T09:11:55Z\",\"completionDate\":\"2021-11-14T02:43:26Z\",\"provisioningState\":\"xtrqjfs\",\"size\":9061974154322303797,\"label\":\"xhwgfwsrtaw\",\"backupType\":\"Scheduled\",\"failureReason\":\"brhu\",\"volumeResourceId\":\"skh\",\"useExistingSnapshot\":false,\"snapshotName\":\"oookkqfq\",\"backupPolicyResourceId\":\"vleo\",\"isLargeVolume\":false},\"id\":\"uiqtqzfavy\",\"name\":\"nqqyba\",\"type\":\"yeua\"},{\"properties\":{\"backupId\":\"kq\",\"creationDate\":\"2021-05-30T08:11:11Z\",\"snapshotCreationDate\":\"2021-11-18T10:38:36Z\",\"completionDate\":\"2021-08-16T02:48:50Z\",\"provisioningState\":\"sjc\",\"size\":9014783078965490836,\"label\":\"ntiew\",\"backupType\":\"Manual\",\"failureReason\":\"bquwrbehw\",\"volumeResourceId\":\"gohbuffkmrq\",\"useExistingSnapshot\":true,\"snapshotName\":\"hmxtdr\",\"backupPolicyResourceId\":\"utacoe\",\"isLargeVolume\":false},\"id\":\"wzcjznmwcpmgua\",\"name\":\"draufactkah\",\"type\":\"ovajjziuxxps\"},{\"properties\":{\"backupId\":\"eekulfgslqubkwd\",\"creationDate\":\"2021-11-08T16:30:24Z\",\"snapshotCreationDate\":\"2021-04-28T05:58:57Z\",\"completionDate\":\"2021-04-26T16:34:12Z\",\"provisioningState\":\"ujbazpjuohminyfl\",\"size\":3372671534162877362,\"label\":\"duvwpklvxwmygd\",\"backupType\":\"Manual\",\"failureReason\":\"qchiszep\",\"volumeResourceId\":\"nb\",\"useExistingSnapshot\":false,\"snapshotName\":\"gibbdaxc\",\"backupPolicyResourceId\":\"fozauorsuk\",\"isLargeVolume\":false},\"id\":\"qplhlvnu\",\"name\":\"epzl\",\"type\":\"phwzsoldweyuqdu\"}],\"nextLink\":\"mnnrwr\"}")
             .toObject(BackupsList.class);
-        Assertions.assertEquals("lmywwtkgkxnyed", model.value().get(0).label());
-        Assertions.assertEquals("uwhcjyxccybv", model.value().get(0).volumeResourceId());
+        Assertions.assertEquals("dshmkxmaehvbbx", model.value().get(0).label());
+        Assertions.assertEquals("wrck", model.value().get(0).volumeResourceId());
         Assertions.assertFalse(model.value().get(0).useExistingSnapshot());
-        Assertions.assertEquals("kkudzp", model.value().get(0).snapshotName());
-        Assertions.assertEquals("jrkambtrnegvmnv", model.nextLink());
+        Assertions.assertEquals("yhpluodpvruudlgz", model.value().get(0).snapshotName());
+        Assertions.assertEquals("mnnrwr", model.nextLink());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         BackupsList model = new BackupsList().withValue(Arrays.asList(
-            new BackupInner().withLabel("lmywwtkgkxnyed")
-                .withVolumeResourceId("uwhcjyxccybv")
+            new BackupInner().withLabel("dshmkxmaehvbbx")
+                .withVolumeResourceId("wrck")
                 .withUseExistingSnapshot(false)
-                .withSnapshotName("kkudzp"),
-            new BackupInner().withLabel("vwrdnhfukuvsj")
-                .withVolumeResourceId("luqypfcvlerch")
+                .withSnapshotName("yhpluodpvruudlgz"),
+            new BackupInner().withLabel("xhwgfwsrtaw")
+                .withVolumeResourceId("skh")
                 .withUseExistingSnapshot(false)
-                .withSnapshotName("f"),
-            new BackupInner().withLabel("gculap")
-                .withVolumeResourceId("b")
+                .withSnapshotName("oookkqfq"),
+            new BackupInner().withLabel("ntiew")
+                .withVolumeResourceId("gohbuffkmrq")
                 .withUseExistingSnapshot(true)
-                .withSnapshotName("lyjt")))
-            .withNextLink("jrkambtrnegvmnv");
+                .withSnapshotName("hmxtdr"),
+            new BackupInner().withLabel("duvwpklvxwmygd")
+                .withVolumeResourceId("nb")
+                .withUseExistingSnapshot(false)
+                .withSnapshotName("gibbdaxc")))
+            .withNextLink("mnnrwr");
         model = BinaryData.fromObject(model).toObject(BackupsList.class);
-        Assertions.assertEquals("lmywwtkgkxnyed", model.value().get(0).label());
-        Assertions.assertEquals("uwhcjyxccybv", model.value().get(0).volumeResourceId());
+        Assertions.assertEquals("dshmkxmaehvbbx", model.value().get(0).label());
+        Assertions.assertEquals("wrck", model.value().get(0).volumeResourceId());
         Assertions.assertFalse(model.value().get(0).useExistingSnapshot());
-        Assertions.assertEquals("kkudzp", model.value().get(0).snapshotName());
-        Assertions.assertEquals("jrkambtrnegvmnv", model.nextLink());
+        Assertions.assertEquals("yhpluodpvruudlgz", model.value().get(0).snapshotName());
+        Assertions.assertEquals("mnnrwr", model.nextLink());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsMigrationRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsMigrationRequestTests.java
index c8648885b69f..26a886ef5af2 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsMigrationRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BackupsMigrationRequestTests.java
@@ -12,14 +12,14 @@ public final class BackupsMigrationRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BackupsMigrationRequest model
-            = BinaryData.fromString("{\"backupVaultId\":\"metttwgd\"}").toObject(BackupsMigrationRequest.class);
-        Assertions.assertEquals("metttwgd", model.backupVaultId());
+            = BinaryData.fromString("{\"backupVaultId\":\"xlllchp\"}").toObject(BackupsMigrationRequest.class);
+        Assertions.assertEquals("xlllchp", model.backupVaultId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        BackupsMigrationRequest model = new BackupsMigrationRequest().withBackupVaultId("metttwgd");
+        BackupsMigrationRequest model = new BackupsMigrationRequest().withBackupVaultId("xlllchp");
         model = BinaryData.fromObject(model).toObject(BackupsMigrationRequest.class);
-        Assertions.assertEquals("metttwgd", model.backupVaultId());
+        Assertions.assertEquals("xlllchp", model.backupVaultId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BreakFileLocksRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BreakFileLocksRequestTests.java
index 1fc80da37e01..a3656b973d0e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BreakFileLocksRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BreakFileLocksRequestTests.java
@@ -12,18 +12,18 @@ public final class BreakFileLocksRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         BreakFileLocksRequest model
-            = BinaryData.fromString("{\"clientIp\":\"zrpzb\",\"confirmRunningDisruptiveOperation\":true}")
+            = BinaryData.fromString("{\"clientIp\":\"odfvuefywsbp\",\"confirmRunningDisruptiveOperation\":false}")
                 .toObject(BreakFileLocksRequest.class);
-        Assertions.assertEquals("zrpzb", model.clientIp());
-        Assertions.assertTrue(model.confirmRunningDisruptiveOperation());
+        Assertions.assertEquals("odfvuefywsbp", model.clientIp());
+        Assertions.assertFalse(model.confirmRunningDisruptiveOperation());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         BreakFileLocksRequest model
-            = new BreakFileLocksRequest().withClientIp("zrpzb").withConfirmRunningDisruptiveOperation(true);
+            = new BreakFileLocksRequest().withClientIp("odfvuefywsbp").withConfirmRunningDisruptiveOperation(false);
         model = BinaryData.fromObject(model).toObject(BreakFileLocksRequest.class);
-        Assertions.assertEquals("zrpzb", model.clientIp());
-        Assertions.assertTrue(model.confirmRunningDisruptiveOperation());
+        Assertions.assertEquals("odfvuefywsbp", model.clientIp());
+        Assertions.assertFalse(model.confirmRunningDisruptiveOperation());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketInnerTests.java
new file mode 100644
index 000000000000..de6e0c9d0d94
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketInnerTests.java
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketInnerTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketInner model = BinaryData.fromString(
+            "{\"properties\":{\"path\":\"qvldspastjbkkd\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":2449402228806390937,\"groupId\":8338278745166305901},\"cifsUser\":{\"username\":\"rriloz\"}},\"provisioningState\":\"Updating\",\"status\":\"Active\",\"server\":{\"fqdn\":\"pxlktwkuziycsl\",\"certificateCommonName\":\"ufuztcktyhjtq\",\"certificateExpiryDate\":\"2021-07-31T16:28:11Z\",\"ipAddress\":\"zulwmmrqzzrrj\",\"certificateObject\":\"gl\"},\"permissions\":\"ReadOnly\"},\"id\":\"krvq\",\"name\":\"ev\",\"type\":\"oepry\"}")
+            .toObject(BucketInner.class);
+        Assertions.assertEquals("qvldspastjbkkd", model.path());
+        Assertions.assertEquals(2449402228806390937L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(8338278745166305901L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("rriloz", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("pxlktwkuziycsl", model.server().fqdn());
+        Assertions.assertEquals("gl", model.server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, model.permissions());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketInner model = new BucketInner().withPath("qvldspastjbkkd")
+            .withFileSystemUser(new FileSystemUser()
+                .withNfsUser(new NfsUser().withUserId(2449402228806390937L).withGroupId(8338278745166305901L))
+                .withCifsUser(new CifsUser().withUsername("rriloz")))
+            .withServer(new BucketServerProperties().withFqdn("pxlktwkuziycsl").withCertificateObject("gl"))
+            .withPermissions(BucketPermissions.READ_ONLY);
+        model = BinaryData.fromObject(model).toObject(BucketInner.class);
+        Assertions.assertEquals("qvldspastjbkkd", model.path());
+        Assertions.assertEquals(2449402228806390937L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(8338278745166305901L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("rriloz", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("pxlktwkuziycsl", model.server().fqdn());
+        Assertions.assertEquals("gl", model.server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, model.permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketListTests.java
new file mode 100644
index 000000000000..77790eb9c44a
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketListTests.java
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.BucketInner;
+import com.azure.resourcemanager.netapp.models.BucketList;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import java.util.Arrays;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketListTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketList model = BinaryData.fromString(
+            "{\"value\":[{\"properties\":{\"path\":\"vwrdnhfukuvsj\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":4555995825543462077,\"groupId\":5004966782756902203},\"cifsUser\":{\"username\":\"qypfcv\"}},\"provisioningState\":\"Accepted\",\"status\":\"NoCredentialsSet\",\"server\":{\"fqdn\":\"bm\",\"certificateCommonName\":\"jbabwidf\",\"certificateExpiryDate\":\"2021-05-31T20:33:23Z\",\"ipAddress\":\"puunnoxyhkxgqd\",\"certificateObject\":\"i\"},\"permissions\":\"ReadOnly\"},\"id\":\"oqcaaewdaomdj\",\"name\":\"l\",\"type\":\"jxxkzbrmsgei\"},{\"properties\":{\"path\":\"ykzkdncjdxo\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":5953743800911269792,\"groupId\":63941224599650233},\"cifsUser\":{\"username\":\"z\"}},\"provisioningState\":\"Moving\",\"status\":\"Active\",\"server\":{\"fqdn\":\"tqxepn\",\"certificateCommonName\":\"b\",\"certificateExpiryDate\":\"2021-09-26T03:21:12Z\",\"ipAddress\":\"lyjt\",\"certificateObject\":\"of\"},\"permissions\":\"ReadWrite\"},\"id\":\"fcibyfmowuxrkj\",\"name\":\"vdwxfzwi\",\"type\":\"vwzjbhyz\"}],\"nextLink\":\"jrkambtrnegvmnv\"}")
+            .toObject(BucketList.class);
+        Assertions.assertEquals("vwrdnhfukuvsj", model.value().get(0).path());
+        Assertions.assertEquals(4555995825543462077L, model.value().get(0).fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(5004966782756902203L, model.value().get(0).fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("qypfcv", model.value().get(0).fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("bm", model.value().get(0).server().fqdn());
+        Assertions.assertEquals("i", model.value().get(0).server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, model.value().get(0).permissions());
+        Assertions.assertEquals("jrkambtrnegvmnv", model.nextLink());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketList model
+            = new BucketList()
+                .withValue(
+                    Arrays
+                        .asList(
+                            new BucketInner().withPath("vwrdnhfukuvsj")
+                                .withFileSystemUser(new FileSystemUser()
+                                    .withNfsUser(new NfsUser().withUserId(4555995825543462077L)
+                                        .withGroupId(5004966782756902203L))
+                                    .withCifsUser(new CifsUser().withUsername("qypfcv")))
+                                .withServer(new BucketServerProperties().withFqdn("bm").withCertificateObject("i"))
+                                .withPermissions(BucketPermissions.READ_ONLY),
+                            new BucketInner().withPath("ykzkdncjdxo")
+                                .withFileSystemUser(new FileSystemUser()
+                                    .withNfsUser(
+                                        new NfsUser().withUserId(5953743800911269792L).withGroupId(63941224599650233L))
+                                    .withCifsUser(new CifsUser().withUsername("z")))
+                                .withServer(new BucketServerProperties().withFqdn("tqxepn").withCertificateObject("of"))
+                                .withPermissions(BucketPermissions.READ_WRITE)))
+                .withNextLink("jrkambtrnegvmnv");
+        model = BinaryData.fromObject(model).toObject(BucketList.class);
+        Assertions.assertEquals("vwrdnhfukuvsj", model.value().get(0).path());
+        Assertions.assertEquals(4555995825543462077L, model.value().get(0).fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(5004966782756902203L, model.value().get(0).fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("qypfcv", model.value().get(0).fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("bm", model.value().get(0).server().fqdn());
+        Assertions.assertEquals("i", model.value().get(0).server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, model.value().get(0).permissions());
+        Assertions.assertEquals("jrkambtrnegvmnv", model.nextLink());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPatchPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPatchPropertiesTests.java
new file mode 100644
index 000000000000..b4eff900f09d
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPatchPropertiesTests.java
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.BucketPatchProperties;
+import com.azure.resourcemanager.netapp.models.BucketPatchPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketPatchPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketPatchProperties model = BinaryData.fromString(
+            "{\"path\":\"pnvdxz\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":5184735928624525939,\"groupId\":107685473629648091},\"cifsUser\":{\"username\":\"qagt\"}},\"provisioningState\":\"Deleting\",\"server\":{\"fqdn\":\"fkqojpy\",\"certificateObject\":\"gtrd\"},\"permissions\":\"ReadOnly\"}")
+            .toObject(BucketPatchProperties.class);
+        Assertions.assertEquals("pnvdxz", model.path());
+        Assertions.assertEquals(5184735928624525939L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(107685473629648091L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("qagt", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("fkqojpy", model.server().fqdn());
+        Assertions.assertEquals("gtrd", model.server().certificateObject());
+        Assertions.assertEquals(BucketPatchPermissions.READ_ONLY, model.permissions());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketPatchProperties model = new BucketPatchProperties().withPath("pnvdxz")
+            .withFileSystemUser(new FileSystemUser()
+                .withNfsUser(new NfsUser().withUserId(5184735928624525939L).withGroupId(107685473629648091L))
+                .withCifsUser(new CifsUser().withUsername("qagt")))
+            .withServer(new BucketServerPatchProperties().withFqdn("fkqojpy").withCertificateObject("gtrd"))
+            .withPermissions(BucketPatchPermissions.READ_ONLY);
+        model = BinaryData.fromObject(model).toObject(BucketPatchProperties.class);
+        Assertions.assertEquals("pnvdxz", model.path());
+        Assertions.assertEquals(5184735928624525939L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(107685473629648091L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("qagt", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("fkqojpy", model.server().fqdn());
+        Assertions.assertEquals("gtrd", model.server().certificateObject());
+        Assertions.assertEquals(BucketPatchPermissions.READ_ONLY, model.permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPatchTests.java
new file mode 100644
index 000000000000..2a22dba45918
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPatchTests.java
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.BucketPatch;
+import com.azure.resourcemanager.netapp.models.BucketPatchPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketPatchTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketPatch model = BinaryData.fromString(
+            "{\"properties\":{\"path\":\"yik\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":4524825461883558353,\"groupId\":3474591298556028282},\"cifsUser\":{\"username\":\"mncsttijfybvp\"}},\"provisioningState\":\"Provisioning\",\"server\":{\"fqdn\":\"gsgbdhuzq\",\"certificateObject\":\"j\"},\"permissions\":\"ReadWrite\"},\"id\":\"nscliqhzvhxnk\",\"name\":\"mtk\",\"type\":\"bo\"}")
+            .toObject(BucketPatch.class);
+        Assertions.assertEquals("yik", model.path());
+        Assertions.assertEquals(4524825461883558353L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(3474591298556028282L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("mncsttijfybvp", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("gsgbdhuzq", model.server().fqdn());
+        Assertions.assertEquals("j", model.server().certificateObject());
+        Assertions.assertEquals(BucketPatchPermissions.READ_WRITE, model.permissions());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketPatch model = new BucketPatch().withPath("yik")
+            .withFileSystemUser(new FileSystemUser()
+                .withNfsUser(new NfsUser().withUserId(4524825461883558353L).withGroupId(3474591298556028282L))
+                .withCifsUser(new CifsUser().withUsername("mncsttijfybvp")))
+            .withServer(new BucketServerPatchProperties().withFqdn("gsgbdhuzq").withCertificateObject("j"))
+            .withPermissions(BucketPatchPermissions.READ_WRITE);
+        model = BinaryData.fromObject(model).toObject(BucketPatch.class);
+        Assertions.assertEquals("yik", model.path());
+        Assertions.assertEquals(4524825461883558353L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(3474591298556028282L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("mncsttijfybvp", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("gsgbdhuzq", model.server().fqdn());
+        Assertions.assertEquals("j", model.server().certificateObject());
+        Assertions.assertEquals(BucketPatchPermissions.READ_WRITE, model.permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPropertiesTests.java
new file mode 100644
index 000000000000..e7a183139613
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketPropertiesTests.java
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.BucketProperties;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketProperties model = BinaryData.fromString(
+            "{\"path\":\"nwy\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":2401123487237665785,\"groupId\":9080277930297911514},\"cifsUser\":{\"username\":\"aawzqadfl\"}},\"provisioningState\":\"Succeeded\",\"status\":\"CredentialsExpired\",\"server\":{\"fqdn\":\"aecxndtic\",\"certificateCommonName\":\"pvz\",\"certificateExpiryDate\":\"2021-12-05T05:29:15Z\",\"ipAddress\":\"mldgxobfirc\",\"certificateObject\":\"pkc\"},\"permissions\":\"ReadOnly\"}")
+            .toObject(BucketProperties.class);
+        Assertions.assertEquals("nwy", model.path());
+        Assertions.assertEquals(2401123487237665785L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(9080277930297911514L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("aawzqadfl", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("aecxndtic", model.server().fqdn());
+        Assertions.assertEquals("pkc", model.server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, model.permissions());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketProperties model = new BucketProperties().withPath("nwy")
+            .withFileSystemUser(new FileSystemUser()
+                .withNfsUser(new NfsUser().withUserId(2401123487237665785L).withGroupId(9080277930297911514L))
+                .withCifsUser(new CifsUser().withUsername("aawzqadfl")))
+            .withServer(new BucketServerProperties().withFqdn("aecxndtic").withCertificateObject("pkc"))
+            .withPermissions(BucketPermissions.READ_ONLY);
+        model = BinaryData.fromObject(model).toObject(BucketProperties.class);
+        Assertions.assertEquals("nwy", model.path());
+        Assertions.assertEquals(2401123487237665785L, model.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(9080277930297911514L, model.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("aawzqadfl", model.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("aecxndtic", model.server().fqdn());
+        Assertions.assertEquals("pkc", model.server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, model.permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketServerPatchPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketServerPatchPropertiesTests.java
new file mode 100644
index 000000000000..51e6a93c47d3
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketServerPatchPropertiesTests.java
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.BucketServerPatchProperties;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketServerPatchPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketServerPatchProperties model = BinaryData.fromString("{\"fqdn\":\"mzzs\",\"certificateObject\":\"m\"}")
+            .toObject(BucketServerPatchProperties.class);
+        Assertions.assertEquals("mzzs", model.fqdn());
+        Assertions.assertEquals("m", model.certificateObject());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketServerPatchProperties model
+            = new BucketServerPatchProperties().withFqdn("mzzs").withCertificateObject("m");
+        model = BinaryData.fromObject(model).toObject(BucketServerPatchProperties.class);
+        Assertions.assertEquals("mzzs", model.fqdn());
+        Assertions.assertEquals("m", model.certificateObject());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketServerPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketServerPropertiesTests.java
new file mode 100644
index 000000000000..06b01c9bc65a
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketServerPropertiesTests.java
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import org.junit.jupiter.api.Assertions;
+
+public final class BucketServerPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        BucketServerProperties model = BinaryData.fromString(
+            "{\"fqdn\":\"tj\",\"certificateCommonName\":\"ysdzhez\",\"certificateExpiryDate\":\"2021-07-03T03:06:30Z\",\"ipAddress\":\"iqyuvvfo\",\"certificateObject\":\"p\"}")
+            .toObject(BucketServerProperties.class);
+        Assertions.assertEquals("tj", model.fqdn());
+        Assertions.assertEquals("p", model.certificateObject());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        BucketServerProperties model = new BucketServerProperties().withFqdn("tj").withCertificateObject("p");
+        model = BinaryData.fromObject(model).toObject(BucketServerProperties.class);
+        Assertions.assertEquals("tj", model.fqdn());
+        Assertions.assertEquals("p", model.certificateObject());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsCreateOrUpdateMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsCreateOrUpdateMockTests.java
new file mode 100644
index 000000000000..226554956976
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsCreateOrUpdateMockTests.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import com.azure.resourcemanager.netapp.models.BucketServerProperties;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class BucketsCreateOrUpdateMockTests {
+    @Test
+    public void testCreateOrUpdate() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"path\":\"oyzbamwineofvf\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":6634708207074157916,\"groupId\":961650519866515302},\"cifsUser\":{\"username\":\"boclzhzjknyuxgv\"}},\"provisioningState\":\"Succeeded\",\"status\":\"NoCredentialsSet\",\"server\":{\"fqdn\":\"pzaamrdixtreki\",\"certificateCommonName\":\"wyskbruffgll\",\"certificateExpiryDate\":\"2021-02-08T16:15:08Z\",\"ipAddress\":\"tvlxhrpqh\",\"certificateObject\":\"blcouqehbhbcdszi\"},\"permissions\":\"ReadWrite\"},\"id\":\"ndo\",\"name\":\"pmbltoormkfql\",\"type\":\"xldykalsygaolnjp\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        NetAppFilesManager manager = NetAppFilesManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        Bucket response = manager.buckets()
+            .define("sryjqgdkfno")
+            .withExistingVolume("lrtywikdmhlakuf", "gbhgau", "cdixmx", "f")
+            .withPath("oqbvjhvefgwbmqj")
+            .withFileSystemUser(new FileSystemUser()
+                .withNfsUser(new NfsUser().withUserId(4828105529763249652L).withGroupId(1533925900451984741L))
+                .withCifsUser(new CifsUser().withUsername("b")))
+            .withServer(new BucketServerProperties().withFqdn("b").withCertificateObject("jcmmzrrscub"))
+            .withPermissions(BucketPermissions.READ_ONLY)
+            .create();
+
+        Assertions.assertEquals("oyzbamwineofvf", response.path());
+        Assertions.assertEquals(6634708207074157916L, response.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(961650519866515302L, response.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("boclzhzjknyuxgv", response.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("pzaamrdixtreki", response.server().fqdn());
+        Assertions.assertEquals("blcouqehbhbcdszi", response.server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_WRITE, response.permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsGetWithResponseMockTests.java
new file mode 100644
index 000000000000..0a07ec97201a
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsGetWithResponseMockTests.java
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class BucketsGetWithResponseMockTests {
+    @Test
+    public void testGetWithResponse() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"path\":\"vmaonurjt\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":7748280938760549360,\"groupId\":1762623729794433667},\"cifsUser\":{\"username\":\"slclblyjxltbsju\"}},\"provisioningState\":\"Accepted\",\"status\":\"NoCredentialsSet\",\"server\":{\"fqdn\":\"gctmgxuupbezq\",\"certificateCommonName\":\"ydrtc\",\"certificateExpiryDate\":\"2021-07-11T08:16:04Z\",\"ipAddress\":\"qkkyihztgeqmg\",\"certificateObject\":\"gwldo\"},\"permissions\":\"ReadOnly\"},\"id\":\"llcecfehuwaoa\",\"name\":\"uhicqllizstacsjv\",\"type\":\"rweft\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        NetAppFilesManager manager = NetAppFilesManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        Bucket response = manager.buckets()
+            .getWithResponse("vidbztjhqtfb", "vnynkb", "etnjuhpsprkz", "aupia", "cxnafbwqrooh",
+                com.azure.core.util.Context.NONE)
+            .getValue();
+
+        Assertions.assertEquals("vmaonurjt", response.path());
+        Assertions.assertEquals(7748280938760549360L, response.fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(1762623729794433667L, response.fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("slclblyjxltbsju", response.fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("gctmgxuupbezq", response.server().fqdn());
+        Assertions.assertEquals("gwldo", response.server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, response.permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsListMockTests.java
new file mode 100644
index 000000000000..4c37efd44af9
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/BucketsListMockTests.java
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
+import com.azure.resourcemanager.netapp.models.Bucket;
+import com.azure.resourcemanager.netapp.models.BucketPermissions;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class BucketsListMockTests {
+    @Test
+    public void testList() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"path\":\"mp\",\"fileSystemUser\":{\"nfsUser\":{\"userId\":8509605857029832760,\"groupId\":3653005464283088293},\"cifsUser\":{\"username\":\"tuiaclkiexhajlfn\"}},\"provisioningState\":\"Moving\",\"status\":\"NoCredentialsSet\",\"server\":{\"fqdn\":\"t\",\"certificateCommonName\":\"iygbpvn\",\"certificateExpiryDate\":\"2021-04-05T20:55:30Z\",\"ipAddress\":\"txkyctwwgzwxjlm\",\"certificateObject\":\"vogygzyvneez\"},\"permissions\":\"ReadOnly\"},\"id\":\"htmoqqtlffhzbkr\",\"name\":\"jjjavfqnvhnq\",\"type\":\"ewdogiyetesy\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        NetAppFilesManager manager = NetAppFilesManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<Bucket> response
+            = manager.buckets().list("patlbijp", "gsksrfhf", "olmk", "bnxwc", com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("mp", response.iterator().next().path());
+        Assertions.assertEquals(8509605857029832760L, response.iterator().next().fileSystemUser().nfsUser().userId());
+        Assertions.assertEquals(3653005464283088293L, response.iterator().next().fileSystemUser().nfsUser().groupId());
+        Assertions.assertEquals("tuiaclkiexhajlfn", response.iterator().next().fileSystemUser().cifsUser().username());
+        Assertions.assertEquals("t", response.iterator().next().server().fqdn());
+        Assertions.assertEquals("vogygzyvneez", response.iterator().next().server().certificateObject());
+        Assertions.assertEquals(BucketPermissions.READ_ONLY, response.iterator().next().permissions());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolInnerTests.java
index d6fca8cb13d2..89a363179ffc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolInnerTests.java
@@ -17,37 +17,37 @@ public final class CapacityPoolInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CapacityPoolInner model = BinaryData.fromString(
-            "{\"etag\":\"wgxhn\",\"properties\":{\"poolId\":\"kxfbkpycgklwndn\",\"size\":8301108996863671678,\"serviceLevel\":\"Standard\",\"provisioningState\":\"whvylw\",\"totalThroughputMibps\":95.03192,\"utilizedThroughputMibps\":3.2213032,\"customThroughputMibps\":26.354445,\"qosType\":\"Manual\",\"coolAccess\":false,\"encryptionType\":\"Single\"},\"location\":\"wuwprzqlv\",\"tags\":{\"khfxobbcswsrt\":\"lupj\",\"fgb\":\"riplrbpbewtg\"},\"id\":\"c\",\"name\":\"wxzvlvqhjkb\",\"type\":\"gibtnm\"}")
+            "{\"etag\":\"oyrxvwfudwpzntxh\",\"properties\":{\"poolId\":\"hl\",\"size\":2074686312708379193,\"serviceLevel\":\"Premium\",\"provisioningState\":\"ck\",\"totalThroughputMibps\":70.234726,\"utilizedThroughputMibps\":47.60285,\"customThroughputMibps\":84.460884,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Double\"},\"location\":\"anuzbpzkafkuw\",\"tags\":{\"seyvj\":\"nwbmeh\"},\"id\":\"srtslhspkdeem\",\"name\":\"ofmxagkvtmelmqkr\",\"type\":\"ahvljuaha\"}")
             .toObject(CapacityPoolInner.class);
-        Assertions.assertEquals("wuwprzqlv", model.location());
-        Assertions.assertEquals("lupj", model.tags().get("khfxobbcswsrt"));
-        Assertions.assertEquals(8301108996863671678L, model.size());
-        Assertions.assertEquals(ServiceLevel.STANDARD, model.serviceLevel());
-        Assertions.assertEquals(26.354445F, model.customThroughputMibps());
-        Assertions.assertEquals(QosType.MANUAL, model.qosType());
-        Assertions.assertFalse(model.coolAccess());
-        Assertions.assertEquals(EncryptionType.SINGLE, model.encryptionType());
+        Assertions.assertEquals("anuzbpzkafkuw", model.location());
+        Assertions.assertEquals("nwbmeh", model.tags().get("seyvj"));
+        Assertions.assertEquals(2074686312708379193L, model.size());
+        Assertions.assertEquals(ServiceLevel.PREMIUM, model.serviceLevel());
+        Assertions.assertEquals(84.460884F, model.customThroughputMibps());
+        Assertions.assertEquals(QosType.AUTO, model.qosType());
+        Assertions.assertTrue(model.coolAccess());
+        Assertions.assertEquals(EncryptionType.DOUBLE, model.encryptionType());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CapacityPoolInner model = new CapacityPoolInner().withLocation("wuwprzqlv")
-            .withTags(mapOf("khfxobbcswsrt", "lupj", "fgb", "riplrbpbewtg"))
-            .withSize(8301108996863671678L)
-            .withServiceLevel(ServiceLevel.STANDARD)
-            .withCustomThroughputMibps(26.354445F)
-            .withQosType(QosType.MANUAL)
-            .withCoolAccess(false)
-            .withEncryptionType(EncryptionType.SINGLE);
+        CapacityPoolInner model = new CapacityPoolInner().withLocation("anuzbpzkafkuw")
+            .withTags(mapOf("seyvj", "nwbmeh"))
+            .withSize(2074686312708379193L)
+            .withServiceLevel(ServiceLevel.PREMIUM)
+            .withCustomThroughputMibps(84.460884F)
+            .withQosType(QosType.AUTO)
+            .withCoolAccess(true)
+            .withEncryptionType(EncryptionType.DOUBLE);
         model = BinaryData.fromObject(model).toObject(CapacityPoolInner.class);
-        Assertions.assertEquals("wuwprzqlv", model.location());
-        Assertions.assertEquals("lupj", model.tags().get("khfxobbcswsrt"));
-        Assertions.assertEquals(8301108996863671678L, model.size());
-        Assertions.assertEquals(ServiceLevel.STANDARD, model.serviceLevel());
-        Assertions.assertEquals(26.354445F, model.customThroughputMibps());
-        Assertions.assertEquals(QosType.MANUAL, model.qosType());
-        Assertions.assertFalse(model.coolAccess());
-        Assertions.assertEquals(EncryptionType.SINGLE, model.encryptionType());
+        Assertions.assertEquals("anuzbpzkafkuw", model.location());
+        Assertions.assertEquals("nwbmeh", model.tags().get("seyvj"));
+        Assertions.assertEquals(2074686312708379193L, model.size());
+        Assertions.assertEquals(ServiceLevel.PREMIUM, model.serviceLevel());
+        Assertions.assertEquals(84.460884F, model.customThroughputMibps());
+        Assertions.assertEquals(QosType.AUTO, model.qosType());
+        Assertions.assertTrue(model.coolAccess());
+        Assertions.assertEquals(EncryptionType.DOUBLE, model.encryptionType());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolListTests.java
index 14dad1342dda..f82efb064e3c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolListTests.java
@@ -19,67 +19,40 @@ public final class CapacityPoolListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CapacityPoolList model = BinaryData.fromString(
-            "{\"value\":[{\"etag\":\"ovplw\",\"properties\":{\"poolId\":\"hvgyuguosvmk\",\"size\":1888744128895186672,\"serviceLevel\":\"Ultra\",\"provisioningState\":\"ukkfplgmgs\",\"totalThroughputMibps\":12.549341,\"utilizedThroughputMibps\":12.664736,\"customThroughputMibps\":27.84288,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Single\"},\"location\":\"pwiyig\",\"tags\":{\"upedeojnabckhs\":\"kdwzbaiuebbaumny\",\"ie\":\"txp\"},\"id\":\"tfhvpesapskrdqmh\",\"name\":\"jdhtldwkyzxu\",\"type\":\"tkncwsc\"},{\"etag\":\"vlxotogtwrupqsx\",\"properties\":{\"poolId\":\"micykvceoveilo\",\"size\":5776325152256074523,\"serviceLevel\":\"Standard\",\"provisioningState\":\"fj\",\"totalThroughputMibps\":90.63137,\"utilizedThroughputMibps\":14.5528555,\"customThroughputMibps\":12.441629,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Double\"},\"location\":\"kphywpnvjto\",\"tags\":{\"crpab\":\"rmclfplphoxu\",\"sbj\":\"ye\",\"wfqkquj\":\"azqugxywpmueefj\",\"cq\":\"dsuyonobgla\"},\"id\":\"tcc\",\"name\":\"g\",\"type\":\"udxytlmoyrx\"},{\"etag\":\"fudwpznt\",\"properties\":{\"poolId\":\"dzhlrq\",\"size\":1353160377015146530,\"serviceLevel\":\"Standard\",\"provisioningState\":\"frlh\",\"totalThroughputMibps\":84.460884,\"utilizedThroughputMibps\":17.647808,\"customThroughputMibps\":60.66745,\"qosType\":\"Manual\",\"coolAccess\":true,\"encryptionType\":\"Double\"},\"location\":\"bpzkafkuwbc\",\"tags\":{\"eyvjusrtslhspkde\":\"bmehh\"},\"id\":\"maofmxagkv\",\"name\":\"melmqkrha\",\"type\":\"vljua\"},{\"etag\":\"quhcdhmduala\",\"properties\":{\"poolId\":\"qpv\",\"size\":3403871146459803360,\"serviceLevel\":\"Standard\",\"provisioningState\":\"sr\",\"totalThroughputMibps\":20.306206,\"utilizedThroughputMibps\":29.336273,\"customThroughputMibps\":29.841852,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Single\"},\"location\":\"isgwbnbbeldawkz\",\"tags\":{\"rqhakauha\":\"io\",\"cjooxdjebwpucwwf\":\"hsfwxosowzxcug\",\"hzceuojgjrwjue\":\"ovbvmeueciv\"},\"id\":\"otwmcdyt\",\"name\":\"x\",\"type\":\"it\"}],\"nextLink\":\"rjaw\"}")
+            "{\"value\":[{\"etag\":\"i\",\"properties\":{\"poolId\":\"kvceoveilovnotyf\",\"size\":3928242933963476014,\"serviceLevel\":\"Standard\",\"provisioningState\":\"bkc\",\"totalThroughputMibps\":22.10667,\"utilizedThroughputMibps\":20.912487,\"customThroughputMibps\":83.024284,\"qosType\":\"Auto\",\"coolAccess\":false,\"encryptionType\":\"Double\"},\"location\":\"vjtoqnermclfp\",\"tags\":{\"azqugxywpmueefj\":\"oxuscrpabgyepsbj\",\"dsuyonobgla\":\"wfqkquj\"},\"id\":\"cq\",\"name\":\"tcc\",\"type\":\"g\"}],\"nextLink\":\"dxyt\"}")
             .toObject(CapacityPoolList.class);
-        Assertions.assertEquals("pwiyig", model.value().get(0).location());
-        Assertions.assertEquals("kdwzbaiuebbaumny", model.value().get(0).tags().get("upedeojnabckhs"));
-        Assertions.assertEquals(1888744128895186672L, model.value().get(0).size());
-        Assertions.assertEquals(ServiceLevel.ULTRA, model.value().get(0).serviceLevel());
-        Assertions.assertEquals(27.84288F, model.value().get(0).customThroughputMibps());
+        Assertions.assertEquals("vjtoqnermclfp", model.value().get(0).location());
+        Assertions.assertEquals("oxuscrpabgyepsbj", model.value().get(0).tags().get("azqugxywpmueefj"));
+        Assertions.assertEquals(3928242933963476014L, model.value().get(0).size());
+        Assertions.assertEquals(ServiceLevel.STANDARD, model.value().get(0).serviceLevel());
+        Assertions.assertEquals(83.024284F, model.value().get(0).customThroughputMibps());
         Assertions.assertEquals(QosType.AUTO, model.value().get(0).qosType());
-        Assertions.assertTrue(model.value().get(0).coolAccess());
-        Assertions.assertEquals(EncryptionType.SINGLE, model.value().get(0).encryptionType());
-        Assertions.assertEquals("rjaw", model.nextLink());
+        Assertions.assertFalse(model.value().get(0).coolAccess());
+        Assertions.assertEquals(EncryptionType.DOUBLE, model.value().get(0).encryptionType());
+        Assertions.assertEquals("dxyt", model.nextLink());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CapacityPoolList model = new CapacityPoolList().withValue(Arrays.asList(
-            new CapacityPoolInner().withLocation("pwiyig")
-                .withTags(mapOf("upedeojnabckhs", "kdwzbaiuebbaumny", "ie", "txp"))
-                .withSize(1888744128895186672L)
-                .withServiceLevel(ServiceLevel.ULTRA)
-                .withCustomThroughputMibps(27.84288F)
-                .withQosType(QosType.AUTO)
-                .withCoolAccess(true)
-                .withEncryptionType(EncryptionType.SINGLE),
-            new CapacityPoolInner().withLocation("kphywpnvjto")
-                .withTags(
-                    mapOf("crpab", "rmclfplphoxu", "sbj", "ye", "wfqkquj", "azqugxywpmueefj", "cq", "dsuyonobgla"))
-                .withSize(5776325152256074523L)
-                .withServiceLevel(ServiceLevel.STANDARD)
-                .withCustomThroughputMibps(12.441629F)
-                .withQosType(QosType.AUTO)
-                .withCoolAccess(true)
-                .withEncryptionType(EncryptionType.DOUBLE),
-            new CapacityPoolInner().withLocation("bpzkafkuwbc")
-                .withTags(mapOf("eyvjusrtslhspkde", "bmehh"))
-                .withSize(1353160377015146530L)
-                .withServiceLevel(ServiceLevel.STANDARD)
-                .withCustomThroughputMibps(60.66745F)
-                .withQosType(QosType.MANUAL)
-                .withCoolAccess(true)
-                .withEncryptionType(EncryptionType.DOUBLE),
-            new CapacityPoolInner().withLocation("isgwbnbbeldawkz")
-                .withTags(
-                    mapOf("rqhakauha", "io", "cjooxdjebwpucwwf", "hsfwxosowzxcug", "hzceuojgjrwjue", "ovbvmeueciv"))
-                .withSize(3403871146459803360L)
+        CapacityPoolList model
+            = new CapacityPoolList().withValue(Arrays.asList(new CapacityPoolInner().withLocation("vjtoqnermclfp")
+                .withTags(mapOf("azqugxywpmueefj", "oxuscrpabgyepsbj", "dsuyonobgla", "wfqkquj"))
+                .withSize(3928242933963476014L)
                 .withServiceLevel(ServiceLevel.STANDARD)
-                .withCustomThroughputMibps(29.841852F)
+                .withCustomThroughputMibps(83.024284F)
                 .withQosType(QosType.AUTO)
-                .withCoolAccess(true)
-                .withEncryptionType(EncryptionType.SINGLE)))
-            .withNextLink("rjaw");
+                .withCoolAccess(false)
+                .withEncryptionType(EncryptionType.DOUBLE))).withNextLink("dxyt");
         model = BinaryData.fromObject(model).toObject(CapacityPoolList.class);
-        Assertions.assertEquals("pwiyig", model.value().get(0).location());
-        Assertions.assertEquals("kdwzbaiuebbaumny", model.value().get(0).tags().get("upedeojnabckhs"));
-        Assertions.assertEquals(1888744128895186672L, model.value().get(0).size());
-        Assertions.assertEquals(ServiceLevel.ULTRA, model.value().get(0).serviceLevel());
-        Assertions.assertEquals(27.84288F, model.value().get(0).customThroughputMibps());
+        Assertions.assertEquals("vjtoqnermclfp", model.value().get(0).location());
+        Assertions.assertEquals("oxuscrpabgyepsbj", model.value().get(0).tags().get("azqugxywpmueefj"));
+        Assertions.assertEquals(3928242933963476014L, model.value().get(0).size());
+        Assertions.assertEquals(ServiceLevel.STANDARD, model.value().get(0).serviceLevel());
+        Assertions.assertEquals(83.024284F, model.value().get(0).customThroughputMibps());
         Assertions.assertEquals(QosType.AUTO, model.value().get(0).qosType());
-        Assertions.assertTrue(model.value().get(0).coolAccess());
-        Assertions.assertEquals(EncryptionType.SINGLE, model.value().get(0).encryptionType());
-        Assertions.assertEquals("rjaw", model.nextLink());
+        Assertions.assertFalse(model.value().get(0).coolAccess());
+        Assertions.assertEquals(EncryptionType.DOUBLE, model.value().get(0).encryptionType());
+        Assertions.assertEquals("dxyt", model.nextLink());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolPatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolPatchTests.java
index c3f147296ca4..113783684779 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolPatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CapacityPoolPatchTests.java
@@ -15,31 +15,31 @@ public final class CapacityPoolPatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CapacityPoolPatch model = BinaryData.fromString(
-            "{\"properties\":{\"size\":3572252614282926056,\"qosType\":\"Manual\",\"coolAccess\":false,\"customThroughputMibps\":92.02532},\"location\":\"xqpsrknftguv\",\"tags\":{\"qtayri\":\"hprwmdyv\",\"bycnojvkn\":\"wroyqbexrmcq\",\"qsgzvahapj\":\"e\"},\"id\":\"zhpvgqzcjrvxd\",\"name\":\"zlmwlxkvugfhz\",\"type\":\"vawjvzunlu\"}")
+            "{\"properties\":{\"size\":6983403361765190016,\"qosType\":\"Auto\",\"coolAccess\":false,\"customThroughputMibps\":96.34032},\"location\":\"e\",\"tags\":{\"ali\":\"wkz\"},\"id\":\"urqhaka\",\"name\":\"hashsfwxosow\",\"type\":\"xcug\"}")
             .toObject(CapacityPoolPatch.class);
-        Assertions.assertEquals("xqpsrknftguv", model.location());
-        Assertions.assertEquals("hprwmdyv", model.tags().get("qtayri"));
-        Assertions.assertEquals(3572252614282926056L, model.size());
-        Assertions.assertEquals(QosType.MANUAL, model.qosType());
+        Assertions.assertEquals("e", model.location());
+        Assertions.assertEquals("wkz", model.tags().get("ali"));
+        Assertions.assertEquals(6983403361765190016L, model.size());
+        Assertions.assertEquals(QosType.AUTO, model.qosType());
         Assertions.assertFalse(model.coolAccess());
-        Assertions.assertEquals(92.02532F, model.customThroughputMibps());
+        Assertions.assertEquals(96.34032F, model.customThroughputMibps());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CapacityPoolPatch model = new CapacityPoolPatch().withLocation("xqpsrknftguv")
-            .withTags(mapOf("qtayri", "hprwmdyv", "bycnojvkn", "wroyqbexrmcq", "qsgzvahapj", "e"))
-            .withSize(3572252614282926056L)
-            .withQosType(QosType.MANUAL)
+        CapacityPoolPatch model = new CapacityPoolPatch().withLocation("e")
+            .withTags(mapOf("ali", "wkz"))
+            .withSize(6983403361765190016L)
+            .withQosType(QosType.AUTO)
             .withCoolAccess(false)
-            .withCustomThroughputMibps(92.02532F);
+            .withCustomThroughputMibps(96.34032F);
         model = BinaryData.fromObject(model).toObject(CapacityPoolPatch.class);
-        Assertions.assertEquals("xqpsrknftguv", model.location());
-        Assertions.assertEquals("hprwmdyv", model.tags().get("qtayri"));
-        Assertions.assertEquals(3572252614282926056L, model.size());
-        Assertions.assertEquals(QosType.MANUAL, model.qosType());
+        Assertions.assertEquals("e", model.location());
+        Assertions.assertEquals("wkz", model.tags().get("ali"));
+        Assertions.assertEquals(6983403361765190016L, model.size());
+        Assertions.assertEquals(QosType.AUTO, model.qosType());
         Assertions.assertFalse(model.coolAccess());
-        Assertions.assertEquals(92.02532F, model.customThroughputMibps());
+        Assertions.assertEquals(96.34032F, model.customThroughputMibps());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CifsUserTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CifsUserTests.java
new file mode 100644
index 000000000000..51b01e1462df
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/CifsUserTests.java
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class CifsUserTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        CifsUser model = BinaryData.fromString("{\"username\":\"wdigumbnraauz\"}").toObject(CifsUser.class);
+        Assertions.assertEquals("wdigumbnraauz", model.username());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        CifsUser model = new CifsUser().withUsername("wdigumbnraauz");
+        model = BinaryData.fromObject(model).toObject(CifsUser.class);
+        Assertions.assertEquals("wdigumbnraauz", model.username());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ClusterPeerCommandResponseInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ClusterPeerCommandResponseInnerTests.java
index ed0f69ee6b70..cb373b701bc9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ClusterPeerCommandResponseInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ClusterPeerCommandResponseInnerTests.java
@@ -11,15 +11,15 @@
 public final class ClusterPeerCommandResponseInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ClusterPeerCommandResponseInner model
-            = BinaryData.fromString("{\"peerAcceptCommand\":\"k\"}").toObject(ClusterPeerCommandResponseInner.class);
-        Assertions.assertEquals("k", model.peerAcceptCommand());
+        ClusterPeerCommandResponseInner model = BinaryData.fromString("{\"peerAcceptCommand\":\"uijfqk\"}")
+            .toObject(ClusterPeerCommandResponseInner.class);
+        Assertions.assertEquals("uijfqk", model.peerAcceptCommand());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ClusterPeerCommandResponseInner model = new ClusterPeerCommandResponseInner().withPeerAcceptCommand("k");
+        ClusterPeerCommandResponseInner model = new ClusterPeerCommandResponseInner().withPeerAcceptCommand("uijfqk");
         model = BinaryData.fromObject(model).toObject(ClusterPeerCommandResponseInner.class);
-        Assertions.assertEquals("k", model.peerAcceptCommand());
+        Assertions.assertEquals("uijfqk", model.peerAcceptCommand());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DailyScheduleTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DailyScheduleTests.java
index 266d8be27ec7..f579ee703d16 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DailyScheduleTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DailyScheduleTests.java
@@ -12,24 +12,24 @@ public final class DailyScheduleTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DailySchedule model = BinaryData.fromString(
-            "{\"snapshotsToKeep\":1689388778,\"hour\":1285451884,\"minute\":404775625,\"usedBytes\":1362554750636902661}")
+            "{\"snapshotsToKeep\":445064797,\"hour\":2101936696,\"minute\":1225956555,\"usedBytes\":8980911642598746949}")
             .toObject(DailySchedule.class);
-        Assertions.assertEquals(1689388778, model.snapshotsToKeep());
-        Assertions.assertEquals(1285451884, model.hour());
-        Assertions.assertEquals(404775625, model.minute());
-        Assertions.assertEquals(1362554750636902661L, model.usedBytes());
+        Assertions.assertEquals(445064797, model.snapshotsToKeep());
+        Assertions.assertEquals(2101936696, model.hour());
+        Assertions.assertEquals(1225956555, model.minute());
+        Assertions.assertEquals(8980911642598746949L, model.usedBytes());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DailySchedule model = new DailySchedule().withSnapshotsToKeep(1689388778)
-            .withHour(1285451884)
-            .withMinute(404775625)
-            .withUsedBytes(1362554750636902661L);
+        DailySchedule model = new DailySchedule().withSnapshotsToKeep(445064797)
+            .withHour(2101936696)
+            .withMinute(1225956555)
+            .withUsedBytes(8980911642598746949L);
         model = BinaryData.fromObject(model).toObject(DailySchedule.class);
-        Assertions.assertEquals(1689388778, model.snapshotsToKeep());
-        Assertions.assertEquals(1285451884, model.hour());
-        Assertions.assertEquals(404775625, model.minute());
-        Assertions.assertEquals(1362554750636902661L, model.usedBytes());
+        Assertions.assertEquals(445064797, model.snapshotsToKeep());
+        Assertions.assertEquals(2101936696, model.hour());
+        Assertions.assertEquals(1225956555, model.minute());
+        Assertions.assertEquals(8980911642598746949L, model.usedBytes());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DestinationReplicationTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DestinationReplicationTests.java
index 5e5e098e108d..d8e21a47438d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DestinationReplicationTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/DestinationReplicationTests.java
@@ -13,24 +13,24 @@ public final class DestinationReplicationTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DestinationReplication model = BinaryData.fromString(
-            "{\"resourceId\":\"rbqtkoie\",\"replicationType\":\"CrossRegionReplication\",\"region\":\"tgqr\",\"zone\":\"tmuwlauwzi\"}")
+            "{\"resourceId\":\"fovasr\",\"replicationType\":\"CrossRegionReplication\",\"region\":\"bhsqfsubcgjbirxb\",\"zone\":\"bsrfbj\"}")
             .toObject(DestinationReplication.class);
-        Assertions.assertEquals("rbqtkoie", model.resourceId());
+        Assertions.assertEquals("fovasr", model.resourceId());
         Assertions.assertEquals(ReplicationType.CROSS_REGION_REPLICATION, model.replicationType());
-        Assertions.assertEquals("tgqr", model.region());
-        Assertions.assertEquals("tmuwlauwzi", model.zone());
+        Assertions.assertEquals("bhsqfsubcgjbirxb", model.region());
+        Assertions.assertEquals("bsrfbj", model.zone());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DestinationReplication model = new DestinationReplication().withResourceId("rbqtkoie")
+        DestinationReplication model = new DestinationReplication().withResourceId("fovasr")
             .withReplicationType(ReplicationType.CROSS_REGION_REPLICATION)
-            .withRegion("tgqr")
-            .withZone("tmuwlauwzi");
+            .withRegion("bhsqfsubcgjbirxb")
+            .withZone("bsrfbj");
         model = BinaryData.fromObject(model).toObject(DestinationReplication.class);
-        Assertions.assertEquals("rbqtkoie", model.resourceId());
+        Assertions.assertEquals("fovasr", model.resourceId());
         Assertions.assertEquals(ReplicationType.CROSS_REGION_REPLICATION, model.replicationType());
-        Assertions.assertEquals("tgqr", model.region());
-        Assertions.assertEquals("tmuwlauwzi", model.zone());
+        Assertions.assertEquals("bhsqfsubcgjbirxb", model.region());
+        Assertions.assertEquals("bsrfbj", model.zone());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionIdentityTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionIdentityTests.java
index d286ed50b9e2..cb6083f63222 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionIdentityTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionIdentityTests.java
@@ -11,19 +11,19 @@
 public final class EncryptionIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        EncryptionIdentity model = BinaryData.fromString(
-            "{\"principalId\":\"zfcl\",\"userAssignedIdentity\":\"axdbabph\",\"federatedClientId\":\"rqlfktsthsucocmn\"}")
+        EncryptionIdentity model = BinaryData
+            .fromString(
+                "{\"principalId\":\"wbavxbniwdj\",\"userAssignedIdentity\":\"zt\",\"federatedClientId\":\"bpg\"}")
             .toObject(EncryptionIdentity.class);
-        Assertions.assertEquals("axdbabph", model.userAssignedIdentity());
-        Assertions.assertEquals("rqlfktsthsucocmn", model.federatedClientId());
+        Assertions.assertEquals("zt", model.userAssignedIdentity());
+        Assertions.assertEquals("bpg", model.federatedClientId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        EncryptionIdentity model
-            = new EncryptionIdentity().withUserAssignedIdentity("axdbabph").withFederatedClientId("rqlfktsthsucocmn");
+        EncryptionIdentity model = new EncryptionIdentity().withUserAssignedIdentity("zt").withFederatedClientId("bpg");
         model = BinaryData.fromObject(model).toObject(EncryptionIdentity.class);
-        Assertions.assertEquals("axdbabph", model.userAssignedIdentity());
-        Assertions.assertEquals("rqlfktsthsucocmn", model.federatedClientId());
+        Assertions.assertEquals("zt", model.userAssignedIdentity());
+        Assertions.assertEquals("bpg", model.federatedClientId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionTransitionRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionTransitionRequestTests.java
index d4445f5f44da..02c0e020cb04 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionTransitionRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/EncryptionTransitionRequestTests.java
@@ -12,18 +12,18 @@ public final class EncryptionTransitionRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         EncryptionTransitionRequest model
-            = BinaryData.fromString("{\"virtualNetworkId\":\"uzyoxaep\",\"privateEndpointId\":\"kzjancuxrhdwbav\"}")
+            = BinaryData.fromString("{\"virtualNetworkId\":\"iuebbaumny\",\"privateEndpointId\":\"upedeojnabckhs\"}")
                 .toObject(EncryptionTransitionRequest.class);
-        Assertions.assertEquals("uzyoxaep", model.virtualNetworkId());
-        Assertions.assertEquals("kzjancuxrhdwbav", model.privateEndpointId());
+        Assertions.assertEquals("iuebbaumny", model.virtualNetworkId());
+        Assertions.assertEquals("upedeojnabckhs", model.privateEndpointId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        EncryptionTransitionRequest model = new EncryptionTransitionRequest().withVirtualNetworkId("uzyoxaep")
-            .withPrivateEndpointId("kzjancuxrhdwbav");
+        EncryptionTransitionRequest model = new EncryptionTransitionRequest().withVirtualNetworkId("iuebbaumny")
+            .withPrivateEndpointId("upedeojnabckhs");
         model = BinaryData.fromObject(model).toObject(EncryptionTransitionRequest.class);
-        Assertions.assertEquals("uzyoxaep", model.virtualNetworkId());
-        Assertions.assertEquals("kzjancuxrhdwbav", model.privateEndpointId());
+        Assertions.assertEquals("iuebbaumny", model.virtualNetworkId());
+        Assertions.assertEquals("upedeojnabckhs", model.privateEndpointId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ExportPolicyRuleTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ExportPolicyRuleTests.java
index 4654e570c361..b8a91d59e86d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ExportPolicyRuleTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ExportPolicyRuleTests.java
@@ -13,57 +13,57 @@ public final class ExportPolicyRuleTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExportPolicyRule model = BinaryData.fromString(
-            "{\"ruleIndex\":1631327314,\"unixReadOnly\":false,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":false,\"allowedClients\":\"yslqbhsfx\",\"hasRootAccess\":false,\"chownMode\":\"Unrestricted\"}")
+            "{\"ruleIndex\":1115460475,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":true,\"allowedClients\":\"srknftguv\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"}")
             .toObject(ExportPolicyRule.class);
-        Assertions.assertEquals(1631327314, model.ruleIndex());
+        Assertions.assertEquals(1115460475, model.ruleIndex());
         Assertions.assertFalse(model.unixReadOnly());
-        Assertions.assertFalse(model.unixReadWrite());
-        Assertions.assertTrue(model.kerberos5ReadOnly());
-        Assertions.assertTrue(model.kerberos5ReadWrite());
+        Assertions.assertTrue(model.unixReadWrite());
+        Assertions.assertFalse(model.kerberos5ReadOnly());
+        Assertions.assertFalse(model.kerberos5ReadWrite());
         Assertions.assertTrue(model.kerberos5IReadOnly());
         Assertions.assertFalse(model.kerberos5IReadWrite());
-        Assertions.assertTrue(model.kerberos5PReadOnly());
+        Assertions.assertFalse(model.kerberos5PReadOnly());
         Assertions.assertTrue(model.kerberos5PReadWrite());
         Assertions.assertFalse(model.cifs());
         Assertions.assertTrue(model.nfsv3());
-        Assertions.assertFalse(model.nfsv41());
-        Assertions.assertEquals("yslqbhsfx", model.allowedClients());
-        Assertions.assertFalse(model.hasRootAccess());
+        Assertions.assertTrue(model.nfsv41());
+        Assertions.assertEquals("srknftguv", model.allowedClients());
+        Assertions.assertTrue(model.hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.chownMode());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExportPolicyRule model = new ExportPolicyRule().withRuleIndex(1631327314)
+        ExportPolicyRule model = new ExportPolicyRule().withRuleIndex(1115460475)
             .withUnixReadOnly(false)
-            .withUnixReadWrite(false)
-            .withKerberos5ReadOnly(true)
-            .withKerberos5ReadWrite(true)
+            .withUnixReadWrite(true)
+            .withKerberos5ReadOnly(false)
+            .withKerberos5ReadWrite(false)
             .withKerberos5IReadOnly(true)
             .withKerberos5IReadWrite(false)
-            .withKerberos5PReadOnly(true)
+            .withKerberos5PReadOnly(false)
             .withKerberos5PReadWrite(true)
             .withCifs(false)
             .withNfsv3(true)
-            .withNfsv41(false)
-            .withAllowedClients("yslqbhsfx")
-            .withHasRootAccess(false)
+            .withNfsv41(true)
+            .withAllowedClients("srknftguv")
+            .withHasRootAccess(true)
             .withChownMode(ChownMode.UNRESTRICTED);
         model = BinaryData.fromObject(model).toObject(ExportPolicyRule.class);
-        Assertions.assertEquals(1631327314, model.ruleIndex());
+        Assertions.assertEquals(1115460475, model.ruleIndex());
         Assertions.assertFalse(model.unixReadOnly());
-        Assertions.assertFalse(model.unixReadWrite());
-        Assertions.assertTrue(model.kerberos5ReadOnly());
-        Assertions.assertTrue(model.kerberos5ReadWrite());
+        Assertions.assertTrue(model.unixReadWrite());
+        Assertions.assertFalse(model.kerberos5ReadOnly());
+        Assertions.assertFalse(model.kerberos5ReadWrite());
         Assertions.assertTrue(model.kerberos5IReadOnly());
         Assertions.assertFalse(model.kerberos5IReadWrite());
-        Assertions.assertTrue(model.kerberos5PReadOnly());
+        Assertions.assertFalse(model.kerberos5PReadOnly());
         Assertions.assertTrue(model.kerberos5PReadWrite());
         Assertions.assertFalse(model.cifs());
         Assertions.assertTrue(model.nfsv3());
-        Assertions.assertFalse(model.nfsv41());
-        Assertions.assertEquals("yslqbhsfx", model.allowedClients());
-        Assertions.assertFalse(model.hasRootAccess());
+        Assertions.assertTrue(model.nfsv41());
+        Assertions.assertEquals("srknftguv", model.allowedClients());
+        Assertions.assertTrue(model.hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.chownMode());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/FileSystemUserTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/FileSystemUserTests.java
new file mode 100644
index 000000000000..1f3a424661a8
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/FileSystemUserTests.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.CifsUser;
+import com.azure.resourcemanager.netapp.models.FileSystemUser;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class FileSystemUserTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        FileSystemUser model = BinaryData.fromString(
+            "{\"nfsUser\":{\"userId\":4767053638441284929,\"groupId\":2638896199399411626},\"cifsUser\":{\"username\":\"fvjlboxqvkjlmx\"}}")
+            .toObject(FileSystemUser.class);
+        Assertions.assertEquals(4767053638441284929L, model.nfsUser().userId());
+        Assertions.assertEquals(2638896199399411626L, model.nfsUser().groupId());
+        Assertions.assertEquals("fvjlboxqvkjlmx", model.cifsUser().username());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        FileSystemUser model = new FileSystemUser()
+            .withNfsUser(new NfsUser().withUserId(4767053638441284929L).withGroupId(2638896199399411626L))
+            .withCifsUser(new CifsUser().withUsername("fvjlboxqvkjlmx"));
+        model = BinaryData.fromObject(model).toObject(FileSystemUser.class);
+        Assertions.assertEquals(4767053638441284929L, model.nfsUser().userId());
+        Assertions.assertEquals(2638896199399411626L, model.nfsUser().groupId());
+        Assertions.assertEquals("fvjlboxqvkjlmx", model.cifsUser().username());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserRequestTests.java
index a55e2264643a..d4a6615b8da3 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserRequestTests.java
@@ -11,15 +11,15 @@
 public final class GetGroupIdListForLdapUserRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        GetGroupIdListForLdapUserRequest model
-            = BinaryData.fromString("{\"username\":\"kqqzqioxiysu\"}").toObject(GetGroupIdListForLdapUserRequest.class);
-        Assertions.assertEquals("kqqzqioxiysu", model.username());
+        GetGroupIdListForLdapUserRequest model = BinaryData.fromString("{\"username\":\"wyhrfouyftaakc\"}")
+            .toObject(GetGroupIdListForLdapUserRequest.class);
+        Assertions.assertEquals("wyhrfouyftaakc", model.username());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        GetGroupIdListForLdapUserRequest model = new GetGroupIdListForLdapUserRequest().withUsername("kqqzqioxiysu");
+        GetGroupIdListForLdapUserRequest model = new GetGroupIdListForLdapUserRequest().withUsername("wyhrfouyftaakc");
         model = BinaryData.fromObject(model).toObject(GetGroupIdListForLdapUserRequest.class);
-        Assertions.assertEquals("kqqzqioxiysu", model.username());
+        Assertions.assertEquals("wyhrfouyftaakc", model.username());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserResponseInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserResponseInnerTests.java
index af82dd0d0a98..eca29fb42435 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserResponseInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/GetGroupIdListForLdapUserResponseInnerTests.java
@@ -13,16 +13,16 @@ public final class GetGroupIdListForLdapUserResponseInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GetGroupIdListForLdapUserResponseInner model
-            = BinaryData.fromString("{\"groupIdsForLdapUser\":[\"ynkedyatrwyhqmib\",\"yhwitsmypyynpcdp\"]}")
+            = BinaryData.fromString("{\"groupIdsForLdapUser\":[\"yzvqt\",\"nubexk\",\"zksmondj\"]}")
                 .toObject(GetGroupIdListForLdapUserResponseInner.class);
-        Assertions.assertEquals("ynkedyatrwyhqmib", model.groupIdsForLdapUser().get(0));
+        Assertions.assertEquals("yzvqt", model.groupIdsForLdapUser().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         GetGroupIdListForLdapUserResponseInner model = new GetGroupIdListForLdapUserResponseInner()
-            .withGroupIdsForLdapUser(Arrays.asList("ynkedyatrwyhqmib", "yhwitsmypyynpcdp"));
+            .withGroupIdsForLdapUser(Arrays.asList("yzvqt", "nubexk", "zksmondj"));
         model = BinaryData.fromObject(model).toObject(GetGroupIdListForLdapUserResponseInner.class);
-        Assertions.assertEquals("ynkedyatrwyhqmib", model.groupIdsForLdapUser().get(0));
+        Assertions.assertEquals("yzvqt", model.groupIdsForLdapUser().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/HourlyScheduleTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/HourlyScheduleTests.java
index e41956f74c9f..8435626c90ba 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/HourlyScheduleTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/HourlyScheduleTests.java
@@ -12,21 +12,21 @@ public final class HourlyScheduleTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         HourlySchedule model = BinaryData
-            .fromString("{\"snapshotsToKeep\":1861224364,\"minute\":831606659,\"usedBytes\":1915905095264122072}")
+            .fromString("{\"snapshotsToKeep\":2084460640,\"minute\":124681073,\"usedBytes\":3697925526495592044}")
             .toObject(HourlySchedule.class);
-        Assertions.assertEquals(1861224364, model.snapshotsToKeep());
-        Assertions.assertEquals(831606659, model.minute());
-        Assertions.assertEquals(1915905095264122072L, model.usedBytes());
+        Assertions.assertEquals(2084460640, model.snapshotsToKeep());
+        Assertions.assertEquals(124681073, model.minute());
+        Assertions.assertEquals(3697925526495592044L, model.usedBytes());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        HourlySchedule model = new HourlySchedule().withSnapshotsToKeep(1861224364)
-            .withMinute(831606659)
-            .withUsedBytes(1915905095264122072L);
+        HourlySchedule model = new HourlySchedule().withSnapshotsToKeep(2084460640)
+            .withMinute(124681073)
+            .withUsedBytes(3697925526495592044L);
         model = BinaryData.fromObject(model).toObject(HourlySchedule.class);
-        Assertions.assertEquals(1861224364, model.snapshotsToKeep());
-        Assertions.assertEquals(831606659, model.minute());
-        Assertions.assertEquals(1915905095264122072L, model.usedBytes());
+        Assertions.assertEquals(2084460640, model.snapshotsToKeep());
+        Assertions.assertEquals(124681073, model.minute());
+        Assertions.assertEquals(3697925526495592044L, model.usedBytes());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/KeyVaultPrivateEndpointTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/KeyVaultPrivateEndpointTests.java
index 47ada8f66fe9..2d83181defff 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/KeyVaultPrivateEndpointTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/KeyVaultPrivateEndpointTests.java
@@ -12,18 +12,18 @@ public final class KeyVaultPrivateEndpointTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         KeyVaultPrivateEndpoint model
-            = BinaryData.fromString("{\"virtualNetworkId\":\"bzpfzab\",\"privateEndpointId\":\"cuh\"}")
+            = BinaryData.fromString("{\"virtualNetworkId\":\"tldwkyzxuutk\",\"privateEndpointId\":\"ws\"}")
                 .toObject(KeyVaultPrivateEndpoint.class);
-        Assertions.assertEquals("bzpfzab", model.virtualNetworkId());
-        Assertions.assertEquals("cuh", model.privateEndpointId());
+        Assertions.assertEquals("tldwkyzxuutk", model.virtualNetworkId());
+        Assertions.assertEquals("ws", model.privateEndpointId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         KeyVaultPrivateEndpoint model
-            = new KeyVaultPrivateEndpoint().withVirtualNetworkId("bzpfzab").withPrivateEndpointId("cuh");
+            = new KeyVaultPrivateEndpoint().withVirtualNetworkId("tldwkyzxuutk").withPrivateEndpointId("ws");
         model = BinaryData.fromObject(model).toObject(KeyVaultPrivateEndpoint.class);
-        Assertions.assertEquals("bzpfzab", model.virtualNetworkId());
-        Assertions.assertEquals("cuh", model.privateEndpointId());
+        Assertions.assertEquals("tldwkyzxuutk", model.virtualNetworkId());
+        Assertions.assertEquals("ws", model.privateEndpointId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapConfigurationTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapConfigurationTests.java
new file mode 100644
index 000000000000..df437094a76a
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapConfigurationTests.java
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.LdapConfiguration;
+import java.util.Arrays;
+import org.junit.jupiter.api.Assertions;
+
+public final class LdapConfigurationTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        LdapConfiguration model = BinaryData.fromString(
+            "{\"domain\":\"ytxhp\",\"ldapServers\":[\"zpfzabglc\",\"hxw\"],\"ldapOverTLS\":false,\"serverCACertificate\":\"qik\",\"certificateCNHost\":\"bovpl\"}")
+            .toObject(LdapConfiguration.class);
+        Assertions.assertEquals("ytxhp", model.domain());
+        Assertions.assertEquals("zpfzabglc", model.ldapServers().get(0));
+        Assertions.assertFalse(model.ldapOverTls());
+        Assertions.assertEquals("qik", model.serverCACertificate());
+        Assertions.assertEquals("bovpl", model.certificateCNHost());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        LdapConfiguration model = new LdapConfiguration().withDomain("ytxhp")
+            .withLdapServers(Arrays.asList("zpfzabglc", "hxw"))
+            .withLdapOverTls(false)
+            .withServerCACertificate("qik")
+            .withCertificateCNHost("bovpl");
+        model = BinaryData.fromObject(model).toObject(LdapConfiguration.class);
+        Assertions.assertEquals("ytxhp", model.domain());
+        Assertions.assertEquals("zpfzabglc", model.ldapServers().get(0));
+        Assertions.assertFalse(model.ldapOverTls());
+        Assertions.assertEquals("qik", model.serverCACertificate());
+        Assertions.assertEquals("bovpl", model.certificateCNHost());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapSearchScopeOptTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapSearchScopeOptTests.java
index 16581482622a..88db36ddeb71 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapSearchScopeOptTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/LdapSearchScopeOptTests.java
@@ -12,21 +12,21 @@ public final class LdapSearchScopeOptTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         LdapSearchScopeOpt model = BinaryData
-            .fromString("{\"userDN\":\"dbhrbnlankxm\",\"groupDN\":\"k\",\"groupMembershipFilter\":\"henbtkcxywnytn\"}")
+            .fromString("{\"userDN\":\"eyueaxibxujwb\",\"groupDN\":\"walm\",\"groupMembershipFilter\":\"yoxa\"}")
             .toObject(LdapSearchScopeOpt.class);
-        Assertions.assertEquals("dbhrbnlankxm", model.userDN());
-        Assertions.assertEquals("k", model.groupDN());
-        Assertions.assertEquals("henbtkcxywnytn", model.groupMembershipFilter());
+        Assertions.assertEquals("eyueaxibxujwb", model.userDN());
+        Assertions.assertEquals("walm", model.groupDN());
+        Assertions.assertEquals("yoxa", model.groupMembershipFilter());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        LdapSearchScopeOpt model = new LdapSearchScopeOpt().withUserDN("dbhrbnlankxm")
-            .withGroupDN("k")
-            .withGroupMembershipFilter("henbtkcxywnytn");
+        LdapSearchScopeOpt model = new LdapSearchScopeOpt().withUserDN("eyueaxibxujwb")
+            .withGroupDN("walm")
+            .withGroupMembershipFilter("yoxa");
         model = BinaryData.fromObject(model).toObject(LdapSearchScopeOpt.class);
-        Assertions.assertEquals("dbhrbnlankxm", model.userDN());
-        Assertions.assertEquals("k", model.groupDN());
-        Assertions.assertEquals("henbtkcxywnytn", model.groupMembershipFilter());
+        Assertions.assertEquals("eyueaxibxujwb", model.userDN());
+        Assertions.assertEquals("walm", model.groupDN());
+        Assertions.assertEquals("yoxa", model.groupMembershipFilter());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListQuotaReportResponseInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListQuotaReportResponseInnerTests.java
new file mode 100644
index 000000000000..b25d8bbc1e1d
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListQuotaReportResponseInnerTests.java
@@ -0,0 +1,63 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.ListQuotaReportResponseInner;
+import com.azure.resourcemanager.netapp.models.QuotaReport;
+import com.azure.resourcemanager.netapp.models.Type;
+import java.util.Arrays;
+import org.junit.jupiter.api.Assertions;
+
+public final class ListQuotaReportResponseInnerTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ListQuotaReportResponseInner model = BinaryData.fromString(
+            "{\"value\":[{\"quotaType\":\"IndividualGroupQuota\",\"quotaTarget\":\"pomgkopkwhojvp\",\"quotaLimitUsedInKiBs\":4279032137659144852,\"quotaLimitTotalInKiBs\":8997316824402958697,\"percentageUsed\":90.659065,\"isDerivedQuota\":false},{\"quotaType\":\"DefaultGroupQuota\",\"quotaTarget\":\"qvmkcxo\",\"quotaLimitUsedInKiBs\":471020820536063690,\"quotaLimitTotalInKiBs\":5939290521556195540,\"percentageUsed\":34.474384,\"isDerivedQuota\":true},{\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"tddckcb\",\"quotaLimitUsedInKiBs\":5774593596555668768,\"quotaLimitTotalInKiBs\":1999500267063441667,\"percentageUsed\":58.71668,\"isDerivedQuota\":true},{\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"hos\",\"quotaLimitUsedInKiBs\":1466489575973148390,\"quotaLimitTotalInKiBs\":2817771375039124322,\"percentageUsed\":4.6601415,\"isDerivedQuota\":false}]}")
+            .toObject(ListQuotaReportResponseInner.class);
+        Assertions.assertEquals(Type.INDIVIDUAL_GROUP_QUOTA, model.value().get(0).quotaType());
+        Assertions.assertEquals("pomgkopkwhojvp", model.value().get(0).quotaTarget());
+        Assertions.assertEquals(4279032137659144852L, model.value().get(0).quotaLimitUsedInKiBs());
+        Assertions.assertEquals(8997316824402958697L, model.value().get(0).quotaLimitTotalInKiBs());
+        Assertions.assertEquals(90.659065F, model.value().get(0).percentageUsed());
+        Assertions.assertFalse(model.value().get(0).isDerivedQuota());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        ListQuotaReportResponseInner model = new ListQuotaReportResponseInner().withValue(Arrays.asList(
+            new QuotaReport().withQuotaType(Type.INDIVIDUAL_GROUP_QUOTA)
+                .withQuotaTarget("pomgkopkwhojvp")
+                .withQuotaLimitUsedInKiBs(4279032137659144852L)
+                .withQuotaLimitTotalInKiBs(8997316824402958697L)
+                .withPercentageUsed(90.659065F)
+                .withIsDerivedQuota(false),
+            new QuotaReport().withQuotaType(Type.DEFAULT_GROUP_QUOTA)
+                .withQuotaTarget("qvmkcxo")
+                .withQuotaLimitUsedInKiBs(471020820536063690L)
+                .withQuotaLimitTotalInKiBs(5939290521556195540L)
+                .withPercentageUsed(34.474384F)
+                .withIsDerivedQuota(true),
+            new QuotaReport().withQuotaType(Type.DEFAULT_USER_QUOTA)
+                .withQuotaTarget("tddckcb")
+                .withQuotaLimitUsedInKiBs(5774593596555668768L)
+                .withQuotaLimitTotalInKiBs(1999500267063441667L)
+                .withPercentageUsed(58.71668F)
+                .withIsDerivedQuota(true),
+            new QuotaReport().withQuotaType(Type.DEFAULT_USER_QUOTA)
+                .withQuotaTarget("hos")
+                .withQuotaLimitUsedInKiBs(1466489575973148390L)
+                .withQuotaLimitTotalInKiBs(2817771375039124322L)
+                .withPercentageUsed(4.6601415F)
+                .withIsDerivedQuota(false)));
+        model = BinaryData.fromObject(model).toObject(ListQuotaReportResponseInner.class);
+        Assertions.assertEquals(Type.INDIVIDUAL_GROUP_QUOTA, model.value().get(0).quotaType());
+        Assertions.assertEquals("pomgkopkwhojvp", model.value().get(0).quotaTarget());
+        Assertions.assertEquals(4279032137659144852L, model.value().get(0).quotaLimitUsedInKiBs());
+        Assertions.assertEquals(8997316824402958697L, model.value().get(0).quotaLimitTotalInKiBs());
+        Assertions.assertEquals(90.659065F, model.value().get(0).percentageUsed());
+        Assertions.assertFalse(model.value().get(0).isDerivedQuota());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListReplicationsTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListReplicationsTests.java
index 9467924f10e0..b8fd61245dbc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListReplicationsTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ListReplicationsTests.java
@@ -16,33 +16,25 @@ public final class ListReplicationsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ListReplications model = BinaryData.fromString(
-            "{\"value\":[{\"replicationId\":\"rlkdmtncvokotl\",\"endpointType\":\"src\",\"replicationSchedule\":\"daily\",\"remoteVolumeResourceId\":\"gsyocogj\",\"remoteVolumeRegion\":\"dtbnnha\"},{\"replicationId\":\"ocrkvcikh\",\"endpointType\":\"src\",\"replicationSchedule\":\"_10minutely\",\"remoteVolumeResourceId\":\"qgxqquezikyw\",\"remoteVolumeRegion\":\"xkalla\"},{\"replicationId\":\"elwuipi\",\"endpointType\":\"src\",\"replicationSchedule\":\"hourly\",\"remoteVolumeResourceId\":\"z\",\"remoteVolumeRegion\":\"gvvcnayrhyr\"}]}")
+            "{\"value\":[{\"replicationId\":\"aasipqi\",\"endpointType\":\"dst\",\"replicationSchedule\":\"hourly\",\"remoteVolumeResourceId\":\"qerpqlpqwcc\",\"remoteVolumeRegion\":\"qgbdbuta\"}]}")
             .toObject(ListReplications.class);
-        Assertions.assertEquals(EndpointType.SRC, model.value().get(0).endpointType());
-        Assertions.assertEquals(ReplicationSchedule.DAILY, model.value().get(0).replicationSchedule());
-        Assertions.assertEquals("gsyocogj", model.value().get(0).remoteVolumeResourceId());
-        Assertions.assertEquals("dtbnnha", model.value().get(0).remoteVolumeRegion());
+        Assertions.assertEquals(EndpointType.DST, model.value().get(0).endpointType());
+        Assertions.assertEquals(ReplicationSchedule.HOURLY, model.value().get(0).replicationSchedule());
+        Assertions.assertEquals("qerpqlpqwcc", model.value().get(0).remoteVolumeResourceId());
+        Assertions.assertEquals("qgbdbuta", model.value().get(0).remoteVolumeRegion());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ListReplications model = new ListReplications().withValue(Arrays.asList(
-            new ReplicationInner().withEndpointType(EndpointType.SRC)
-                .withReplicationSchedule(ReplicationSchedule.DAILY)
-                .withRemoteVolumeResourceId("gsyocogj")
-                .withRemoteVolumeRegion("dtbnnha"),
-            new ReplicationInner().withEndpointType(EndpointType.SRC)
-                .withReplicationSchedule(ReplicationSchedule.ONE_ZEROMINUTELY)
-                .withRemoteVolumeResourceId("qgxqquezikyw")
-                .withRemoteVolumeRegion("xkalla"),
-            new ReplicationInner().withEndpointType(EndpointType.SRC)
+        ListReplications model
+            = new ListReplications().withValue(Arrays.asList(new ReplicationInner().withEndpointType(EndpointType.DST)
                 .withReplicationSchedule(ReplicationSchedule.HOURLY)
-                .withRemoteVolumeResourceId("z")
-                .withRemoteVolumeRegion("gvvcnayrhyr")));
+                .withRemoteVolumeResourceId("qerpqlpqwcc")
+                .withRemoteVolumeRegion("qgbdbuta")));
         model = BinaryData.fromObject(model).toObject(ListReplications.class);
-        Assertions.assertEquals(EndpointType.SRC, model.value().get(0).endpointType());
-        Assertions.assertEquals(ReplicationSchedule.DAILY, model.value().get(0).replicationSchedule());
-        Assertions.assertEquals("gsyocogj", model.value().get(0).remoteVolumeResourceId());
-        Assertions.assertEquals("dtbnnha", model.value().get(0).remoteVolumeRegion());
+        Assertions.assertEquals(EndpointType.DST, model.value().get(0).endpointType());
+        Assertions.assertEquals(ReplicationSchedule.HOURLY, model.value().get(0).replicationSchedule());
+        Assertions.assertEquals("qerpqlpqwcc", model.value().get(0).remoteVolumeResourceId());
+        Assertions.assertEquals("qgbdbuta", model.value().get(0).remoteVolumeRegion());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ManagedServiceIdentityTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ManagedServiceIdentityTests.java
index f80ec76d9505..3ba499eb7e9d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ManagedServiceIdentityTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ManagedServiceIdentityTests.java
@@ -16,17 +16,17 @@ public final class ManagedServiceIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedServiceIdentity model = BinaryData.fromString(
-            "{\"principalId\":\"592f83e9-ef81-4e16-b25f-cb544b5cf9ca\",\"tenantId\":\"225cbc00-d820-4d9d-a55c-1997a35263a0\",\"type\":\"None\",\"userAssignedIdentities\":{\"wwrq\":{\"principalId\":\"fe9ba13c-876b-495a-bdb0-23ab6787deb4\",\"clientId\":\"284eefae-7d27-4bd0-8e6a-19f8575e5383\"}}}")
+            "{\"principalId\":\"89047f54-fc8b-4a1f-a5fc-d757bb445c08\",\"tenantId\":\"88b5f406-0c0f-4c71-9eff-8f674c4ba104\",\"type\":\"UserAssigned\",\"userAssignedIdentities\":{\"gu\":{\"principalId\":\"edca8328-c9da-4350-b3b8-65255fe27d6e\",\"clientId\":\"8e784279-d39a-4142-802c-4755a404c940\"}}}")
             .toObject(ManagedServiceIdentity.class);
-        Assertions.assertEquals(ManagedServiceIdentityType.NONE, model.type());
+        Assertions.assertEquals(ManagedServiceIdentityType.USER_ASSIGNED, model.type());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ManagedServiceIdentity model = new ManagedServiceIdentity().withType(ManagedServiceIdentityType.NONE)
-            .withUserAssignedIdentities(mapOf("wwrq", new UserAssignedIdentity()));
+        ManagedServiceIdentity model = new ManagedServiceIdentity().withType(ManagedServiceIdentityType.USER_ASSIGNED)
+            .withUserAssignedIdentities(mapOf("gu", new UserAssignedIdentity()));
         model = BinaryData.fromObject(model).toObject(ManagedServiceIdentity.class);
-        Assertions.assertEquals(ManagedServiceIdentityType.NONE, model.type());
+        Assertions.assertEquals(ManagedServiceIdentityType.USER_ASSIGNED, model.type());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MonthlyScheduleTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MonthlyScheduleTests.java
index 710f34ea759d..f82d6641139c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MonthlyScheduleTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MonthlyScheduleTests.java
@@ -12,27 +12,27 @@ public final class MonthlyScheduleTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         MonthlySchedule model = BinaryData.fromString(
-            "{\"snapshotsToKeep\":1515177914,\"daysOfMonth\":\"r\",\"hour\":500405809,\"minute\":900186733,\"usedBytes\":2808792794921568191}")
+            "{\"snapshotsToKeep\":1895840108,\"daysOfMonth\":\"efkdlf\",\"hour\":1731932488,\"minute\":1662630957,\"usedBytes\":2710412149295788675}")
             .toObject(MonthlySchedule.class);
-        Assertions.assertEquals(1515177914, model.snapshotsToKeep());
-        Assertions.assertEquals("r", model.daysOfMonth());
-        Assertions.assertEquals(500405809, model.hour());
-        Assertions.assertEquals(900186733, model.minute());
-        Assertions.assertEquals(2808792794921568191L, model.usedBytes());
+        Assertions.assertEquals(1895840108, model.snapshotsToKeep());
+        Assertions.assertEquals("efkdlf", model.daysOfMonth());
+        Assertions.assertEquals(1731932488, model.hour());
+        Assertions.assertEquals(1662630957, model.minute());
+        Assertions.assertEquals(2710412149295788675L, model.usedBytes());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        MonthlySchedule model = new MonthlySchedule().withSnapshotsToKeep(1515177914)
-            .withDaysOfMonth("r")
-            .withHour(500405809)
-            .withMinute(900186733)
-            .withUsedBytes(2808792794921568191L);
+        MonthlySchedule model = new MonthlySchedule().withSnapshotsToKeep(1895840108)
+            .withDaysOfMonth("efkdlf")
+            .withHour(1731932488)
+            .withMinute(1662630957)
+            .withUsedBytes(2710412149295788675L);
         model = BinaryData.fromObject(model).toObject(MonthlySchedule.class);
-        Assertions.assertEquals(1515177914, model.snapshotsToKeep());
-        Assertions.assertEquals("r", model.daysOfMonth());
-        Assertions.assertEquals(500405809, model.hour());
-        Assertions.assertEquals(900186733, model.minute());
-        Assertions.assertEquals(2808792794921568191L, model.usedBytes());
+        Assertions.assertEquals(1895840108, model.snapshotsToKeep());
+        Assertions.assertEquals("efkdlf", model.daysOfMonth());
+        Assertions.assertEquals(1731932488, model.hour());
+        Assertions.assertEquals(1662630957, model.minute());
+        Assertions.assertEquals(2710412149295788675L, model.usedBytes());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MountTargetPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MountTargetPropertiesTests.java
index af679f2716ef..f17bc17b072f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MountTargetPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/MountTargetPropertiesTests.java
@@ -12,18 +12,18 @@ public final class MountTargetPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         MountTargetProperties model = BinaryData.fromString(
-            "{\"mountTargetId\":\"blmpewww\",\"fileSystemId\":\"bkrvrnsvshqj\",\"ipAddress\":\"xc\",\"smbServerFqdn\":\"bfovasrruvwbhsq\"}")
+            "{\"mountTargetId\":\"wmdyvxqtay\",\"fileSystemId\":\"iwwroyqbexrmc\",\"ipAddress\":\"bycnojvkn\",\"smbServerFqdn\":\"fqsgzvahapjy\"}")
             .toObject(MountTargetProperties.class);
-        Assertions.assertEquals("bkrvrnsvshqj", model.fileSystemId());
-        Assertions.assertEquals("bfovasrruvwbhsq", model.smbServerFqdn());
+        Assertions.assertEquals("iwwroyqbexrmc", model.fileSystemId());
+        Assertions.assertEquals("fqsgzvahapjy", model.smbServerFqdn());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         MountTargetProperties model
-            = new MountTargetProperties().withFileSystemId("bkrvrnsvshqj").withSmbServerFqdn("bfovasrruvwbhsq");
+            = new MountTargetProperties().withFileSystemId("iwwroyqbexrmc").withSmbServerFqdn("fqsgzvahapjy");
         model = BinaryData.fromObject(model).toObject(MountTargetProperties.class);
-        Assertions.assertEquals("bkrvrnsvshqj", model.fileSystemId());
-        Assertions.assertEquals("bfovasrruvwbhsq", model.smbServerFqdn());
+        Assertions.assertEquals("iwwroyqbexrmc", model.fileSystemId());
+        Assertions.assertEquals("fqsgzvahapjy", model.smbServerFqdn());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountsGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountsGetWithResponseMockTests.java
new file mode 100644
index 000000000000..90495f9144c9
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountsGetWithResponseMockTests.java
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class NetAppResourceQuotaLimitsAccountsGetWithResponseMockTests {
+    @Test
+    public void testGetWithResponse() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"current\":1992563781,\"default\":249669652,\"usage\":472451577},\"id\":\"bxigdhxiidlo\",\"name\":\"edbw\",\"type\":\"pyqy\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        NetAppFilesManager manager = NetAppFilesManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        QuotaItem response = manager.netAppResourceQuotaLimitsAccounts()
+            .getWithResponse("hltnjadhqoawjq", "yueayfbpcmsp", "byrrueqth", com.azure.core.util.Context.NONE)
+            .getValue();
+
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountsListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountsListMockTests.java
new file mode 100644
index 000000000000..aaa44cd46128
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsAccountsListMockTests.java
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class NetAppResourceQuotaLimitsAccountsListMockTests {
+    @Test
+    public void testList() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"current\":149368324,\"default\":1320300577,\"usage\":523480750},\"id\":\"klsbsbqqqagw\",\"name\":\"rxaomzisglrrcze\",\"type\":\"k\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        NetAppFilesManager manager = NetAppFilesManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<QuotaItem> response
+            = manager.netAppResourceQuotaLimitsAccounts().list("wxihs", "nxw", com.azure.core.util.Context.NONE);
+
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetWithResponseMockTests.java
index eeeeee0941ca..fb292f0b0e4f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsGetWithResponseMockTests.java
@@ -10,7 +10,7 @@
 import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.netapp.NetAppFilesManager;
-import com.azure.resourcemanager.netapp.models.SubscriptionQuotaItem;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Test;
@@ -20,7 +20,7 @@ public final class NetAppResourceQuotaLimitsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"current\":913425762,\"default\":1666163860},\"id\":\"jrwhryvy\",\"name\":\"ytdc\",\"type\":\"xgccknfnw\"}";
+            = "{\"properties\":{\"current\":1391311949,\"default\":1527840088,\"usage\":219424992},\"id\":\"pqtgsfjac\",\"name\":\"slhhxudbxv\",\"type\":\"d\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -29,8 +29,8 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        SubscriptionQuotaItem response = manager.netAppResourceQuotaLimits()
-            .getWithResponse("a", "xulcdisdos", com.azure.core.util.Context.NONE)
+        QuotaItem response = manager.netAppResourceQuotaLimits()
+            .getWithResponse("itvtzeexavo", "tfgle", com.azure.core.util.Context.NONE)
             .getValue();
 
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListMockTests.java
index 470c66db711a..992ddc877212 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceQuotaLimitsListMockTests.java
@@ -11,7 +11,7 @@
 import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.netapp.NetAppFilesManager;
-import com.azure.resourcemanager.netapp.models.SubscriptionQuotaItem;
+import com.azure.resourcemanager.netapp.models.QuotaItem;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Test;
@@ -21,7 +21,7 @@ public final class NetAppResourceQuotaLimitsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"current\":929790319,\"default\":1718381075},\"id\":\"zvytnrzvuljraaer\",\"name\":\"nok\",\"type\":\"gukkjqnvbroy\"}]}";
+            = "{\"value\":[{\"properties\":{\"current\":1418439712,\"default\":2054437598,\"usage\":1020538162},\"id\":\"s\",\"name\":\"wprtu\",\"type\":\"wsawddjibabxvi\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,8 +30,8 @@ public void testList() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        PagedIterable<SubscriptionQuotaItem> response
-            = manager.netAppResourceQuotaLimits().list("lnacgcc", com.azure.core.util.Context.NONE);
+        PagedIterable<QuotaItem> response
+            = manager.netAppResourceQuotaLimits().list("vrefdeesv", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetWithResponseMockTests.java
index ebd6662fd74c..fe178a0a9d63 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class NetAppResourceRegionInfosGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"storageToNetworkProximity\":\"AcrossT2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"xtxj\",\"isAvailable\":false},{\"availabilityZone\":\"afidltugsres\",\"isAvailable\":true}]},\"id\":\"jhoiftxfkfweg\",\"name\":\"rhptilluc\",\"type\":\"iqtgdqoh\"}";
+            = "{\"properties\":{\"storageToNetworkProximity\":\"T1\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"kkjqnvbroylaxxu\",\"isAvailable\":true},{\"availabilityZone\":\"sdosfjbjsvgjr\",\"isAvailable\":false},{\"availabilityZone\":\"vyc\",\"isAvailable\":false}]},\"id\":\"lxgccknfnwmbtm\",\"name\":\"pdvjdhttzaefedx\",\"type\":\"hchrphkmcrjdqn\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,11 +31,12 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        RegionInfoResource response
-            = manager.netAppResourceRegionInfos().getWithResponse("f", com.azure.core.util.Context.NONE).getValue();
+        RegionInfoResource response = manager.netAppResourceRegionInfos()
+            .getWithResponse("zvytnrzvuljraaer", com.azure.core.util.Context.NONE)
+            .getValue();
 
-        Assertions.assertEquals(RegionStorageToNetworkProximity.ACROSS_T2, response.storageToNetworkProximity());
-        Assertions.assertEquals("xtxj", response.availabilityZoneMappings().get(0).availabilityZone());
-        Assertions.assertFalse(response.availabilityZoneMappings().get(0).isAvailable());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.T1, response.storageToNetworkProximity());
+        Assertions.assertEquals("kkjqnvbroylaxxu", response.availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertTrue(response.availabilityZoneMappings().get(0).isAvailable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListMockTests.java
index bcf4000d8c8a..bdef090ce6c0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceRegionInfosListMockTests.java
@@ -23,7 +23,7 @@ public final class NetAppResourceRegionInfosListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"storageToNetworkProximity\":\"T2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"ch\",\"isAvailable\":false},{\"availabilityZone\":\"m\",\"isAvailable\":true},{\"availabilityZone\":\"qnsdfzpbgtgky\",\"isAvailable\":false},{\"availabilityZone\":\"hrjeuutlw\",\"isAvailable\":false}]},\"id\":\"zhokvbwnhh\",\"name\":\"qlgehg\",\"type\":\"pipifh\"}]}";
+            = "{\"value\":[{\"properties\":{\"storageToNetworkProximity\":\"T2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"es\",\"isAvailable\":true}]},\"id\":\"pagzrcxfailcfxwm\",\"name\":\"boxdfgsftufq\",\"type\":\"brjlnacgcckknhxk\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,11 +33,11 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<RegionInfoResource> response
-            = manager.netAppResourceRegionInfos().list("btmvpdvjdhttza", com.azure.core.util.Context.NONE);
+            = manager.netAppResourceRegionInfos().list("tnsi", com.azure.core.util.Context.NONE);
 
         Assertions.assertEquals(RegionStorageToNetworkProximity.T2,
             response.iterator().next().storageToNetworkProximity());
-        Assertions.assertEquals("ch", response.iterator().next().availabilityZoneMappings().get(0).availabilityZone());
-        Assertions.assertFalse(response.iterator().next().availabilityZoneMappings().get(0).isAvailable());
+        Assertions.assertEquals("es", response.iterator().next().availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertTrue(response.iterator().next().availabilityZoneMappings().get(0).isAvailable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetWithResponseMockTests.java
index 93a88c78cd64..b63f1f18d039 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesGetWithResponseMockTests.java
@@ -20,7 +20,7 @@ public final class NetAppResourceUsagesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"id\":\"odhtnsirudhzm\",\"name\":{\"value\":\"ckdlpag\",\"localizedValue\":\"cxfailcfxwmdboxd\"},\"properties\":{\"currentValue\":312353480,\"limit\":572567438,\"unit\":\"qobr\"}}";
+            = "{\"id\":\"ckt\",\"name\":{\"value\":\"merteeammxqiek\",\"localizedValue\":\"zddrt\"},\"properties\":{\"currentValue\":1587956871,\"limit\":1241768286,\"unit\":\"xv\"}}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,7 +30,7 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         UsageResult response = manager.netAppResourceUsages()
-            .getWithResponse("cbslhhx", "db", com.azure.core.util.Context.NONE)
+            .getWithResponse("zg", "klnsrmffey", com.azure.core.util.Context.NONE)
             .getValue();
 
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListMockTests.java
index 73269ba4de3d..2f7c830c1dc6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourceUsagesListMockTests.java
@@ -21,7 +21,7 @@ public final class NetAppResourceUsagesListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"id\":\"uwprtujwsawd\",\"name\":{\"value\":\"babxvitit\",\"localizedValue\":\"zeexavoxtfgle\"},\"properties\":{\"currentValue\":1391311949,\"limit\":1527840088,\"unit\":\"pypqtgsfj\"}}]}";
+            = "{\"value\":[{\"id\":\"kyxvxevblbjedn\",\"name\":{\"value\":\"age\",\"localizedValue\":\"ulxunsmjbnkpp\"},\"properties\":{\"currentValue\":1640986571,\"limit\":1909310911,\"unit\":\"vxei\"}}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,7 +31,7 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<UsageResult> response
-            = manager.netAppResourceUsages().list("cuijpxt", com.azure.core.util.Context.NONE);
+            = manager.netAppResourceUsages().list("idjks", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckFilePathAvailabilityWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckFilePathAvailabilityWithResponseMockTests.java
index dfa2eeb45614..e60639395f43 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckFilePathAvailabilityWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckFilePathAvailabilityWithResponseMockTests.java
@@ -22,7 +22,7 @@
 public final class NetAppResourcesCheckFilePathAvailabilityWithResponseMockTests {
     @Test
     public void testCheckFilePathAvailabilityWithResponse() throws Exception {
-        String responseStr = "{\"isAvailable\":false,\"reason\":\"AlreadyExists\",\"message\":\"srdvetn\"}";
+        String responseStr = "{\"isAvailable\":true,\"reason\":\"Invalid\",\"message\":\"nwlduycvuzhyrmew\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,15 +32,15 @@ public void testCheckFilePathAvailabilityWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CheckAvailabilityResponse response = manager.netAppResources()
-            .checkFilePathAvailabilityWithResponse("euvyinzqodfvpgs",
-                new FilePathAvailabilityRequest().withName("oxgsgbpfgzdjtx")
-                    .withSubnetId("zflbqvg")
-                    .withAvailabilityZone("vl"),
+            .checkFilePathAvailabilityWithResponse("nzqodfvpg",
+                new FilePathAvailabilityRequest().withName("hoxgsgbpf")
+                    .withSubnetId("zdjtxvzflbqv")
+                    .withAvailabilityZone("qvlgafcqusrdvetn"),
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertFalse(response.isAvailable());
-        Assertions.assertEquals(InAvailabilityReasonType.ALREADY_EXISTS, response.reason());
-        Assertions.assertEquals("srdvetn", response.message());
+        Assertions.assertTrue(response.isAvailable());
+        Assertions.assertEquals(InAvailabilityReasonType.INVALID, response.reason());
+        Assertions.assertEquals("nwlduycvuzhyrmew", response.message());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckNameAvailabilityWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckNameAvailabilityWithResponseMockTests.java
index 24b6fa99861e..0d3f8eb1a404 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckNameAvailabilityWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckNameAvailabilityWithResponseMockTests.java
@@ -23,7 +23,7 @@
 public final class NetAppResourcesCheckNameAvailabilityWithResponseMockTests {
     @Test
     public void testCheckNameAvailabilityWithResponse() throws Exception {
-        String responseStr = "{\"isAvailable\":false,\"reason\":\"Invalid\",\"message\":\"ivmmghfcfiwrxgk\"}";
+        String responseStr = "{\"isAvailable\":false,\"reason\":\"Invalid\",\"message\":\"wrxgkneuvy\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,15 +33,15 @@ public void testCheckNameAvailabilityWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CheckAvailabilityResponse response = manager.netAppResources()
-            .checkNameAvailabilityWithResponse("pxtgqscjav",
-                new ResourceNameAvailabilityRequest().withName("t")
+            .checkNameAvailabilityWithResponse("ftjuh",
+                new ResourceNameAvailabilityRequest().withName("qaz")
                     .withType(CheckNameResourceTypes.MICROSOFT_NET_APP_NET_APP_ACCOUNTS_CAPACITY_POOLS)
-                    .withResourceGroup("hdqazkmtgguwp"),
+                    .withResourceGroup("tgguwpijrajcivmm"),
                 com.azure.core.util.Context.NONE)
             .getValue();
 
         Assertions.assertFalse(response.isAvailable());
         Assertions.assertEquals(InAvailabilityReasonType.INVALID, response.reason());
-        Assertions.assertEquals("ivmmghfcfiwrxgk", response.message());
+        Assertions.assertEquals("wrxgkneuvy", response.message());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckQuotaAvailabilityWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckQuotaAvailabilityWithResponseMockTests.java
index 4ac48b2e68db..05121c9d168d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckQuotaAvailabilityWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesCheckQuotaAvailabilityWithResponseMockTests.java
@@ -23,7 +23,7 @@
 public final class NetAppResourcesCheckQuotaAvailabilityWithResponseMockTests {
     @Test
     public void testCheckQuotaAvailabilityWithResponse() throws Exception {
-        String responseStr = "{\"isAvailable\":true,\"reason\":\"AlreadyExists\",\"message\":\"gketwzhhzjhf\"}";
+        String responseStr = "{\"isAvailable\":false,\"reason\":\"AlreadyExists\",\"message\":\"eqsx\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,16 +33,16 @@ public void testCheckQuotaAvailabilityWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CheckAvailabilityResponse response = manager.netAppResources()
-            .checkQuotaAvailabilityWithResponse("sdtutnwlduyc",
-                new QuotaAvailabilityRequest().withName("uzhyrmewipmvekdx")
+            .checkQuotaAvailabilityWithResponse("pmvekdxukuqg",
+                new QuotaAvailabilityRequest().withName("jjxundxgke")
                     .withType(
                         CheckQuotaNameResourceTypes.MICROSOFT_NET_APP_NET_APP_ACCOUNTS_CAPACITY_POOLS_VOLUMES_SNAPSHOTS)
-                    .withResourceGroup("uqgsj"),
+                    .withResourceGroup("zhhzjhfjmhvvmu"),
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertTrue(response.isAvailable());
+        Assertions.assertFalse(response.isAvailable());
         Assertions.assertEquals(InAvailabilityReasonType.ALREADY_EXISTS, response.reason());
-        Assertions.assertEquals("gketwzhhzjhf", response.message());
+        Assertions.assertEquals("eqsx", response.message());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryNetworkSiblingSetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryNetworkSiblingSetWithResponseMockTests.java
index 0abf9e5cb3b3..11129fca1048 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryNetworkSiblingSetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryNetworkSiblingSetWithResponseMockTests.java
@@ -23,7 +23,7 @@ public final class NetAppResourcesQueryNetworkSiblingSetWithResponseMockTests {
     @Test
     public void testQueryNetworkSiblingSetWithResponse() throws Exception {
         String responseStr
-            = "{\"networkSiblingSetId\":\"ilaxhn\",\"subnetId\":\"qlyvijo\",\"networkSiblingSetStateId\":\"iv\",\"networkFeatures\":\"Basic_Standard\",\"provisioningState\":\"Failed\",\"nicInfoList\":[{\"ipAddress\":\"ixxrtikvcpw\",\"volumeResourceIds\":[\"lrcivtsoxfrke\",\"xpmyyefrpmpdnq\",\"skawaoqvmmb\"]},{\"ipAddress\":\"qfr\",\"volumeResourceIds\":[\"kzmegnitgvkxlz\",\"qdrfegcealzxwhc\",\"nsymoyqhlwigd\",\"vbkbxgomf\"]}]}";
+            = "{\"networkSiblingSetId\":\"uwivkxoy\",\"subnetId\":\"nbixxrti\",\"networkSiblingSetStateId\":\"cpwpg\",\"networkFeatures\":\"Basic\",\"provisioningState\":\"Updating\",\"nicInfoList\":[{\"ipAddress\":\"oxfrkenxpmyyefr\",\"volumeResourceIds\":[\"dnqqskawaoqvmmb\",\"pqfrtqlkz\",\"egnitg\",\"kxlzyqdrfeg\"]}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,15 +33,15 @@ public void testQueryNetworkSiblingSetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         NetworkSiblingSet response = manager.netAppResources()
-            .queryNetworkSiblingSetWithResponse("rpfoobr",
-                new QueryNetworkSiblingSetRequest().withNetworkSiblingSetId("ttymsjny").withSubnetId("qdnfwqzdz"),
+            .queryNetworkSiblingSetWithResponse("qdnfwqzdz",
+                new QueryNetworkSiblingSetRequest().withNetworkSiblingSetId("tilaxh").withSubnetId("fhqlyvi"),
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("ilaxhn", response.networkSiblingSetId());
-        Assertions.assertEquals("qlyvijo", response.subnetId());
-        Assertions.assertEquals("iv", response.networkSiblingSetStateId());
-        Assertions.assertEquals(NetworkFeatures.BASIC_STANDARD, response.networkFeatures());
-        Assertions.assertEquals("lrcivtsoxfrke", response.nicInfoList().get(0).volumeResourceIds().get(0));
+        Assertions.assertEquals("uwivkxoy", response.networkSiblingSetId());
+        Assertions.assertEquals("nbixxrti", response.subnetId());
+        Assertions.assertEquals("cpwpg", response.networkSiblingSetStateId());
+        Assertions.assertEquals(NetworkFeatures.BASIC, response.networkFeatures());
+        Assertions.assertEquals("dnqqskawaoqvmmb", response.nicInfoList().get(0).volumeResourceIds().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryRegionInfoWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryRegionInfoWithResponseMockTests.java
index c55acde25d96..7597afd3b582 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryRegionInfoWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesQueryRegionInfoWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class NetAppResourcesQueryRegionInfoWithResponseMockTests {
     @Test
     public void testQueryRegionInfoWithResponse() throws Exception {
         String responseStr
-            = "{\"storageToNetworkProximity\":\"T1\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"mun\",\"isAvailable\":false},{\"availabilityZone\":\"vmhfbuz\",\"isAvailable\":false},{\"availabilityZone\":\"sasbhu\",\"isAvailable\":true},{\"availabilityZone\":\"hyuemslyn\",\"isAvailable\":true}]}";
+            = "{\"storageToNetworkProximity\":\"T2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"hudypohyuemsl\",\"isAvailable\":false},{\"availabilityZone\":\"yrpfoobrlttymsj\",\"isAvailable\":true}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,11 +31,12 @@ public void testQueryRegionInfoWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        RegionInfo response
-            = manager.netAppResources().queryRegionInfoWithResponse("mhv", com.azure.core.util.Context.NONE).getValue();
+        RegionInfo response = manager.netAppResources()
+            .queryRegionInfoWithResponse("mhfbuzjy", com.azure.core.util.Context.NONE)
+            .getValue();
 
-        Assertions.assertEquals(RegionStorageToNetworkProximity.T1, response.storageToNetworkProximity());
-        Assertions.assertEquals("mun", response.availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.T2, response.storageToNetworkProximity());
+        Assertions.assertEquals("hudypohyuemsl", response.availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertFalse(response.availabilityZoneMappings().get(0).isAvailable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesUpdateNetworkSiblingSetMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesUpdateNetworkSiblingSetMockTests.java
index 0507879ab3b9..480325801f6f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesUpdateNetworkSiblingSetMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetAppResourcesUpdateNetworkSiblingSetMockTests.java
@@ -23,7 +23,7 @@ public final class NetAppResourcesUpdateNetworkSiblingSetMockTests {
     @Test
     public void testUpdateNetworkSiblingSet() throws Exception {
         String responseStr
-            = "{\"networkSiblingSetId\":\"jeaahhvjhh\",\"subnetId\":\"kzyb\",\"networkSiblingSetStateId\":\"jid\",\"networkFeatures\":\"Standard_Basic\",\"provisioningState\":\"Canceled\",\"nicInfoList\":[{\"ipAddress\":\"vxevblb\",\"volumeResourceIds\":[\"nljlageuaulx\"]},{\"ipAddress\":\"smjbnkppxyn\",\"volumeResourceIds\":[\"svxeizzgwklnsr\",\"ffeycx\"]},{\"ipAddress\":\"tpiymerteea\",\"volumeResourceIds\":[\"qiekkkzddrt\",\"g\",\"ojbmxv\",\"vrefdeesv\"]}]}";
+            = "{\"networkSiblingSetId\":\"kjsqzhzbezkgi\",\"subnetId\":\"idxas\",\"networkSiblingSetStateId\":\"ddyvvjskgfmo\",\"networkFeatures\":\"Basic\",\"provisioningState\":\"Succeeded\",\"nicInfoList\":[{\"ipAddress\":\"tjeaahhvjhh\",\"volumeResourceIds\":[\"zybbj\"]}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,17 +33,17 @@ public void testUpdateNetworkSiblingSet() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         NetworkSiblingSet response = manager.netAppResources()
-            .updateNetworkSiblingSet("juwasqvdaeyyguxa",
-                new UpdateNetworkSiblingSetRequest().withNetworkSiblingSetId("jsqzhzbezk")
-                    .withSubnetId("imsidxasicddyvvj")
-                    .withNetworkSiblingSetStateId("kgfmocwahpq")
-                    .withNetworkFeatures(NetworkFeatures.STANDARD),
+            .updateNetworkSiblingSet("ealzxwhcansymoyq",
+                new UpdateNetworkSiblingSetRequest().withNetworkSiblingSetId("lwigdivbkbx")
+                    .withSubnetId("omfaj")
+                    .withNetworkSiblingSetStateId("wasqvdaeyyg")
+                    .withNetworkFeatures(NetworkFeatures.BASIC_STANDARD),
                 com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("jeaahhvjhh", response.networkSiblingSetId());
-        Assertions.assertEquals("kzyb", response.subnetId());
-        Assertions.assertEquals("jid", response.networkSiblingSetStateId());
-        Assertions.assertEquals(NetworkFeatures.STANDARD_BASIC, response.networkFeatures());
-        Assertions.assertEquals("nljlageuaulx", response.nicInfoList().get(0).volumeResourceIds().get(0));
+        Assertions.assertEquals("kjsqzhzbezkgi", response.networkSiblingSetId());
+        Assertions.assertEquals("idxas", response.subnetId());
+        Assertions.assertEquals("ddyvvjskgfmo", response.networkSiblingSetStateId());
+        Assertions.assertEquals(NetworkFeatures.BASIC, response.networkFeatures());
+        Assertions.assertEquals("zybbj", response.nicInfoList().get(0).volumeResourceIds().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetworkSiblingSetInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetworkSiblingSetInnerTests.java
index 2b27028f648b..05d5f65c93a1 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetworkSiblingSetInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NetworkSiblingSetInnerTests.java
@@ -15,31 +15,32 @@ public final class NetworkSiblingSetInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         NetworkSiblingSetInner model = BinaryData.fromString(
-            "{\"networkSiblingSetId\":\"hxdeoejz\",\"subnetId\":\"w\",\"networkSiblingSetStateId\":\"sjttgzfbish\",\"networkFeatures\":\"Basic\",\"provisioningState\":\"Updating\",\"nicInfoList\":[{\"ipAddress\":\"yeamdphagalpb\",\"volumeResourceIds\":[\"gipwhonowkg\",\"hwankixzbinjepu\",\"tmryw\"]},{\"ipAddress\":\"zoqftiyqzrnkcqvy\",\"volumeResourceIds\":[\"hzls\",\"cohoq\",\"nwvlryavwhheunmm\"]},{\"ipAddress\":\"gyxzk\",\"volumeResourceIds\":[\"cukoklyaxuconu\",\"szfkbe\",\"pewr\"]},{\"ipAddress\":\"mwvvjektcxsenhw\",\"volumeResourceIds\":[\"ffrzpwvlqdqgbiqy\"]}]}")
+            "{\"networkSiblingSetId\":\"yeamdphagalpb\",\"subnetId\":\"wgipwhono\",\"networkSiblingSetStateId\":\"gshwankixz\",\"networkFeatures\":\"Basic_Standard\",\"provisioningState\":\"Updating\",\"nicInfoList\":[{\"ipAddress\":\"tmryw\",\"volumeResourceIds\":[\"oqftiyqzrnkcq\",\"yx\",\"whzlsicohoq\",\"nwvlryavwhheunmm\"]},{\"ipAddress\":\"gyxzk\",\"volumeResourceIds\":[\"cukoklyaxuconu\",\"szfkbe\",\"pewr\"]},{\"ipAddress\":\"mwvvjektcxsenhw\",\"volumeResourceIds\":[\"ffrzpwvlqdqgbiqy\"]},{\"ipAddress\":\"hkaetcktvfc\",\"volumeResourceIds\":[\"snkymuctq\",\"jf\",\"ebrjcxe\"]}]}")
             .toObject(NetworkSiblingSetInner.class);
-        Assertions.assertEquals("hxdeoejz", model.networkSiblingSetId());
-        Assertions.assertEquals("w", model.subnetId());
-        Assertions.assertEquals("sjttgzfbish", model.networkSiblingSetStateId());
-        Assertions.assertEquals(NetworkFeatures.BASIC, model.networkFeatures());
-        Assertions.assertEquals("gipwhonowkg", model.nicInfoList().get(0).volumeResourceIds().get(0));
+        Assertions.assertEquals("yeamdphagalpb", model.networkSiblingSetId());
+        Assertions.assertEquals("wgipwhono", model.subnetId());
+        Assertions.assertEquals("gshwankixz", model.networkSiblingSetStateId());
+        Assertions.assertEquals(NetworkFeatures.BASIC_STANDARD, model.networkFeatures());
+        Assertions.assertEquals("oqftiyqzrnkcq", model.nicInfoList().get(0).volumeResourceIds().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        NetworkSiblingSetInner model = new NetworkSiblingSetInner().withNetworkSiblingSetId("hxdeoejz")
-            .withSubnetId("w")
-            .withNetworkSiblingSetStateId("sjttgzfbish")
-            .withNetworkFeatures(NetworkFeatures.BASIC)
+        NetworkSiblingSetInner model = new NetworkSiblingSetInner().withNetworkSiblingSetId("yeamdphagalpb")
+            .withSubnetId("wgipwhono")
+            .withNetworkSiblingSetStateId("gshwankixz")
+            .withNetworkFeatures(NetworkFeatures.BASIC_STANDARD)
             .withNicInfoList(Arrays.asList(
-                new NicInfo().withVolumeResourceIds(Arrays.asList("gipwhonowkg", "hwankixzbinjepu", "tmryw")),
-                new NicInfo().withVolumeResourceIds(Arrays.asList("hzls", "cohoq", "nwvlryavwhheunmm")),
+                new NicInfo()
+                    .withVolumeResourceIds(Arrays.asList("oqftiyqzrnkcq", "yx", "whzlsicohoq", "nwvlryavwhheunmm")),
                 new NicInfo().withVolumeResourceIds(Arrays.asList("cukoklyaxuconu", "szfkbe", "pewr")),
-                new NicInfo().withVolumeResourceIds(Arrays.asList("ffrzpwvlqdqgbiqy"))));
+                new NicInfo().withVolumeResourceIds(Arrays.asList("ffrzpwvlqdqgbiqy")),
+                new NicInfo().withVolumeResourceIds(Arrays.asList("snkymuctq", "jf", "ebrjcxe"))));
         model = BinaryData.fromObject(model).toObject(NetworkSiblingSetInner.class);
-        Assertions.assertEquals("hxdeoejz", model.networkSiblingSetId());
-        Assertions.assertEquals("w", model.subnetId());
-        Assertions.assertEquals("sjttgzfbish", model.networkSiblingSetStateId());
-        Assertions.assertEquals(NetworkFeatures.BASIC, model.networkFeatures());
-        Assertions.assertEquals("gipwhonowkg", model.nicInfoList().get(0).volumeResourceIds().get(0));
+        Assertions.assertEquals("yeamdphagalpb", model.networkSiblingSetId());
+        Assertions.assertEquals("wgipwhono", model.subnetId());
+        Assertions.assertEquals("gshwankixz", model.networkSiblingSetStateId());
+        Assertions.assertEquals(NetworkFeatures.BASIC_STANDARD, model.networkFeatures());
+        Assertions.assertEquals("oqftiyqzrnkcq", model.nicInfoList().get(0).volumeResourceIds().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NfsUserTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NfsUserTests.java
new file mode 100644
index 000000000000..a92648ffbae6
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NfsUserTests.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.NfsUser;
+import org.junit.jupiter.api.Assertions;
+
+public final class NfsUserTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        NfsUser model = BinaryData.fromString("{\"userId\":3072021334506042533,\"groupId\":4997501643254233811}")
+            .toObject(NfsUser.class);
+        Assertions.assertEquals(3072021334506042533L, model.userId());
+        Assertions.assertEquals(4997501643254233811L, model.groupId());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        NfsUser model = new NfsUser().withUserId(3072021334506042533L).withGroupId(4997501643254233811L);
+        model = BinaryData.fromObject(model).toObject(NfsUser.class);
+        Assertions.assertEquals(3072021334506042533L, model.userId());
+        Assertions.assertEquals(4997501643254233811L, model.groupId());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NicInfoTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NicInfoTests.java
index a49d9dde98b9..45ad8e0f3708 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NicInfoTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/NicInfoTests.java
@@ -12,16 +12,17 @@
 public final class NicInfoTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        NicInfo model = BinaryData
-            .fromString("{\"ipAddress\":\"hkaetcktvfc\",\"volumeResourceIds\":[\"snkymuctq\",\"jf\",\"ebrjcxe\"]}")
+        NicInfo model = BinaryData.fromString(
+            "{\"ipAddress\":\"uwutttxfvjrbi\",\"volumeResourceIds\":[\"xepcyvahfn\",\"jky\",\"xjvuujqgidokg\",\"ljyoxgvcltb\"]}")
             .toObject(NicInfo.class);
-        Assertions.assertEquals("snkymuctq", model.volumeResourceIds().get(0));
+        Assertions.assertEquals("xepcyvahfn", model.volumeResourceIds().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        NicInfo model = new NicInfo().withVolumeResourceIds(Arrays.asList("snkymuctq", "jf", "ebrjcxe"));
+        NicInfo model
+            = new NicInfo().withVolumeResourceIds(Arrays.asList("xepcyvahfn", "jky", "xjvuujqgidokg", "ljyoxgvcltb"));
         model = BinaryData.fromObject(model).toObject(NicInfo.class);
-        Assertions.assertEquals("snkymuctq", model.volumeResourceIds().get(0));
+        Assertions.assertEquals("xepcyvahfn", model.volumeResourceIds().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/OperationsListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/OperationsListMockTests.java
index 92cdbd625e4e..5665bda10400 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/OperationsListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/OperationsListMockTests.java
@@ -23,7 +23,7 @@ public final class OperationsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"name\":\"qxihhrmooi\",\"display\":{\"provider\":\"eypxiutcxapzhyr\",\"resource\":\"togebjoxsl\",\"operation\":\"nhl\",\"description\":\"rqnkkzjcjbtr\"},\"origin\":\"ehvvib\",\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"oqbeitpkxzt\",\"displayName\":\"ob\",\"displayDescription\":\"ft\",\"unit\":\"gfcwqmpimaqxzhem\",\"supportedAggregationTypes\":[\"Average\"],\"supportedTimeGrainTypes\":[\"jswtwkozzwc\"],\"internalMetricName\":\"kb\",\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"ajnjwltlwtjj\",\"sourceMdmNamespace\":\"ktalhsnvkcdmxz\",\"dimensions\":[{},{}],\"aggregationType\":\"imlnwiaaomylw\",\"fillGapWithZero\":false,\"category\":\"lcsethwwnpj\",\"resourceIdDimensionNameOverride\":\"fz\",\"isInternal\":false}],\"logSpecifications\":[{\"name\":\"ahfbous\",\"displayName\":\"epgfew\"},{\"name\":\"wlyxgncxyk\",\"displayName\":\"djhlimm\"},{\"name\":\"x\",\"displayName\":\"bcporxvxcjzhqizx\"}]}}}]}";
+            = "{\"value\":[{\"name\":\"ckh\",\"display\":{\"provider\":\"vdff\",\"resource\":\"afqr\",\"operation\":\"daspavehhrvk\",\"description\":\"n\"},\"origin\":\"zudhcxg\",\"properties\":{\"serviceSpecification\":{\"metricSpecifications\":[{\"name\":\"dyuib\",\"displayName\":\"fdn\",\"displayDescription\":\"ydvfvfcjnae\",\"unit\":\"srvhmgorffuki\",\"supportedAggregationTypes\":[\"Average\",\"Average\",\"Average\",\"Average\"],\"supportedTimeGrainTypes\":[\"lefaxvxilcbtgn\"],\"internalMetricName\":\"zeyqxtjjfzqlqhyc\",\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"ggxdb\",\"sourceMdmNamespace\":\"smieknlra\",\"dimensions\":[{},{},{},{}],\"aggregationType\":\"wiuagydwqf\",\"fillGapWithZero\":false,\"category\":\"rfgi\",\"resourceIdDimensionNameOverride\":\"tcojocqwo\",\"isInternal\":true},{\"name\":\"jvusfzldmozux\",\"displayName\":\"fsbtkad\",\"displayDescription\":\"s\",\"unit\":\"nbtgkbugrjqctoj\",\"supportedAggregationTypes\":[\"Average\",\"Average\",\"Average\",\"Average\"],\"supportedTimeGrainTypes\":[\"pe\",\"ojyqdhcuplcplcw\",\"hihihlhzdsqtzbsr\",\"nowc\"],\"internalMetricName\":\"fgmvecactxmwo\",\"enableRegionalMdmAccount\":false,\"sourceMdmAccount\":\"wcluqovekqvgq\",\"sourceMdmNamespace\":\"wifzmp\",\"dimensions\":[{},{},{},{}],\"aggregationType\":\"vqikfxcvhrfsphu\",\"fillGapWithZero\":true,\"category\":\"tikteusqczkvykl\",\"resourceIdDimensionNameOverride\":\"byjaffmmf\",\"isInternal\":false},{\"name\":\"cuubgq\",\"displayName\":\"rtalmet\",\"displayDescription\":\"wgdsl\",\"unit\":\"ihhrmo\",\"supportedAggregationTypes\":[\"Average\"],\"supportedTimeGrainTypes\":[\"ypxiutcxap\",\"hyrpetogebjoxs\",\"hvnh\",\"abrqnkkzj\"],\"internalMetricName\":\"b\",\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"ehvvib\",\"sourceMdmNamespace\":\"jj\",\"dimensions\":[{},{},{}],\"aggregationType\":\"beitpkx\",\"fillGapWithZero\":false,\"category\":\"ob\",\"resourceIdDimensionNameOverride\":\"ft\",\"isInternal\":true},{\"name\":\"cwq\",\"displayName\":\"imaq\",\"displayDescription\":\"hemjy\",\"unit\":\"hujswtwkozzwcul\",\"supportedAggregationTypes\":[\"Average\",\"Average\",\"Average\",\"Average\"],\"supportedTimeGrainTypes\":[\"jwltlwtjjgu\",\"talhsnvkcdmxzr\",\"oaimlnw\"],\"internalMetricName\":\"aomylwea\",\"enableRegionalMdmAccount\":true,\"sourceMdmAccount\":\"sethwwn\",\"sourceMdmNamespace\":\"hlf\",\"dimensions\":[{},{}],\"aggregationType\":\"ch\",\"fillGapWithZero\":true,\"category\":\"bousn\",\"resourceIdDimensionNameOverride\":\"pgfewetwlyx\",\"isInternal\":false}],\"logSpecifications\":[{\"name\":\"xhdjhl\",\"displayName\":\"mbcxfhbcp\"},{\"name\":\"xvxcjzhq\",\"displayName\":\"xfpxtgqscja\"}]}}}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,19 +34,19 @@ public void testList() throws Exception {
 
         PagedIterable<Operation> response = manager.operations().list(com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("qxihhrmooi", response.iterator().next().name());
-        Assertions.assertEquals("eypxiutcxapzhyr", response.iterator().next().display().provider());
-        Assertions.assertEquals("togebjoxsl", response.iterator().next().display().resource());
-        Assertions.assertEquals("nhl", response.iterator().next().display().operation());
-        Assertions.assertEquals("rqnkkzjcjbtr", response.iterator().next().display().description());
-        Assertions.assertEquals("ehvvib", response.iterator().next().origin());
-        Assertions.assertEquals("oqbeitpkxzt",
+        Assertions.assertEquals("ckh", response.iterator().next().name());
+        Assertions.assertEquals("vdff", response.iterator().next().display().provider());
+        Assertions.assertEquals("afqr", response.iterator().next().display().resource());
+        Assertions.assertEquals("daspavehhrvk", response.iterator().next().display().operation());
+        Assertions.assertEquals("n", response.iterator().next().display().description());
+        Assertions.assertEquals("zudhcxg", response.iterator().next().origin());
+        Assertions.assertEquals("dyuib",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).name());
-        Assertions.assertEquals("ob",
+        Assertions.assertEquals("fdn",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).displayName());
-        Assertions.assertEquals("ft",
+        Assertions.assertEquals("ydvfvfcjnae",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).displayDescription());
-        Assertions.assertEquals("gfcwqmpimaqxzhem",
+        Assertions.assertEquals("srvhmgorffuki",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).unit());
         Assertions.assertEquals(MetricAggregationType.AVERAGE,
             response.iterator()
@@ -56,7 +56,7 @@ public void testList() throws Exception {
                 .get(0)
                 .supportedAggregationTypes()
                 .get(0));
-        Assertions.assertEquals("jswtwkozzwc",
+        Assertions.assertEquals("lefaxvxilcbtgn",
             response.iterator()
                 .next()
                 .serviceSpecification()
@@ -64,21 +64,21 @@ public void testList() throws Exception {
                 .get(0)
                 .supportedTimeGrainTypes()
                 .get(0));
-        Assertions.assertEquals("kb",
+        Assertions.assertEquals("zeyqxtjjfzqlqhyc",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).internalMetricName());
-        Assertions.assertTrue(
+        Assertions.assertFalse(
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).enableRegionalMdmAccount());
-        Assertions.assertEquals("ajnjwltlwtjj",
+        Assertions.assertEquals("ggxdb",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).sourceMdmAccount());
-        Assertions.assertEquals("ktalhsnvkcdmxz",
+        Assertions.assertEquals("smieknlra",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).sourceMdmNamespace());
-        Assertions.assertEquals("imlnwiaaomylw",
+        Assertions.assertEquals("wiuagydwqf",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).aggregationType());
         Assertions.assertFalse(
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).fillGapWithZero());
-        Assertions.assertEquals("lcsethwwnpj",
+        Assertions.assertEquals("rfgi",
             response.iterator().next().serviceSpecification().metricSpecifications().get(0).category());
-        Assertions.assertEquals("fz",
+        Assertions.assertEquals("tcojocqwo",
             response.iterator()
                 .next()
                 .serviceSpecification()
@@ -86,10 +86,10 @@ public void testList() throws Exception {
                 .get(0)
                 .resourceIdDimensionNameOverride());
         Assertions
-            .assertFalse(response.iterator().next().serviceSpecification().metricSpecifications().get(0).isInternal());
-        Assertions.assertEquals("ahfbous",
+            .assertTrue(response.iterator().next().serviceSpecification().metricSpecifications().get(0).isInternal());
+        Assertions.assertEquals("xhdjhl",
             response.iterator().next().serviceSpecification().logSpecifications().get(0).name());
-        Assertions.assertEquals("epgfew",
+        Assertions.assertEquals("mbcxfhbcp",
             response.iterator().next().serviceSpecification().logSpecifications().get(0).displayName());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PeerClusterForVolumeMigrationRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PeerClusterForVolumeMigrationRequestTests.java
index 36e55dbf3b9a..9443bac9084e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PeerClusterForVolumeMigrationRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PeerClusterForVolumeMigrationRequestTests.java
@@ -13,16 +13,16 @@ public final class PeerClusterForVolumeMigrationRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PeerClusterForVolumeMigrationRequest model
-            = BinaryData.fromString("{\"peerIpAddresses\":[\"gpiohgwxrtfudxe\",\"xg\",\"qagvrvm\"]}")
+            = BinaryData.fromString("{\"peerIpAddresses\":[\"vljxywsu\",\"syrsndsytgadgvra\",\"aeneqnzarrwl\"]}")
                 .toObject(PeerClusterForVolumeMigrationRequest.class);
-        Assertions.assertEquals("gpiohgwxrtfudxe", model.peerIpAddresses().get(0));
+        Assertions.assertEquals("vljxywsu", model.peerIpAddresses().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         PeerClusterForVolumeMigrationRequest model = new PeerClusterForVolumeMigrationRequest()
-            .withPeerIpAddresses(Arrays.asList("gpiohgwxrtfudxe", "xg", "qagvrvm"));
+            .withPeerIpAddresses(Arrays.asList("vljxywsu", "syrsndsytgadgvra", "aeneqnzarrwl"));
         model = BinaryData.fromObject(model).toObject(PeerClusterForVolumeMigrationRequest.class);
-        Assertions.assertEquals("gpiohgwxrtfudxe", model.peerIpAddresses().get(0));
+        Assertions.assertEquals("vljxywsu", model.peerIpAddresses().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolChangeRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolChangeRequestTests.java
index fa2673ee93ba..20b218f445f7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolChangeRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolChangeRequestTests.java
@@ -12,14 +12,14 @@ public final class PoolChangeRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PoolChangeRequest model
-            = BinaryData.fromString("{\"newPoolResourceId\":\"wi\"}").toObject(PoolChangeRequest.class);
-        Assertions.assertEquals("wi", model.newPoolResourceId());
+            = BinaryData.fromString("{\"newPoolResourceId\":\"iipfpubj\"}").toObject(PoolChangeRequest.class);
+        Assertions.assertEquals("iipfpubj", model.newPoolResourceId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PoolChangeRequest model = new PoolChangeRequest().withNewPoolResourceId("wi");
+        PoolChangeRequest model = new PoolChangeRequest().withNewPoolResourceId("iipfpubj");
         model = BinaryData.fromObject(model).toObject(PoolChangeRequest.class);
-        Assertions.assertEquals("wi", model.newPoolResourceId());
+        Assertions.assertEquals("iipfpubj", model.newPoolResourceId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPatchPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPatchPropertiesTests.java
index 287eb55a340d..2e0cba609320 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPatchPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPatchPropertiesTests.java
@@ -13,24 +13,24 @@ public final class PoolPatchPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PoolPatchProperties model = BinaryData.fromString(
-            "{\"size\":4925727369956565818,\"qosType\":\"Auto\",\"coolAccess\":true,\"customThroughputMibps\":85.84867}")
+            "{\"size\":985999643464514171,\"qosType\":\"Auto\",\"coolAccess\":false,\"customThroughputMibps\":80.753395}")
             .toObject(PoolPatchProperties.class);
-        Assertions.assertEquals(4925727369956565818L, model.size());
+        Assertions.assertEquals(985999643464514171L, model.size());
         Assertions.assertEquals(QosType.AUTO, model.qosType());
-        Assertions.assertTrue(model.coolAccess());
-        Assertions.assertEquals(85.84867F, model.customThroughputMibps());
+        Assertions.assertFalse(model.coolAccess());
+        Assertions.assertEquals(80.753395F, model.customThroughputMibps());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PoolPatchProperties model = new PoolPatchProperties().withSize(4925727369956565818L)
+        PoolPatchProperties model = new PoolPatchProperties().withSize(985999643464514171L)
             .withQosType(QosType.AUTO)
-            .withCoolAccess(true)
-            .withCustomThroughputMibps(85.84867F);
+            .withCoolAccess(false)
+            .withCustomThroughputMibps(80.753395F);
         model = BinaryData.fromObject(model).toObject(PoolPatchProperties.class);
-        Assertions.assertEquals(4925727369956565818L, model.size());
+        Assertions.assertEquals(985999643464514171L, model.size());
         Assertions.assertEquals(QosType.AUTO, model.qosType());
-        Assertions.assertTrue(model.coolAccess());
-        Assertions.assertEquals(85.84867F, model.customThroughputMibps());
+        Assertions.assertFalse(model.coolAccess());
+        Assertions.assertEquals(80.753395F, model.customThroughputMibps());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPropertiesTests.java
index 61d6676683f1..78dae4c12b0d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolPropertiesTests.java
@@ -15,30 +15,30 @@ public final class PoolPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PoolProperties model = BinaryData.fromString(
-            "{\"poolId\":\"ebwwaloayqc\",\"size\":4443763316743009421,\"serviceLevel\":\"Ultra\",\"provisioningState\":\"j\",\"totalThroughputMibps\":25.971334,\"utilizedThroughputMibps\":13.51856,\"customThroughputMibps\":91.29269,\"qosType\":\"Auto\",\"coolAccess\":false,\"encryptionType\":\"Double\"}")
+            "{\"poolId\":\"hcdhmdual\",\"size\":2559158309988957100,\"serviceLevel\":\"Premium\",\"provisioningState\":\"vfadmws\",\"totalThroughputMibps\":4.791844,\"utilizedThroughputMibps\":44.560753,\"customThroughputMibps\":10.123992,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Single\"}")
             .toObject(PoolProperties.class);
-        Assertions.assertEquals(4443763316743009421L, model.size());
-        Assertions.assertEquals(ServiceLevel.ULTRA, model.serviceLevel());
-        Assertions.assertEquals(91.29269F, model.customThroughputMibps());
+        Assertions.assertEquals(2559158309988957100L, model.size());
+        Assertions.assertEquals(ServiceLevel.PREMIUM, model.serviceLevel());
+        Assertions.assertEquals(10.123992F, model.customThroughputMibps());
         Assertions.assertEquals(QosType.AUTO, model.qosType());
-        Assertions.assertFalse(model.coolAccess());
-        Assertions.assertEquals(EncryptionType.DOUBLE, model.encryptionType());
+        Assertions.assertTrue(model.coolAccess());
+        Assertions.assertEquals(EncryptionType.SINGLE, model.encryptionType());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PoolProperties model = new PoolProperties().withSize(4443763316743009421L)
-            .withServiceLevel(ServiceLevel.ULTRA)
-            .withCustomThroughputMibps(91.29269F)
+        PoolProperties model = new PoolProperties().withSize(2559158309988957100L)
+            .withServiceLevel(ServiceLevel.PREMIUM)
+            .withCustomThroughputMibps(10.123992F)
             .withQosType(QosType.AUTO)
-            .withCoolAccess(false)
-            .withEncryptionType(EncryptionType.DOUBLE);
+            .withCoolAccess(true)
+            .withEncryptionType(EncryptionType.SINGLE);
         model = BinaryData.fromObject(model).toObject(PoolProperties.class);
-        Assertions.assertEquals(4443763316743009421L, model.size());
-        Assertions.assertEquals(ServiceLevel.ULTRA, model.serviceLevel());
-        Assertions.assertEquals(91.29269F, model.customThroughputMibps());
+        Assertions.assertEquals(2559158309988957100L, model.size());
+        Assertions.assertEquals(ServiceLevel.PREMIUM, model.serviceLevel());
+        Assertions.assertEquals(10.123992F, model.customThroughputMibps());
         Assertions.assertEquals(QosType.AUTO, model.qosType());
-        Assertions.assertFalse(model.coolAccess());
-        Assertions.assertEquals(EncryptionType.DOUBLE, model.encryptionType());
+        Assertions.assertTrue(model.coolAccess());
+        Assertions.assertEquals(EncryptionType.SINGLE, model.encryptionType());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateMockTests.java
index b9a9b6b20108..d7eae3fed82f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsCreateOrUpdateMockTests.java
@@ -26,7 +26,7 @@ public final class PoolsCreateOrUpdateMockTests {
     @Test
     public void testCreateOrUpdate() throws Exception {
         String responseStr
-            = "{\"etag\":\"gleohi\",\"properties\":{\"poolId\":\"tnluankrr\",\"size\":8132506550445245383,\"serviceLevel\":\"StandardZRS\",\"provisioningState\":\"Succeeded\",\"totalThroughputMibps\":39.060837,\"utilizedThroughputMibps\":0.7475734,\"customThroughputMibps\":82.000725,\"qosType\":\"Manual\",\"coolAccess\":false,\"encryptionType\":\"Single\"},\"location\":\"cevehjkuyxoafg\",\"tags\":{\"aeylinm\":\"lt\",\"irpghriypoqeyh\":\"gv\"},\"id\":\"qhykprlpyzn\",\"name\":\"ciqdsme\",\"type\":\"iitdfuxt\"}";
+            = "{\"etag\":\"fuojrngif\",\"properties\":{\"poolId\":\"z\",\"size\":8761692939426802425,\"serviceLevel\":\"Ultra\",\"provisioningState\":\"Succeeded\",\"totalThroughputMibps\":47.9407,\"utilizedThroughputMibps\":9.529722,\"customThroughputMibps\":40.48493,\"qosType\":\"Manual\",\"coolAccess\":false,\"encryptionType\":\"Single\"},\"location\":\"lzo\",\"tags\":{\"dgug\":\"ctfnmdxotng\"},\"id\":\"yzihgrkyuizabsn\",\"name\":\"fpphoj\",\"type\":\"evy\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -36,23 +36,23 @@ public void testCreateOrUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CapacityPool response = manager.pools()
-            .define("boxjumvq")
-            .withRegion("dvruzslzojhpctf")
-            .withExistingNetAppAccount("unqndyfpchrqb", "jjrcgegydc")
-            .withSize(9205555563516540319L)
-            .withServiceLevel(ServiceLevel.PREMIUM)
-            .withTags(mapOf("zihgrkyu", "xotngfdguge", "mfp", "zabs"))
-            .withCustomThroughputMibps(93.34672F)
-            .withQosType(QosType.AUTO)
+            .define("xkjibnxmy")
+            .withRegion("wmqs")
+            .withExistingNetAppAccount("tybbwwpgda", "chzyvlixqnrk")
+            .withSize(8488562628713523190L)
+            .withServiceLevel(ServiceLevel.FLEXIBLE)
+            .withTags(mapOf("ctddun", "dqzh", "pchrqbn", "ndy", "gydcw", "jrcg"))
+            .withCustomThroughputMibps(59.372757F)
+            .withQosType(QosType.MANUAL)
             .withCoolAccess(false)
             .withEncryptionType(EncryptionType.SINGLE)
             .create();
 
-        Assertions.assertEquals("cevehjkuyxoafg", response.location());
-        Assertions.assertEquals("lt", response.tags().get("aeylinm"));
-        Assertions.assertEquals(8132506550445245383L, response.size());
-        Assertions.assertEquals(ServiceLevel.STANDARD_ZRS, response.serviceLevel());
-        Assertions.assertEquals(82.000725F, response.customThroughputMibps());
+        Assertions.assertEquals("lzo", response.location());
+        Assertions.assertEquals("ctfnmdxotng", response.tags().get("dgug"));
+        Assertions.assertEquals(8761692939426802425L, response.size());
+        Assertions.assertEquals(ServiceLevel.ULTRA, response.serviceLevel());
+        Assertions.assertEquals(40.48493F, response.customThroughputMibps());
         Assertions.assertEquals(QosType.MANUAL, response.qosType());
         Assertions.assertFalse(response.coolAccess());
         Assertions.assertEquals(EncryptionType.SINGLE, response.encryptionType());
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsGetWithResponseMockTests.java
index 3df785bbdc83..20e38b281484 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsGetWithResponseMockTests.java
@@ -24,7 +24,7 @@ public final class PoolsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"etag\":\"acqpbtuodxesza\",\"properties\":{\"poolId\":\"elawumu\",\"size\":5473347801245581276,\"serviceLevel\":\"Standard\",\"provisioningState\":\"wrrwoycqucw\",\"totalThroughputMibps\":65.6384,\"utilizedThroughputMibps\":77.321945,\"customThroughputMibps\":15.815377,\"qosType\":\"Manual\",\"coolAccess\":true,\"encryptionType\":\"Single\"},\"location\":\"psvfuurutlwexxwl\",\"tags\":{\"q\":\"iexzsrzpge\",\"wwpgdakchzyvlixq\":\"yb\",\"bn\":\"rkcxkj\",\"swqrntvlwijp\":\"mysu\"},\"id\":\"ttexoqqpwcyyufmh\",\"name\":\"uncuw\",\"type\":\"qspkcdqzhlctd\"}";
+            = "{\"etag\":\"ccxjm\",\"properties\":{\"poolId\":\"fdgnwncypuuwwlt\",\"size\":3010705428081291072,\"serviceLevel\":\"Premium\",\"provisioningState\":\"tzenk\",\"totalThroughputMibps\":58.080147,\"utilizedThroughputMibps\":71.052414,\"customThroughputMibps\":34.28848,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Single\"},\"location\":\"yhbxcudchxgs\",\"tags\":{\"vizbfhfo\":\"ldforobwj\",\"bbelawumuaslzk\":\"vacqpbtuodxesz\",\"mdr\":\"rrwoycqucwyhahn\"},\"id\":\"ywuhpsvfuur\",\"name\":\"tlwexxwlalniexz\",\"type\":\"rzpgep\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,15 +34,15 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CapacityPool response = manager.pools()
-            .getWithResponse("chxgs", "boldforobwj", "vizbfhfo", com.azure.core.util.Context.NONE)
+            .getWithResponse("xlpm", "erbdk", "lvidizozs", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("psvfuurutlwexxwl", response.location());
-        Assertions.assertEquals("iexzsrzpge", response.tags().get("q"));
-        Assertions.assertEquals(5473347801245581276L, response.size());
-        Assertions.assertEquals(ServiceLevel.STANDARD, response.serviceLevel());
-        Assertions.assertEquals(15.815377F, response.customThroughputMibps());
-        Assertions.assertEquals(QosType.MANUAL, response.qosType());
+        Assertions.assertEquals("yhbxcudchxgs", response.location());
+        Assertions.assertEquals("ldforobwj", response.tags().get("vizbfhfo"));
+        Assertions.assertEquals(3010705428081291072L, response.size());
+        Assertions.assertEquals(ServiceLevel.PREMIUM, response.serviceLevel());
+        Assertions.assertEquals(34.28848F, response.customThroughputMibps());
+        Assertions.assertEquals(QosType.AUTO, response.qosType());
         Assertions.assertTrue(response.coolAccess());
         Assertions.assertEquals(EncryptionType.SINGLE, response.encryptionType());
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsListMockTests.java
index aa9acd4aa033..8efe66d356fe 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/PoolsListMockTests.java
@@ -25,7 +25,7 @@ public final class PoolsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"etag\":\"wrevkhgnlnzon\",\"properties\":{\"poolId\":\"rpiqywncv\",\"size\":7277409446614883590,\"serviceLevel\":\"Premium\",\"provisioningState\":\"ofizehtdhgbj\",\"totalThroughputMibps\":55.94089,\"utilizedThroughputMibps\":32.998966,\"customThroughputMibps\":59.745365,\"qosType\":\"Auto\",\"coolAccess\":true,\"encryptionType\":\"Double\"},\"location\":\"lovuana\",\"tags\":{\"erbdk\":\"xlpm\",\"bccxjmonfdgn\":\"lvidizozs\",\"ypuuwwltvuqjctze\":\"n\"},\"id\":\"keifzzhmkdasv\",\"name\":\"lyhb\",\"type\":\"cu\"}]}";
+            = "{\"value\":[{\"etag\":\"mhh\",\"properties\":{\"poolId\":\"oqaqhvseufuq\",\"size\":2623469123642487838,\"serviceLevel\":\"Flexible\",\"provisioningState\":\"lcgqlsismj\",\"totalThroughputMibps\":25.698645,\"utilizedThroughputMibps\":75.36992,\"customThroughputMibps\":24.463505,\"qosType\":\"Manual\",\"coolAccess\":true,\"encryptionType\":\"Single\"},\"location\":\"rsjuivfcdisyir\",\"tags\":{\"xrxzbujrtr\":\"hcz\",\"khgn\":\"qvwre\",\"piqywnc\":\"nzonzl\",\"zehtdhgb\":\"jtszcof\"},\"id\":\"k\",\"name\":\"reljeamur\",\"type\":\"zmlovuanash\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -35,15 +35,15 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<CapacityPool> response
-            = manager.pools().list("vfcdisyirn", "zhczexrxzbujrtrh", com.azure.core.util.Context.NONE);
+            = manager.pools().list("yxeb", "ybpmzznrtffyaq", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("lovuana", response.iterator().next().location());
-        Assertions.assertEquals("xlpm", response.iterator().next().tags().get("erbdk"));
-        Assertions.assertEquals(7277409446614883590L, response.iterator().next().size());
-        Assertions.assertEquals(ServiceLevel.PREMIUM, response.iterator().next().serviceLevel());
-        Assertions.assertEquals(59.745365F, response.iterator().next().customThroughputMibps());
-        Assertions.assertEquals(QosType.AUTO, response.iterator().next().qosType());
+        Assertions.assertEquals("rsjuivfcdisyir", response.iterator().next().location());
+        Assertions.assertEquals("hcz", response.iterator().next().tags().get("xrxzbujrtr"));
+        Assertions.assertEquals(2623469123642487838L, response.iterator().next().size());
+        Assertions.assertEquals(ServiceLevel.FLEXIBLE, response.iterator().next().serviceLevel());
+        Assertions.assertEquals(24.463505F, response.iterator().next().customThroughputMibps());
+        Assertions.assertEquals(QosType.MANUAL, response.iterator().next().qosType());
         Assertions.assertTrue(response.iterator().next().coolAccess());
-        Assertions.assertEquals(EncryptionType.DOUBLE, response.iterator().next().encryptionType());
+        Assertions.assertEquals(EncryptionType.SINGLE, response.iterator().next().encryptionType());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QueryNetworkSiblingSetRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QueryNetworkSiblingSetRequestTests.java
index 5e95db30fc01..c91409b615cb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QueryNetworkSiblingSetRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QueryNetworkSiblingSetRequestTests.java
@@ -12,18 +12,18 @@ public final class QueryNetworkSiblingSetRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         QueryNetworkSiblingSetRequest model
-            = BinaryData.fromString("{\"networkSiblingSetId\":\"mrbpizcdrqj\",\"subnetId\":\"dpydn\"}")
+            = BinaryData.fromString("{\"networkSiblingSetId\":\"ishc\",\"subnetId\":\"khaj\"}")
                 .toObject(QueryNetworkSiblingSetRequest.class);
-        Assertions.assertEquals("mrbpizcdrqj", model.networkSiblingSetId());
-        Assertions.assertEquals("dpydn", model.subnetId());
+        Assertions.assertEquals("ishc", model.networkSiblingSetId());
+        Assertions.assertEquals("khaj", model.subnetId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         QueryNetworkSiblingSetRequest model
-            = new QueryNetworkSiblingSetRequest().withNetworkSiblingSetId("mrbpizcdrqj").withSubnetId("dpydn");
+            = new QueryNetworkSiblingSetRequest().withNetworkSiblingSetId("ishc").withSubnetId("khaj");
         model = BinaryData.fromObject(model).toObject(QueryNetworkSiblingSetRequest.class);
-        Assertions.assertEquals("mrbpizcdrqj", model.networkSiblingSetId());
-        Assertions.assertEquals("dpydn", model.subnetId());
+        Assertions.assertEquals("ishc", model.networkSiblingSetId());
+        Assertions.assertEquals("khaj", model.subnetId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemInnerTests.java
new file mode 100644
index 000000000000..775e37bdc133
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemInnerTests.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+
+public final class QuotaItemInnerTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        QuotaItemInner model = BinaryData.fromString(
+            "{\"properties\":{\"current\":445329815,\"default\":668778225,\"usage\":807862919},\"id\":\"okacspk\",\"name\":\"lhzdobp\",\"type\":\"jmflbvvnch\"}")
+            .toObject(QuotaItemInner.class);
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        QuotaItemInner model = new QuotaItemInner();
+        model = BinaryData.fromObject(model).toObject(QuotaItemInner.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemListTests.java
new file mode 100644
index 000000000000..095dee98f44d
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemListTests.java
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemInner;
+import com.azure.resourcemanager.netapp.models.QuotaItemList;
+import java.util.Arrays;
+import org.junit.jupiter.api.Assertions;
+
+public final class QuotaItemListTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        QuotaItemList model = BinaryData.fromString(
+            "{\"value\":[{\"properties\":{\"current\":1747091504,\"default\":1085417867,\"usage\":93101784},\"id\":\"qrvkdv\",\"name\":\"sllr\",\"type\":\"vvdfwatkpnpul\"}],\"nextLink\":\"xbczwtruwiqz\"}")
+            .toObject(QuotaItemList.class);
+        Assertions.assertEquals("xbczwtruwiqz", model.nextLink());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        QuotaItemList model
+            = new QuotaItemList().withValue(Arrays.asList(new QuotaItemInner())).withNextLink("xbczwtruwiqz");
+        model = BinaryData.fromObject(model).toObject(QuotaItemList.class);
+        Assertions.assertEquals("xbczwtruwiqz", model.nextLink());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemPropertiesTests.java
new file mode 100644
index 000000000000..fc1dfbf7aa19
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaItemPropertiesTests.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.fluent.models.QuotaItemProperties;
+
+public final class QuotaItemPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        QuotaItemProperties model
+            = BinaryData.fromString("{\"current\":812677705,\"default\":1925395217,\"usage\":1426028232}")
+                .toObject(QuotaItemProperties.class);
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        QuotaItemProperties model = new QuotaItemProperties();
+        model = BinaryData.fromObject(model).toObject(QuotaItemProperties.class);
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaReportTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaReportTests.java
new file mode 100644
index 000000000000..a37144a1d46b
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/QuotaReportTests.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.netapp.models.QuotaReport;
+import com.azure.resourcemanager.netapp.models.Type;
+import org.junit.jupiter.api.Assertions;
+
+public final class QuotaReportTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        QuotaReport model = BinaryData.fromString(
+            "{\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"qyib\",\"quotaLimitUsedInKiBs\":8539790193753290872,\"quotaLimitTotalInKiBs\":3859662575119335920,\"percentageUsed\":88.90607,\"isDerivedQuota\":true}")
+            .toObject(QuotaReport.class);
+        Assertions.assertEquals(Type.DEFAULT_USER_QUOTA, model.quotaType());
+        Assertions.assertEquals("qyib", model.quotaTarget());
+        Assertions.assertEquals(8539790193753290872L, model.quotaLimitUsedInKiBs());
+        Assertions.assertEquals(3859662575119335920L, model.quotaLimitTotalInKiBs());
+        Assertions.assertEquals(88.90607F, model.percentageUsed());
+        Assertions.assertTrue(model.isDerivedQuota());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        QuotaReport model = new QuotaReport().withQuotaType(Type.DEFAULT_USER_QUOTA)
+            .withQuotaTarget("qyib")
+            .withQuotaLimitUsedInKiBs(8539790193753290872L)
+            .withQuotaLimitTotalInKiBs(3859662575119335920L)
+            .withPercentageUsed(88.90607F)
+            .withIsDerivedQuota(true);
+        model = BinaryData.fromObject(model).toObject(QuotaReport.class);
+        Assertions.assertEquals(Type.DEFAULT_USER_QUOTA, model.quotaType());
+        Assertions.assertEquals("qyib", model.quotaTarget());
+        Assertions.assertEquals(8539790193753290872L, model.quotaLimitUsedInKiBs());
+        Assertions.assertEquals(3859662575119335920L, model.quotaLimitTotalInKiBs());
+        Assertions.assertEquals(88.90607F, model.percentageUsed());
+        Assertions.assertTrue(model.isDerivedQuota());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReestablishReplicationRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReestablishReplicationRequestTests.java
index b3591d31d69c..3b82a5b9d1d3 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReestablishReplicationRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReestablishReplicationRequestTests.java
@@ -11,15 +11,15 @@
 public final class ReestablishReplicationRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ReestablishReplicationRequest model
-            = BinaryData.fromString("{\"sourceVolumeId\":\"g\"}").toObject(ReestablishReplicationRequest.class);
-        Assertions.assertEquals("g", model.sourceVolumeId());
+        ReestablishReplicationRequest model = BinaryData.fromString("{\"sourceVolumeId\":\"wofyyvoqacpiexp\"}")
+            .toObject(ReestablishReplicationRequest.class);
+        Assertions.assertEquals("wofyyvoqacpiexp", model.sourceVolumeId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ReestablishReplicationRequest model = new ReestablishReplicationRequest().withSourceVolumeId("g");
+        ReestablishReplicationRequest model = new ReestablishReplicationRequest().withSourceVolumeId("wofyyvoqacpiexp");
         model = BinaryData.fromObject(model).toObject(ReestablishReplicationRequest.class);
-        Assertions.assertEquals("g", model.sourceVolumeId());
+        Assertions.assertEquals("wofyyvoqacpiexp", model.sourceVolumeId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoAvailabilityZoneMappingsItemTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoAvailabilityZoneMappingsItemTests.java
index 927041432074..f840e8da92c5 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoAvailabilityZoneMappingsItemTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoAvailabilityZoneMappingsItemTests.java
@@ -12,19 +12,18 @@ public final class RegionInfoAvailabilityZoneMappingsItemTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RegionInfoAvailabilityZoneMappingsItem model
-            = BinaryData.fromString("{\"availabilityZone\":\"jiwkuofoskghsau\",\"isAvailable\":true}")
+            = BinaryData.fromString("{\"availabilityZone\":\"sauuimj\",\"isAvailable\":true}")
                 .toObject(RegionInfoAvailabilityZoneMappingsItem.class);
-        Assertions.assertEquals("jiwkuofoskghsau", model.availabilityZone());
+        Assertions.assertEquals("sauuimj", model.availabilityZone());
         Assertions.assertTrue(model.isAvailable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         RegionInfoAvailabilityZoneMappingsItem model
-            = new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("jiwkuofoskghsau")
-                .withIsAvailable(true);
+            = new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("sauuimj").withIsAvailable(true);
         model = BinaryData.fromObject(model).toObject(RegionInfoAvailabilityZoneMappingsItem.class);
-        Assertions.assertEquals("jiwkuofoskghsau", model.availabilityZone());
+        Assertions.assertEquals("sauuimj", model.availabilityZone());
         Assertions.assertTrue(model.isAvailable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoInnerTests.java
index cae29417942e..d9b6a1e75927 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoInnerTests.java
@@ -15,24 +15,22 @@ public final class RegionInfoInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RegionInfoInner model = BinaryData.fromString(
-            "{\"storageToNetworkProximity\":\"AcrossT2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"mflbv\",\"isAvailable\":true},{\"availabilityZone\":\"rkcciwwzjuqk\",\"isAvailable\":false}]}")
+            "{\"storageToNetworkProximity\":\"T1\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"hrsajiwkuofo\",\"isAvailable\":true}]}")
             .toObject(RegionInfoInner.class);
-        Assertions.assertEquals(RegionStorageToNetworkProximity.ACROSS_T2, model.storageToNetworkProximity());
-        Assertions.assertEquals("mflbv", model.availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.T1, model.storageToNetworkProximity());
+        Assertions.assertEquals("hrsajiwkuofo", model.availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertTrue(model.availabilityZoneMappings().get(0).isAvailable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RegionInfoInner model
-            = new RegionInfoInner().withStorageToNetworkProximity(RegionStorageToNetworkProximity.ACROSS_T2)
-                .withAvailabilityZoneMappings(Arrays.asList(
-                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("mflbv").withIsAvailable(true),
-                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("rkcciwwzjuqk")
-                        .withIsAvailable(false)));
+        RegionInfoInner model = new RegionInfoInner().withStorageToNetworkProximity(RegionStorageToNetworkProximity.T1)
+            .withAvailabilityZoneMappings(
+                Arrays.asList(new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("hrsajiwkuofo")
+                    .withIsAvailable(true)));
         model = BinaryData.fromObject(model).toObject(RegionInfoInner.class);
-        Assertions.assertEquals(RegionStorageToNetworkProximity.ACROSS_T2, model.storageToNetworkProximity());
-        Assertions.assertEquals("mflbv", model.availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.T1, model.storageToNetworkProximity());
+        Assertions.assertEquals("hrsajiwkuofo", model.availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertTrue(model.availabilityZoneMappings().get(0).isAvailable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoResourceInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoResourceInnerTests.java
index c0489d6bce52..bbd3a2774731 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoResourceInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfoResourceInnerTests.java
@@ -15,23 +15,24 @@ public final class RegionInfoResourceInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RegionInfoResourceInner model = BinaryData.fromString(
-            "{\"properties\":{\"storageToNetworkProximity\":\"T1AndAcrossT2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"enkouknvudw\",\"isAvailable\":true}]},\"id\":\"bldngkpoc\",\"name\":\"pazyxoegukg\",\"type\":\"npiucgygevqznty\"}")
+            "{\"properties\":{\"storageToNetworkProximity\":\"T1AndT2AndAcrossT2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"rbpizc\",\"isAvailable\":true}]},\"id\":\"sdpydnfyhxdeoejz\",\"name\":\"cwif\",\"type\":\"jttgzf\"}")
             .toObject(RegionInfoResourceInner.class);
-        Assertions.assertEquals(RegionStorageToNetworkProximity.T1AND_ACROSS_T2, model.storageToNetworkProximity());
-        Assertions.assertEquals("enkouknvudw", model.availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.T1AND_T2AND_ACROSS_T2,
+            model.storageToNetworkProximity());
+        Assertions.assertEquals("rbpizc", model.availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertTrue(model.availabilityZoneMappings().get(0).isAvailable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         RegionInfoResourceInner model = new RegionInfoResourceInner()
-            .withStorageToNetworkProximity(RegionStorageToNetworkProximity.T1AND_ACROSS_T2)
-            .withAvailabilityZoneMappings(
-                Arrays.asList(new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("enkouknvudw")
-                    .withIsAvailable(true)));
+            .withStorageToNetworkProximity(RegionStorageToNetworkProximity.T1AND_T2AND_ACROSS_T2)
+            .withAvailabilityZoneMappings(Arrays.asList(
+                new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("rbpizc").withIsAvailable(true)));
         model = BinaryData.fromObject(model).toObject(RegionInfoResourceInner.class);
-        Assertions.assertEquals(RegionStorageToNetworkProximity.T1AND_ACROSS_T2, model.storageToNetworkProximity());
-        Assertions.assertEquals("enkouknvudw", model.availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.T1AND_T2AND_ACROSS_T2,
+            model.storageToNetworkProximity());
+        Assertions.assertEquals("rbpizc", model.availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertTrue(model.availabilityZoneMappings().get(0).isAvailable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfosListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfosListTests.java
index ad811138ad59..f7b09f1d53d3 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfosListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RegionInfosListTests.java
@@ -16,28 +16,40 @@ public final class RegionInfosListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RegionInfosList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"storageToNetworkProximity\":\"T1\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"ugidyjrr\",\"isAvailable\":false},{\"availabilityZone\":\"osvexcsonpclhoc\",\"isAvailable\":false},{\"availabilityZone\":\"kevle\",\"isAvailable\":false}]},\"id\":\"buhfmvfaxkffeiit\",\"name\":\"lvmezyvshxmzsbbz\",\"type\":\"ggi\"}],\"nextLink\":\"xwburvjxxjns\"}")
+            "{\"value\":[{\"properties\":{\"storageToNetworkProximity\":\"AcrossT2\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"yjr\",\"isAvailable\":false},{\"availabilityZone\":\"aos\",\"isAvailable\":false},{\"availabilityZone\":\"sonpclhocohs\",\"isAvailable\":false},{\"availabilityZone\":\"leggzfbu\",\"isAvailable\":true}]},\"id\":\"faxkffeii\",\"name\":\"hl\",\"type\":\"m\"},{\"properties\":{\"storageToNetworkProximity\":\"Default\",\"availabilityZoneMappings\":[{\"availabilityZone\":\"mzsb\",\"isAvailable\":true},{\"availabilityZone\":\"gigr\",\"isAvailable\":true},{\"availabilityZone\":\"rvjx\",\"isAvailable\":true},{\"availabilityZone\":\"pydptko\",\"isAvailable\":true}]},\"id\":\"uknvudwti\",\"name\":\"kbldngkpocipa\",\"type\":\"yxoegukgjnp\"}],\"nextLink\":\"cgygev\"}")
             .toObject(RegionInfosList.class);
-        Assertions.assertEquals(RegionStorageToNetworkProximity.T1, model.value().get(0).storageToNetworkProximity());
-        Assertions.assertEquals("ugidyjrr", model.value().get(0).availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.ACROSS_T2,
+            model.value().get(0).storageToNetworkProximity());
+        Assertions.assertEquals("yjr", model.value().get(0).availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertFalse(model.value().get(0).availabilityZoneMappings().get(0).isAvailable());
-        Assertions.assertEquals("xwburvjxxjns", model.nextLink());
+        Assertions.assertEquals("cgygev", model.nextLink());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RegionInfosList model = new RegionInfosList().withValue(Arrays.asList(new RegionInfoResourceInner()
-            .withStorageToNetworkProximity(RegionStorageToNetworkProximity.T1)
-            .withAvailabilityZoneMappings(Arrays.asList(
-                new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("ugidyjrr").withIsAvailable(false),
-                new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("osvexcsonpclhoc")
-                    .withIsAvailable(false),
-                new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("kevle").withIsAvailable(false)))))
-            .withNextLink("xwburvjxxjns");
+        RegionInfosList model = new RegionInfosList().withValue(Arrays.asList(
+            new RegionInfoResourceInner().withStorageToNetworkProximity(RegionStorageToNetworkProximity.ACROSS_T2)
+                .withAvailabilityZoneMappings(Arrays.asList(
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("yjr").withIsAvailable(false),
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("aos").withIsAvailable(false),
+                    new RegionInfoAvailabilityZoneMappingsItem()
+                        .withAvailabilityZone("sonpclhocohs")
+                        .withIsAvailable(false),
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("leggzfbu")
+                        .withIsAvailable(true))),
+            new RegionInfoResourceInner().withStorageToNetworkProximity(RegionStorageToNetworkProximity.DEFAULT)
+                .withAvailabilityZoneMappings(Arrays.asList(
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("mzsb").withIsAvailable(true),
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("gigr").withIsAvailable(true),
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("rvjx").withIsAvailable(true),
+                    new RegionInfoAvailabilityZoneMappingsItem().withAvailabilityZone("pydptko")
+                        .withIsAvailable(true)))))
+            .withNextLink("cgygev");
         model = BinaryData.fromObject(model).toObject(RegionInfosList.class);
-        Assertions.assertEquals(RegionStorageToNetworkProximity.T1, model.value().get(0).storageToNetworkProximity());
-        Assertions.assertEquals("ugidyjrr", model.value().get(0).availabilityZoneMappings().get(0).availabilityZone());
+        Assertions.assertEquals(RegionStorageToNetworkProximity.ACROSS_T2,
+            model.value().get(0).storageToNetworkProximity());
+        Assertions.assertEquals("yjr", model.value().get(0).availabilityZoneMappings().get(0).availabilityZone());
         Assertions.assertFalse(model.value().get(0).availabilityZoneMappings().get(0).isAvailable());
-        Assertions.assertEquals("xwburvjxxjns", model.nextLink());
+        Assertions.assertEquals("cgygev", model.nextLink());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RemotePathTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RemotePathTests.java
index 8dbbef48b704..57a9d581cc6c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RemotePathTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RemotePathTests.java
@@ -12,22 +12,20 @@ public final class RemotePathTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RemotePath model = BinaryData
-            .fromString(
-                "{\"externalHostName\":\"gqxndlkzgxhuripl\",\"serverName\":\"podxunkb\",\"volumeName\":\"bxmubyynt\"}")
+            .fromString("{\"externalHostName\":\"wwwfbkr\",\"serverName\":\"rn\",\"volumeName\":\"vshqjohxcr\"}")
             .toObject(RemotePath.class);
-        Assertions.assertEquals("gqxndlkzgxhuripl", model.externalHostname());
-        Assertions.assertEquals("podxunkb", model.serverName());
-        Assertions.assertEquals("bxmubyynt", model.volumeName());
+        Assertions.assertEquals("wwwfbkr", model.externalHostname());
+        Assertions.assertEquals("rn", model.serverName());
+        Assertions.assertEquals("vshqjohxcr", model.volumeName());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RemotePath model = new RemotePath().withExternalHostname("gqxndlkzgxhuripl")
-            .withServerName("podxunkb")
-            .withVolumeName("bxmubyynt");
+        RemotePath model
+            = new RemotePath().withExternalHostname("wwwfbkr").withServerName("rn").withVolumeName("vshqjohxcr");
         model = BinaryData.fromObject(model).toObject(RemotePath.class);
-        Assertions.assertEquals("gqxndlkzgxhuripl", model.externalHostname());
-        Assertions.assertEquals("podxunkb", model.serverName());
-        Assertions.assertEquals("bxmubyynt", model.volumeName());
+        Assertions.assertEquals("wwwfbkr", model.externalHostname());
+        Assertions.assertEquals("rn", model.serverName());
+        Assertions.assertEquals("vshqjohxcr", model.volumeName());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationInnerTests.java
index 4f4e1ee51e5b..2ee1ce665ccc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationInnerTests.java
@@ -14,24 +14,24 @@ public final class ReplicationInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ReplicationInner model = BinaryData.fromString(
-            "{\"replicationId\":\"xmueed\",\"endpointType\":\"dst\",\"replicationSchedule\":\"daily\",\"remoteVolumeResourceId\":\"stkwqqtch\",\"remoteVolumeRegion\":\"lmfmtdaay\"}")
+            "{\"replicationId\":\"fbtkuwhhmhyk\",\"endpointType\":\"src\",\"replicationSchedule\":\"hourly\",\"remoteVolumeResourceId\":\"fnndl\",\"remoteVolumeRegion\":\"chkoymkcdyh\"}")
             .toObject(ReplicationInner.class);
-        Assertions.assertEquals(EndpointType.DST, model.endpointType());
-        Assertions.assertEquals(ReplicationSchedule.DAILY, model.replicationSchedule());
-        Assertions.assertEquals("stkwqqtch", model.remoteVolumeResourceId());
-        Assertions.assertEquals("lmfmtdaay", model.remoteVolumeRegion());
+        Assertions.assertEquals(EndpointType.SRC, model.endpointType());
+        Assertions.assertEquals(ReplicationSchedule.HOURLY, model.replicationSchedule());
+        Assertions.assertEquals("fnndl", model.remoteVolumeResourceId());
+        Assertions.assertEquals("chkoymkcdyh", model.remoteVolumeRegion());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ReplicationInner model = new ReplicationInner().withEndpointType(EndpointType.DST)
-            .withReplicationSchedule(ReplicationSchedule.DAILY)
-            .withRemoteVolumeResourceId("stkwqqtch")
-            .withRemoteVolumeRegion("lmfmtdaay");
+        ReplicationInner model = new ReplicationInner().withEndpointType(EndpointType.SRC)
+            .withReplicationSchedule(ReplicationSchedule.HOURLY)
+            .withRemoteVolumeResourceId("fnndl")
+            .withRemoteVolumeRegion("chkoymkcdyh");
         model = BinaryData.fromObject(model).toObject(ReplicationInner.class);
-        Assertions.assertEquals(EndpointType.DST, model.endpointType());
-        Assertions.assertEquals(ReplicationSchedule.DAILY, model.replicationSchedule());
-        Assertions.assertEquals("stkwqqtch", model.remoteVolumeResourceId());
-        Assertions.assertEquals("lmfmtdaay", model.remoteVolumeRegion());
+        Assertions.assertEquals(EndpointType.SRC, model.endpointType());
+        Assertions.assertEquals(ReplicationSchedule.HOURLY, model.replicationSchedule());
+        Assertions.assertEquals("fnndl", model.remoteVolumeResourceId());
+        Assertions.assertEquals("chkoymkcdyh", model.remoteVolumeRegion());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationObjectTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationObjectTests.java
index 42005950f7f5..dfe80642b89c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationObjectTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationObjectTests.java
@@ -14,30 +14,30 @@ public final class ReplicationObjectTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ReplicationObject model = BinaryData.fromString(
-            "{\"replicationId\":\"qsemwabne\",\"endpointType\":\"src\",\"replicationSchedule\":\"hourly\",\"remoteVolumeResourceId\":\"h\",\"remotePath\":{\"externalHostName\":\"plvwiwubmwmbes\",\"serverName\":\"dnkwwtppjflcxog\",\"volumeName\":\"okonzmnsikvmkqz\"},\"remoteVolumeRegion\":\"qkdltfz\",\"destinationReplications\":[{\"resourceId\":\"v\",\"replicationType\":\"CrossRegionReplication\",\"region\":\"eodkwobda\",\"zone\":\"tibqdxbxwakb\"}]}")
+            "{\"replicationId\":\"pcqeqx\",\"endpointType\":\"src\",\"replicationSchedule\":\"hourly\",\"remoteVolumeResourceId\":\"zxctobgb\",\"remotePath\":{\"externalHostName\":\"moizpos\",\"serverName\":\"mgrcfbu\",\"volumeName\":\"rmfqjhhkxbpvj\"},\"remoteVolumeRegion\":\"jhxxjyn\",\"destinationReplications\":[{\"resourceId\":\"vkr\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"xqzvszjfa\",\"zone\":\"j\"},{\"resourceId\":\"xxivetv\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"qtdo\",\"zone\":\"cbxvwvxyslqbh\"}],\"externalReplicationSetupStatus\":\"ClusterPeerRequired\",\"externalReplicationSetupInfo\":\"blytk\",\"mirrorState\":\"Uninitialized\",\"relationshipStatus\":\"Transferring\"}")
             .toObject(ReplicationObject.class);
         Assertions.assertEquals(ReplicationSchedule.HOURLY, model.replicationSchedule());
-        Assertions.assertEquals("h", model.remoteVolumeResourceId());
-        Assertions.assertEquals("plvwiwubmwmbes", model.remotePath().externalHostname());
-        Assertions.assertEquals("dnkwwtppjflcxog", model.remotePath().serverName());
-        Assertions.assertEquals("okonzmnsikvmkqz", model.remotePath().volumeName());
-        Assertions.assertEquals("qkdltfz", model.remoteVolumeRegion());
+        Assertions.assertEquals("zxctobgb", model.remoteVolumeResourceId());
+        Assertions.assertEquals("moizpos", model.remotePath().externalHostname());
+        Assertions.assertEquals("mgrcfbu", model.remotePath().serverName());
+        Assertions.assertEquals("rmfqjhhkxbpvj", model.remotePath().volumeName());
+        Assertions.assertEquals("jhxxjyn", model.remoteVolumeRegion());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ReplicationObject model = new ReplicationObject().withReplicationSchedule(ReplicationSchedule.HOURLY)
-            .withRemoteVolumeResourceId("h")
-            .withRemotePath(new RemotePath().withExternalHostname("plvwiwubmwmbes")
-                .withServerName("dnkwwtppjflcxog")
-                .withVolumeName("okonzmnsikvmkqz"))
-            .withRemoteVolumeRegion("qkdltfz");
+            .withRemoteVolumeResourceId("zxctobgb")
+            .withRemotePath(new RemotePath().withExternalHostname("moizpos")
+                .withServerName("mgrcfbu")
+                .withVolumeName("rmfqjhhkxbpvj"))
+            .withRemoteVolumeRegion("jhxxjyn");
         model = BinaryData.fromObject(model).toObject(ReplicationObject.class);
         Assertions.assertEquals(ReplicationSchedule.HOURLY, model.replicationSchedule());
-        Assertions.assertEquals("h", model.remoteVolumeResourceId());
-        Assertions.assertEquals("plvwiwubmwmbes", model.remotePath().externalHostname());
-        Assertions.assertEquals("dnkwwtppjflcxog", model.remotePath().serverName());
-        Assertions.assertEquals("okonzmnsikvmkqz", model.remotePath().volumeName());
-        Assertions.assertEquals("qkdltfz", model.remoteVolumeRegion());
+        Assertions.assertEquals("zxctobgb", model.remoteVolumeResourceId());
+        Assertions.assertEquals("moizpos", model.remotePath().externalHostname());
+        Assertions.assertEquals("mgrcfbu", model.remotePath().serverName());
+        Assertions.assertEquals("rmfqjhhkxbpvj", model.remotePath().volumeName());
+        Assertions.assertEquals("jhxxjyn", model.remoteVolumeRegion());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationStatusInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationStatusInnerTests.java
index bd926fdd5003..2ab6cb108cf8 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationStatusInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/ReplicationStatusInnerTests.java
@@ -6,7 +6,6 @@
 
 import com.azure.core.util.BinaryData;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationStatusInner;
-import com.azure.resourcemanager.netapp.models.MirrorState;
 import com.azure.resourcemanager.netapp.models.RelationshipStatus;
 import org.junit.jupiter.api.Assertions;
 
@@ -14,27 +13,24 @@ public final class ReplicationStatusInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ReplicationStatusInner model = BinaryData.fromString(
-            "{\"healthy\":false,\"relationshipStatus\":\"Unknown\",\"mirrorState\":\"Broken\",\"totalProgress\":\"knso\",\"errorMessage\":\"jhxbld\"}")
+            "{\"healthy\":true,\"relationshipStatus\":\"Idle\",\"mirrorState\":\"Mirrored\",\"totalProgress\":\"enwash\",\"errorMessage\":\"dtkcnqxwbpokulp\"}")
             .toObject(ReplicationStatusInner.class);
-        Assertions.assertFalse(model.healthy());
-        Assertions.assertEquals(RelationshipStatus.UNKNOWN, model.relationshipStatus());
-        Assertions.assertEquals(MirrorState.BROKEN, model.mirrorState());
-        Assertions.assertEquals("knso", model.totalProgress());
-        Assertions.assertEquals("jhxbld", model.errorMessage());
+        Assertions.assertTrue(model.healthy());
+        Assertions.assertEquals(RelationshipStatus.IDLE, model.relationshipStatus());
+        Assertions.assertEquals("enwash", model.totalProgress());
+        Assertions.assertEquals("dtkcnqxwbpokulp", model.errorMessage());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ReplicationStatusInner model = new ReplicationStatusInner().withHealthy(false)
-            .withRelationshipStatus(RelationshipStatus.UNKNOWN)
-            .withMirrorState(MirrorState.BROKEN)
-            .withTotalProgress("knso")
-            .withErrorMessage("jhxbld");
+        ReplicationStatusInner model = new ReplicationStatusInner().withHealthy(true)
+            .withRelationshipStatus(RelationshipStatus.IDLE)
+            .withTotalProgress("enwash")
+            .withErrorMessage("dtkcnqxwbpokulp");
         model = BinaryData.fromObject(model).toObject(ReplicationStatusInner.class);
-        Assertions.assertFalse(model.healthy());
-        Assertions.assertEquals(RelationshipStatus.UNKNOWN, model.relationshipStatus());
-        Assertions.assertEquals(MirrorState.BROKEN, model.mirrorState());
-        Assertions.assertEquals("knso", model.totalProgress());
-        Assertions.assertEquals("jhxbld", model.errorMessage());
+        Assertions.assertTrue(model.healthy());
+        Assertions.assertEquals(RelationshipStatus.IDLE, model.relationshipStatus());
+        Assertions.assertEquals("enwash", model.totalProgress());
+        Assertions.assertEquals("dtkcnqxwbpokulp", model.errorMessage());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RestoreStatusInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RestoreStatusInnerTests.java
index 4308d3c94a88..c13d3bb89db6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RestoreStatusInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/RestoreStatusInnerTests.java
@@ -11,7 +11,7 @@ public final class RestoreStatusInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         RestoreStatusInner model = BinaryData.fromString(
-            "{\"healthy\":true,\"relationshipStatus\":\"Failed\",\"mirrorState\":\"Broken\",\"unhealthyReason\":\"igovi\",\"errorMessage\":\"xk\",\"totalTransferBytes\":5344178861543099367}")
+            "{\"healthy\":true,\"relationshipStatus\":\"Idle\",\"mirrorState\":\"Broken\",\"unhealthyReason\":\"o\",\"errorMessage\":\"jw\",\"totalTransferBytes\":4972912184284980492}")
             .toObject(RestoreStatusInner.class);
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotInnerTests.java
index 5636666cdaec..f5b6a9b4d9db 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotInnerTests.java
@@ -12,15 +12,15 @@ public final class SnapshotInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotInner model = BinaryData.fromString(
-            "{\"location\":\"hlyfjhdgqgg\",\"properties\":{\"snapshotId\":\"unygaeqid\",\"created\":\"2021-08-07T13:11:54Z\",\"provisioningState\":\"t\"},\"id\":\"llrxcyjmoad\",\"name\":\"uvarmywdmjsjq\",\"type\":\"jhhyxxrwlycoduhp\"}")
+            "{\"location\":\"qgxqquezikyw\",\"properties\":{\"snapshotId\":\"kallatmel\",\"created\":\"2021-06-18T06:04:26Z\",\"provisioningState\":\"iccjzkzivgvvcna\"},\"id\":\"hyrnxxmu\",\"name\":\"edndr\",\"type\":\"v\"}")
             .toObject(SnapshotInner.class);
-        Assertions.assertEquals("hlyfjhdgqgg", model.location());
+        Assertions.assertEquals("qgxqquezikyw", model.location());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SnapshotInner model = new SnapshotInner().withLocation("hlyfjhdgqgg");
+        SnapshotInner model = new SnapshotInner().withLocation("qgxqquezikyw");
         model = BinaryData.fromObject(model).toObject(SnapshotInner.class);
-        Assertions.assertEquals("hlyfjhdgqgg", model.location());
+        Assertions.assertEquals("qgxqquezikyw", model.location());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateWithResponseMockTests.java
index 0473171c56fb..3cffd312bdfd 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesCreateWithResponseMockTests.java
@@ -27,7 +27,7 @@ public final class SnapshotPoliciesCreateWithResponseMockTests {
     @Test
     public void testCreateWithResponse() throws Exception {
         String responseStr
-            = "{\"etag\":\"pofoi\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":179547673,\"minute\":1217605698,\"usedBytes\":3076873232947895029},\"dailySchedule\":{\"snapshotsToKeep\":1510318129,\"hour\":59722653,\"minute\":272074002,\"usedBytes\":8388081220495319367},\"weeklySchedule\":{\"snapshotsToKeep\":1834993865,\"day\":\"gphuartvtiu\",\"hour\":1323258140,\"minute\":1475609054,\"usedBytes\":8570024839367974546},\"monthlySchedule\":{\"snapshotsToKeep\":490468657,\"daysOfMonth\":\"nxhkxjqi\",\"hour\":994792416,\"minute\":172621613,\"usedBytes\":6225651252305347741},\"enabled\":true,\"provisioningState\":\"fhxwrsne\"},\"location\":\"ozqvbubqmam\",\"tags\":{\"xz\":\"cx\",\"ppu\":\"azttaboidvmfq\",\"btcjuah\":\"owsepdfgkmtdhern\"},\"id\":\"kqtob\",\"name\":\"auxofshfph\",\"type\":\"pnulaiywzej\"}";
+            = "{\"etag\":\"kyefchnmnahmnxhk\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1375223336,\"minute\":1523309198,\"usedBytes\":6875461100902154029},\"dailySchedule\":{\"snapshotsToKeep\":1025524893,\"hour\":641060199,\"minute\":1908059989,\"usedBytes\":6980954745708555342},\"weeklySchedule\":{\"snapshotsToKeep\":109793124,\"day\":\"wmozqvbub\",\"hour\":1359553105,\"minute\":584332320,\"usedBytes\":4252712587815072260},\"monthlySchedule\":{\"snapshotsToKeep\":459336606,\"daysOfMonth\":\"gaztt\",\"hour\":184475150,\"minute\":459855545,\"usedBytes\":3462457286901025092},\"enabled\":true,\"provisioningState\":\"pubowsepdfg\"},\"location\":\"tdherngbtcjuahok\",\"tags\":{\"ofshfphwpnulaiyw\":\"bkau\",\"ywhslwkojpllndnp\":\"e\",\"yetefyp\":\"wrpqafgfugsnnf\"},\"id\":\"coc\",\"name\":\"fjgtixrjvzuy\",\"type\":\"urmlmuo\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -37,49 +37,49 @@ public void testCreateWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         SnapshotPolicy response = manager.snapshotPolicies()
-            .define("ttgplucfotangcf")
-            .withRegion("mur")
-            .withExistingNetAppAccount("ekov", "ribi")
-            .withTags(mapOf("wpktvqylkmqpzoyh", "g"))
-            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(2107871356)
-                .withMinute(1129614200)
-                .withUsedBytes(6906743101666991339L))
-            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1707570357)
-                .withHour(1038183797)
-                .withMinute(84697617)
-                .withUsedBytes(6585872083691327234L))
-            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1226161915)
-                .withDay("xynpdkvgf")
-                .withHour(1392311287)
-                .withMinute(1082360596)
-                .withUsedBytes(4461489025878240096L))
-            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(874901455)
-                .withDaysOfMonth("dugneiknp")
-                .withHour(1795509017)
-                .withMinute(679525953)
-                .withUsedBytes(2310378494180433800L))
-            .withEnabled(true)
+            .define("xgjiuqh")
+            .withRegion("pofoi")
+            .withExistingNetAppAccount("phdu", "neiknpg")
+            .withTags(mapOf("ilkmk", "p"))
+            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1063877777)
+                .withMinute(189610286)
+                .withUsedBytes(994426263609562850L))
+            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(783540465)
+                .withHour(2101350417)
+                .withMinute(1212082891)
+                .withUsedBytes(2313274218462985682L))
+            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(455213677)
+                .withDay("o")
+                .withHour(172898691)
+                .withMinute(726864279)
+                .withUsedBytes(5332986278611814316L))
+            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(125495169)
+                .withDaysOfMonth("xoe")
+                .withHour(189021776)
+                .withMinute(1567586671)
+                .withUsedBytes(9143156260970924467L))
+            .withEnabled(false)
             .create();
 
-        Assertions.assertEquals("ozqvbubqmam", response.location());
-        Assertions.assertEquals("cx", response.tags().get("xz"));
-        Assertions.assertEquals(179547673, response.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(1217605698, response.hourlySchedule().minute());
-        Assertions.assertEquals(3076873232947895029L, response.hourlySchedule().usedBytes());
-        Assertions.assertEquals(1510318129, response.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(59722653, response.dailySchedule().hour());
-        Assertions.assertEquals(272074002, response.dailySchedule().minute());
-        Assertions.assertEquals(8388081220495319367L, response.dailySchedule().usedBytes());
-        Assertions.assertEquals(1834993865, response.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("gphuartvtiu", response.weeklySchedule().day());
-        Assertions.assertEquals(1323258140, response.weeklySchedule().hour());
-        Assertions.assertEquals(1475609054, response.weeklySchedule().minute());
-        Assertions.assertEquals(8570024839367974546L, response.weeklySchedule().usedBytes());
-        Assertions.assertEquals(490468657, response.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("nxhkxjqi", response.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(994792416, response.monthlySchedule().hour());
-        Assertions.assertEquals(172621613, response.monthlySchedule().minute());
-        Assertions.assertEquals(6225651252305347741L, response.monthlySchedule().usedBytes());
+        Assertions.assertEquals("tdherngbtcjuahok", response.location());
+        Assertions.assertEquals("bkau", response.tags().get("ofshfphwpnulaiyw"));
+        Assertions.assertEquals(1375223336, response.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1523309198, response.hourlySchedule().minute());
+        Assertions.assertEquals(6875461100902154029L, response.hourlySchedule().usedBytes());
+        Assertions.assertEquals(1025524893, response.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(641060199, response.dailySchedule().hour());
+        Assertions.assertEquals(1908059989, response.dailySchedule().minute());
+        Assertions.assertEquals(6980954745708555342L, response.dailySchedule().usedBytes());
+        Assertions.assertEquals(109793124, response.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("wmozqvbub", response.weeklySchedule().day());
+        Assertions.assertEquals(1359553105, response.weeklySchedule().hour());
+        Assertions.assertEquals(584332320, response.weeklySchedule().minute());
+        Assertions.assertEquals(4252712587815072260L, response.weeklySchedule().usedBytes());
+        Assertions.assertEquals(459336606, response.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("gaztt", response.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(184475150, response.monthlySchedule().hour());
+        Assertions.assertEquals(459855545, response.monthlySchedule().minute());
+        Assertions.assertEquals(3462457286901025092L, response.monthlySchedule().usedBytes());
         Assertions.assertTrue(response.enabled());
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteMockTests.java
index 5df58aa79d74..e56421a76a72 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesDeleteMockTests.java
@@ -27,7 +27,7 @@ public void testDelete() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.snapshotPolicies().delete("tglxx", "ljfp", "picrmnzhrgmqgjsx", com.azure.core.util.Context.NONE);
+        manager.snapshotPolicies().delete("fr", "xousxauzl", "vsg", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetWithResponseMockTests.java
index da3d4f011065..35bbf56b065b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class SnapshotPoliciesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"etag\":\"ieyujtvc\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":262283585,\"minute\":785582924,\"usedBytes\":1090733031599150283},\"dailySchedule\":{\"snapshotsToKeep\":1591034330,\"hour\":630868038,\"minute\":859827610,\"usedBytes\":4026904103872747326},\"weeklySchedule\":{\"snapshotsToKeep\":1403533063,\"day\":\"paglqivbgk\",\"hour\":779368946,\"minute\":425846035,\"usedBytes\":3704999238857518787},\"monthlySchedule\":{\"snapshotsToKeep\":526826203,\"daysOfMonth\":\"voniypfp\",\"hour\":38455799,\"minute\":783120706,\"usedBytes\":8070561326110235610},\"enabled\":true,\"provisioningState\":\"hjknidibg\"},\"location\":\"xgpnr\",\"tags\":{\"vuporqzdfuydzv\":\"vfgpikqmhhaowjrm\"},\"id\":\"fvxcnqmxqpswo\",\"name\":\"mvkhlggd\",\"type\":\"bemzqkzszuwi\"}";
+            = "{\"etag\":\"ubcpzgpxti\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1447599159,\"minute\":666978054,\"usedBytes\":3056575382713445212},\"dailySchedule\":{\"snapshotsToKeep\":1035678028,\"hour\":2098514959,\"minute\":110670070,\"usedBytes\":7717455974347272022},\"weeklySchedule\":{\"snapshotsToKeep\":1614297715,\"day\":\"pikqmh\",\"hour\":1148372917,\"minute\":200690953,\"usedBytes\":7097521120621616769},\"monthlySchedule\":{\"snapshotsToKeep\":2093217192,\"daysOfMonth\":\"rqzdfuydzvkfvx\",\"hour\":976662726,\"minute\":1675068224,\"usedBytes\":2350782477198178194},\"enabled\":true,\"provisioningState\":\"mvkhlggd\"},\"location\":\"em\",\"tags\":{\"ljfp\":\"zszuwiwtglxx\"},\"id\":\"picrmnzhrgmqgjsx\",\"name\":\"pqcbfrmbodthsq\",\"type\":\"gvriibakclac\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,28 +31,28 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         SnapshotPolicy response = manager.snapshotPolicies()
-            .getWithResponse("xylrjvmtygjbmz", "ospspshckf", "yjpmspbpssdfppyo", com.azure.core.util.Context.NONE)
+            .getWithResponse("aglqivbgkcvkh", "zvuqdflvon", "yp", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("xgpnr", response.location());
-        Assertions.assertEquals("vfgpikqmhhaowjrm", response.tags().get("vuporqzdfuydzv"));
-        Assertions.assertEquals(262283585, response.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(785582924, response.hourlySchedule().minute());
-        Assertions.assertEquals(1090733031599150283L, response.hourlySchedule().usedBytes());
-        Assertions.assertEquals(1591034330, response.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(630868038, response.dailySchedule().hour());
-        Assertions.assertEquals(859827610, response.dailySchedule().minute());
-        Assertions.assertEquals(4026904103872747326L, response.dailySchedule().usedBytes());
-        Assertions.assertEquals(1403533063, response.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("paglqivbgk", response.weeklySchedule().day());
-        Assertions.assertEquals(779368946, response.weeklySchedule().hour());
-        Assertions.assertEquals(425846035, response.weeklySchedule().minute());
-        Assertions.assertEquals(3704999238857518787L, response.weeklySchedule().usedBytes());
-        Assertions.assertEquals(526826203, response.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("voniypfp", response.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(38455799, response.monthlySchedule().hour());
-        Assertions.assertEquals(783120706, response.monthlySchedule().minute());
-        Assertions.assertEquals(8070561326110235610L, response.monthlySchedule().usedBytes());
+        Assertions.assertEquals("em", response.location());
+        Assertions.assertEquals("zszuwiwtglxx", response.tags().get("ljfp"));
+        Assertions.assertEquals(1447599159, response.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(666978054, response.hourlySchedule().minute());
+        Assertions.assertEquals(3056575382713445212L, response.hourlySchedule().usedBytes());
+        Assertions.assertEquals(1035678028, response.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(2098514959, response.dailySchedule().hour());
+        Assertions.assertEquals(110670070, response.dailySchedule().minute());
+        Assertions.assertEquals(7717455974347272022L, response.dailySchedule().usedBytes());
+        Assertions.assertEquals(1614297715, response.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("pikqmh", response.weeklySchedule().day());
+        Assertions.assertEquals(1148372917, response.weeklySchedule().hour());
+        Assertions.assertEquals(200690953, response.weeklySchedule().minute());
+        Assertions.assertEquals(7097521120621616769L, response.weeklySchedule().usedBytes());
+        Assertions.assertEquals(2093217192, response.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("rqzdfuydzvkfvx", response.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(976662726, response.monthlySchedule().hour());
+        Assertions.assertEquals(1675068224, response.monthlySchedule().minute());
+        Assertions.assertEquals(2350782477198178194L, response.monthlySchedule().usedBytes());
         Assertions.assertTrue(response.enabled());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListMockTests.java
index 8b98fa8d7634..21133bec0cea 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListMockTests.java
@@ -22,7 +22,7 @@ public final class SnapshotPoliciesListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"etag\":\"atzv\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1946908693,\"minute\":39003903,\"usedBytes\":4361094771098981141},\"dailySchedule\":{\"snapshotsToKeep\":1666158836,\"hour\":1709678755,\"minute\":2132495866,\"usedBytes\":7284906915051050454},\"weeklySchedule\":{\"snapshotsToKeep\":802199540,\"day\":\"fmsh\",\"hour\":1340920016,\"minute\":1977846106,\"usedBytes\":8052136361174930320},\"monthlySchedule\":{\"snapshotsToKeep\":862945688,\"daysOfMonth\":\"dby\",\"hour\":1387875327,\"minute\":555019895,\"usedBytes\":8453153522791825173},\"enabled\":false,\"provisioningState\":\"xbiygnugjknfsmf\"},\"location\":\"tuxuuyilflq\",\"tags\":{\"hmrnjhvsuj\":\"uvr\",\"uunfprnjletlxsm\":\"tczytqjtwh\"},\"id\":\"pddouifamowaziyn\",\"name\":\"nlqwzdvpiwhx\",\"type\":\"szdtmaajquh\"}]}";
+            = "{\"value\":[{\"etag\":\"gxffmshkwf\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1874784092,\"minute\":1139944911,\"usedBytes\":3706323507119701161},\"dailySchedule\":{\"snapshotsToKeep\":530743618,\"hour\":29760646,\"minute\":1805819824,\"usedBytes\":7577684278453969496},\"weeklySchedule\":{\"snapshotsToKeep\":1182183471,\"day\":\"xbiygnugjknfsmf\",\"hour\":801406490,\"minute\":1703966020,\"usedBytes\":8661454181197474572},\"monthlySchedule\":{\"snapshotsToKeep\":1037919815,\"daysOfMonth\":\"qoiquvrehmrnjhv\",\"hour\":14202620,\"minute\":455910755,\"usedBytes\":7457236027788701363},\"enabled\":false,\"provisioningState\":\"t\"},\"location\":\"auunfprnjletlx\",\"tags\":{\"nlqwzdvpiwhx\":\"pddouifamowaziyn\",\"xylrjvmtygjbmz\":\"szdtmaajquh\",\"yjpmspbpssdfppyo\":\"ospspshckf\"},\"id\":\"tieyujtvczkcny\",\"name\":\"rxmunjdxvgln\",\"type\":\"vxlx\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,27 +32,27 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<SnapshotPolicy> response
-            = manager.snapshotPolicies().list("xtmkzjvkviir", "gfgrwsdp", com.azure.core.util.Context.NONE);
+            = manager.snapshotPolicies().list("bglbyvict", "tbrxkjz", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("tuxuuyilflq", response.iterator().next().location());
-        Assertions.assertEquals("uvr", response.iterator().next().tags().get("hmrnjhvsuj"));
-        Assertions.assertEquals(1946908693, response.iterator().next().hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(39003903, response.iterator().next().hourlySchedule().minute());
-        Assertions.assertEquals(4361094771098981141L, response.iterator().next().hourlySchedule().usedBytes());
-        Assertions.assertEquals(1666158836, response.iterator().next().dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(1709678755, response.iterator().next().dailySchedule().hour());
-        Assertions.assertEquals(2132495866, response.iterator().next().dailySchedule().minute());
-        Assertions.assertEquals(7284906915051050454L, response.iterator().next().dailySchedule().usedBytes());
-        Assertions.assertEquals(802199540, response.iterator().next().weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("fmsh", response.iterator().next().weeklySchedule().day());
-        Assertions.assertEquals(1340920016, response.iterator().next().weeklySchedule().hour());
-        Assertions.assertEquals(1977846106, response.iterator().next().weeklySchedule().minute());
-        Assertions.assertEquals(8052136361174930320L, response.iterator().next().weeklySchedule().usedBytes());
-        Assertions.assertEquals(862945688, response.iterator().next().monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("dby", response.iterator().next().monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1387875327, response.iterator().next().monthlySchedule().hour());
-        Assertions.assertEquals(555019895, response.iterator().next().monthlySchedule().minute());
-        Assertions.assertEquals(8453153522791825173L, response.iterator().next().monthlySchedule().usedBytes());
+        Assertions.assertEquals("auunfprnjletlx", response.iterator().next().location());
+        Assertions.assertEquals("pddouifamowaziyn", response.iterator().next().tags().get("nlqwzdvpiwhx"));
+        Assertions.assertEquals(1874784092, response.iterator().next().hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1139944911, response.iterator().next().hourlySchedule().minute());
+        Assertions.assertEquals(3706323507119701161L, response.iterator().next().hourlySchedule().usedBytes());
+        Assertions.assertEquals(530743618, response.iterator().next().dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(29760646, response.iterator().next().dailySchedule().hour());
+        Assertions.assertEquals(1805819824, response.iterator().next().dailySchedule().minute());
+        Assertions.assertEquals(7577684278453969496L, response.iterator().next().dailySchedule().usedBytes());
+        Assertions.assertEquals(1182183471, response.iterator().next().weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("xbiygnugjknfsmf", response.iterator().next().weeklySchedule().day());
+        Assertions.assertEquals(801406490, response.iterator().next().weeklySchedule().hour());
+        Assertions.assertEquals(1703966020, response.iterator().next().weeklySchedule().minute());
+        Assertions.assertEquals(8661454181197474572L, response.iterator().next().weeklySchedule().usedBytes());
+        Assertions.assertEquals(1037919815, response.iterator().next().monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("qoiquvrehmrnjhv", response.iterator().next().monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(14202620, response.iterator().next().monthlySchedule().hour());
+        Assertions.assertEquals(455910755, response.iterator().next().monthlySchedule().minute());
+        Assertions.assertEquals(7457236027788701363L, response.iterator().next().monthlySchedule().usedBytes());
         Assertions.assertFalse(response.iterator().next().enabled());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListTests.java
index 5ec3d51f2dfb..0026bf18aaca 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPoliciesListTests.java
@@ -20,135 +20,74 @@ public final class SnapshotPoliciesListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotPoliciesList model = BinaryData.fromString(
-            "{\"value\":[{\"etag\":\"nbyxbaaabjyv\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1602757195,\"minute\":221742108,\"usedBytes\":6779663371110428519},\"dailySchedule\":{\"snapshotsToKeep\":1520746749,\"hour\":769547097,\"minute\":276880748,\"usedBytes\":1028498932315825835},\"weeklySchedule\":{\"snapshotsToKeep\":850324011,\"day\":\"nwnwme\",\"hour\":1440499034,\"minute\":10547913,\"usedBytes\":6335921088837380808},\"monthlySchedule\":{\"snapshotsToKeep\":1682881109,\"daysOfMonth\":\"bjudpfrxtrthzv\",\"hour\":1946200201,\"minute\":1672690714,\"usedBytes\":8785236673495844841},\"enabled\":false,\"provisioningState\":\"bpaxhexiilivpdt\"},\"location\":\"r\",\"tags\":{\"uyfxrxxleptramxj\":\"qoaxoruzfgs\"},\"id\":\"zwl\",\"name\":\"nwxuqlcvydyp\",\"type\":\"tdooaoj\"},{\"etag\":\"iodkooebwnujhem\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":191965310,\"minute\":640428654,\"usedBytes\":5638108058648089710},\"dailySchedule\":{\"snapshotsToKeep\":1291411043,\"hour\":1997229408,\"minute\":291950475,\"usedBytes\":6410034847924566454},\"weeklySchedule\":{\"snapshotsToKeep\":896449803,\"day\":\"cjvefkdlfo\",\"hour\":1252976241,\"minute\":1706699033,\"usedBytes\":5309095811404897814},\"monthlySchedule\":{\"snapshotsToKeep\":1709159088,\"daysOfMonth\":\"pulpqblylsyxk\",\"hour\":648285682,\"minute\":1830521196,\"usedBytes\":1136404486876218562},\"enabled\":true,\"provisioningState\":\"gxsds\"},\"location\":\"e\",\"tags\":{\"icvi\":\"bzkfzbeyvpn\",\"jjxd\":\"v\"},\"id\":\"rbuukzclewyhmlwp\",\"name\":\"ztzp\",\"type\":\"fn\"},{\"etag\":\"kwyfzqwhxxbuyqax\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1280631673,\"minute\":608343994,\"usedBytes\":5894027165628852811},\"dailySchedule\":{\"snapshotsToKeep\":1872827948,\"hour\":411799174,\"minute\":110839155,\"usedBytes\":1269488169933236475},\"weeklySchedule\":{\"snapshotsToKeep\":1325987050,\"day\":\"cwsobqwcs\",\"hour\":1806206586,\"minute\":358085488,\"usedBytes\":1296933680465064139},\"monthlySchedule\":{\"snapshotsToKeep\":1589501712,\"daysOfMonth\":\"pfuvglsbjjca\",\"hour\":1995846414,\"minute\":1075232734,\"usedBytes\":652867049720214090},\"enabled\":false,\"provisioningState\":\"ncormrlxqtvcof\"},\"location\":\"f\",\"tags\":{\"bgdknnqv\":\"gj\",\"sgsahmkycgr\":\"aznqntoru\",\"s\":\"uwjuetaeburuvdmo\",\"tpuqujmq\":\"zlxwabmqoefkifr\"},\"id\":\"gkfbtndoaong\",\"name\":\"jcntuj\",\"type\":\"tcje\"},{\"etag\":\"twwaezkojvdcpzf\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1599861645,\"minute\":1139129644,\"usedBytes\":5885643020838098503},\"dailySchedule\":{\"snapshotsToKeep\":490438503,\"hour\":1685402148,\"minute\":1273142830,\"usedBytes\":7790831784605788648},\"weeklySchedule\":{\"snapshotsToKeep\":95404001,\"day\":\"p\",\"hour\":2028743450,\"minute\":1543353321,\"usedBytes\":4762978154142225773},\"monthlySchedule\":{\"snapshotsToKeep\":1660457179,\"daysOfMonth\":\"azxkhnzbonlwnto\",\"hour\":1273575692,\"minute\":2078888236,\"usedBytes\":2330390624121963294},\"enabled\":true,\"provisioningState\":\"z\"},\"location\":\"mrv\",\"tags\":{\"qgsfraoyzkoow\":\"tvb\",\"aldsy\":\"lmnguxaw\",\"znkbykutwpfhpagm\":\"uximerqfobw\"},\"id\":\"r\",\"name\":\"kdsnfdsdoakgtdl\",\"type\":\"kkze\"}]}")
+            "{\"value\":[{\"etag\":\"kghimdblxgwimfnj\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":510557599,\"minute\":1675220188,\"usedBytes\":1198847986383751038},\"dailySchedule\":{\"snapshotsToKeep\":1767053067,\"hour\":739435613,\"minute\":1563203885,\"usedBytes\":8338807266312513089},\"weeklySchedule\":{\"snapshotsToKeep\":1648570452,\"day\":\"aw\",\"hour\":113630721,\"minute\":841259449,\"usedBytes\":9051460600298746000},\"monthlySchedule\":{\"snapshotsToKeep\":220414413,\"daysOfMonth\":\"c\",\"hour\":1974208739,\"minute\":833171610,\"usedBytes\":2411008459227076557},\"enabled\":true,\"provisioningState\":\"abfatkl\"},\"location\":\"xbjhwuaanozjosph\",\"tags\":{\"jrvxaglrv\":\"l\",\"tcs\":\"mjwosytx\"},\"id\":\"fcktqumiekke\",\"name\":\"zikhl\",\"type\":\"fjhdg\"}]}")
             .toObject(SnapshotPoliciesList.class);
-        Assertions.assertEquals("r", model.value().get(0).location());
-        Assertions.assertEquals("qoaxoruzfgs", model.value().get(0).tags().get("uyfxrxxleptramxj"));
-        Assertions.assertEquals(1602757195, model.value().get(0).hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(221742108, model.value().get(0).hourlySchedule().minute());
-        Assertions.assertEquals(6779663371110428519L, model.value().get(0).hourlySchedule().usedBytes());
-        Assertions.assertEquals(1520746749, model.value().get(0).dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(769547097, model.value().get(0).dailySchedule().hour());
-        Assertions.assertEquals(276880748, model.value().get(0).dailySchedule().minute());
-        Assertions.assertEquals(1028498932315825835L, model.value().get(0).dailySchedule().usedBytes());
-        Assertions.assertEquals(850324011, model.value().get(0).weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("nwnwme", model.value().get(0).weeklySchedule().day());
-        Assertions.assertEquals(1440499034, model.value().get(0).weeklySchedule().hour());
-        Assertions.assertEquals(10547913, model.value().get(0).weeklySchedule().minute());
-        Assertions.assertEquals(6335921088837380808L, model.value().get(0).weeklySchedule().usedBytes());
-        Assertions.assertEquals(1682881109, model.value().get(0).monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("bjudpfrxtrthzv", model.value().get(0).monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1946200201, model.value().get(0).monthlySchedule().hour());
-        Assertions.assertEquals(1672690714, model.value().get(0).monthlySchedule().minute());
-        Assertions.assertEquals(8785236673495844841L, model.value().get(0).monthlySchedule().usedBytes());
-        Assertions.assertFalse(model.value().get(0).enabled());
+        Assertions.assertEquals("xbjhwuaanozjosph", model.value().get(0).location());
+        Assertions.assertEquals("l", model.value().get(0).tags().get("jrvxaglrv"));
+        Assertions.assertEquals(510557599, model.value().get(0).hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1675220188, model.value().get(0).hourlySchedule().minute());
+        Assertions.assertEquals(1198847986383751038L, model.value().get(0).hourlySchedule().usedBytes());
+        Assertions.assertEquals(1767053067, model.value().get(0).dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(739435613, model.value().get(0).dailySchedule().hour());
+        Assertions.assertEquals(1563203885, model.value().get(0).dailySchedule().minute());
+        Assertions.assertEquals(8338807266312513089L, model.value().get(0).dailySchedule().usedBytes());
+        Assertions.assertEquals(1648570452, model.value().get(0).weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("aw", model.value().get(0).weeklySchedule().day());
+        Assertions.assertEquals(113630721, model.value().get(0).weeklySchedule().hour());
+        Assertions.assertEquals(841259449, model.value().get(0).weeklySchedule().minute());
+        Assertions.assertEquals(9051460600298746000L, model.value().get(0).weeklySchedule().usedBytes());
+        Assertions.assertEquals(220414413, model.value().get(0).monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("c", model.value().get(0).monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(1974208739, model.value().get(0).monthlySchedule().hour());
+        Assertions.assertEquals(833171610, model.value().get(0).monthlySchedule().minute());
+        Assertions.assertEquals(2411008459227076557L, model.value().get(0).monthlySchedule().usedBytes());
+        Assertions.assertTrue(model.value().get(0).enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SnapshotPoliciesList model = new SnapshotPoliciesList().withValue(Arrays.asList(
-            new SnapshotPolicyInner().withLocation("r")
-                .withTags(mapOf("uyfxrxxleptramxj", "qoaxoruzfgs"))
-                .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1602757195)
-                    .withMinute(221742108)
-                    .withUsedBytes(6779663371110428519L))
-                .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1520746749)
-                    .withHour(769547097)
-                    .withMinute(276880748)
-                    .withUsedBytes(1028498932315825835L))
-                .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(850324011)
-                    .withDay("nwnwme")
-                    .withHour(1440499034)
-                    .withMinute(10547913)
-                    .withUsedBytes(6335921088837380808L))
-                .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1682881109)
-                    .withDaysOfMonth("bjudpfrxtrthzv")
-                    .withHour(1946200201)
-                    .withMinute(1672690714)
-                    .withUsedBytes(8785236673495844841L))
-                .withEnabled(false),
-            new SnapshotPolicyInner().withLocation("e")
-                .withTags(mapOf("icvi", "bzkfzbeyvpn", "jjxd", "v"))
-                .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(191965310)
-                    .withMinute(640428654)
-                    .withUsedBytes(5638108058648089710L))
-                .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1291411043)
-                    .withHour(1997229408)
-                    .withMinute(291950475)
-                    .withUsedBytes(6410034847924566454L))
-                .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(896449803)
-                    .withDay("cjvefkdlfo")
-                    .withHour(1252976241)
-                    .withMinute(1706699033)
-                    .withUsedBytes(5309095811404897814L))
-                .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1709159088)
-                    .withDaysOfMonth("pulpqblylsyxk")
-                    .withHour(648285682)
-                    .withMinute(1830521196)
-                    .withUsedBytes(1136404486876218562L))
-                .withEnabled(true),
-            new SnapshotPolicyInner().withLocation("f")
-                .withTags(mapOf("bgdknnqv", "gj", "sgsahmkycgr", "aznqntoru", "s", "uwjuetaeburuvdmo", "tpuqujmq",
-                    "zlxwabmqoefkifr"))
-                .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1280631673)
-                    .withMinute(608343994)
-                    .withUsedBytes(5894027165628852811L))
-                .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1872827948)
-                    .withHour(411799174)
-                    .withMinute(110839155)
-                    .withUsedBytes(1269488169933236475L))
-                .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1325987050)
-                    .withDay("cwsobqwcs")
-                    .withHour(1806206586)
-                    .withMinute(358085488)
-                    .withUsedBytes(1296933680465064139L))
-                .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1589501712)
-                    .withDaysOfMonth("pfuvglsbjjca")
-                    .withHour(1995846414)
-                    .withMinute(1075232734)
-                    .withUsedBytes(652867049720214090L))
-                .withEnabled(false),
-            new SnapshotPolicyInner().withLocation("mrv")
-                .withTags(mapOf("qgsfraoyzkoow", "tvb", "aldsy", "lmnguxaw", "znkbykutwpfhpagm", "uximerqfobw"))
-                .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1599861645)
-                    .withMinute(1139129644)
-                    .withUsedBytes(5885643020838098503L))
-                .withDailySchedule(new DailySchedule().withSnapshotsToKeep(490438503)
-                    .withHour(1685402148)
-                    .withMinute(1273142830)
-                    .withUsedBytes(7790831784605788648L))
-                .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(95404001)
-                    .withDay("p")
-                    .withHour(2028743450)
-                    .withMinute(1543353321)
-                    .withUsedBytes(4762978154142225773L))
-                .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1660457179)
-                    .withDaysOfMonth("azxkhnzbonlwnto")
-                    .withHour(1273575692)
-                    .withMinute(2078888236)
-                    .withUsedBytes(2330390624121963294L))
+        SnapshotPoliciesList model = new SnapshotPoliciesList()
+            .withValue(Arrays.asList(new SnapshotPolicyInner().withLocation("xbjhwuaanozjosph")
+                .withTags(mapOf("jrvxaglrv", "l", "tcs", "mjwosytx"))
+                .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(510557599)
+                    .withMinute(1675220188)
+                    .withUsedBytes(1198847986383751038L))
+                .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1767053067)
+                    .withHour(739435613)
+                    .withMinute(1563203885)
+                    .withUsedBytes(8338807266312513089L))
+                .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1648570452)
+                    .withDay("aw")
+                    .withHour(113630721)
+                    .withMinute(841259449)
+                    .withUsedBytes(9051460600298746000L))
+                .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(220414413)
+                    .withDaysOfMonth("c")
+                    .withHour(1974208739)
+                    .withMinute(833171610)
+                    .withUsedBytes(2411008459227076557L))
                 .withEnabled(true)));
         model = BinaryData.fromObject(model).toObject(SnapshotPoliciesList.class);
-        Assertions.assertEquals("r", model.value().get(0).location());
-        Assertions.assertEquals("qoaxoruzfgs", model.value().get(0).tags().get("uyfxrxxleptramxj"));
-        Assertions.assertEquals(1602757195, model.value().get(0).hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(221742108, model.value().get(0).hourlySchedule().minute());
-        Assertions.assertEquals(6779663371110428519L, model.value().get(0).hourlySchedule().usedBytes());
-        Assertions.assertEquals(1520746749, model.value().get(0).dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(769547097, model.value().get(0).dailySchedule().hour());
-        Assertions.assertEquals(276880748, model.value().get(0).dailySchedule().minute());
-        Assertions.assertEquals(1028498932315825835L, model.value().get(0).dailySchedule().usedBytes());
-        Assertions.assertEquals(850324011, model.value().get(0).weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("nwnwme", model.value().get(0).weeklySchedule().day());
-        Assertions.assertEquals(1440499034, model.value().get(0).weeklySchedule().hour());
-        Assertions.assertEquals(10547913, model.value().get(0).weeklySchedule().minute());
-        Assertions.assertEquals(6335921088837380808L, model.value().get(0).weeklySchedule().usedBytes());
-        Assertions.assertEquals(1682881109, model.value().get(0).monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("bjudpfrxtrthzv", model.value().get(0).monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1946200201, model.value().get(0).monthlySchedule().hour());
-        Assertions.assertEquals(1672690714, model.value().get(0).monthlySchedule().minute());
-        Assertions.assertEquals(8785236673495844841L, model.value().get(0).monthlySchedule().usedBytes());
-        Assertions.assertFalse(model.value().get(0).enabled());
+        Assertions.assertEquals("xbjhwuaanozjosph", model.value().get(0).location());
+        Assertions.assertEquals("l", model.value().get(0).tags().get("jrvxaglrv"));
+        Assertions.assertEquals(510557599, model.value().get(0).hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1675220188, model.value().get(0).hourlySchedule().minute());
+        Assertions.assertEquals(1198847986383751038L, model.value().get(0).hourlySchedule().usedBytes());
+        Assertions.assertEquals(1767053067, model.value().get(0).dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(739435613, model.value().get(0).dailySchedule().hour());
+        Assertions.assertEquals(1563203885, model.value().get(0).dailySchedule().minute());
+        Assertions.assertEquals(8338807266312513089L, model.value().get(0).dailySchedule().usedBytes());
+        Assertions.assertEquals(1648570452, model.value().get(0).weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("aw", model.value().get(0).weeklySchedule().day());
+        Assertions.assertEquals(113630721, model.value().get(0).weeklySchedule().hour());
+        Assertions.assertEquals(841259449, model.value().get(0).weeklySchedule().minute());
+        Assertions.assertEquals(9051460600298746000L, model.value().get(0).weeklySchedule().usedBytes());
+        Assertions.assertEquals(220414413, model.value().get(0).monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("c", model.value().get(0).monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(1974208739, model.value().get(0).monthlySchedule().hour());
+        Assertions.assertEquals(833171610, model.value().get(0).monthlySchedule().minute());
+        Assertions.assertEquals(2411008459227076557L, model.value().get(0).monthlySchedule().usedBytes());
+        Assertions.assertTrue(model.value().get(0).enabled());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyInnerTests.java
index 780706c4b3ac..8808313e6a23 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyInnerTests.java
@@ -18,72 +18,72 @@ public final class SnapshotPolicyInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotPolicyInner model = BinaryData.fromString(
-            "{\"etag\":\"l\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1686383029,\"minute\":39972053,\"usedBytes\":2495517310112510640},\"dailySchedule\":{\"snapshotsToKeep\":2145512273,\"hour\":494596236,\"minute\":661100043,\"usedBytes\":6615521098570079164},\"weeklySchedule\":{\"snapshotsToKeep\":308243032,\"day\":\"qqmoaku\",\"hour\":127978460,\"minute\":328261823,\"usedBytes\":1502170199128472445},\"monthlySchedule\":{\"snapshotsToKeep\":632499232,\"daysOfMonth\":\"wae\",\"hour\":809360205,\"minute\":32016010,\"usedBytes\":6235701474270002775},\"enabled\":true,\"provisioningState\":\"rfdwoyu\"},\"location\":\"ziuiefozbhdm\",\"tags\":{\"hxicslfaoqz\":\"mzqhoftrmaequi\"},\"id\":\"iyylhalnswhccsp\",\"name\":\"kaivwit\",\"type\":\"scywuggwoluhc\"}")
+            "{\"etag\":\"gebdunygaeq\",\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1475802306,\"minute\":1233334035,\"usedBytes\":6620237582798297782},\"dailySchedule\":{\"snapshotsToKeep\":48002498,\"hour\":1459715111,\"minute\":2063960908,\"usedBytes\":8725801999952390480},\"weeklySchedule\":{\"snapshotsToKeep\":1120671201,\"day\":\"arm\",\"hour\":1679294493,\"minute\":522176461,\"usedBytes\":7091421984194372162},\"monthlySchedule\":{\"snapshotsToKeep\":1756269391,\"daysOfMonth\":\"yxxrwlycoduh\",\"hour\":1842821288,\"minute\":1440361385,\"usedBytes\":4645704067973725569},\"enabled\":true,\"provisioningState\":\"n\"},\"location\":\"xqugjhkycubedd\",\"tags\":{\"zqalkrmnjijpx\":\"ofwq\",\"byxbaaabjy\":\"cqqudf\",\"zrtuzq\":\"ayffim\",\"fdnw\":\"gsexne\"},\"id\":\"wmewzsyy\",\"name\":\"euzsoi\",\"type\":\"judpfrxt\"}")
             .toObject(SnapshotPolicyInner.class);
-        Assertions.assertEquals("ziuiefozbhdm", model.location());
-        Assertions.assertEquals("mzqhoftrmaequi", model.tags().get("hxicslfaoqz"));
-        Assertions.assertEquals(1686383029, model.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(39972053, model.hourlySchedule().minute());
-        Assertions.assertEquals(2495517310112510640L, model.hourlySchedule().usedBytes());
-        Assertions.assertEquals(2145512273, model.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(494596236, model.dailySchedule().hour());
-        Assertions.assertEquals(661100043, model.dailySchedule().minute());
-        Assertions.assertEquals(6615521098570079164L, model.dailySchedule().usedBytes());
-        Assertions.assertEquals(308243032, model.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("qqmoaku", model.weeklySchedule().day());
-        Assertions.assertEquals(127978460, model.weeklySchedule().hour());
-        Assertions.assertEquals(328261823, model.weeklySchedule().minute());
-        Assertions.assertEquals(1502170199128472445L, model.weeklySchedule().usedBytes());
-        Assertions.assertEquals(632499232, model.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("wae", model.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(809360205, model.monthlySchedule().hour());
-        Assertions.assertEquals(32016010, model.monthlySchedule().minute());
-        Assertions.assertEquals(6235701474270002775L, model.monthlySchedule().usedBytes());
+        Assertions.assertEquals("xqugjhkycubedd", model.location());
+        Assertions.assertEquals("ofwq", model.tags().get("zqalkrmnjijpx"));
+        Assertions.assertEquals(1475802306, model.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1233334035, model.hourlySchedule().minute());
+        Assertions.assertEquals(6620237582798297782L, model.hourlySchedule().usedBytes());
+        Assertions.assertEquals(48002498, model.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1459715111, model.dailySchedule().hour());
+        Assertions.assertEquals(2063960908, model.dailySchedule().minute());
+        Assertions.assertEquals(8725801999952390480L, model.dailySchedule().usedBytes());
+        Assertions.assertEquals(1120671201, model.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("arm", model.weeklySchedule().day());
+        Assertions.assertEquals(1679294493, model.weeklySchedule().hour());
+        Assertions.assertEquals(522176461, model.weeklySchedule().minute());
+        Assertions.assertEquals(7091421984194372162L, model.weeklySchedule().usedBytes());
+        Assertions.assertEquals(1756269391, model.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("yxxrwlycoduh", model.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(1842821288, model.monthlySchedule().hour());
+        Assertions.assertEquals(1440361385, model.monthlySchedule().minute());
+        Assertions.assertEquals(4645704067973725569L, model.monthlySchedule().usedBytes());
         Assertions.assertTrue(model.enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SnapshotPolicyInner model = new SnapshotPolicyInner().withLocation("ziuiefozbhdm")
-            .withTags(mapOf("hxicslfaoqz", "mzqhoftrmaequi"))
-            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1686383029)
-                .withMinute(39972053)
-                .withUsedBytes(2495517310112510640L))
-            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(2145512273)
-                .withHour(494596236)
-                .withMinute(661100043)
-                .withUsedBytes(6615521098570079164L))
-            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(308243032)
-                .withDay("qqmoaku")
-                .withHour(127978460)
-                .withMinute(328261823)
-                .withUsedBytes(1502170199128472445L))
-            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(632499232)
-                .withDaysOfMonth("wae")
-                .withHour(809360205)
-                .withMinute(32016010)
-                .withUsedBytes(6235701474270002775L))
+        SnapshotPolicyInner model = new SnapshotPolicyInner().withLocation("xqugjhkycubedd")
+            .withTags(mapOf("zqalkrmnjijpx", "ofwq", "byxbaaabjy", "cqqudf", "zrtuzq", "ayffim", "fdnw", "gsexne"))
+            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1475802306)
+                .withMinute(1233334035)
+                .withUsedBytes(6620237582798297782L))
+            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(48002498)
+                .withHour(1459715111)
+                .withMinute(2063960908)
+                .withUsedBytes(8725801999952390480L))
+            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1120671201)
+                .withDay("arm")
+                .withHour(1679294493)
+                .withMinute(522176461)
+                .withUsedBytes(7091421984194372162L))
+            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1756269391)
+                .withDaysOfMonth("yxxrwlycoduh")
+                .withHour(1842821288)
+                .withMinute(1440361385)
+                .withUsedBytes(4645704067973725569L))
             .withEnabled(true);
         model = BinaryData.fromObject(model).toObject(SnapshotPolicyInner.class);
-        Assertions.assertEquals("ziuiefozbhdm", model.location());
-        Assertions.assertEquals("mzqhoftrmaequi", model.tags().get("hxicslfaoqz"));
-        Assertions.assertEquals(1686383029, model.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(39972053, model.hourlySchedule().minute());
-        Assertions.assertEquals(2495517310112510640L, model.hourlySchedule().usedBytes());
-        Assertions.assertEquals(2145512273, model.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(494596236, model.dailySchedule().hour());
-        Assertions.assertEquals(661100043, model.dailySchedule().minute());
-        Assertions.assertEquals(6615521098570079164L, model.dailySchedule().usedBytes());
-        Assertions.assertEquals(308243032, model.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("qqmoaku", model.weeklySchedule().day());
-        Assertions.assertEquals(127978460, model.weeklySchedule().hour());
-        Assertions.assertEquals(328261823, model.weeklySchedule().minute());
-        Assertions.assertEquals(1502170199128472445L, model.weeklySchedule().usedBytes());
-        Assertions.assertEquals(632499232, model.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("wae", model.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(809360205, model.monthlySchedule().hour());
-        Assertions.assertEquals(32016010, model.monthlySchedule().minute());
-        Assertions.assertEquals(6235701474270002775L, model.monthlySchedule().usedBytes());
+        Assertions.assertEquals("xqugjhkycubedd", model.location());
+        Assertions.assertEquals("ofwq", model.tags().get("zqalkrmnjijpx"));
+        Assertions.assertEquals(1475802306, model.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1233334035, model.hourlySchedule().minute());
+        Assertions.assertEquals(6620237582798297782L, model.hourlySchedule().usedBytes());
+        Assertions.assertEquals(48002498, model.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1459715111, model.dailySchedule().hour());
+        Assertions.assertEquals(2063960908, model.dailySchedule().minute());
+        Assertions.assertEquals(8725801999952390480L, model.dailySchedule().usedBytes());
+        Assertions.assertEquals(1120671201, model.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("arm", model.weeklySchedule().day());
+        Assertions.assertEquals(1679294493, model.weeklySchedule().hour());
+        Assertions.assertEquals(522176461, model.weeklySchedule().minute());
+        Assertions.assertEquals(7091421984194372162L, model.weeklySchedule().usedBytes());
+        Assertions.assertEquals(1756269391, model.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("yxxrwlycoduh", model.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(1842821288, model.monthlySchedule().hour());
+        Assertions.assertEquals(1440361385, model.monthlySchedule().minute());
+        Assertions.assertEquals(4645704067973725569L, model.monthlySchedule().usedBytes());
         Assertions.assertTrue(model.enabled());
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPatchTests.java
index 8433afa44d08..7baa01317223 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPatchTests.java
@@ -18,73 +18,74 @@ public final class SnapshotPolicyPatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotPolicyPatch model = BinaryData.fromString(
-            "{\"location\":\"htwdwrftswibyrcd\",\"id\":\"h\",\"name\":\"fwpracstwi\",\"type\":\"khevxccedc\",\"tags\":{\"vnhltiugcx\":\"dyodnwzxltj\"},\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":1627588082,\"minute\":836619519,\"usedBytes\":8209456551947561442},\"dailySchedule\":{\"snapshotsToKeep\":1643458041,\"hour\":601869733,\"minute\":1874068657,\"usedBytes\":8184174444781433747},\"weeklySchedule\":{\"snapshotsToKeep\":1183604183,\"day\":\"vfgbvfvpdboda\",\"hour\":1592823352,\"minute\":218756340,\"usedBytes\":8303913431627699430},\"monthlySchedule\":{\"snapshotsToKeep\":218475539,\"daysOfMonth\":\"bdeibqipqk\",\"hour\":1234217414,\"minute\":370586550,\"usedBytes\":4034217572792949127},\"enabled\":true,\"provisioningState\":\"efajpj\"}}")
+            "{\"location\":\"gaowpulpqblylsyx\",\"id\":\"jnsjervtiagxsd\",\"name\":\"uem\",\"type\":\"bzkfzbeyvpn\",\"tags\":{\"xdxr\":\"vinvkj\",\"aztz\":\"uukzclewyhmlw\",\"yq\":\"ofncckwyfzqwhxxb\",\"ztppriolxorjalto\":\"xzfe\"},\"properties\":{\"hourlySchedule\":{\"snapshotsToKeep\":618891293,\"minute\":1429171965,\"usedBytes\":6564772827394590293},\"dailySchedule\":{\"snapshotsToKeep\":1051180868,\"hour\":1806206586,\"minute\":358085488,\"usedBytes\":1296933680465064139},\"weeklySchedule\":{\"snapshotsToKeep\":1589501712,\"day\":\"pfuvglsbjjca\",\"hour\":1995846414,\"minute\":1075232734,\"usedBytes\":652867049720214090},\"monthlySchedule\":{\"snapshotsToKeep\":1601872964,\"daysOfMonth\":\"cormr\",\"hour\":1360670450,\"minute\":1954508595,\"usedBytes\":2688344690599449184},\"enabled\":false,\"provisioningState\":\"lvkgju\"}}")
             .toObject(SnapshotPolicyPatch.class);
-        Assertions.assertEquals("htwdwrftswibyrcd", model.location());
-        Assertions.assertEquals("dyodnwzxltj", model.tags().get("vnhltiugcx"));
-        Assertions.assertEquals(1627588082, model.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(836619519, model.hourlySchedule().minute());
-        Assertions.assertEquals(8209456551947561442L, model.hourlySchedule().usedBytes());
-        Assertions.assertEquals(1643458041, model.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(601869733, model.dailySchedule().hour());
-        Assertions.assertEquals(1874068657, model.dailySchedule().minute());
-        Assertions.assertEquals(8184174444781433747L, model.dailySchedule().usedBytes());
-        Assertions.assertEquals(1183604183, model.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("vfgbvfvpdboda", model.weeklySchedule().day());
-        Assertions.assertEquals(1592823352, model.weeklySchedule().hour());
-        Assertions.assertEquals(218756340, model.weeklySchedule().minute());
-        Assertions.assertEquals(8303913431627699430L, model.weeklySchedule().usedBytes());
-        Assertions.assertEquals(218475539, model.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("bdeibqipqk", model.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1234217414, model.monthlySchedule().hour());
-        Assertions.assertEquals(370586550, model.monthlySchedule().minute());
-        Assertions.assertEquals(4034217572792949127L, model.monthlySchedule().usedBytes());
-        Assertions.assertTrue(model.enabled());
+        Assertions.assertEquals("gaowpulpqblylsyx", model.location());
+        Assertions.assertEquals("vinvkj", model.tags().get("xdxr"));
+        Assertions.assertEquals(618891293, model.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1429171965, model.hourlySchedule().minute());
+        Assertions.assertEquals(6564772827394590293L, model.hourlySchedule().usedBytes());
+        Assertions.assertEquals(1051180868, model.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1806206586, model.dailySchedule().hour());
+        Assertions.assertEquals(358085488, model.dailySchedule().minute());
+        Assertions.assertEquals(1296933680465064139L, model.dailySchedule().usedBytes());
+        Assertions.assertEquals(1589501712, model.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("pfuvglsbjjca", model.weeklySchedule().day());
+        Assertions.assertEquals(1995846414, model.weeklySchedule().hour());
+        Assertions.assertEquals(1075232734, model.weeklySchedule().minute());
+        Assertions.assertEquals(652867049720214090L, model.weeklySchedule().usedBytes());
+        Assertions.assertEquals(1601872964, model.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("cormr", model.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(1360670450, model.monthlySchedule().hour());
+        Assertions.assertEquals(1954508595, model.monthlySchedule().minute());
+        Assertions.assertEquals(2688344690599449184L, model.monthlySchedule().usedBytes());
+        Assertions.assertFalse(model.enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SnapshotPolicyPatch model = new SnapshotPolicyPatch().withLocation("htwdwrftswibyrcd")
-            .withTags(mapOf("vnhltiugcx", "dyodnwzxltj"))
-            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(1627588082)
-                .withMinute(836619519)
-                .withUsedBytes(8209456551947561442L))
-            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1643458041)
-                .withHour(601869733)
-                .withMinute(1874068657)
-                .withUsedBytes(8184174444781433747L))
-            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1183604183)
-                .withDay("vfgbvfvpdboda")
-                .withHour(1592823352)
-                .withMinute(218756340)
-                .withUsedBytes(8303913431627699430L))
-            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(218475539)
-                .withDaysOfMonth("bdeibqipqk")
-                .withHour(1234217414)
-                .withMinute(370586550)
-                .withUsedBytes(4034217572792949127L))
-            .withEnabled(true);
+        SnapshotPolicyPatch model = new SnapshotPolicyPatch().withLocation("gaowpulpqblylsyx")
+            .withTags(
+                mapOf("xdxr", "vinvkj", "aztz", "uukzclewyhmlw", "yq", "ofncckwyfzqwhxxb", "ztppriolxorjalto", "xzfe"))
+            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(618891293)
+                .withMinute(1429171965)
+                .withUsedBytes(6564772827394590293L))
+            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(1051180868)
+                .withHour(1806206586)
+                .withMinute(358085488)
+                .withUsedBytes(1296933680465064139L))
+            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1589501712)
+                .withDay("pfuvglsbjjca")
+                .withHour(1995846414)
+                .withMinute(1075232734)
+                .withUsedBytes(652867049720214090L))
+            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1601872964)
+                .withDaysOfMonth("cormr")
+                .withHour(1360670450)
+                .withMinute(1954508595)
+                .withUsedBytes(2688344690599449184L))
+            .withEnabled(false);
         model = BinaryData.fromObject(model).toObject(SnapshotPolicyPatch.class);
-        Assertions.assertEquals("htwdwrftswibyrcd", model.location());
-        Assertions.assertEquals("dyodnwzxltj", model.tags().get("vnhltiugcx"));
-        Assertions.assertEquals(1627588082, model.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(836619519, model.hourlySchedule().minute());
-        Assertions.assertEquals(8209456551947561442L, model.hourlySchedule().usedBytes());
-        Assertions.assertEquals(1643458041, model.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(601869733, model.dailySchedule().hour());
-        Assertions.assertEquals(1874068657, model.dailySchedule().minute());
-        Assertions.assertEquals(8184174444781433747L, model.dailySchedule().usedBytes());
-        Assertions.assertEquals(1183604183, model.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("vfgbvfvpdboda", model.weeklySchedule().day());
-        Assertions.assertEquals(1592823352, model.weeklySchedule().hour());
-        Assertions.assertEquals(218756340, model.weeklySchedule().minute());
-        Assertions.assertEquals(8303913431627699430L, model.weeklySchedule().usedBytes());
-        Assertions.assertEquals(218475539, model.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("bdeibqipqk", model.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1234217414, model.monthlySchedule().hour());
-        Assertions.assertEquals(370586550, model.monthlySchedule().minute());
-        Assertions.assertEquals(4034217572792949127L, model.monthlySchedule().usedBytes());
-        Assertions.assertTrue(model.enabled());
+        Assertions.assertEquals("gaowpulpqblylsyx", model.location());
+        Assertions.assertEquals("vinvkj", model.tags().get("xdxr"));
+        Assertions.assertEquals(618891293, model.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1429171965, model.hourlySchedule().minute());
+        Assertions.assertEquals(6564772827394590293L, model.hourlySchedule().usedBytes());
+        Assertions.assertEquals(1051180868, model.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1806206586, model.dailySchedule().hour());
+        Assertions.assertEquals(358085488, model.dailySchedule().minute());
+        Assertions.assertEquals(1296933680465064139L, model.dailySchedule().usedBytes());
+        Assertions.assertEquals(1589501712, model.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("pfuvglsbjjca", model.weeklySchedule().day());
+        Assertions.assertEquals(1995846414, model.weeklySchedule().hour());
+        Assertions.assertEquals(1075232734, model.weeklySchedule().minute());
+        Assertions.assertEquals(652867049720214090L, model.weeklySchedule().usedBytes());
+        Assertions.assertEquals(1601872964, model.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("cormr", model.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(1360670450, model.monthlySchedule().hour());
+        Assertions.assertEquals(1954508595, model.monthlySchedule().minute());
+        Assertions.assertEquals(2688344690599449184L, model.monthlySchedule().usedBytes());
+        Assertions.assertFalse(model.enabled());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPropertiesTests.java
index cdea3933ecda..a3c50a05d13f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPolicyPropertiesTests.java
@@ -16,67 +16,67 @@ public final class SnapshotPolicyPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotPolicyProperties model = BinaryData.fromString(
-            "{\"hourlySchedule\":{\"snapshotsToKeep\":748127164,\"minute\":1174203733,\"usedBytes\":85717460698050500},\"dailySchedule\":{\"snapshotsToKeep\":538424722,\"hour\":73661757,\"minute\":444921706,\"usedBytes\":2987884868949644497},\"weeklySchedule\":{\"snapshotsToKeep\":827255205,\"day\":\"w\",\"hour\":840450646,\"minute\":1308163389,\"usedBytes\":423468759806751864},\"monthlySchedule\":{\"snapshotsToKeep\":1451810874,\"daysOfMonth\":\"uexmkttlst\",\"hour\":1961670618,\"minute\":596743052,\"usedBytes\":5017420893473411481},\"enabled\":true,\"provisioningState\":\"csdtclusiypbs\"}")
+            "{\"hourlySchedule\":{\"snapshotsToKeep\":747190122,\"minute\":383996827,\"usedBytes\":8358866216552319675},\"dailySchedule\":{\"snapshotsToKeep\":2045472309,\"hour\":1322383691,\"minute\":1729344688,\"usedBytes\":4145471517526414946},\"weeklySchedule\":{\"snapshotsToKeep\":1389326915,\"day\":\"iilivpdtiirqtd\",\"hour\":887642500,\"minute\":1693357038,\"usedBytes\":3114947430528398041},\"monthlySchedule\":{\"snapshotsToKeep\":1061692620,\"daysOfMonth\":\"uyfxrxxleptramxj\",\"hour\":576385447,\"minute\":800812531,\"usedBytes\":9127393651345868324},\"enabled\":false,\"provisioningState\":\"cvydypatdoo\"}")
             .toObject(SnapshotPolicyProperties.class);
-        Assertions.assertEquals(748127164, model.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(1174203733, model.hourlySchedule().minute());
-        Assertions.assertEquals(85717460698050500L, model.hourlySchedule().usedBytes());
-        Assertions.assertEquals(538424722, model.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(73661757, model.dailySchedule().hour());
-        Assertions.assertEquals(444921706, model.dailySchedule().minute());
-        Assertions.assertEquals(2987884868949644497L, model.dailySchedule().usedBytes());
-        Assertions.assertEquals(827255205, model.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("w", model.weeklySchedule().day());
-        Assertions.assertEquals(840450646, model.weeklySchedule().hour());
-        Assertions.assertEquals(1308163389, model.weeklySchedule().minute());
-        Assertions.assertEquals(423468759806751864L, model.weeklySchedule().usedBytes());
-        Assertions.assertEquals(1451810874, model.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("uexmkttlst", model.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1961670618, model.monthlySchedule().hour());
-        Assertions.assertEquals(596743052, model.monthlySchedule().minute());
-        Assertions.assertEquals(5017420893473411481L, model.monthlySchedule().usedBytes());
-        Assertions.assertTrue(model.enabled());
+        Assertions.assertEquals(747190122, model.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(383996827, model.hourlySchedule().minute());
+        Assertions.assertEquals(8358866216552319675L, model.hourlySchedule().usedBytes());
+        Assertions.assertEquals(2045472309, model.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1322383691, model.dailySchedule().hour());
+        Assertions.assertEquals(1729344688, model.dailySchedule().minute());
+        Assertions.assertEquals(4145471517526414946L, model.dailySchedule().usedBytes());
+        Assertions.assertEquals(1389326915, model.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("iilivpdtiirqtd", model.weeklySchedule().day());
+        Assertions.assertEquals(887642500, model.weeklySchedule().hour());
+        Assertions.assertEquals(1693357038, model.weeklySchedule().minute());
+        Assertions.assertEquals(3114947430528398041L, model.weeklySchedule().usedBytes());
+        Assertions.assertEquals(1061692620, model.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("uyfxrxxleptramxj", model.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(576385447, model.monthlySchedule().hour());
+        Assertions.assertEquals(800812531, model.monthlySchedule().minute());
+        Assertions.assertEquals(9127393651345868324L, model.monthlySchedule().usedBytes());
+        Assertions.assertFalse(model.enabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         SnapshotPolicyProperties model = new SnapshotPolicyProperties()
-            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(748127164)
-                .withMinute(1174203733)
-                .withUsedBytes(85717460698050500L))
-            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(538424722)
-                .withHour(73661757)
-                .withMinute(444921706)
-                .withUsedBytes(2987884868949644497L))
-            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(827255205)
-                .withDay("w")
-                .withHour(840450646)
-                .withMinute(1308163389)
-                .withUsedBytes(423468759806751864L))
-            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1451810874)
-                .withDaysOfMonth("uexmkttlst")
-                .withHour(1961670618)
-                .withMinute(596743052)
-                .withUsedBytes(5017420893473411481L))
-            .withEnabled(true);
+            .withHourlySchedule(new HourlySchedule().withSnapshotsToKeep(747190122)
+                .withMinute(383996827)
+                .withUsedBytes(8358866216552319675L))
+            .withDailySchedule(new DailySchedule().withSnapshotsToKeep(2045472309)
+                .withHour(1322383691)
+                .withMinute(1729344688)
+                .withUsedBytes(4145471517526414946L))
+            .withWeeklySchedule(new WeeklySchedule().withSnapshotsToKeep(1389326915)
+                .withDay("iilivpdtiirqtd")
+                .withHour(887642500)
+                .withMinute(1693357038)
+                .withUsedBytes(3114947430528398041L))
+            .withMonthlySchedule(new MonthlySchedule().withSnapshotsToKeep(1061692620)
+                .withDaysOfMonth("uyfxrxxleptramxj")
+                .withHour(576385447)
+                .withMinute(800812531)
+                .withUsedBytes(9127393651345868324L))
+            .withEnabled(false);
         model = BinaryData.fromObject(model).toObject(SnapshotPolicyProperties.class);
-        Assertions.assertEquals(748127164, model.hourlySchedule().snapshotsToKeep());
-        Assertions.assertEquals(1174203733, model.hourlySchedule().minute());
-        Assertions.assertEquals(85717460698050500L, model.hourlySchedule().usedBytes());
-        Assertions.assertEquals(538424722, model.dailySchedule().snapshotsToKeep());
-        Assertions.assertEquals(73661757, model.dailySchedule().hour());
-        Assertions.assertEquals(444921706, model.dailySchedule().minute());
-        Assertions.assertEquals(2987884868949644497L, model.dailySchedule().usedBytes());
-        Assertions.assertEquals(827255205, model.weeklySchedule().snapshotsToKeep());
-        Assertions.assertEquals("w", model.weeklySchedule().day());
-        Assertions.assertEquals(840450646, model.weeklySchedule().hour());
-        Assertions.assertEquals(1308163389, model.weeklySchedule().minute());
-        Assertions.assertEquals(423468759806751864L, model.weeklySchedule().usedBytes());
-        Assertions.assertEquals(1451810874, model.monthlySchedule().snapshotsToKeep());
-        Assertions.assertEquals("uexmkttlst", model.monthlySchedule().daysOfMonth());
-        Assertions.assertEquals(1961670618, model.monthlySchedule().hour());
-        Assertions.assertEquals(596743052, model.monthlySchedule().minute());
-        Assertions.assertEquals(5017420893473411481L, model.monthlySchedule().usedBytes());
-        Assertions.assertTrue(model.enabled());
+        Assertions.assertEquals(747190122, model.hourlySchedule().snapshotsToKeep());
+        Assertions.assertEquals(383996827, model.hourlySchedule().minute());
+        Assertions.assertEquals(8358866216552319675L, model.hourlySchedule().usedBytes());
+        Assertions.assertEquals(2045472309, model.dailySchedule().snapshotsToKeep());
+        Assertions.assertEquals(1322383691, model.dailySchedule().hour());
+        Assertions.assertEquals(1729344688, model.dailySchedule().minute());
+        Assertions.assertEquals(4145471517526414946L, model.dailySchedule().usedBytes());
+        Assertions.assertEquals(1389326915, model.weeklySchedule().snapshotsToKeep());
+        Assertions.assertEquals("iilivpdtiirqtd", model.weeklySchedule().day());
+        Assertions.assertEquals(887642500, model.weeklySchedule().hour());
+        Assertions.assertEquals(1693357038, model.weeklySchedule().minute());
+        Assertions.assertEquals(3114947430528398041L, model.weeklySchedule().usedBytes());
+        Assertions.assertEquals(1061692620, model.monthlySchedule().snapshotsToKeep());
+        Assertions.assertEquals("uyfxrxxleptramxj", model.monthlySchedule().daysOfMonth());
+        Assertions.assertEquals(576385447, model.monthlySchedule().hour());
+        Assertions.assertEquals(800812531, model.monthlySchedule().minute());
+        Assertions.assertEquals(9127393651345868324L, model.monthlySchedule().usedBytes());
+        Assertions.assertFalse(model.enabled());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPropertiesTests.java
index ec579ebe2473..d479a9927931 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotPropertiesTests.java
@@ -11,7 +11,7 @@ public final class SnapshotPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotProperties model = BinaryData.fromString(
-            "{\"snapshotId\":\"kgymareqnajxqug\",\"created\":\"2020-12-30T20:00:15Z\",\"provisioningState\":\"cubeddgssofw\"}")
+            "{\"snapshotId\":\"kwqqtchealmf\",\"created\":\"2021-05-23T20:32:01Z\",\"provisioningState\":\"aygdvwvgpioh\"}")
             .toObject(SnapshotProperties.class);
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotRestoreFilesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotRestoreFilesTests.java
index f7fa25dcc44c..06f580b79f68 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotRestoreFilesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotRestoreFilesTests.java
@@ -13,18 +13,18 @@ public final class SnapshotRestoreFilesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotRestoreFiles model
-            = BinaryData.fromString("{\"filePaths\":[\"zqalkrmnjijpx\"],\"destinationPath\":\"q\"}")
+            = BinaryData.fromString("{\"filePaths\":[\"xrtfudxep\"],\"destinationPath\":\"yqagvrvm\"}")
                 .toObject(SnapshotRestoreFiles.class);
-        Assertions.assertEquals("zqalkrmnjijpx", model.filePaths().get(0));
-        Assertions.assertEquals("q", model.destinationPath());
+        Assertions.assertEquals("xrtfudxep", model.filePaths().get(0));
+        Assertions.assertEquals("yqagvrvm", model.destinationPath());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         SnapshotRestoreFiles model
-            = new SnapshotRestoreFiles().withFilePaths(Arrays.asList("zqalkrmnjijpx")).withDestinationPath("q");
+            = new SnapshotRestoreFiles().withFilePaths(Arrays.asList("xrtfudxep")).withDestinationPath("yqagvrvm");
         model = BinaryData.fromObject(model).toObject(SnapshotRestoreFiles.class);
-        Assertions.assertEquals("zqalkrmnjijpx", model.filePaths().get(0));
-        Assertions.assertEquals("q", model.destinationPath());
+        Assertions.assertEquals("xrtfudxep", model.filePaths().get(0));
+        Assertions.assertEquals("yqagvrvm", model.destinationPath());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteMockTests.java
index 652363033e59..68130ff42042 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsDeleteMockTests.java
@@ -28,7 +28,7 @@ public void testDelete() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.snapshots()
-            .delete("pdqmjxlyyzglgouw", "lmjjyuo", "qtobaxkjeyt", "nlb", "jkwrusnkq", com.azure.core.util.Context.NONE);
+            .delete("qunjqh", "enx", "ulkpakd", "ifmjnn", "wtqabpxuckp", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetWithResponseMockTests.java
index a84e8bbc86f4..da587e5e3bf7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class SnapshotsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"location\":\"lzok\",\"properties\":{\"snapshotId\":\"xpelnjetagltsx\",\"created\":\"2021-03-05T21:15:44Z\",\"provisioningState\":\"tgzpnpb\"},\"id\":\"vefloccsrmozihmi\",\"name\":\"g\",\"type\":\"wtxxpkyjcx\"}";
+            = "{\"location\":\"jxgrytfmp\",\"properties\":{\"snapshotId\":\"ilrmcaykggnox\",\"created\":\"2021-09-05T21:02:51Z\",\"provisioningState\":\"ksxwpnd\"},\"id\":\"pfnznthjtwkj\",\"name\":\"osrxuzvoa\",\"type\":\"ktcqio\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         Snapshot response = manager.snapshots()
-            .getWithResponse("swhvhczznvfbycj", "xjww", "xzv", "mwmxqhndvnoamld", "ehaohdjhh",
+            .getWithResponse("tsxoatftgz", "npbs", "vefloccsrmozihmi", "g", "wtxxpkyjcx",
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("lzok", response.location());
+        Assertions.assertEquals("jxgrytfmp", response.location());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListMockTests.java
index f7771cb9d1cd..ff891b91a78a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListMockTests.java
@@ -22,7 +22,7 @@ public final class SnapshotsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"location\":\"vuwcobiegstmnin\",\"properties\":{\"snapshotId\":\"zcilnghg\",\"created\":\"2021-06-03T10:48:11Z\",\"provisioningState\":\"jtbxqmuluxlx\"},\"id\":\"vnersbycucrw\",\"name\":\"amikzebrqbsm\",\"type\":\"wziqgfuhokzr\"}]}";
+            = "{\"value\":[{\"location\":\"hczznvf\",\"properties\":{\"snapshotId\":\"jsxjwwix\",\"created\":\"2021-05-29T07:40:45Z\",\"provisioningState\":\"wmxqhndvnoamlds\"},\"id\":\"aohdjh\",\"name\":\"flzokxco\",\"type\":\"pelnjetag\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,9 +31,9 @@ public void testList() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        PagedIterable<Snapshot> response
-            = manager.snapshots().list("qwhix", "onsts", "i", "xgvelfclduccbird", com.azure.core.util.Context.NONE);
+        PagedIterable<Snapshot> response = manager.snapshots()
+            .list("ycucrwnamikzeb", "qbsms", "ziqgfuh", "kzruswh", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("vuwcobiegstmnin", response.iterator().next().location());
+        Assertions.assertEquals("hczznvf", response.iterator().next().location());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListTests.java
index 1028437895e4..12c1dfddfc67 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsListTests.java
@@ -14,16 +14,17 @@ public final class SnapshotsListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SnapshotsList model = BinaryData.fromString(
-            "{\"value\":[{\"location\":\"mszkkfo\",\"properties\":{\"snapshotId\":\"yfkzik\",\"created\":\"2021-01-25T00:08:01Z\",\"provisioningState\":\"n\"},\"id\":\"ivx\",\"name\":\"czelpcirel\",\"type\":\"feaenwab\"},{\"location\":\"atklddxbjhwuaa\",\"properties\":{\"snapshotId\":\"jos\",\"created\":\"2021-07-19T15:07:37Z\",\"provisioningState\":\"ulpjr\"},\"id\":\"ag\",\"name\":\"rvimjwosytxitcsk\",\"type\":\"cktqumiekkezzi\"}]}")
+            "{\"value\":[{\"location\":\"plsaknynfsynljph\",\"properties\":{\"snapshotId\":\"xodlqiyntorzih\",\"created\":\"2021-04-08T02:51:20Z\",\"provisioningState\":\"jswsrmslyz\"},\"id\":\"zbchckqqzqioxiy\",\"name\":\"uiizynke\",\"type\":\"yatrwy\"},{\"location\":\"q\",\"properties\":{\"snapshotId\":\"zyh\",\"created\":\"2021-05-20T17:58:30Z\",\"provisioningState\":\"mypyynpcdpu\"},\"id\":\"zgmwznmabikns\",\"name\":\"rgjhxb\",\"type\":\"dtlwwrlkd\"},{\"location\":\"tncvokot\",\"properties\":{\"snapshotId\":\"d\",\"created\":\"2021-07-23T09:43:53Z\",\"provisioningState\":\"y\"},\"id\":\"ogjltdtbnnhad\",\"name\":\"ocrkvcikh\",\"type\":\"vpa\"}]}")
             .toObject(SnapshotsList.class);
-        Assertions.assertEquals("mszkkfo", model.value().get(0).location());
+        Assertions.assertEquals("plsaknynfsynljph", model.value().get(0).location());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SnapshotsList model = new SnapshotsList().withValue(Arrays.asList(new SnapshotInner().withLocation("mszkkfo"),
-            new SnapshotInner().withLocation("atklddxbjhwuaa")));
+        SnapshotsList model
+            = new SnapshotsList().withValue(Arrays.asList(new SnapshotInner().withLocation("plsaknynfsynljph"),
+                new SnapshotInner().withLocation("q"), new SnapshotInner().withLocation("tncvokot")));
         model = BinaryData.fromObject(model).toObject(SnapshotsList.class);
-        Assertions.assertEquals("mszkkfo", model.value().get(0).location());
+        Assertions.assertEquals("plsaknynfsynljph", model.value().get(0).location());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesMockTests.java
index 1069c606b063..0296508d36ab 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsRestoreFilesMockTests.java
@@ -30,9 +30,9 @@ public void testRestoreFiles() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.snapshots()
-            .restoreFiles("hsyrqunj", "hdenxaulk", "akdkifmjnnawtqab", "xuckpggqoweyir", "hlisngw",
-                new SnapshotRestoreFiles().withFilePaths(Arrays.asList("qqmpizruwnpqx", "xiw"))
-                    .withDestinationPath("ngjsaasi"),
+            .restoreFiles("gqoweyirdhlisn", "wfl", "qmp", "zruwn", "qxpxiwfcngjsaa",
+                new SnapshotRestoreFiles().withFilePaths(Arrays.asList("ixtmkzjvkviirhgf", "rwsdp"))
+                    .withDestinationPath("atzv"),
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateMockTests.java
index eed8f83cdf82..d690e3e6d6aa 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SnapshotsUpdateMockTests.java
@@ -21,7 +21,7 @@ public final class SnapshotsUpdateMockTests {
     @Test
     public void testUpdate() throws Exception {
         String responseStr
-            = "{\"location\":\"mgbzahgxqdlyrtl\",\"properties\":{\"snapshotId\":\"prltzkatbhjmz\",\"created\":\"2020-12-30T18:21:45Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"arvlagunbt\",\"name\":\"febwlnbmhyreeudz\",\"type\":\"av\"}";
+            = "{\"location\":\"av\",\"properties\":{\"snapshotId\":\"qmjxlyyzglgouwtl\",\"created\":\"2021-03-15T04:42:49Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"axkjeytunlbfjk\",\"name\":\"rusnk\",\"type\":\"bhsy\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,9 +31,9 @@ public void testUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         Snapshot response = manager.snapshots()
-            .update("jxgrytfmp", "ycilrmcaykggnox", "ztrksxwpndf", "pfnznthjtwkj", "osrxuzvoa", "dataktcqio",
+            .update("mgbzahgxqdlyrtl", "laprlt", "katbhjm", "nnbsoqeqa", "arvlagunbt", "datafebwlnbmhyreeudz",
                 com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("mgbzahgxqdlyrtl", response.location());
+        Assertions.assertEquals("av", response.location());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemInnerTests.java
deleted file mode 100644
index 7de22e36c936..000000000000
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemInnerTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.resourcemanager.netapp.generated;
-
-import com.azure.core.util.BinaryData;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
-
-public final class SubscriptionQuotaItemInnerTests {
-    @org.junit.jupiter.api.Test
-    public void testDeserialize() throws Exception {
-        SubscriptionQuotaItemInner model = BinaryData.fromString(
-            "{\"properties\":{\"current\":63177450,\"default\":891101767},\"id\":\"czwtruwiqzbqjv\",\"name\":\"ovm\",\"type\":\"okacspk\"}")
-            .toObject(SubscriptionQuotaItemInner.class);
-    }
-
-    @org.junit.jupiter.api.Test
-    public void testSerialize() throws Exception {
-        SubscriptionQuotaItemInner model = new SubscriptionQuotaItemInner();
-        model = BinaryData.fromObject(model).toObject(SubscriptionQuotaItemInner.class);
-    }
-}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemListTests.java
deleted file mode 100644
index 0515ffbff4a9..000000000000
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemListTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.resourcemanager.netapp.generated;
-
-import com.azure.core.util.BinaryData;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemInner;
-import com.azure.resourcemanager.netapp.models.SubscriptionQuotaItemList;
-import java.util.Arrays;
-import org.junit.jupiter.api.Assertions;
-
-public final class SubscriptionQuotaItemListTests {
-    @org.junit.jupiter.api.Test
-    public void testDeserialize() throws Exception {
-        SubscriptionQuotaItemList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"current\":1747091504,\"default\":1085417867},\"id\":\"i\",\"name\":\"qrvkdv\",\"type\":\"sllr\"}],\"nextLink\":\"vdfwatkpn\"}")
-            .toObject(SubscriptionQuotaItemList.class);
-        Assertions.assertEquals("vdfwatkpn", model.nextLink());
-    }
-
-    @org.junit.jupiter.api.Test
-    public void testSerialize() throws Exception {
-        SubscriptionQuotaItemList model
-            = new SubscriptionQuotaItemList().withValue(Arrays.asList(new SubscriptionQuotaItemInner()))
-                .withNextLink("vdfwatkpn");
-        model = BinaryData.fromObject(model).toObject(SubscriptionQuotaItemList.class);
-        Assertions.assertEquals("vdfwatkpn", model.nextLink());
-    }
-}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemPropertiesTests.java
deleted file mode 100644
index cbac8ecd7a52..000000000000
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubscriptionQuotaItemPropertiesTests.java
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.resourcemanager.netapp.generated;
-
-import com.azure.core.util.BinaryData;
-import com.azure.resourcemanager.netapp.fluent.models.SubscriptionQuotaItemProperties;
-
-public final class SubscriptionQuotaItemPropertiesTests {
-    @org.junit.jupiter.api.Test
-    public void testDeserialize() throws Exception {
-        SubscriptionQuotaItemProperties model = BinaryData.fromString("{\"current\":1932691851,\"default\":1196709774}")
-            .toObject(SubscriptionQuotaItemProperties.class);
-    }
-
-    @org.junit.jupiter.api.Test
-    public void testSerialize() throws Exception {
-        SubscriptionQuotaItemProperties model = new SubscriptionQuotaItemProperties();
-        model = BinaryData.fromObject(model).toObject(SubscriptionQuotaItemProperties.class);
-    }
-}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeInfoInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeInfoInnerTests.java
index 57f3fe7a9d36..8273640da503 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeInfoInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeInfoInnerTests.java
@@ -12,20 +12,20 @@ public final class SubvolumeInfoInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubvolumeInfoInner model = BinaryData.fromString(
-            "{\"properties\":{\"path\":\"l\",\"size\":5819230901215248432,\"parentPath\":\"qdunvmnnrwrbior\",\"provisioningState\":\"alywjhhgdn\"},\"id\":\"msi\",\"name\":\"fomiloxgg\",\"type\":\"ufiqndieuzaof\"}")
+            "{\"properties\":{\"path\":\"dshf\",\"size\":962248529586106867,\"parentPath\":\"gy\",\"provisioningState\":\"rymsgaojfmw\"},\"id\":\"otmrfhir\",\"name\":\"tymoxoftp\",\"type\":\"piwyczuhxacpqjl\"}")
             .toObject(SubvolumeInfoInner.class);
-        Assertions.assertEquals("l", model.path());
-        Assertions.assertEquals(5819230901215248432L, model.size());
-        Assertions.assertEquals("qdunvmnnrwrbior", model.parentPath());
+        Assertions.assertEquals("dshf", model.path());
+        Assertions.assertEquals(962248529586106867L, model.size());
+        Assertions.assertEquals("gy", model.parentPath());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         SubvolumeInfoInner model
-            = new SubvolumeInfoInner().withPath("l").withSize(5819230901215248432L).withParentPath("qdunvmnnrwrbior");
+            = new SubvolumeInfoInner().withPath("dshf").withSize(962248529586106867L).withParentPath("gy");
         model = BinaryData.fromObject(model).toObject(SubvolumeInfoInner.class);
-        Assertions.assertEquals("l", model.path());
-        Assertions.assertEquals(5819230901215248432L, model.size());
-        Assertions.assertEquals("qdunvmnnrwrbior", model.parentPath());
+        Assertions.assertEquals("dshf", model.path());
+        Assertions.assertEquals(962248529586106867L, model.size());
+        Assertions.assertEquals("gy", model.parentPath());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelInnerTests.java
index b7a65dcbeae9..00e43a6ea3b7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelInnerTests.java
@@ -13,42 +13,42 @@ public final class SubvolumeModelInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubvolumeModelInner model = BinaryData.fromString(
-            "{\"id\":\"cwrwfs\",\"name\":\"fnynszqujizdvoqy\",\"type\":\"byowbblgyavutp\",\"properties\":{\"path\":\"oxoismsksbpim\",\"parentPath\":\"oljxkcgx\",\"size\":1099091758856498635,\"bytesUsed\":5824973782109910502,\"permissions\":\"vizqzdwl\",\"creationTimeStamp\":\"2021-04-04T23:05:36Z\",\"accessedTimeStamp\":\"2021-03-22T22:39:30Z\",\"modifiedTimeStamp\":\"2021-10-25T23:33:10Z\",\"changedTimeStamp\":\"2021-11-27T21:02:31Z\",\"provisioningState\":\"bkjubdyhgkfmins\"}}")
+            "{\"id\":\"sutrgjup\",\"name\":\"utpwoqhihejqgw\",\"type\":\"nfqn\",\"properties\":{\"path\":\"psxjvf\",\"parentPath\":\"mwks\",\"size\":139453520421525767,\"bytesUsed\":1648418859978390426,\"permissions\":\"vydfceacvlhvygdy\",\"creationTimeStamp\":\"2021-04-02T04:25:09Z\",\"accessedTimeStamp\":\"2021-04-26T02:40:30Z\",\"modifiedTimeStamp\":\"2021-01-27T11:41:35Z\",\"changedTimeStamp\":\"2021-05-06T02:12:21Z\",\"provisioningState\":\"jslb\"}}")
             .toObject(SubvolumeModelInner.class);
-        Assertions.assertEquals("oxoismsksbpim", model.path());
-        Assertions.assertEquals("oljxkcgx", model.parentPath());
-        Assertions.assertEquals(1099091758856498635L, model.size());
-        Assertions.assertEquals(5824973782109910502L, model.bytesUsed());
-        Assertions.assertEquals("vizqzdwl", model.permissions());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-04-04T23:05:36Z"), model.creationTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-22T22:39:30Z"), model.accessedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-25T23:33:10Z"), model.modifiedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-27T21:02:31Z"), model.changedTimestamp());
-        Assertions.assertEquals("bkjubdyhgkfmins", model.provisioningState());
+        Assertions.assertEquals("psxjvf", model.path());
+        Assertions.assertEquals("mwks", model.parentPath());
+        Assertions.assertEquals(139453520421525767L, model.size());
+        Assertions.assertEquals(1648418859978390426L, model.bytesUsed());
+        Assertions.assertEquals("vydfceacvlhvygdy", model.permissions());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-04-02T04:25:09Z"), model.creationTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-04-26T02:40:30Z"), model.accessedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-27T11:41:35Z"), model.modifiedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-06T02:12:21Z"), model.changedTimestamp());
+        Assertions.assertEquals("jslb", model.provisioningState());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SubvolumeModelInner model = new SubvolumeModelInner().withPath("oxoismsksbpim")
-            .withParentPath("oljxkcgx")
-            .withSize(1099091758856498635L)
-            .withBytesUsed(5824973782109910502L)
-            .withPermissions("vizqzdwl")
-            .withCreationTimestamp(OffsetDateTime.parse("2021-04-04T23:05:36Z"))
-            .withAccessedTimestamp(OffsetDateTime.parse("2021-03-22T22:39:30Z"))
-            .withModifiedTimestamp(OffsetDateTime.parse("2021-10-25T23:33:10Z"))
-            .withChangedTimestamp(OffsetDateTime.parse("2021-11-27T21:02:31Z"))
-            .withProvisioningState("bkjubdyhgkfmins");
+        SubvolumeModelInner model = new SubvolumeModelInner().withPath("psxjvf")
+            .withParentPath("mwks")
+            .withSize(139453520421525767L)
+            .withBytesUsed(1648418859978390426L)
+            .withPermissions("vydfceacvlhvygdy")
+            .withCreationTimestamp(OffsetDateTime.parse("2021-04-02T04:25:09Z"))
+            .withAccessedTimestamp(OffsetDateTime.parse("2021-04-26T02:40:30Z"))
+            .withModifiedTimestamp(OffsetDateTime.parse("2021-01-27T11:41:35Z"))
+            .withChangedTimestamp(OffsetDateTime.parse("2021-05-06T02:12:21Z"))
+            .withProvisioningState("jslb");
         model = BinaryData.fromObject(model).toObject(SubvolumeModelInner.class);
-        Assertions.assertEquals("oxoismsksbpim", model.path());
-        Assertions.assertEquals("oljxkcgx", model.parentPath());
-        Assertions.assertEquals(1099091758856498635L, model.size());
-        Assertions.assertEquals(5824973782109910502L, model.bytesUsed());
-        Assertions.assertEquals("vizqzdwl", model.permissions());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-04-04T23:05:36Z"), model.creationTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-22T22:39:30Z"), model.accessedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-25T23:33:10Z"), model.modifiedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-27T21:02:31Z"), model.changedTimestamp());
-        Assertions.assertEquals("bkjubdyhgkfmins", model.provisioningState());
+        Assertions.assertEquals("psxjvf", model.path());
+        Assertions.assertEquals("mwks", model.parentPath());
+        Assertions.assertEquals(139453520421525767L, model.size());
+        Assertions.assertEquals(1648418859978390426L, model.bytesUsed());
+        Assertions.assertEquals("vydfceacvlhvygdy", model.permissions());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-04-02T04:25:09Z"), model.creationTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-04-26T02:40:30Z"), model.accessedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-27T11:41:35Z"), model.modifiedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-06T02:12:21Z"), model.changedTimestamp());
+        Assertions.assertEquals("jslb", model.provisioningState());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelPropertiesTests.java
index aecc0f2378ef..a4f47af96cd3 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumeModelPropertiesTests.java
@@ -13,42 +13,42 @@ public final class SubvolumeModelPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubvolumeModelProperties model = BinaryData.fromString(
-            "{\"path\":\"wzf\",\"parentPath\":\"sttktlahbqa\",\"size\":8616212085400187990,\"bytesUsed\":5269080860796174079,\"permissions\":\"xitmmqtgqqq\",\"creationTimeStamp\":\"2021-09-05T22:16:51Z\",\"accessedTimeStamp\":\"2021-09-26T11:40:15Z\",\"modifiedTimeStamp\":\"2021-07-18T12:52:35Z\",\"changedTimeStamp\":\"2021-11-27T09:39:12Z\",\"provisioningState\":\"uisavokq\"}")
+            "{\"path\":\"kojgcyzts\",\"parentPath\":\"z\",\"size\":1225838395587285153,\"bytesUsed\":1800143907295962702,\"permissions\":\"hqnrn\",\"creationTimeStamp\":\"2021-07-24T02:25:51Z\",\"accessedTimeStamp\":\"2021-01-21T00:49:26Z\",\"modifiedTimeStamp\":\"2021-01-03T13:06:24Z\",\"changedTimeStamp\":\"2021-10-20T16:41:45Z\",\"provisioningState\":\"qgaifmviklbydv\"}")
             .toObject(SubvolumeModelProperties.class);
-        Assertions.assertEquals("wzf", model.path());
-        Assertions.assertEquals("sttktlahbqa", model.parentPath());
-        Assertions.assertEquals(8616212085400187990L, model.size());
-        Assertions.assertEquals(5269080860796174079L, model.bytesUsed());
-        Assertions.assertEquals("xitmmqtgqqq", model.permissions());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-05T22:16:51Z"), model.creationTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-26T11:40:15Z"), model.accessedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-07-18T12:52:35Z"), model.modifiedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-27T09:39:12Z"), model.changedTimestamp());
-        Assertions.assertEquals("uisavokq", model.provisioningState());
+        Assertions.assertEquals("kojgcyzts", model.path());
+        Assertions.assertEquals("z", model.parentPath());
+        Assertions.assertEquals(1225838395587285153L, model.size());
+        Assertions.assertEquals(1800143907295962702L, model.bytesUsed());
+        Assertions.assertEquals("hqnrn", model.permissions());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-24T02:25:51Z"), model.creationTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-21T00:49:26Z"), model.accessedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-03T13:06:24Z"), model.modifiedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-10-20T16:41:45Z"), model.changedTimestamp());
+        Assertions.assertEquals("qgaifmviklbydv", model.provisioningState());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SubvolumeModelProperties model = new SubvolumeModelProperties().withPath("wzf")
-            .withParentPath("sttktlahbqa")
-            .withSize(8616212085400187990L)
-            .withBytesUsed(5269080860796174079L)
-            .withPermissions("xitmmqtgqqq")
-            .withCreationTimestamp(OffsetDateTime.parse("2021-09-05T22:16:51Z"))
-            .withAccessedTimestamp(OffsetDateTime.parse("2021-09-26T11:40:15Z"))
-            .withModifiedTimestamp(OffsetDateTime.parse("2021-07-18T12:52:35Z"))
-            .withChangedTimestamp(OffsetDateTime.parse("2021-11-27T09:39:12Z"))
-            .withProvisioningState("uisavokq");
+        SubvolumeModelProperties model = new SubvolumeModelProperties().withPath("kojgcyzts")
+            .withParentPath("z")
+            .withSize(1225838395587285153L)
+            .withBytesUsed(1800143907295962702L)
+            .withPermissions("hqnrn")
+            .withCreationTimestamp(OffsetDateTime.parse("2021-07-24T02:25:51Z"))
+            .withAccessedTimestamp(OffsetDateTime.parse("2021-01-21T00:49:26Z"))
+            .withModifiedTimestamp(OffsetDateTime.parse("2021-01-03T13:06:24Z"))
+            .withChangedTimestamp(OffsetDateTime.parse("2021-10-20T16:41:45Z"))
+            .withProvisioningState("qgaifmviklbydv");
         model = BinaryData.fromObject(model).toObject(SubvolumeModelProperties.class);
-        Assertions.assertEquals("wzf", model.path());
-        Assertions.assertEquals("sttktlahbqa", model.parentPath());
-        Assertions.assertEquals(8616212085400187990L, model.size());
-        Assertions.assertEquals(5269080860796174079L, model.bytesUsed());
-        Assertions.assertEquals("xitmmqtgqqq", model.permissions());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-05T22:16:51Z"), model.creationTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-26T11:40:15Z"), model.accessedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-07-18T12:52:35Z"), model.modifiedTimestamp());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-27T09:39:12Z"), model.changedTimestamp());
-        Assertions.assertEquals("uisavokq", model.provisioningState());
+        Assertions.assertEquals("kojgcyzts", model.path());
+        Assertions.assertEquals("z", model.parentPath());
+        Assertions.assertEquals(1225838395587285153L, model.size());
+        Assertions.assertEquals(1800143907295962702L, model.bytesUsed());
+        Assertions.assertEquals("hqnrn", model.permissions());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-24T02:25:51Z"), model.creationTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-21T00:49:26Z"), model.accessedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-03T13:06:24Z"), model.modifiedTimestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-10-20T16:41:45Z"), model.changedTimestamp());
+        Assertions.assertEquals("qgaifmviklbydv", model.provisioningState());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchParamsTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchParamsTests.java
index 0dda2435c12e..ad75a9535036 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchParamsTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchParamsTests.java
@@ -11,17 +11,17 @@
 public final class SubvolumePatchParamsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        SubvolumePatchParams model = BinaryData.fromString("{\"size\":8487159630667152775,\"path\":\"wdxsm\"}")
+        SubvolumePatchParams model = BinaryData.fromString("{\"size\":5651082290732520756,\"path\":\"jzgxmrhublwp\"}")
             .toObject(SubvolumePatchParams.class);
-        Assertions.assertEquals(8487159630667152775L, model.size());
-        Assertions.assertEquals("wdxsm", model.path());
+        Assertions.assertEquals(5651082290732520756L, model.size());
+        Assertions.assertEquals("jzgxmrhublwp", model.path());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SubvolumePatchParams model = new SubvolumePatchParams().withSize(8487159630667152775L).withPath("wdxsm");
+        SubvolumePatchParams model = new SubvolumePatchParams().withSize(5651082290732520756L).withPath("jzgxmrhublwp");
         model = BinaryData.fromObject(model).toObject(SubvolumePatchParams.class);
-        Assertions.assertEquals(8487159630667152775L, model.size());
-        Assertions.assertEquals("wdxsm", model.path());
+        Assertions.assertEquals(5651082290732520756L, model.size());
+        Assertions.assertEquals("jzgxmrhublwp", model.path());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchRequestTests.java
index 961bd7907930..7011d867011f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePatchRequestTests.java
@@ -12,18 +12,18 @@ public final class SubvolumePatchRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubvolumePatchRequest model
-            = BinaryData.fromString("{\"properties\":{\"size\":3710084328619196753,\"path\":\"hqvcimpevfgmblr\"}}")
+            = BinaryData.fromString("{\"properties\":{\"size\":3604947321817577406,\"path\":\"zvxurisjnhny\"}}")
                 .toObject(SubvolumePatchRequest.class);
-        Assertions.assertEquals(3710084328619196753L, model.size());
-        Assertions.assertEquals("hqvcimpevfgmblr", model.path());
+        Assertions.assertEquals(3604947321817577406L, model.size());
+        Assertions.assertEquals("zvxurisjnhny", model.path());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         SubvolumePatchRequest model
-            = new SubvolumePatchRequest().withSize(3710084328619196753L).withPath("hqvcimpevfgmblr");
+            = new SubvolumePatchRequest().withSize(3604947321817577406L).withPath("zvxurisjnhny");
         model = BinaryData.fromObject(model).toObject(SubvolumePatchRequest.class);
-        Assertions.assertEquals(3710084328619196753L, model.size());
-        Assertions.assertEquals("hqvcimpevfgmblr", model.path());
+        Assertions.assertEquals(3604947321817577406L, model.size());
+        Assertions.assertEquals("zvxurisjnhny", model.path());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePropertiesTests.java
index e38536b8bb53..afe25915bb6d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumePropertiesTests.java
@@ -12,20 +12,20 @@ public final class SubvolumePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubvolumeProperties model = BinaryData.fromString(
-            "{\"path\":\"hvcyyysfg\",\"size\":9181006907151825799,\"parentPath\":\"biipuip\",\"provisioningState\":\"qonmacj\"}")
+            "{\"path\":\"hyus\",\"size\":7815395193237239429,\"parentPath\":\"dvlmfwdgzxul\",\"provisioningState\":\"vpa\"}")
             .toObject(SubvolumeProperties.class);
-        Assertions.assertEquals("hvcyyysfg", model.path());
-        Assertions.assertEquals(9181006907151825799L, model.size());
-        Assertions.assertEquals("biipuip", model.parentPath());
+        Assertions.assertEquals("hyus", model.path());
+        Assertions.assertEquals(7815395193237239429L, model.size());
+        Assertions.assertEquals("dvlmfwdgzxul", model.parentPath());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         SubvolumeProperties model
-            = new SubvolumeProperties().withPath("hvcyyysfg").withSize(9181006907151825799L).withParentPath("biipuip");
+            = new SubvolumeProperties().withPath("hyus").withSize(7815395193237239429L).withParentPath("dvlmfwdgzxul");
         model = BinaryData.fromObject(model).toObject(SubvolumeProperties.class);
-        Assertions.assertEquals("hvcyyysfg", model.path());
-        Assertions.assertEquals(9181006907151825799L, model.size());
-        Assertions.assertEquals("biipuip", model.parentPath());
+        Assertions.assertEquals("hyus", model.path());
+        Assertions.assertEquals(7815395193237239429L, model.size());
+        Assertions.assertEquals("dvlmfwdgzxul", model.parentPath());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumesListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumesListTests.java
index fed770e276d2..e19d8218bf8b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumesListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SubvolumesListTests.java
@@ -14,24 +14,25 @@ public final class SubvolumesListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SubvolumesList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"path\":\"epn\",\"size\":6219904994785247374,\"parentPath\":\"xgibbda\",\"provisioningState\":\"onfo\"},\"id\":\"uors\",\"name\":\"kokwbqplhlvnu\",\"type\":\"epzl\"}],\"nextLink\":\"hw\"}")
+            "{\"value\":[{\"properties\":{\"path\":\"sxiftozq\",\"size\":319144288054659459,\"parentPath\":\"wesgogczh\",\"provisioningState\":\"nxkrlgnyhmossxkk\"},\"id\":\"h\",\"name\":\"rghxjb\",\"type\":\"hqxvcxgfrpdsofbs\"},{\"properties\":{\"path\":\"svbuswdvzyy\",\"size\":9049331973830942528,\"parentPath\":\"nvjsrtkfa\",\"provisioningState\":\"opqgikyzirtxdyux\"},\"id\":\"jntpsewgioilqu\",\"name\":\"rydxtqm\",\"type\":\"eoxorggufhyao\"},{\"properties\":{\"path\":\"ghhavgrvkffo\",\"size\":1220387324863982995,\"parentPath\":\"jbibg\",\"provisioningState\":\"fxumv\"},\"id\":\"luyovwxnbkfezzx\",\"name\":\"cy\",\"type\":\"wzdgirujbzbo\"}],\"nextLink\":\"zzbtdcqvpniyujvi\"}")
             .toObject(SubvolumesList.class);
-        Assertions.assertEquals("epn", model.value().get(0).path());
-        Assertions.assertEquals(6219904994785247374L, model.value().get(0).size());
-        Assertions.assertEquals("xgibbda", model.value().get(0).parentPath());
-        Assertions.assertEquals("hw", model.nextLink());
+        Assertions.assertEquals("sxiftozq", model.value().get(0).path());
+        Assertions.assertEquals(319144288054659459L, model.value().get(0).size());
+        Assertions.assertEquals("wesgogczh", model.value().get(0).parentPath());
+        Assertions.assertEquals("zzbtdcqvpniyujvi", model.nextLink());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SubvolumesList model = new SubvolumesList()
-            .withValue(Arrays.asList(
-                new SubvolumeInfoInner().withPath("epn").withSize(6219904994785247374L).withParentPath("xgibbda")))
-            .withNextLink("hw");
+        SubvolumesList model = new SubvolumesList().withValue(Arrays.asList(
+            new SubvolumeInfoInner().withPath("sxiftozq").withSize(319144288054659459L).withParentPath("wesgogczh"),
+            new SubvolumeInfoInner().withPath("svbuswdvzyy").withSize(9049331973830942528L).withParentPath("nvjsrtkfa"),
+            new SubvolumeInfoInner().withPath("ghhavgrvkffo").withSize(1220387324863982995L).withParentPath("jbibg")))
+            .withNextLink("zzbtdcqvpniyujvi");
         model = BinaryData.fromObject(model).toObject(SubvolumesList.class);
-        Assertions.assertEquals("epn", model.value().get(0).path());
-        Assertions.assertEquals(6219904994785247374L, model.value().get(0).size());
-        Assertions.assertEquals("xgibbda", model.value().get(0).parentPath());
-        Assertions.assertEquals("hw", model.nextLink());
+        Assertions.assertEquals("sxiftozq", model.value().get(0).path());
+        Assertions.assertEquals(319144288054659459L, model.value().get(0).size());
+        Assertions.assertEquals("wesgogczh", model.value().get(0).parentPath());
+        Assertions.assertEquals("zzbtdcqvpniyujvi", model.nextLink());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SvmPeerCommandResponseInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SvmPeerCommandResponseInnerTests.java
index 03fb64957b83..32bc0e66f759 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SvmPeerCommandResponseInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/SvmPeerCommandResponseInnerTests.java
@@ -12,14 +12,14 @@ public final class SvmPeerCommandResponseInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SvmPeerCommandResponseInner model
-            = BinaryData.fromString("{\"svmPeeringCommand\":\"ghimdblx\"}").toObject(SvmPeerCommandResponseInner.class);
-        Assertions.assertEquals("ghimdblx", model.svmPeeringCommand());
+            = BinaryData.fromString("{\"svmPeeringCommand\":\"e\"}").toObject(SvmPeerCommandResponseInner.class);
+        Assertions.assertEquals("e", model.svmPeeringCommand());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SvmPeerCommandResponseInner model = new SvmPeerCommandResponseInner().withSvmPeeringCommand("ghimdblx");
+        SvmPeerCommandResponseInner model = new SvmPeerCommandResponseInner().withSvmPeeringCommand("e");
         model = BinaryData.fromObject(model).toObject(SvmPeerCommandResponseInner.class);
-        Assertions.assertEquals("ghimdblx", model.svmPeeringCommand());
+        Assertions.assertEquals("e", model.svmPeeringCommand());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UpdateNetworkSiblingSetRequestTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UpdateNetworkSiblingSetRequestTests.java
index 45e70820275c..f45c5d989582 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UpdateNetworkSiblingSetRequestTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UpdateNetworkSiblingSetRequestTests.java
@@ -13,24 +13,25 @@ public final class UpdateNetworkSiblingSetRequestTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         UpdateNetworkSiblingSetRequest model = BinaryData.fromString(
-            "{\"networkSiblingSetId\":\"fuwutttxf\",\"subnetId\":\"jrbirphxepcyv\",\"networkSiblingSetStateId\":\"hfnljkyq\",\"networkFeatures\":\"Basic\"}")
+            "{\"networkSiblingSetId\":\"sncghkjeszz\",\"subnetId\":\"bijhtxfvgxbf\",\"networkSiblingSetStateId\":\"mxnehmp\",\"networkFeatures\":\"Basic\"}")
             .toObject(UpdateNetworkSiblingSetRequest.class);
-        Assertions.assertEquals("fuwutttxf", model.networkSiblingSetId());
-        Assertions.assertEquals("jrbirphxepcyv", model.subnetId());
-        Assertions.assertEquals("hfnljkyq", model.networkSiblingSetStateId());
+        Assertions.assertEquals("sncghkjeszz", model.networkSiblingSetId());
+        Assertions.assertEquals("bijhtxfvgxbf", model.subnetId());
+        Assertions.assertEquals("mxnehmp", model.networkSiblingSetStateId());
         Assertions.assertEquals(NetworkFeatures.BASIC, model.networkFeatures());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        UpdateNetworkSiblingSetRequest model = new UpdateNetworkSiblingSetRequest().withNetworkSiblingSetId("fuwutttxf")
-            .withSubnetId("jrbirphxepcyv")
-            .withNetworkSiblingSetStateId("hfnljkyq")
-            .withNetworkFeatures(NetworkFeatures.BASIC);
+        UpdateNetworkSiblingSetRequest model
+            = new UpdateNetworkSiblingSetRequest().withNetworkSiblingSetId("sncghkjeszz")
+                .withSubnetId("bijhtxfvgxbf")
+                .withNetworkSiblingSetStateId("mxnehmp")
+                .withNetworkFeatures(NetworkFeatures.BASIC);
         model = BinaryData.fromObject(model).toObject(UpdateNetworkSiblingSetRequest.class);
-        Assertions.assertEquals("fuwutttxf", model.networkSiblingSetId());
-        Assertions.assertEquals("jrbirphxepcyv", model.subnetId());
-        Assertions.assertEquals("hfnljkyq", model.networkSiblingSetStateId());
+        Assertions.assertEquals("sncghkjeszz", model.networkSiblingSetId());
+        Assertions.assertEquals("bijhtxfvgxbf", model.subnetId());
+        Assertions.assertEquals("mxnehmp", model.networkSiblingSetStateId());
         Assertions.assertEquals(NetworkFeatures.BASIC, model.networkFeatures());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UserAssignedIdentityTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UserAssignedIdentityTests.java
index e1977af4ad06..aea59c0620e2 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UserAssignedIdentityTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/UserAssignedIdentityTests.java
@@ -11,7 +11,7 @@ public final class UserAssignedIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         UserAssignedIdentity model = BinaryData.fromString(
-            "{\"principalId\":\"bceec19a-035f-45c0-b234-a10177df1500\",\"clientId\":\"197badd5-c7df-4370-a15f-5d15baeac9a0\"}")
+            "{\"principalId\":\"9ee35cb6-014c-4686-a50b-4fa17ceba7e9\",\"clientId\":\"5cdbe763-05e7-463a-9c87-6612fb6f4e5c\"}")
             .toObject(UserAssignedIdentity.class);
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupPropertiesTests.java
index 7bd06996ab78..29b674086ec4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupPropertiesTests.java
@@ -11,22 +11,22 @@
 public final class VolumeBackupPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        VolumeBackupProperties model = BinaryData
-            .fromString("{\"backupPolicyId\":\"dsslswt\",\"policyEnforced\":true,\"backupVaultId\":\"iofz\"}")
-            .toObject(VolumeBackupProperties.class);
-        Assertions.assertEquals("dsslswt", model.backupPolicyId());
-        Assertions.assertTrue(model.policyEnforced());
-        Assertions.assertEquals("iofz", model.backupVaultId());
+        VolumeBackupProperties model
+            = BinaryData.fromString("{\"backupPolicyId\":\"op\",\"policyEnforced\":false,\"backupVaultId\":\"hhuao\"}")
+                .toObject(VolumeBackupProperties.class);
+        Assertions.assertEquals("op", model.backupPolicyId());
+        Assertions.assertFalse(model.policyEnforced());
+        Assertions.assertEquals("hhuao", model.backupVaultId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeBackupProperties model = new VolumeBackupProperties().withBackupPolicyId("dsslswt")
-            .withPolicyEnforced(true)
-            .withBackupVaultId("iofz");
+        VolumeBackupProperties model = new VolumeBackupProperties().withBackupPolicyId("op")
+            .withPolicyEnforced(false)
+            .withBackupVaultId("hhuao");
         model = BinaryData.fromObject(model).toObject(VolumeBackupProperties.class);
-        Assertions.assertEquals("dsslswt", model.backupPolicyId());
-        Assertions.assertTrue(model.policyEnforced());
-        Assertions.assertEquals("iofz", model.backupVaultId());
+        Assertions.assertEquals("op", model.backupPolicyId());
+        Assertions.assertFalse(model.policyEnforced());
+        Assertions.assertEquals("hhuao", model.backupVaultId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupsTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupsTests.java
index 50930ae154be..320d80964dd6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupsTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeBackupsTests.java
@@ -12,24 +12,24 @@ public final class VolumeBackupsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeBackups model = BinaryData.fromString(
-            "{\"volumeName\":\"mjihyeozphv\",\"volumeResourceId\":\"uyqncygupkvipmd\",\"backupsCount\":497556076,\"policyEnabled\":false}")
+            "{\"volumeName\":\"ajpjo\",\"volumeResourceId\":\"kqnyh\",\"backupsCount\":506694346,\"policyEnabled\":true}")
             .toObject(VolumeBackups.class);
-        Assertions.assertEquals("mjihyeozphv", model.volumeName());
-        Assertions.assertEquals("uyqncygupkvipmd", model.volumeResourceId());
-        Assertions.assertEquals(497556076, model.backupsCount());
-        Assertions.assertFalse(model.policyEnabled());
+        Assertions.assertEquals("ajpjo", model.volumeName());
+        Assertions.assertEquals("kqnyh", model.volumeResourceId());
+        Assertions.assertEquals(506694346, model.backupsCount());
+        Assertions.assertTrue(model.policyEnabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeBackups model = new VolumeBackups().withVolumeName("mjihyeozphv")
-            .withVolumeResourceId("uyqncygupkvipmd")
-            .withBackupsCount(497556076)
-            .withPolicyEnabled(false);
+        VolumeBackups model = new VolumeBackups().withVolumeName("ajpjo")
+            .withVolumeResourceId("kqnyh")
+            .withBackupsCount(506694346)
+            .withPolicyEnabled(true);
         model = BinaryData.fromObject(model).toObject(VolumeBackups.class);
-        Assertions.assertEquals("mjihyeozphv", model.volumeName());
-        Assertions.assertEquals("uyqncygupkvipmd", model.volumeResourceId());
-        Assertions.assertEquals(497556076, model.backupsCount());
-        Assertions.assertFalse(model.policyEnabled());
+        Assertions.assertEquals("ajpjo", model.volumeName());
+        Assertions.assertEquals("kqnyh", model.volumeResourceId());
+        Assertions.assertEquals(506694346, model.backupsCount());
+        Assertions.assertTrue(model.policyEnabled());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesDataProtectionTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesDataProtectionTests.java
index 4beefd95e8ec..89e316bf8097 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesDataProtectionTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesDataProtectionTests.java
@@ -14,25 +14,25 @@ public final class VolumePatchPropertiesDataProtectionTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumePatchPropertiesDataProtection model = BinaryData.fromString(
-            "{\"backup\":{\"backupPolicyId\":\"vpuvks\",\"policyEnforced\":false,\"backupVaultId\":\"aknynfsynljphuop\"},\"snapshot\":{\"snapshotPolicyId\":\"lqiyntorzihl\"}}")
+            "{\"backup\":{\"backupPolicyId\":\"wvnhdldwmgx\",\"policyEnforced\":true,\"backupVaultId\":\"lpmutwuoegrpkhj\"},\"snapshot\":{\"snapshotPolicyId\":\"yqsluic\"}}")
             .toObject(VolumePatchPropertiesDataProtection.class);
-        Assertions.assertEquals("vpuvks", model.backup().backupPolicyId());
-        Assertions.assertFalse(model.backup().policyEnforced());
-        Assertions.assertEquals("aknynfsynljphuop", model.backup().backupVaultId());
-        Assertions.assertEquals("lqiyntorzihl", model.snapshot().snapshotPolicyId());
+        Assertions.assertEquals("wvnhdldwmgx", model.backup().backupPolicyId());
+        Assertions.assertTrue(model.backup().policyEnforced());
+        Assertions.assertEquals("lpmutwuoegrpkhj", model.backup().backupVaultId());
+        Assertions.assertEquals("yqsluic", model.snapshot().snapshotPolicyId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VolumePatchPropertiesDataProtection model = new VolumePatchPropertiesDataProtection()
-            .withBackup(new VolumeBackupProperties().withBackupPolicyId("vpuvks")
-                .withPolicyEnforced(false)
-                .withBackupVaultId("aknynfsynljphuop"))
-            .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("lqiyntorzihl"));
+            .withBackup(new VolumeBackupProperties().withBackupPolicyId("wvnhdldwmgx")
+                .withPolicyEnforced(true)
+                .withBackupVaultId("lpmutwuoegrpkhj"))
+            .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("yqsluic"));
         model = BinaryData.fromObject(model).toObject(VolumePatchPropertiesDataProtection.class);
-        Assertions.assertEquals("vpuvks", model.backup().backupPolicyId());
-        Assertions.assertFalse(model.backup().policyEnforced());
-        Assertions.assertEquals("aknynfsynljphuop", model.backup().backupVaultId());
-        Assertions.assertEquals("lqiyntorzihl", model.snapshot().snapshotPolicyId());
+        Assertions.assertEquals("wvnhdldwmgx", model.backup().backupPolicyId());
+        Assertions.assertTrue(model.backup().policyEnforced());
+        Assertions.assertEquals("lpmutwuoegrpkhj", model.backup().backupVaultId());
+        Assertions.assertEquals("yqsluic", model.snapshot().snapshotPolicyId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesExportPolicyTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesExportPolicyTests.java
index 2c6c1832eaf2..24eac2722fb7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesExportPolicyTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesExportPolicyTests.java
@@ -15,88 +15,88 @@ public final class VolumePatchPropertiesExportPolicyTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumePatchPropertiesExportPolicy model = BinaryData.fromString(
-            "{\"rules\":[{\"ruleIndex\":1305719459,\"unixReadOnly\":true,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":false,\"cifs\":true,\"nfsv3\":true,\"nfsv41\":true,\"allowedClients\":\"koymkcd\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":823230249,\"unixReadOnly\":true,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":false,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":true,\"allowedClients\":\"rsndsytgadgvra\",\"hasRootAccess\":false,\"chownMode\":\"Restricted\"},{\"ruleIndex\":999689633,\"unixReadOnly\":false,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":true,\"allowedClients\":\"ubjibww\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"}]}")
+            "{\"rules\":[{\"ruleIndex\":183492568,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":true,\"allowedClients\":\"fgdkzzew\",\"hasRootAccess\":false,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":875285248,\"unixReadOnly\":true,\"unixReadWrite\":false,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":false,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":false,\"allowedClients\":\"xsaga\",\"hasRootAccess\":true,\"chownMode\":\"Restricted\"},{\"ruleIndex\":1260393669,\"unixReadOnly\":true,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":false,\"cifs\":true,\"nfsv3\":true,\"nfsv41\":true,\"allowedClients\":\"drhvoodsotbo\",\"hasRootAccess\":true,\"chownMode\":\"Restricted\"}]}")
             .toObject(VolumePatchPropertiesExportPolicy.class);
-        Assertions.assertEquals(1305719459, model.rules().get(0).ruleIndex());
-        Assertions.assertTrue(model.rules().get(0).unixReadOnly());
+        Assertions.assertEquals(183492568, model.rules().get(0).ruleIndex());
+        Assertions.assertFalse(model.rules().get(0).unixReadOnly());
         Assertions.assertTrue(model.rules().get(0).unixReadWrite());
         Assertions.assertTrue(model.rules().get(0).kerberos5ReadOnly());
-        Assertions.assertTrue(model.rules().get(0).kerberos5ReadWrite());
-        Assertions.assertTrue(model.rules().get(0).kerberos5IReadOnly());
-        Assertions.assertFalse(model.rules().get(0).kerberos5IReadWrite());
-        Assertions.assertFalse(model.rules().get(0).kerberos5PReadOnly());
-        Assertions.assertFalse(model.rules().get(0).kerberos5PReadWrite());
-        Assertions.assertTrue(model.rules().get(0).cifs());
-        Assertions.assertTrue(model.rules().get(0).nfsv3());
+        Assertions.assertFalse(model.rules().get(0).kerberos5ReadWrite());
+        Assertions.assertFalse(model.rules().get(0).kerberos5IReadOnly());
+        Assertions.assertTrue(model.rules().get(0).kerberos5IReadWrite());
+        Assertions.assertTrue(model.rules().get(0).kerberos5PReadOnly());
+        Assertions.assertTrue(model.rules().get(0).kerberos5PReadWrite());
+        Assertions.assertFalse(model.rules().get(0).cifs());
+        Assertions.assertFalse(model.rules().get(0).nfsv3());
         Assertions.assertTrue(model.rules().get(0).nfsv41());
-        Assertions.assertEquals("koymkcd", model.rules().get(0).allowedClients());
-        Assertions.assertTrue(model.rules().get(0).hasRootAccess());
+        Assertions.assertEquals("fgdkzzew", model.rules().get(0).allowedClients());
+        Assertions.assertFalse(model.rules().get(0).hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.rules().get(0).chownMode());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VolumePatchPropertiesExportPolicy model = new VolumePatchPropertiesExportPolicy().withRules(Arrays.asList(
-            new ExportPolicyRule().withRuleIndex(1305719459)
-                .withUnixReadOnly(true)
+            new ExportPolicyRule().withRuleIndex(183492568)
+                .withUnixReadOnly(false)
                 .withUnixReadWrite(true)
                 .withKerberos5ReadOnly(true)
-                .withKerberos5ReadWrite(true)
-                .withKerberos5IReadOnly(true)
-                .withKerberos5IReadWrite(false)
-                .withKerberos5PReadOnly(false)
-                .withKerberos5PReadWrite(false)
-                .withCifs(true)
-                .withNfsv3(true)
+                .withKerberos5ReadWrite(false)
+                .withKerberos5IReadOnly(false)
+                .withKerberos5IReadWrite(true)
+                .withKerberos5PReadOnly(true)
+                .withKerberos5PReadWrite(true)
+                .withCifs(false)
+                .withNfsv3(false)
                 .withNfsv41(true)
-                .withAllowedClients("koymkcd")
-                .withHasRootAccess(true)
+                .withAllowedClients("fgdkzzew")
+                .withHasRootAccess(false)
                 .withChownMode(ChownMode.UNRESTRICTED),
-            new ExportPolicyRule().withRuleIndex(823230249)
+            new ExportPolicyRule().withRuleIndex(875285248)
                 .withUnixReadOnly(true)
-                .withUnixReadWrite(true)
-                .withKerberos5ReadOnly(true)
-                .withKerberos5ReadWrite(true)
-                .withKerberos5IReadOnly(true)
+                .withUnixReadWrite(false)
+                .withKerberos5ReadOnly(false)
+                .withKerberos5ReadWrite(false)
+                .withKerberos5IReadOnly(false)
                 .withKerberos5IReadWrite(true)
-                .withKerberos5PReadOnly(false)
+                .withKerberos5PReadOnly(true)
                 .withKerberos5PReadWrite(false)
                 .withCifs(false)
                 .withNfsv3(true)
-                .withNfsv41(true)
-                .withAllowedClients("rsndsytgadgvra")
-                .withHasRootAccess(false)
+                .withNfsv41(false)
+                .withAllowedClients("xsaga")
+                .withHasRootAccess(true)
                 .withChownMode(ChownMode.RESTRICTED),
-            new ExportPolicyRule().withRuleIndex(999689633)
-                .withUnixReadOnly(false)
+            new ExportPolicyRule().withRuleIndex(1260393669)
+                .withUnixReadOnly(true)
                 .withUnixReadWrite(false)
                 .withKerberos5ReadOnly(true)
                 .withKerberos5ReadWrite(false)
                 .withKerberos5IReadOnly(true)
                 .withKerberos5IReadWrite(false)
-                .withKerberos5PReadOnly(true)
-                .withKerberos5PReadWrite(true)
-                .withCifs(false)
-                .withNfsv3(false)
+                .withKerberos5PReadOnly(false)
+                .withKerberos5PReadWrite(false)
+                .withCifs(true)
+                .withNfsv3(true)
                 .withNfsv41(true)
-                .withAllowedClients("ubjibww")
+                .withAllowedClients("drhvoodsotbo")
                 .withHasRootAccess(true)
-                .withChownMode(ChownMode.UNRESTRICTED)));
+                .withChownMode(ChownMode.RESTRICTED)));
         model = BinaryData.fromObject(model).toObject(VolumePatchPropertiesExportPolicy.class);
-        Assertions.assertEquals(1305719459, model.rules().get(0).ruleIndex());
-        Assertions.assertTrue(model.rules().get(0).unixReadOnly());
+        Assertions.assertEquals(183492568, model.rules().get(0).ruleIndex());
+        Assertions.assertFalse(model.rules().get(0).unixReadOnly());
         Assertions.assertTrue(model.rules().get(0).unixReadWrite());
         Assertions.assertTrue(model.rules().get(0).kerberos5ReadOnly());
-        Assertions.assertTrue(model.rules().get(0).kerberos5ReadWrite());
-        Assertions.assertTrue(model.rules().get(0).kerberos5IReadOnly());
-        Assertions.assertFalse(model.rules().get(0).kerberos5IReadWrite());
-        Assertions.assertFalse(model.rules().get(0).kerberos5PReadOnly());
-        Assertions.assertFalse(model.rules().get(0).kerberos5PReadWrite());
-        Assertions.assertTrue(model.rules().get(0).cifs());
-        Assertions.assertTrue(model.rules().get(0).nfsv3());
+        Assertions.assertFalse(model.rules().get(0).kerberos5ReadWrite());
+        Assertions.assertFalse(model.rules().get(0).kerberos5IReadOnly());
+        Assertions.assertTrue(model.rules().get(0).kerberos5IReadWrite());
+        Assertions.assertTrue(model.rules().get(0).kerberos5PReadOnly());
+        Assertions.assertTrue(model.rules().get(0).kerberos5PReadWrite());
+        Assertions.assertFalse(model.rules().get(0).cifs());
+        Assertions.assertFalse(model.rules().get(0).nfsv3());
         Assertions.assertTrue(model.rules().get(0).nfsv41());
-        Assertions.assertEquals("koymkcd", model.rules().get(0).allowedClients());
-        Assertions.assertTrue(model.rules().get(0).hasRootAccess());
+        Assertions.assertEquals("fgdkzzew", model.rules().get(0).allowedClients());
+        Assertions.assertFalse(model.rules().get(0).hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.rules().get(0).chownMode());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesTests.java
index 87bf832f4fa0..24101aa73e93 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchPropertiesTests.java
@@ -24,131 +24,146 @@ public final class VolumePatchPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumePatchProperties model = BinaryData.fromString(
-            "{\"serviceLevel\":\"Ultra\",\"usageThreshold\":7500274521983784453,\"exportPolicy\":{\"rules\":[{\"ruleIndex\":1729730350,\"unixReadOnly\":true,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":false,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"ckcb\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":714963203,\"unixReadOnly\":true,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":true,\"allowedClients\":\"rq\",\"hasRootAccess\":false,\"chownMode\":\"Restricted\"}]},\"protocolTypes\":[\"luszdtmhrkwof\",\"yvoqa\"],\"throughputMibps\":69.76196,\"dataProtection\":{\"backup\":{\"backupPolicyId\":\"btgiwbwoenwas\",\"policyEnforced\":false,\"backupVaultId\":\"tkcnqxwb\"},\"snapshot\":{\"snapshotPolicyId\":\"ulpiuj\"}},\"isDefaultQuotaEnabled\":false,\"defaultUserQuotaInKiBs\":6495974274819449912,\"defaultGroupQuotaInKiBs\":741204342979784260,\"unixPermissions\":\"byuqerpqlp\",\"coolAccess\":true,\"coolnessPeriod\":929911976,\"coolAccessRetrievalPolicy\":\"Never\",\"coolAccessTieringPolicy\":\"SnapshotOnly\",\"snapshotDirectoryVisible\":false,\"smbAccessBasedEnumeration\":\"Disabled\",\"smbNonBrowsable\":\"Enabled\"}")
+            "{\"serviceLevel\":\"Ultra\",\"usageThreshold\":877746656530607911,\"exportPolicy\":{\"rules\":[{\"ruleIndex\":1995245792,\"unixReadOnly\":false,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":false,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":false,\"allowedClients\":\"odkwobd\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":1795454962,\"unixReadOnly\":false,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":true,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"plbpodxun\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":1819295736,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"l\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"}]},\"protocolTypes\":[\"uwz\",\"zxb\",\"pgcjefuzmuvp\"],\"throughputMibps\":20.674778,\"dataProtection\":{\"backup\":{\"backupPolicyId\":\"orppxebmnzbtb\",\"policyEnforced\":false,\"backupVaultId\":\"lkfg\"},\"snapshot\":{\"snapshotPolicyId\":\"neuelfphsdyhtoz\"}},\"isDefaultQuotaEnabled\":false,\"defaultUserQuotaInKiBs\":1123884029466838588,\"defaultGroupQuotaInKiBs\":739493966833728448,\"unixPermissions\":\"v\",\"coolAccess\":false,\"coolnessPeriod\":1447033048,\"coolAccessRetrievalPolicy\":\"Never\",\"coolAccessTieringPolicy\":\"SnapshotOnly\",\"snapshotDirectoryVisible\":true,\"smbAccessBasedEnumeration\":\"Disabled\",\"smbNonBrowsable\":\"Disabled\"}")
             .toObject(VolumePatchProperties.class);
         Assertions.assertEquals(ServiceLevel.ULTRA, model.serviceLevel());
-        Assertions.assertEquals(7500274521983784453L, model.usageThreshold());
-        Assertions.assertEquals(1729730350, model.exportPolicy().rules().get(0).ruleIndex());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadOnly());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadWrite());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5ReadOnly());
+        Assertions.assertEquals(877746656530607911L, model.usageThreshold());
+        Assertions.assertEquals(1995245792, model.exportPolicy().rules().get(0).ruleIndex());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).unixReadOnly());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).unixReadWrite());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5ReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5ReadWrite());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5IReadOnly());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5IReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5IReadWrite());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5PReadOnly());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5PReadWrite());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).cifs());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).nfsv3());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).nfsv3());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).nfsv41());
-        Assertions.assertEquals("ckcb", model.exportPolicy().rules().get(0).allowedClients());
+        Assertions.assertEquals("odkwobd", model.exportPolicy().rules().get(0).allowedClients());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.exportPolicy().rules().get(0).chownMode());
-        Assertions.assertEquals("luszdtmhrkwof", model.protocolTypes().get(0));
-        Assertions.assertEquals(69.76196F, model.throughputMibps());
-        Assertions.assertEquals("btgiwbwoenwas", model.dataProtection().backup().backupPolicyId());
+        Assertions.assertEquals("uwz", model.protocolTypes().get(0));
+        Assertions.assertEquals(20.674778F, model.throughputMibps());
+        Assertions.assertEquals("orppxebmnzbtb", model.dataProtection().backup().backupPolicyId());
         Assertions.assertFalse(model.dataProtection().backup().policyEnforced());
-        Assertions.assertEquals("tkcnqxwb", model.dataProtection().backup().backupVaultId());
-        Assertions.assertEquals("ulpiuj", model.dataProtection().snapshot().snapshotPolicyId());
+        Assertions.assertEquals("lkfg", model.dataProtection().backup().backupVaultId());
+        Assertions.assertEquals("neuelfphsdyhtoz", model.dataProtection().snapshot().snapshotPolicyId());
         Assertions.assertFalse(model.isDefaultQuotaEnabled());
-        Assertions.assertEquals(6495974274819449912L, model.defaultUserQuotaInKiBs());
-        Assertions.assertEquals(741204342979784260L, model.defaultGroupQuotaInKiBs());
-        Assertions.assertEquals("byuqerpqlp", model.unixPermissions());
-        Assertions.assertTrue(model.coolAccess());
-        Assertions.assertEquals(929911976, model.coolnessPeriod());
+        Assertions.assertEquals(1123884029466838588L, model.defaultUserQuotaInKiBs());
+        Assertions.assertEquals(739493966833728448L, model.defaultGroupQuotaInKiBs());
+        Assertions.assertEquals("v", model.unixPermissions());
+        Assertions.assertFalse(model.coolAccess());
+        Assertions.assertEquals(1447033048, model.coolnessPeriod());
         Assertions.assertEquals(CoolAccessRetrievalPolicy.NEVER, model.coolAccessRetrievalPolicy());
         Assertions.assertEquals(CoolAccessTieringPolicy.SNAPSHOT_ONLY, model.coolAccessTieringPolicy());
-        Assertions.assertFalse(model.snapshotDirectoryVisible());
+        Assertions.assertTrue(model.snapshotDirectoryVisible());
         Assertions.assertEquals(SmbAccessBasedEnumeration.DISABLED, model.smbAccessBasedEnumeration());
-        Assertions.assertEquals(SmbNonBrowsable.ENABLED, model.smbNonBrowsable());
+        Assertions.assertEquals(SmbNonBrowsable.DISABLED, model.smbNonBrowsable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VolumePatchProperties model = new VolumePatchProperties().withServiceLevel(ServiceLevel.ULTRA)
-            .withUsageThreshold(7500274521983784453L)
+            .withUsageThreshold(877746656530607911L)
             .withExportPolicy(new VolumePatchPropertiesExportPolicy().withRules(Arrays.asList(
-                new ExportPolicyRule().withRuleIndex(1729730350)
-                    .withUnixReadOnly(true)
-                    .withUnixReadWrite(true)
-                    .withKerberos5ReadOnly(false)
+                new ExportPolicyRule().withRuleIndex(1995245792)
+                    .withUnixReadOnly(false)
+                    .withUnixReadWrite(false)
+                    .withKerberos5ReadOnly(true)
                     .withKerberos5ReadWrite(true)
-                    .withKerberos5IReadOnly(true)
+                    .withKerberos5IReadOnly(false)
                     .withKerberos5IReadWrite(true)
                     .withKerberos5PReadOnly(true)
                     .withKerberos5PReadWrite(false)
                     .withCifs(false)
+                    .withNfsv3(true)
+                    .withNfsv41(false)
+                    .withAllowedClients("odkwobd")
+                    .withHasRootAccess(true)
+                    .withChownMode(ChownMode.UNRESTRICTED),
+                new ExportPolicyRule().withRuleIndex(1795454962)
+                    .withUnixReadOnly(false)
+                    .withUnixReadWrite(false)
+                    .withKerberos5ReadOnly(true)
+                    .withKerberos5ReadWrite(true)
+                    .withKerberos5IReadOnly(true)
+                    .withKerberos5IReadWrite(true)
+                    .withKerberos5PReadOnly(true)
+                    .withKerberos5PReadWrite(true)
+                    .withCifs(true)
                     .withNfsv3(false)
                     .withNfsv41(false)
-                    .withAllowedClients("ckcb")
+                    .withAllowedClients("plbpodxun")
                     .withHasRootAccess(true)
                     .withChownMode(ChownMode.UNRESTRICTED),
-                new ExportPolicyRule().withRuleIndex(714963203)
-                    .withUnixReadOnly(true)
+                new ExportPolicyRule().withRuleIndex(1819295736)
+                    .withUnixReadOnly(false)
                     .withUnixReadWrite(true)
-                    .withKerberos5ReadOnly(false)
+                    .withKerberos5ReadOnly(true)
                     .withKerberos5ReadWrite(false)
-                    .withKerberos5IReadOnly(true)
-                    .withKerberos5IReadWrite(true)
+                    .withKerberos5IReadOnly(false)
+                    .withKerberos5IReadWrite(false)
                     .withKerberos5PReadOnly(true)
                     .withKerberos5PReadWrite(true)
                     .withCifs(false)
                     .withNfsv3(false)
-                    .withNfsv41(true)
-                    .withAllowedClients("rq")
-                    .withHasRootAccess(false)
-                    .withChownMode(ChownMode.RESTRICTED))))
-            .withProtocolTypes(Arrays.asList("luszdtmhrkwof", "yvoqa"))
-            .withThroughputMibps(69.76196F)
+                    .withNfsv41(false)
+                    .withAllowedClients("l")
+                    .withHasRootAccess(true)
+                    .withChownMode(ChownMode.UNRESTRICTED))))
+            .withProtocolTypes(Arrays.asList("uwz", "zxb", "pgcjefuzmuvp"))
+            .withThroughputMibps(20.674778F)
             .withDataProtection(new VolumePatchPropertiesDataProtection()
-                .withBackup(new VolumeBackupProperties().withBackupPolicyId("btgiwbwoenwas")
+                .withBackup(new VolumeBackupProperties().withBackupPolicyId("orppxebmnzbtb")
                     .withPolicyEnforced(false)
-                    .withBackupVaultId("tkcnqxwb"))
-                .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("ulpiuj")))
+                    .withBackupVaultId("lkfg"))
+                .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("neuelfphsdyhtoz")))
             .withIsDefaultQuotaEnabled(false)
-            .withDefaultUserQuotaInKiBs(6495974274819449912L)
-            .withDefaultGroupQuotaInKiBs(741204342979784260L)
-            .withUnixPermissions("byuqerpqlp")
-            .withCoolAccess(true)
-            .withCoolnessPeriod(929911976)
+            .withDefaultUserQuotaInKiBs(1123884029466838588L)
+            .withDefaultGroupQuotaInKiBs(739493966833728448L)
+            .withUnixPermissions("v")
+            .withCoolAccess(false)
+            .withCoolnessPeriod(1447033048)
             .withCoolAccessRetrievalPolicy(CoolAccessRetrievalPolicy.NEVER)
             .withCoolAccessTieringPolicy(CoolAccessTieringPolicy.SNAPSHOT_ONLY)
-            .withSnapshotDirectoryVisible(false)
+            .withSnapshotDirectoryVisible(true)
             .withSmbAccessBasedEnumeration(SmbAccessBasedEnumeration.DISABLED)
-            .withSmbNonBrowsable(SmbNonBrowsable.ENABLED);
+            .withSmbNonBrowsable(SmbNonBrowsable.DISABLED);
         model = BinaryData.fromObject(model).toObject(VolumePatchProperties.class);
         Assertions.assertEquals(ServiceLevel.ULTRA, model.serviceLevel());
-        Assertions.assertEquals(7500274521983784453L, model.usageThreshold());
-        Assertions.assertEquals(1729730350, model.exportPolicy().rules().get(0).ruleIndex());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadOnly());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadWrite());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5ReadOnly());
+        Assertions.assertEquals(877746656530607911L, model.usageThreshold());
+        Assertions.assertEquals(1995245792, model.exportPolicy().rules().get(0).ruleIndex());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).unixReadOnly());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).unixReadWrite());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5ReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5ReadWrite());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5IReadOnly());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5IReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5IReadWrite());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5PReadOnly());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5PReadWrite());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).cifs());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).nfsv3());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).nfsv3());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).nfsv41());
-        Assertions.assertEquals("ckcb", model.exportPolicy().rules().get(0).allowedClients());
+        Assertions.assertEquals("odkwobd", model.exportPolicy().rules().get(0).allowedClients());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.exportPolicy().rules().get(0).chownMode());
-        Assertions.assertEquals("luszdtmhrkwof", model.protocolTypes().get(0));
-        Assertions.assertEquals(69.76196F, model.throughputMibps());
-        Assertions.assertEquals("btgiwbwoenwas", model.dataProtection().backup().backupPolicyId());
+        Assertions.assertEquals("uwz", model.protocolTypes().get(0));
+        Assertions.assertEquals(20.674778F, model.throughputMibps());
+        Assertions.assertEquals("orppxebmnzbtb", model.dataProtection().backup().backupPolicyId());
         Assertions.assertFalse(model.dataProtection().backup().policyEnforced());
-        Assertions.assertEquals("tkcnqxwb", model.dataProtection().backup().backupVaultId());
-        Assertions.assertEquals("ulpiuj", model.dataProtection().snapshot().snapshotPolicyId());
+        Assertions.assertEquals("lkfg", model.dataProtection().backup().backupVaultId());
+        Assertions.assertEquals("neuelfphsdyhtoz", model.dataProtection().snapshot().snapshotPolicyId());
         Assertions.assertFalse(model.isDefaultQuotaEnabled());
-        Assertions.assertEquals(6495974274819449912L, model.defaultUserQuotaInKiBs());
-        Assertions.assertEquals(741204342979784260L, model.defaultGroupQuotaInKiBs());
-        Assertions.assertEquals("byuqerpqlp", model.unixPermissions());
-        Assertions.assertTrue(model.coolAccess());
-        Assertions.assertEquals(929911976, model.coolnessPeriod());
+        Assertions.assertEquals(1123884029466838588L, model.defaultUserQuotaInKiBs());
+        Assertions.assertEquals(739493966833728448L, model.defaultGroupQuotaInKiBs());
+        Assertions.assertEquals("v", model.unixPermissions());
+        Assertions.assertFalse(model.coolAccess());
+        Assertions.assertEquals(1447033048, model.coolnessPeriod());
         Assertions.assertEquals(CoolAccessRetrievalPolicy.NEVER, model.coolAccessRetrievalPolicy());
         Assertions.assertEquals(CoolAccessTieringPolicy.SNAPSHOT_ONLY, model.coolAccessTieringPolicy());
-        Assertions.assertFalse(model.snapshotDirectoryVisible());
+        Assertions.assertTrue(model.snapshotDirectoryVisible());
         Assertions.assertEquals(SmbAccessBasedEnumeration.DISABLED, model.smbAccessBasedEnumeration());
-        Assertions.assertEquals(SmbNonBrowsable.ENABLED, model.smbNonBrowsable());
+        Assertions.assertEquals(SmbNonBrowsable.DISABLED, model.smbNonBrowsable());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchTests.java
index a9164b4808fc..8d3974099433 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePatchTests.java
@@ -26,14 +26,14 @@ public final class VolumePatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumePatch model = BinaryData.fromString(
-            "{\"properties\":{\"serviceLevel\":\"Flexible\",\"usageThreshold\":411911013999749991,\"exportPolicy\":{\"rules\":[{\"ruleIndex\":1702938248,\"unixReadOnly\":true,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":false,\"allowedClients\":\"sdyhtozfikdowwq\",\"hasRootAccess\":false,\"chownMode\":\"Restricted\"},{\"ruleIndex\":1319405146,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"jnkaljutiiswacff\",\"hasRootAccess\":false,\"chownMode\":\"Restricted\"},{\"ruleIndex\":1157139188,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":true,\"cifs\":false,\"nfsv3\":true,\"nfsv41\":true,\"allowedClients\":\"hdlxyjrxsagafcn\",\"hasRootAccess\":false,\"chownMode\":\"Unrestricted\"}]},\"protocolTypes\":[\"nedgfbc\",\"kcvqvpke\"],\"throughputMibps\":71.283,\"dataProtection\":{\"backup\":{\"backupPolicyId\":\"hvoodsotbobzd\",\"policyEnforced\":false,\"backupVaultId\":\"wvnhdldwmgx\"},\"snapshot\":{\"snapshotPolicyId\":\"slpmutwuo\"}},\"isDefaultQuotaEnabled\":false,\"defaultUserQuotaInKiBs\":5722379398974283920,\"defaultGroupQuotaInKiBs\":3859577697194270181,\"unixPermissions\":\"yqsluic\",\"coolAccess\":true,\"coolnessPeriod\":1810528552,\"coolAccessRetrievalPolicy\":\"Never\",\"coolAccessTieringPolicy\":\"Auto\",\"snapshotDirectoryVisible\":true,\"smbAccessBasedEnumeration\":\"Enabled\",\"smbNonBrowsable\":\"Disabled\"},\"location\":\"modfvuefywsbpfvm\",\"tags\":{\"yzvqt\":\"rfouyftaakcpw\",\"zksmondj\":\"nubexk\"},\"id\":\"quxvypomgkop\",\"name\":\"whojvp\",\"type\":\"jqg\"}")
+            "{\"properties\":{\"serviceLevel\":\"Ultra\",\"usageThreshold\":6783178562921072735,\"exportPolicy\":{\"rules\":[{\"ruleIndex\":1133541665,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":true,\"cifs\":true,\"nfsv3\":true,\"nfsv41\":true,\"allowedClients\":\"ybn\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":1130044611,\"unixReadOnly\":true,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":false,\"cifs\":true,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"nzdndslgna\",\"hasRootAccess\":true,\"chownMode\":\"Restricted\"}]},\"protocolTypes\":[\"uhavhql\",\"thuma\",\"olbgycduiertgccy\"],\"throughputMibps\":30.20277,\"dataProtection\":{\"backup\":{\"backupPolicyId\":\"ssl\",\"policyEnforced\":false,\"backupVaultId\":\"mdnbbglzpswiy\"},\"snapshot\":{\"snapshotPolicyId\":\"wyhzdx\"}},\"isDefaultQuotaEnabled\":true,\"defaultUserQuotaInKiBs\":3261490626317443130,\"defaultGroupQuotaInKiBs\":527102059874859174,\"unixPermissions\":\"fznudaodvxzb\",\"coolAccess\":true,\"coolnessPeriod\":1795882398,\"coolAccessRetrievalPolicy\":\"Never\",\"coolAccessTieringPolicy\":\"SnapshotOnly\",\"snapshotDirectoryVisible\":true,\"smbAccessBasedEnumeration\":\"Enabled\",\"smbNonBrowsable\":\"Enabled\"},\"location\":\"rzdzucerscdnt\",\"tags\":{\"tmweriofzpyq\":\"fiwjmygtdssls\",\"hhszh\":\"emwabnet\",\"lvwiwubmwmbesl\":\"d\"},\"id\":\"nkww\",\"name\":\"pp\",\"type\":\"flcxoga\"}")
             .toObject(VolumePatch.class);
-        Assertions.assertEquals("modfvuefywsbpfvm", model.location());
-        Assertions.assertEquals("rfouyftaakcpw", model.tags().get("yzvqt"));
-        Assertions.assertEquals(ServiceLevel.FLEXIBLE, model.serviceLevel());
-        Assertions.assertEquals(411911013999749991L, model.usageThreshold());
-        Assertions.assertEquals(1702938248, model.exportPolicy().rules().get(0).ruleIndex());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadOnly());
+        Assertions.assertEquals("rzdzucerscdnt", model.location());
+        Assertions.assertEquals("fiwjmygtdssls", model.tags().get("tmweriofzpyq"));
+        Assertions.assertEquals(ServiceLevel.ULTRA, model.serviceLevel());
+        Assertions.assertEquals(6783178562921072735L, model.usageThreshold());
+        Assertions.assertEquals(1133541665, model.exportPolicy().rules().get(0).ruleIndex());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).unixReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadWrite());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5ReadOnly());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5ReadWrite());
@@ -41,40 +41,40 @@ public void testDeserialize() throws Exception {
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5IReadWrite());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5PReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5PReadWrite());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).cifs());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).cifs());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).nfsv3());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).nfsv41());
-        Assertions.assertEquals("sdyhtozfikdowwq", model.exportPolicy().rules().get(0).allowedClients());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).hasRootAccess());
-        Assertions.assertEquals(ChownMode.RESTRICTED, model.exportPolicy().rules().get(0).chownMode());
-        Assertions.assertEquals("nedgfbc", model.protocolTypes().get(0));
-        Assertions.assertEquals(71.283F, model.throughputMibps());
-        Assertions.assertEquals("hvoodsotbobzd", model.dataProtection().backup().backupPolicyId());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).nfsv41());
+        Assertions.assertEquals("ybn", model.exportPolicy().rules().get(0).allowedClients());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).hasRootAccess());
+        Assertions.assertEquals(ChownMode.UNRESTRICTED, model.exportPolicy().rules().get(0).chownMode());
+        Assertions.assertEquals("uhavhql", model.protocolTypes().get(0));
+        Assertions.assertEquals(30.20277F, model.throughputMibps());
+        Assertions.assertEquals("ssl", model.dataProtection().backup().backupPolicyId());
         Assertions.assertFalse(model.dataProtection().backup().policyEnforced());
-        Assertions.assertEquals("wvnhdldwmgx", model.dataProtection().backup().backupVaultId());
-        Assertions.assertEquals("slpmutwuo", model.dataProtection().snapshot().snapshotPolicyId());
-        Assertions.assertFalse(model.isDefaultQuotaEnabled());
-        Assertions.assertEquals(5722379398974283920L, model.defaultUserQuotaInKiBs());
-        Assertions.assertEquals(3859577697194270181L, model.defaultGroupQuotaInKiBs());
-        Assertions.assertEquals("yqsluic", model.unixPermissions());
+        Assertions.assertEquals("mdnbbglzpswiy", model.dataProtection().backup().backupVaultId());
+        Assertions.assertEquals("wyhzdx", model.dataProtection().snapshot().snapshotPolicyId());
+        Assertions.assertTrue(model.isDefaultQuotaEnabled());
+        Assertions.assertEquals(3261490626317443130L, model.defaultUserQuotaInKiBs());
+        Assertions.assertEquals(527102059874859174L, model.defaultGroupQuotaInKiBs());
+        Assertions.assertEquals("fznudaodvxzb", model.unixPermissions());
         Assertions.assertTrue(model.coolAccess());
-        Assertions.assertEquals(1810528552, model.coolnessPeriod());
+        Assertions.assertEquals(1795882398, model.coolnessPeriod());
         Assertions.assertEquals(CoolAccessRetrievalPolicy.NEVER, model.coolAccessRetrievalPolicy());
-        Assertions.assertEquals(CoolAccessTieringPolicy.AUTO, model.coolAccessTieringPolicy());
+        Assertions.assertEquals(CoolAccessTieringPolicy.SNAPSHOT_ONLY, model.coolAccessTieringPolicy());
         Assertions.assertTrue(model.snapshotDirectoryVisible());
         Assertions.assertEquals(SmbAccessBasedEnumeration.ENABLED, model.smbAccessBasedEnumeration());
-        Assertions.assertEquals(SmbNonBrowsable.DISABLED, model.smbNonBrowsable());
+        Assertions.assertEquals(SmbNonBrowsable.ENABLED, model.smbNonBrowsable());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumePatch model = new VolumePatch().withLocation("modfvuefywsbpfvm")
-            .withTags(mapOf("yzvqt", "rfouyftaakcpw", "zksmondj", "nubexk"))
-            .withServiceLevel(ServiceLevel.FLEXIBLE)
-            .withUsageThreshold(411911013999749991L)
+        VolumePatch model = new VolumePatch().withLocation("rzdzucerscdnt")
+            .withTags(mapOf("tmweriofzpyq", "fiwjmygtdssls", "hhszh", "emwabnet", "lvwiwubmwmbesl", "d"))
+            .withServiceLevel(ServiceLevel.ULTRA)
+            .withUsageThreshold(6783178562921072735L)
             .withExportPolicy(new VolumePatchPropertiesExportPolicy().withRules(Arrays.asList(
-                new ExportPolicyRule().withRuleIndex(1702938248)
-                    .withUnixReadOnly(true)
+                new ExportPolicyRule().withRuleIndex(1133541665)
+                    .withUnixReadOnly(false)
                     .withUnixReadWrite(true)
                     .withKerberos5ReadOnly(true)
                     .withKerberos5ReadWrite(false)
@@ -82,67 +82,52 @@ public void testSerialize() throws Exception {
                     .withKerberos5IReadWrite(true)
                     .withKerberos5PReadOnly(true)
                     .withKerberos5PReadWrite(true)
-                    .withCifs(false)
+                    .withCifs(true)
                     .withNfsv3(true)
-                    .withNfsv41(false)
-                    .withAllowedClients("sdyhtozfikdowwq")
-                    .withHasRootAccess(false)
-                    .withChownMode(ChownMode.RESTRICTED),
-                new ExportPolicyRule().withRuleIndex(1319405146)
-                    .withUnixReadOnly(false)
+                    .withNfsv41(true)
+                    .withAllowedClients("ybn")
+                    .withHasRootAccess(true)
+                    .withChownMode(ChownMode.UNRESTRICTED),
+                new ExportPolicyRule().withRuleIndex(1130044611)
+                    .withUnixReadOnly(true)
                     .withUnixReadWrite(true)
-                    .withKerberos5ReadOnly(true)
+                    .withKerberos5ReadOnly(false)
                     .withKerberos5ReadWrite(false)
                     .withKerberos5IReadOnly(true)
                     .withKerberos5IReadWrite(false)
                     .withKerberos5PReadOnly(true)
-                    .withKerberos5PReadWrite(true)
-                    .withCifs(false)
+                    .withKerberos5PReadWrite(false)
+                    .withCifs(true)
                     .withNfsv3(false)
                     .withNfsv41(false)
-                    .withAllowedClients("jnkaljutiiswacff")
-                    .withHasRootAccess(false)
-                    .withChownMode(ChownMode.RESTRICTED),
-                new ExportPolicyRule().withRuleIndex(1157139188)
-                    .withUnixReadOnly(false)
-                    .withUnixReadWrite(true)
-                    .withKerberos5ReadOnly(false)
-                    .withKerberos5ReadWrite(false)
-                    .withKerberos5IReadOnly(false)
-                    .withKerberos5IReadWrite(false)
-                    .withKerberos5PReadOnly(false)
-                    .withKerberos5PReadWrite(true)
-                    .withCifs(false)
-                    .withNfsv3(true)
-                    .withNfsv41(true)
-                    .withAllowedClients("hdlxyjrxsagafcn")
-                    .withHasRootAccess(false)
-                    .withChownMode(ChownMode.UNRESTRICTED))))
-            .withProtocolTypes(Arrays.asList("nedgfbc", "kcvqvpke"))
-            .withThroughputMibps(71.283F)
+                    .withAllowedClients("nzdndslgna")
+                    .withHasRootAccess(true)
+                    .withChownMode(ChownMode.RESTRICTED))))
+            .withProtocolTypes(Arrays.asList("uhavhql", "thuma", "olbgycduiertgccy"))
+            .withThroughputMibps(30.20277F)
             .withDataProtection(new VolumePatchPropertiesDataProtection()
-                .withBackup(new VolumeBackupProperties().withBackupPolicyId("hvoodsotbobzd")
+                .withBackup(new VolumeBackupProperties().withBackupPolicyId("ssl")
                     .withPolicyEnforced(false)
-                    .withBackupVaultId("wvnhdldwmgx"))
-                .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("slpmutwuo")))
-            .withIsDefaultQuotaEnabled(false)
-            .withDefaultUserQuotaInKiBs(5722379398974283920L)
-            .withDefaultGroupQuotaInKiBs(3859577697194270181L)
-            .withUnixPermissions("yqsluic")
+                    .withBackupVaultId("mdnbbglzpswiy"))
+                .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("wyhzdx")))
+            .withIsDefaultQuotaEnabled(true)
+            .withDefaultUserQuotaInKiBs(3261490626317443130L)
+            .withDefaultGroupQuotaInKiBs(527102059874859174L)
+            .withUnixPermissions("fznudaodvxzb")
             .withCoolAccess(true)
-            .withCoolnessPeriod(1810528552)
+            .withCoolnessPeriod(1795882398)
             .withCoolAccessRetrievalPolicy(CoolAccessRetrievalPolicy.NEVER)
-            .withCoolAccessTieringPolicy(CoolAccessTieringPolicy.AUTO)
+            .withCoolAccessTieringPolicy(CoolAccessTieringPolicy.SNAPSHOT_ONLY)
             .withSnapshotDirectoryVisible(true)
             .withSmbAccessBasedEnumeration(SmbAccessBasedEnumeration.ENABLED)
-            .withSmbNonBrowsable(SmbNonBrowsable.DISABLED);
+            .withSmbNonBrowsable(SmbNonBrowsable.ENABLED);
         model = BinaryData.fromObject(model).toObject(VolumePatch.class);
-        Assertions.assertEquals("modfvuefywsbpfvm", model.location());
-        Assertions.assertEquals("rfouyftaakcpw", model.tags().get("yzvqt"));
-        Assertions.assertEquals(ServiceLevel.FLEXIBLE, model.serviceLevel());
-        Assertions.assertEquals(411911013999749991L, model.usageThreshold());
-        Assertions.assertEquals(1702938248, model.exportPolicy().rules().get(0).ruleIndex());
-        Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadOnly());
+        Assertions.assertEquals("rzdzucerscdnt", model.location());
+        Assertions.assertEquals("fiwjmygtdssls", model.tags().get("tmweriofzpyq"));
+        Assertions.assertEquals(ServiceLevel.ULTRA, model.serviceLevel());
+        Assertions.assertEquals(6783178562921072735L, model.usageThreshold());
+        Assertions.assertEquals(1133541665, model.exportPolicy().rules().get(0).ruleIndex());
+        Assertions.assertFalse(model.exportPolicy().rules().get(0).unixReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).unixReadWrite());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5ReadOnly());
         Assertions.assertFalse(model.exportPolicy().rules().get(0).kerberos5ReadWrite());
@@ -150,29 +135,29 @@ public void testSerialize() throws Exception {
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5IReadWrite());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5PReadOnly());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).kerberos5PReadWrite());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).cifs());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).cifs());
         Assertions.assertTrue(model.exportPolicy().rules().get(0).nfsv3());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).nfsv41());
-        Assertions.assertEquals("sdyhtozfikdowwq", model.exportPolicy().rules().get(0).allowedClients());
-        Assertions.assertFalse(model.exportPolicy().rules().get(0).hasRootAccess());
-        Assertions.assertEquals(ChownMode.RESTRICTED, model.exportPolicy().rules().get(0).chownMode());
-        Assertions.assertEquals("nedgfbc", model.protocolTypes().get(0));
-        Assertions.assertEquals(71.283F, model.throughputMibps());
-        Assertions.assertEquals("hvoodsotbobzd", model.dataProtection().backup().backupPolicyId());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).nfsv41());
+        Assertions.assertEquals("ybn", model.exportPolicy().rules().get(0).allowedClients());
+        Assertions.assertTrue(model.exportPolicy().rules().get(0).hasRootAccess());
+        Assertions.assertEquals(ChownMode.UNRESTRICTED, model.exportPolicy().rules().get(0).chownMode());
+        Assertions.assertEquals("uhavhql", model.protocolTypes().get(0));
+        Assertions.assertEquals(30.20277F, model.throughputMibps());
+        Assertions.assertEquals("ssl", model.dataProtection().backup().backupPolicyId());
         Assertions.assertFalse(model.dataProtection().backup().policyEnforced());
-        Assertions.assertEquals("wvnhdldwmgx", model.dataProtection().backup().backupVaultId());
-        Assertions.assertEquals("slpmutwuo", model.dataProtection().snapshot().snapshotPolicyId());
-        Assertions.assertFalse(model.isDefaultQuotaEnabled());
-        Assertions.assertEquals(5722379398974283920L, model.defaultUserQuotaInKiBs());
-        Assertions.assertEquals(3859577697194270181L, model.defaultGroupQuotaInKiBs());
-        Assertions.assertEquals("yqsluic", model.unixPermissions());
+        Assertions.assertEquals("mdnbbglzpswiy", model.dataProtection().backup().backupVaultId());
+        Assertions.assertEquals("wyhzdx", model.dataProtection().snapshot().snapshotPolicyId());
+        Assertions.assertTrue(model.isDefaultQuotaEnabled());
+        Assertions.assertEquals(3261490626317443130L, model.defaultUserQuotaInKiBs());
+        Assertions.assertEquals(527102059874859174L, model.defaultGroupQuotaInKiBs());
+        Assertions.assertEquals("fznudaodvxzb", model.unixPermissions());
         Assertions.assertTrue(model.coolAccess());
-        Assertions.assertEquals(1810528552, model.coolnessPeriod());
+        Assertions.assertEquals(1795882398, model.coolnessPeriod());
         Assertions.assertEquals(CoolAccessRetrievalPolicy.NEVER, model.coolAccessRetrievalPolicy());
-        Assertions.assertEquals(CoolAccessTieringPolicy.AUTO, model.coolAccessTieringPolicy());
+        Assertions.assertEquals(CoolAccessTieringPolicy.SNAPSHOT_ONLY, model.coolAccessTieringPolicy());
         Assertions.assertTrue(model.snapshotDirectoryVisible());
         Assertions.assertEquals(SmbAccessBasedEnumeration.ENABLED, model.smbAccessBasedEnumeration());
-        Assertions.assertEquals(SmbNonBrowsable.DISABLED, model.smbNonBrowsable());
+        Assertions.assertEquals(SmbNonBrowsable.ENABLED, model.smbNonBrowsable());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesDataProtectionTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesDataProtectionTests.java
index a557d141b8b7..56de79403ef5 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesDataProtectionTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesDataProtectionTests.java
@@ -18,46 +18,46 @@ public final class VolumePropertiesDataProtectionTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumePropertiesDataProtection model = BinaryData.fromString(
-            "{\"backup\":{\"backupPolicyId\":\"bcgjbirxbp\",\"policyEnforced\":true,\"backupVaultId\":\"fbjfdtwssotftpvj\"},\"replication\":{\"replicationId\":\"xilzznf\",\"endpointType\":\"dst\",\"replicationSchedule\":\"hourly\",\"remoteVolumeResourceId\":\"mqtaruoujmkcjh\",\"remotePath\":{\"externalHostName\":\"ytjrybnwjewgdr\",\"serverName\":\"ervnaenqpehi\",\"volumeName\":\"doy\"},\"remoteVolumeRegion\":\"ifthnz\",\"destinationReplications\":[{\"resourceId\":\"l\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"qig\",\"zone\":\"duhavhqlkt\"},{\"resourceId\":\"maqolbgycduie\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"cym\",\"zone\":\"olpsslqlf\"},{\"resourceId\":\"dnbbglzps\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"mcwyhzdxssadb\",\"zone\":\"nvdfznuda\"},{\"resourceId\":\"vxzbncb\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"stdbhhxsrzdzu\",\"zone\":\"rsc\"}]},\"snapshot\":{\"snapshotPolicyId\":\"nevf\"},\"volumeRelocation\":{\"relocationRequested\":true,\"readyToBeFinalized\":true}}")
+            "{\"backup\":{\"backupPolicyId\":\"vgqzcjrvxd\",\"policyEnforced\":true,\"backupVaultId\":\"wlxkvugfhzovaw\"},\"replication\":{\"replicationId\":\"u\",\"endpointType\":\"dst\",\"replicationSchedule\":\"_10minutely\",\"remoteVolumeResourceId\":\"n\",\"remotePath\":{\"externalHostName\":\"nxipeil\",\"serverName\":\"jzuaejxdultskzbb\",\"volumeName\":\"dzumveekg\"},\"remoteVolumeRegion\":\"ozuhkfp\",\"destinationReplications\":[{\"resourceId\":\"ofd\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"sd\",\"zone\":\"ouwaboekqvkeln\"},{\"resourceId\":\"vbxwyjsflhh\",\"replicationType\":\"CrossRegionReplication\",\"region\":\"n\",\"zone\":\"xisxyawjoyaqcsl\"},{\"resourceId\":\"pkii\",\"replicationType\":\"CrossRegionReplication\",\"region\":\"xznelixhnrztf\",\"zone\":\"hb\"},{\"resourceId\":\"knalaulppg\",\"replicationType\":\"CrossZoneReplication\",\"region\":\"napnyiropuhpigv\",\"zone\":\"ylgqgitxmedjvcsl\"}],\"externalReplicationSetupStatus\":\"ClusterPeerRequired\",\"externalReplicationSetupInfo\":\"wncwzzhxgktrmg\",\"mirrorState\":\"Broken\",\"relationshipStatus\":\"Idle\"},\"snapshot\":{\"snapshotPolicyId\":\"eoellwptfdygp\"},\"volumeRelocation\":{\"relocationRequested\":true,\"readyToBeFinalized\":true}}")
             .toObject(VolumePropertiesDataProtection.class);
-        Assertions.assertEquals("bcgjbirxbp", model.backup().backupPolicyId());
+        Assertions.assertEquals("vgqzcjrvxd", model.backup().backupPolicyId());
         Assertions.assertTrue(model.backup().policyEnforced());
-        Assertions.assertEquals("fbjfdtwssotftpvj", model.backup().backupVaultId());
-        Assertions.assertEquals(ReplicationSchedule.HOURLY, model.replication().replicationSchedule());
-        Assertions.assertEquals("mqtaruoujmkcjh", model.replication().remoteVolumeResourceId());
-        Assertions.assertEquals("ytjrybnwjewgdr", model.replication().remotePath().externalHostname());
-        Assertions.assertEquals("ervnaenqpehi", model.replication().remotePath().serverName());
-        Assertions.assertEquals("doy", model.replication().remotePath().volumeName());
-        Assertions.assertEquals("ifthnz", model.replication().remoteVolumeRegion());
-        Assertions.assertEquals("nevf", model.snapshot().snapshotPolicyId());
+        Assertions.assertEquals("wlxkvugfhzovaw", model.backup().backupVaultId());
+        Assertions.assertEquals(ReplicationSchedule.ONE_ZEROMINUTELY, model.replication().replicationSchedule());
+        Assertions.assertEquals("n", model.replication().remoteVolumeResourceId());
+        Assertions.assertEquals("nxipeil", model.replication().remotePath().externalHostname());
+        Assertions.assertEquals("jzuaejxdultskzbb", model.replication().remotePath().serverName());
+        Assertions.assertEquals("dzumveekg", model.replication().remotePath().volumeName());
+        Assertions.assertEquals("ozuhkfp", model.replication().remoteVolumeRegion());
+        Assertions.assertEquals("eoellwptfdygp", model.snapshot().snapshotPolicyId());
         Assertions.assertTrue(model.volumeRelocation().relocationRequested());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VolumePropertiesDataProtection model = new VolumePropertiesDataProtection()
-            .withBackup(new VolumeBackupProperties().withBackupPolicyId("bcgjbirxbp")
+            .withBackup(new VolumeBackupProperties().withBackupPolicyId("vgqzcjrvxd")
                 .withPolicyEnforced(true)
-                .withBackupVaultId("fbjfdtwssotftpvj"))
-            .withReplication(new ReplicationObject().withReplicationSchedule(ReplicationSchedule.HOURLY)
-                .withRemoteVolumeResourceId("mqtaruoujmkcjh")
-                .withRemotePath(new RemotePath().withExternalHostname("ytjrybnwjewgdr")
-                    .withServerName("ervnaenqpehi")
-                    .withVolumeName("doy"))
-                .withRemoteVolumeRegion("ifthnz"))
-            .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("nevf"))
+                .withBackupVaultId("wlxkvugfhzovaw"))
+            .withReplication(new ReplicationObject().withReplicationSchedule(ReplicationSchedule.ONE_ZEROMINUTELY)
+                .withRemoteVolumeResourceId("n")
+                .withRemotePath(new RemotePath().withExternalHostname("nxipeil")
+                    .withServerName("jzuaejxdultskzbb")
+                    .withVolumeName("dzumveekg"))
+                .withRemoteVolumeRegion("ozuhkfp"))
+            .withSnapshot(new VolumeSnapshotProperties().withSnapshotPolicyId("eoellwptfdygp"))
             .withVolumeRelocation(new VolumeRelocationProperties().withRelocationRequested(true));
         model = BinaryData.fromObject(model).toObject(VolumePropertiesDataProtection.class);
-        Assertions.assertEquals("bcgjbirxbp", model.backup().backupPolicyId());
+        Assertions.assertEquals("vgqzcjrvxd", model.backup().backupPolicyId());
         Assertions.assertTrue(model.backup().policyEnforced());
-        Assertions.assertEquals("fbjfdtwssotftpvj", model.backup().backupVaultId());
-        Assertions.assertEquals(ReplicationSchedule.HOURLY, model.replication().replicationSchedule());
-        Assertions.assertEquals("mqtaruoujmkcjh", model.replication().remoteVolumeResourceId());
-        Assertions.assertEquals("ytjrybnwjewgdr", model.replication().remotePath().externalHostname());
-        Assertions.assertEquals("ervnaenqpehi", model.replication().remotePath().serverName());
-        Assertions.assertEquals("doy", model.replication().remotePath().volumeName());
-        Assertions.assertEquals("ifthnz", model.replication().remoteVolumeRegion());
-        Assertions.assertEquals("nevf", model.snapshot().snapshotPolicyId());
+        Assertions.assertEquals("wlxkvugfhzovaw", model.backup().backupVaultId());
+        Assertions.assertEquals(ReplicationSchedule.ONE_ZEROMINUTELY, model.replication().replicationSchedule());
+        Assertions.assertEquals("n", model.replication().remoteVolumeResourceId());
+        Assertions.assertEquals("nxipeil", model.replication().remotePath().externalHostname());
+        Assertions.assertEquals("jzuaejxdultskzbb", model.replication().remotePath().serverName());
+        Assertions.assertEquals("dzumveekg", model.replication().remotePath().volumeName());
+        Assertions.assertEquals("ozuhkfp", model.replication().remoteVolumeRegion());
+        Assertions.assertEquals("eoellwptfdygp", model.snapshot().snapshotPolicyId());
         Assertions.assertTrue(model.volumeRelocation().relocationRequested());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesExportPolicyTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesExportPolicyTests.java
index 6d1f5066f4c9..98eb39cf8f6d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesExportPolicyTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumePropertiesExportPolicyTests.java
@@ -15,103 +15,58 @@ public final class VolumePropertiesExportPolicyTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumePropertiesExportPolicy model = BinaryData.fromString(
-            "{\"rules\":[{\"ruleIndex\":327718055,\"unixReadOnly\":true,\"unixReadWrite\":false,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":false,\"cifs\":true,\"nfsv3\":false,\"nfsv41\":true,\"allowedClients\":\"rmgucnap\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":1761160515,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":false,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"uaopppcqeq\",\"hasRootAccess\":true,\"chownMode\":\"Unrestricted\"},{\"ruleIndex\":1114534772,\"unixReadOnly\":false,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":true,\"kerberos5pReadWrite\":false,\"cifs\":true,\"nfsv3\":false,\"nfsv41\":false,\"allowedClients\":\"bunrmfqjhhk\",\"hasRootAccess\":true,\"chownMode\":\"Restricted\"},{\"ruleIndex\":685095993,\"unixReadOnly\":false,\"unixReadWrite\":true,\"kerberos5ReadOnly\":false,\"kerberos5ReadWrite\":true,\"kerberos5iReadOnly\":false,\"kerberos5iReadWrite\":false,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":false,\"cifs\":false,\"nfsv3\":false,\"nfsv41\":true,\"allowedClients\":\"zjf\",\"hasRootAccess\":false,\"chownMode\":\"Unrestricted\"}]}")
+            "{\"rules\":[{\"ruleIndex\":1553365340,\"unixReadOnly\":true,\"unixReadWrite\":false,\"kerberos5ReadOnly\":true,\"kerberos5ReadWrite\":false,\"kerberos5iReadOnly\":true,\"kerberos5iReadWrite\":true,\"kerberos5pReadOnly\":false,\"kerberos5pReadWrite\":false,\"cifs\":true,\"nfsv3\":false,\"nfsv41\":true,\"allowedClients\":\"loayqcgw\",\"hasRootAccess\":false,\"chownMode\":\"Unrestricted\"}]}")
             .toObject(VolumePropertiesExportPolicy.class);
-        Assertions.assertEquals(327718055, model.rules().get(0).ruleIndex());
+        Assertions.assertEquals(1553365340, model.rules().get(0).ruleIndex());
         Assertions.assertTrue(model.rules().get(0).unixReadOnly());
         Assertions.assertFalse(model.rules().get(0).unixReadWrite());
-        Assertions.assertFalse(model.rules().get(0).kerberos5ReadOnly());
-        Assertions.assertTrue(model.rules().get(0).kerberos5ReadWrite());
-        Assertions.assertFalse(model.rules().get(0).kerberos5IReadOnly());
+        Assertions.assertTrue(model.rules().get(0).kerberos5ReadOnly());
+        Assertions.assertFalse(model.rules().get(0).kerberos5ReadWrite());
+        Assertions.assertTrue(model.rules().get(0).kerberos5IReadOnly());
         Assertions.assertTrue(model.rules().get(0).kerberos5IReadWrite());
         Assertions.assertFalse(model.rules().get(0).kerberos5PReadOnly());
         Assertions.assertFalse(model.rules().get(0).kerberos5PReadWrite());
         Assertions.assertTrue(model.rules().get(0).cifs());
         Assertions.assertFalse(model.rules().get(0).nfsv3());
         Assertions.assertTrue(model.rules().get(0).nfsv41());
-        Assertions.assertEquals("rmgucnap", model.rules().get(0).allowedClients());
-        Assertions.assertTrue(model.rules().get(0).hasRootAccess());
+        Assertions.assertEquals("loayqcgw", model.rules().get(0).allowedClients());
+        Assertions.assertFalse(model.rules().get(0).hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.rules().get(0).chownMode());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumePropertiesExportPolicy model = new VolumePropertiesExportPolicy().withRules(Arrays.asList(
-            new ExportPolicyRule().withRuleIndex(327718055)
+        VolumePropertiesExportPolicy model = new VolumePropertiesExportPolicy()
+            .withRules(Arrays.asList(new ExportPolicyRule().withRuleIndex(1553365340)
                 .withUnixReadOnly(true)
                 .withUnixReadWrite(false)
-                .withKerberos5ReadOnly(false)
-                .withKerberos5ReadWrite(true)
-                .withKerberos5IReadOnly(false)
-                .withKerberos5IReadWrite(true)
-                .withKerberos5PReadOnly(false)
-                .withKerberos5PReadWrite(false)
-                .withCifs(true)
-                .withNfsv3(false)
-                .withNfsv41(true)
-                .withAllowedClients("rmgucnap")
-                .withHasRootAccess(true)
-                .withChownMode(ChownMode.UNRESTRICTED),
-            new ExportPolicyRule().withRuleIndex(1761160515)
-                .withUnixReadOnly(false)
-                .withUnixReadWrite(true)
-                .withKerberos5ReadOnly(false)
-                .withKerberos5ReadWrite(true)
-                .withKerberos5IReadOnly(true)
-                .withKerberos5IReadWrite(true)
-                .withKerberos5PReadOnly(true)
-                .withKerberos5PReadWrite(false)
-                .withCifs(false)
-                .withNfsv3(false)
-                .withNfsv41(false)
-                .withAllowedClients("uaopppcqeq")
-                .withHasRootAccess(true)
-                .withChownMode(ChownMode.UNRESTRICTED),
-            new ExportPolicyRule().withRuleIndex(1114534772)
-                .withUnixReadOnly(false)
-                .withUnixReadWrite(false)
                 .withKerberos5ReadOnly(true)
                 .withKerberos5ReadWrite(false)
                 .withKerberos5IReadOnly(true)
                 .withKerberos5IReadWrite(true)
-                .withKerberos5PReadOnly(true)
-                .withKerberos5PReadWrite(false)
-                .withCifs(true)
-                .withNfsv3(false)
-                .withNfsv41(false)
-                .withAllowedClients("bunrmfqjhhk")
-                .withHasRootAccess(true)
-                .withChownMode(ChownMode.RESTRICTED),
-            new ExportPolicyRule().withRuleIndex(685095993)
-                .withUnixReadOnly(false)
-                .withUnixReadWrite(true)
-                .withKerberos5ReadOnly(false)
-                .withKerberos5ReadWrite(true)
-                .withKerberos5IReadOnly(false)
-                .withKerberos5IReadWrite(false)
                 .withKerberos5PReadOnly(false)
                 .withKerberos5PReadWrite(false)
-                .withCifs(false)
+                .withCifs(true)
                 .withNfsv3(false)
                 .withNfsv41(true)
-                .withAllowedClients("zjf")
+                .withAllowedClients("loayqcgw")
                 .withHasRootAccess(false)
                 .withChownMode(ChownMode.UNRESTRICTED)));
         model = BinaryData.fromObject(model).toObject(VolumePropertiesExportPolicy.class);
-        Assertions.assertEquals(327718055, model.rules().get(0).ruleIndex());
+        Assertions.assertEquals(1553365340, model.rules().get(0).ruleIndex());
         Assertions.assertTrue(model.rules().get(0).unixReadOnly());
         Assertions.assertFalse(model.rules().get(0).unixReadWrite());
-        Assertions.assertFalse(model.rules().get(0).kerberos5ReadOnly());
-        Assertions.assertTrue(model.rules().get(0).kerberos5ReadWrite());
-        Assertions.assertFalse(model.rules().get(0).kerberos5IReadOnly());
+        Assertions.assertTrue(model.rules().get(0).kerberos5ReadOnly());
+        Assertions.assertFalse(model.rules().get(0).kerberos5ReadWrite());
+        Assertions.assertTrue(model.rules().get(0).kerberos5IReadOnly());
         Assertions.assertTrue(model.rules().get(0).kerberos5IReadWrite());
         Assertions.assertFalse(model.rules().get(0).kerberos5PReadOnly());
         Assertions.assertFalse(model.rules().get(0).kerberos5PReadWrite());
         Assertions.assertTrue(model.rules().get(0).cifs());
         Assertions.assertFalse(model.rules().get(0).nfsv3());
         Assertions.assertTrue(model.rules().get(0).nfsv41());
-        Assertions.assertEquals("rmgucnap", model.rules().get(0).allowedClients());
-        Assertions.assertTrue(model.rules().get(0).hasRootAccess());
+        Assertions.assertEquals("loayqcgw", model.rules().get(0).allowedClients());
+        Assertions.assertFalse(model.rules().get(0).hasRootAccess());
         Assertions.assertEquals(ChownMode.UNRESTRICTED, model.rules().get(0).chownMode());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRuleInnerTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRuleInnerTests.java
index 02517e04d45f..84768fdb7854 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRuleInnerTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRuleInnerTests.java
@@ -15,28 +15,29 @@ public final class VolumeQuotaRuleInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeQuotaRuleInner model = BinaryData.fromString(
-            "{\"properties\":{\"provisioningState\":\"Succeeded\",\"quotaSizeInKiBs\":5632238878555686719,\"quotaType\":\"DefaultGroupQuota\",\"quotaTarget\":\"yczuhxacpq\"},\"location\":\"ihhyuspskasd\",\"tags\":{\"mrsreuzvxurisjnh\":\"fwdgzxulucvp\",\"blwpcesutrgj\":\"ytxifqjzgxmrh\"},\"id\":\"pauutpw\",\"name\":\"qhih\",\"type\":\"jqgwzp\"}")
+            "{\"properties\":{\"provisioningState\":\"Failed\",\"quotaSizeInKiBs\":6267067833178554211,\"quotaType\":\"DefaultGroupQuota\",\"quotaTarget\":\"kfxu\"},\"location\":\"mdwzrmuhapfcqdps\",\"tags\":{\"vezrypqlmfeo\":\"vpsvuoymgcce\",\"edkowepbqpcrfk\":\"erqwkyhkobopg\",\"tn\":\"wccsnjvcdwxlpqek\"},\"id\":\"htjsying\",\"name\":\"fq\",\"type\":\"tmtdhtmdvypgik\"}")
             .toObject(VolumeQuotaRuleInner.class);
-        Assertions.assertEquals("ihhyuspskasd", model.location());
-        Assertions.assertEquals("fwdgzxulucvp", model.tags().get("mrsreuzvxurisjnh"));
-        Assertions.assertEquals(5632238878555686719L, model.quotaSizeInKiBs());
+        Assertions.assertEquals("mdwzrmuhapfcqdps", model.location());
+        Assertions.assertEquals("vpsvuoymgcce", model.tags().get("vezrypqlmfeo"));
+        Assertions.assertEquals(6267067833178554211L, model.quotaSizeInKiBs());
         Assertions.assertEquals(Type.DEFAULT_GROUP_QUOTA, model.quotaType());
-        Assertions.assertEquals("yczuhxacpq", model.quotaTarget());
+        Assertions.assertEquals("kfxu", model.quotaTarget());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeQuotaRuleInner model = new VolumeQuotaRuleInner().withLocation("ihhyuspskasd")
-            .withTags(mapOf("mrsreuzvxurisjnh", "fwdgzxulucvp", "blwpcesutrgj", "ytxifqjzgxmrh"))
-            .withQuotaSizeInKiBs(5632238878555686719L)
+        VolumeQuotaRuleInner model = new VolumeQuotaRuleInner().withLocation("mdwzrmuhapfcqdps")
+            .withTags(
+                mapOf("vezrypqlmfeo", "vpsvuoymgcce", "edkowepbqpcrfk", "erqwkyhkobopg", "tn", "wccsnjvcdwxlpqek"))
+            .withQuotaSizeInKiBs(6267067833178554211L)
             .withQuotaType(Type.DEFAULT_GROUP_QUOTA)
-            .withQuotaTarget("yczuhxacpq");
+            .withQuotaTarget("kfxu");
         model = BinaryData.fromObject(model).toObject(VolumeQuotaRuleInner.class);
-        Assertions.assertEquals("ihhyuspskasd", model.location());
-        Assertions.assertEquals("fwdgzxulucvp", model.tags().get("mrsreuzvxurisjnh"));
-        Assertions.assertEquals(5632238878555686719L, model.quotaSizeInKiBs());
+        Assertions.assertEquals("mdwzrmuhapfcqdps", model.location());
+        Assertions.assertEquals("vpsvuoymgcce", model.tags().get("vezrypqlmfeo"));
+        Assertions.assertEquals(6267067833178554211L, model.quotaSizeInKiBs());
         Assertions.assertEquals(Type.DEFAULT_GROUP_QUOTA, model.quotaType());
-        Assertions.assertEquals("yczuhxacpq", model.quotaTarget());
+        Assertions.assertEquals("kfxu", model.quotaTarget());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulePatchTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulePatchTests.java
index cce6991538bb..5ac3d445912e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulePatchTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulePatchTests.java
@@ -15,26 +15,27 @@ public final class VolumeQuotaRulePatchTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeQuotaRulePatch model = BinaryData.fromString(
-            "{\"tags\":{\"ydfce\":\"izjx\",\"gdyftumrtwna\":\"cvlhv\",\"wkojgcyztsfmzn\":\"jslb\",\"rpxeh\":\"aeqphchqnr\"},\"properties\":{\"provisioningState\":\"Creating\",\"quotaSizeInKiBs\":6374606817951698453,\"quotaType\":\"IndividualUserQuota\",\"quotaTarget\":\"mvikl\"}}")
+            "{\"tags\":{\"mfiibfggj\":\"qqaatjinrvgou\",\"rwxkvtkkgl\":\"ool\",\"vblm\":\"qwjygvja\",\"byrqufeg\":\"vkzuhbxvvyhgso\"},\"properties\":{\"provisioningState\":\"Succeeded\",\"quotaSizeInKiBs\":3115230018445319703,\"quotaType\":\"IndividualGroupQuota\",\"quotaTarget\":\"mctlpdngitv\"}}")
             .toObject(VolumeQuotaRulePatch.class);
-        Assertions.assertEquals("izjx", model.tags().get("ydfce"));
-        Assertions.assertEquals(6374606817951698453L, model.quotaSizeInKiBs());
-        Assertions.assertEquals(Type.INDIVIDUAL_USER_QUOTA, model.quotaType());
-        Assertions.assertEquals("mvikl", model.quotaTarget());
+        Assertions.assertEquals("qqaatjinrvgou", model.tags().get("mfiibfggj"));
+        Assertions.assertEquals(3115230018445319703L, model.quotaSizeInKiBs());
+        Assertions.assertEquals(Type.INDIVIDUAL_GROUP_QUOTA, model.quotaType());
+        Assertions.assertEquals("mctlpdngitv", model.quotaTarget());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VolumeQuotaRulePatch model = new VolumeQuotaRulePatch()
-            .withTags(mapOf("ydfce", "izjx", "gdyftumrtwna", "cvlhv", "wkojgcyztsfmzn", "jslb", "rpxeh", "aeqphchqnr"))
-            .withQuotaSizeInKiBs(6374606817951698453L)
-            .withQuotaType(Type.INDIVIDUAL_USER_QUOTA)
-            .withQuotaTarget("mvikl");
+            .withTags(mapOf("mfiibfggj", "qqaatjinrvgou", "rwxkvtkkgl", "ool", "vblm", "qwjygvja", "byrqufeg",
+                "vkzuhbxvvyhgso"))
+            .withQuotaSizeInKiBs(3115230018445319703L)
+            .withQuotaType(Type.INDIVIDUAL_GROUP_QUOTA)
+            .withQuotaTarget("mctlpdngitv");
         model = BinaryData.fromObject(model).toObject(VolumeQuotaRulePatch.class);
-        Assertions.assertEquals("izjx", model.tags().get("ydfce"));
-        Assertions.assertEquals(6374606817951698453L, model.quotaSizeInKiBs());
-        Assertions.assertEquals(Type.INDIVIDUAL_USER_QUOTA, model.quotaType());
-        Assertions.assertEquals("mvikl", model.quotaTarget());
+        Assertions.assertEquals("qqaatjinrvgou", model.tags().get("mfiibfggj"));
+        Assertions.assertEquals(3115230018445319703L, model.quotaSizeInKiBs());
+        Assertions.assertEquals(Type.INDIVIDUAL_GROUP_QUOTA, model.quotaType());
+        Assertions.assertEquals("mctlpdngitv", model.quotaTarget());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetWithResponseMockTests.java
index 0dfd3fca3c5d..b21f2c7bb313 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class VolumeQuotaRulesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Failed\",\"quotaSizeInKiBs\":3451547714942547827,\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"ybww\"},\"location\":\"d\",\"tags\":{\"plfmuvapckccrrvw\":\"idmhmwf\"},\"id\":\"yoxoy\",\"name\":\"ukphaimmoiroq\",\"type\":\"oshbragapyy\"}";
+            = "{\"properties\":{\"provisioningState\":\"Canceled\",\"quotaSizeInKiBs\":3451547714942547827,\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"ybww\"},\"location\":\"d\",\"tags\":{\"plfmuvapckccrrvw\":\"idmhmwf\"},\"id\":\"yoxoy\",\"name\":\"ukphaimmoiroq\",\"type\":\"oshbragapyy\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeMockTests.java
index 42f0205a886b..f45efcdd10d0 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListByVolumeMockTests.java
@@ -23,7 +23,7 @@ public final class VolumeQuotaRulesListByVolumeMockTests {
     @Test
     public void testListByVolume() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Patching\",\"quotaSizeInKiBs\":1290302634644263235,\"quotaType\":\"DefaultGroupQuota\",\"quotaTarget\":\"dmflhuytx\"},\"location\":\"tznapxbannovv\",\"tags\":{\"lyokrrrou\":\"zytprwnwvroevy\",\"sasbcrymodizrx\":\"xv\"},\"id\":\"lobdxna\",\"name\":\"pmkmlmvevfx\",\"type\":\"op\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Deleting\",\"quotaSizeInKiBs\":1290302634644263235,\"quotaType\":\"DefaultGroupQuota\",\"quotaTarget\":\"dmflhuytx\"},\"location\":\"tznapxbannovv\",\"tags\":{\"lyokrrrou\":\"zytprwnwvroevy\",\"sasbcrymodizrx\":\"xv\"},\"id\":\"lobdxna\",\"name\":\"pmkmlmvevfx\",\"type\":\"op\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListTests.java
index c32eff62393f..a1c6e27af8af 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesListTests.java
@@ -17,40 +17,34 @@ public final class VolumeQuotaRulesListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeQuotaRulesList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"provisioningState\":\"Moving\",\"quotaSizeInKiBs\":5516945390083190100,\"quotaType\":\"IndividualGroupQuota\",\"quotaTarget\":\"seinqfiuf\"},\"location\":\"knpirgnepttwq\",\"tags\":{\"rxfrddhc\":\"iffcdmqnrojlpijn\",\"ronasxift\":\"atiz\",\"zh\":\"zq\"},\"id\":\"tw\",\"name\":\"sgogczhonnxk\",\"type\":\"lgnyhmo\"},{\"properties\":{\"provisioningState\":\"Succeeded\",\"quotaSizeInKiBs\":5675818129522047029,\"quotaType\":\"IndividualGroupQuota\",\"quotaTarget\":\"gh\"},\"location\":\"bdhqxvcxgf\",\"tags\":{\"vbuswd\":\"sofbshrn\",\"ybycnunvj\":\"z\",\"ikyzirtxdy\":\"rtkfawnopq\"},\"id\":\"x\",\"name\":\"ejnt\",\"type\":\"sewgioilqukr\"},{\"properties\":{\"provisioningState\":\"Creating\",\"quotaSizeInKiBs\":2574413464596771769,\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"orgguf\"},\"location\":\"aomtbghhavgrvkff\",\"tags\":{\"jbibg\":\"zh\",\"nbkfezzxscy\":\"mfxumvfcluyovw\",\"vzzbtdcq\":\"wzdgirujbzbo\",\"dshf\":\"pniyujviyl\"},\"id\":\"snrbgyefrymsgao\",\"name\":\"fmwncotmrfh\",\"type\":\"rctym\"}]}")
+            "{\"value\":[{\"properties\":{\"provisioningState\":\"Failed\",\"quotaSizeInKiBs\":496662249945843080,\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"zpfrla\"},\"location\":\"zrnw\",\"tags\":{\"lwbtlhf\":\"ndfpwpj\",\"dhszfjv\":\"sj\",\"qmqhldvriii\":\"bgofeljag\"},\"id\":\"jnalghf\",\"name\":\"vtvsexsowueluq\",\"type\":\"hahhxvrhmzkwpj\"},{\"properties\":{\"provisioningState\":\"Updating\",\"quotaSizeInKiBs\":8756648845252646804,\"quotaType\":\"IndividualGroupQuota\",\"quotaTarget\":\"qs\"},\"location\":\"qxujxukndxd\",\"tags\":{\"yqtfihwh\":\"jguufzdm\",\"gamv\":\"otzi\",\"dphqamv\":\"phoszqz\",\"vtbvkayh\":\"kfwynw\"},\"id\":\"tnvyqiatkzwp\",\"name\":\"npwzcjaes\",\"type\":\"vvsccyajguq\"}]}")
             .toObject(VolumeQuotaRulesList.class);
-        Assertions.assertEquals("knpirgnepttwq", model.value().get(0).location());
-        Assertions.assertEquals("iffcdmqnrojlpijn", model.value().get(0).tags().get("rxfrddhc"));
-        Assertions.assertEquals(5516945390083190100L, model.value().get(0).quotaSizeInKiBs());
-        Assertions.assertEquals(Type.INDIVIDUAL_GROUP_QUOTA, model.value().get(0).quotaType());
-        Assertions.assertEquals("seinqfiuf", model.value().get(0).quotaTarget());
+        Assertions.assertEquals("zrnw", model.value().get(0).location());
+        Assertions.assertEquals("ndfpwpj", model.value().get(0).tags().get("lwbtlhf"));
+        Assertions.assertEquals(496662249945843080L, model.value().get(0).quotaSizeInKiBs());
+        Assertions.assertEquals(Type.DEFAULT_USER_QUOTA, model.value().get(0).quotaType());
+        Assertions.assertEquals("zpfrla", model.value().get(0).quotaTarget());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VolumeQuotaRulesList model = new VolumeQuotaRulesList().withValue(Arrays.asList(
-            new VolumeQuotaRuleInner().withLocation("knpirgnepttwq")
-                .withTags(mapOf("rxfrddhc", "iffcdmqnrojlpijn", "ronasxift", "atiz", "zh", "zq"))
-                .withQuotaSizeInKiBs(5516945390083190100L)
-                .withQuotaType(Type.INDIVIDUAL_GROUP_QUOTA)
-                .withQuotaTarget("seinqfiuf"),
-            new VolumeQuotaRuleInner().withLocation("bdhqxvcxgf")
-                .withTags(mapOf("vbuswd", "sofbshrn", "ybycnunvj", "z", "ikyzirtxdy", "rtkfawnopq"))
-                .withQuotaSizeInKiBs(5675818129522047029L)
-                .withQuotaType(Type.INDIVIDUAL_GROUP_QUOTA)
-                .withQuotaTarget("gh"),
-            new VolumeQuotaRuleInner().withLocation("aomtbghhavgrvkff")
-                .withTags(mapOf("jbibg", "zh", "nbkfezzxscy", "mfxumvfcluyovw", "vzzbtdcq", "wzdgirujbzbo", "dshf",
-                    "pniyujviyl"))
-                .withQuotaSizeInKiBs(2574413464596771769L)
+            new VolumeQuotaRuleInner().withLocation("zrnw")
+                .withTags(mapOf("lwbtlhf", "ndfpwpj", "dhszfjv", "sj", "qmqhldvriii", "bgofeljag"))
+                .withQuotaSizeInKiBs(496662249945843080L)
                 .withQuotaType(Type.DEFAULT_USER_QUOTA)
-                .withQuotaTarget("orgguf")));
+                .withQuotaTarget("zpfrla"),
+            new VolumeQuotaRuleInner().withLocation("qxujxukndxd")
+                .withTags(mapOf("yqtfihwh", "jguufzdm", "gamv", "otzi", "dphqamv", "phoszqz", "vtbvkayh", "kfwynw"))
+                .withQuotaSizeInKiBs(8756648845252646804L)
+                .withQuotaType(Type.INDIVIDUAL_GROUP_QUOTA)
+                .withQuotaTarget("qs")));
         model = BinaryData.fromObject(model).toObject(VolumeQuotaRulesList.class);
-        Assertions.assertEquals("knpirgnepttwq", model.value().get(0).location());
-        Assertions.assertEquals("iffcdmqnrojlpijn", model.value().get(0).tags().get("rxfrddhc"));
-        Assertions.assertEquals(5516945390083190100L, model.value().get(0).quotaSizeInKiBs());
-        Assertions.assertEquals(Type.INDIVIDUAL_GROUP_QUOTA, model.value().get(0).quotaType());
-        Assertions.assertEquals("seinqfiuf", model.value().get(0).quotaTarget());
+        Assertions.assertEquals("zrnw", model.value().get(0).location());
+        Assertions.assertEquals("ndfpwpj", model.value().get(0).tags().get("lwbtlhf"));
+        Assertions.assertEquals(496662249945843080L, model.value().get(0).quotaSizeInKiBs());
+        Assertions.assertEquals(Type.DEFAULT_USER_QUOTA, model.value().get(0).quotaType());
+        Assertions.assertEquals("zpfrla", model.value().get(0).quotaTarget());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesPropertiesTests.java
index 9cc6e993fe0a..40d554de377a 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeQuotaRulesPropertiesTests.java
@@ -13,21 +13,21 @@ public final class VolumeQuotaRulesPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeQuotaRulesProperties model = BinaryData.fromString(
-            "{\"provisioningState\":\"Failed\",\"quotaSizeInKiBs\":4113630630290274938,\"quotaType\":\"DefaultGroupQuota\",\"quotaTarget\":\"xjvfoimwksl\"}")
+            "{\"provisioningState\":\"Updating\",\"quotaSizeInKiBs\":9200667924935240148,\"quotaType\":\"IndividualUserQuota\",\"quotaTarget\":\"rryuzhlhkjo\"}")
             .toObject(VolumeQuotaRulesProperties.class);
-        Assertions.assertEquals(4113630630290274938L, model.quotaSizeInKiBs());
-        Assertions.assertEquals(Type.DEFAULT_GROUP_QUOTA, model.quotaType());
-        Assertions.assertEquals("xjvfoimwksl", model.quotaTarget());
+        Assertions.assertEquals(9200667924935240148L, model.quotaSizeInKiBs());
+        Assertions.assertEquals(Type.INDIVIDUAL_USER_QUOTA, model.quotaType());
+        Assertions.assertEquals("rryuzhlhkjo", model.quotaTarget());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeQuotaRulesProperties model = new VolumeQuotaRulesProperties().withQuotaSizeInKiBs(4113630630290274938L)
-            .withQuotaType(Type.DEFAULT_GROUP_QUOTA)
-            .withQuotaTarget("xjvfoimwksl");
+        VolumeQuotaRulesProperties model = new VolumeQuotaRulesProperties().withQuotaSizeInKiBs(9200667924935240148L)
+            .withQuotaType(Type.INDIVIDUAL_USER_QUOTA)
+            .withQuotaTarget("rryuzhlhkjo");
         model = BinaryData.fromObject(model).toObject(VolumeQuotaRulesProperties.class);
-        Assertions.assertEquals(4113630630290274938L, model.quotaSizeInKiBs());
-        Assertions.assertEquals(Type.DEFAULT_GROUP_QUOTA, model.quotaType());
-        Assertions.assertEquals("xjvfoimwksl", model.quotaTarget());
+        Assertions.assertEquals(9200667924935240148L, model.quotaSizeInKiBs());
+        Assertions.assertEquals(Type.INDIVIDUAL_USER_QUOTA, model.quotaType());
+        Assertions.assertEquals("rryuzhlhkjo", model.quotaTarget());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRelocationPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRelocationPropertiesTests.java
index 0b7aea353d34..1a72c26b6b51 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRelocationPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRelocationPropertiesTests.java
@@ -12,15 +12,15 @@ public final class VolumeRelocationPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeRelocationProperties model
-            = BinaryData.fromString("{\"relocationRequested\":false,\"readyToBeFinalized\":true}")
+            = BinaryData.fromString("{\"relocationRequested\":true,\"readyToBeFinalized\":false}")
                 .toObject(VolumeRelocationProperties.class);
-        Assertions.assertFalse(model.relocationRequested());
+        Assertions.assertTrue(model.relocationRequested());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeRelocationProperties model = new VolumeRelocationProperties().withRelocationRequested(false);
+        VolumeRelocationProperties model = new VolumeRelocationProperties().withRelocationRequested(true);
         model = BinaryData.fromObject(model).toObject(VolumeRelocationProperties.class);
-        Assertions.assertFalse(model.relocationRequested());
+        Assertions.assertTrue(model.relocationRequested());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRevertTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRevertTests.java
index 00aedbe75841..75c60f02ecfe 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRevertTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeRevertTests.java
@@ -11,14 +11,14 @@
 public final class VolumeRevertTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        VolumeRevert model = BinaryData.fromString("{\"snapshotId\":\"sjswsrms\"}").toObject(VolumeRevert.class);
-        Assertions.assertEquals("sjswsrms", model.snapshotId());
+        VolumeRevert model = BinaryData.fromString("{\"snapshotId\":\"ggkzzlvmbmpa\"}").toObject(VolumeRevert.class);
+        Assertions.assertEquals("ggkzzlvmbmpa", model.snapshotId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeRevert model = new VolumeRevert().withSnapshotId("sjswsrms");
+        VolumeRevert model = new VolumeRevert().withSnapshotId("ggkzzlvmbmpa");
         model = BinaryData.fromObject(model).toObject(VolumeRevert.class);
-        Assertions.assertEquals("sjswsrms", model.snapshotId());
+        Assertions.assertEquals("ggkzzlvmbmpa", model.snapshotId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeSnapshotPropertiesTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeSnapshotPropertiesTests.java
index d786e2179380..a88d12f968f2 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeSnapshotPropertiesTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumeSnapshotPropertiesTests.java
@@ -12,14 +12,14 @@ public final class VolumeSnapshotPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VolumeSnapshotProperties model
-            = BinaryData.fromString("{\"snapshotPolicyId\":\"bm\"}").toObject(VolumeSnapshotProperties.class);
-        Assertions.assertEquals("bm", model.snapshotPolicyId());
+            = BinaryData.fromString("{\"snapshotPolicyId\":\"twss\"}").toObject(VolumeSnapshotProperties.class);
+        Assertions.assertEquals("twss", model.snapshotPolicyId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        VolumeSnapshotProperties model = new VolumeSnapshotProperties().withSnapshotPolicyId("bm");
+        VolumeSnapshotProperties model = new VolumeSnapshotProperties().withSnapshotPolicyId("twss");
         model = BinaryData.fromObject(model).toObject(VolumeSnapshotProperties.class);
-        Assertions.assertEquals("bm", model.snapshotPolicyId());
+        Assertions.assertEquals("twss", model.snapshotPolicyId());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationMockTests.java
index 15f96ee29008..4d04eb63e27b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeExternalReplicationMockTests.java
@@ -20,7 +20,7 @@
 public final class VolumesAuthorizeExternalReplicationMockTests {
     @Test
     public void testAuthorizeExternalReplication() throws Exception {
-        String responseStr = "{\"svmPeeringCommand\":\"gbqi\"}";
+        String responseStr = "{\"svmPeeringCommand\":\"n\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,9 +30,9 @@ public void testAuthorizeExternalReplication() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         SvmPeerCommandResponse response = manager.volumes()
-            .authorizeExternalReplication("qihebw", "swbzuwfmdurage", "izvcjfe", "isdju",
+            .authorizeExternalReplication("bzjedmstk", "nlvxbcuii", "nktwfansnvpdibmi", "ostbzbkiwb",
                 com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("gbqi", response.svmPeeringCommand());
+        Assertions.assertEquals("n", response.svmPeeringCommand());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationMockTests.java
index 43178f8cb9c4..360f64602360 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesAuthorizeReplicationMockTests.java
@@ -29,8 +29,8 @@ public void testAuthorizeReplication() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .authorizeReplication("gzwywak", "ihknsmjbl", "ljhlnymzotq", "ryuzcbmqqv",
-                new AuthorizeRequest().withRemoteVolumeResourceId("vwf"), com.azure.core.util.Context.NONE);
+            .authorizeReplication("iiqbi", "htmwwinh", "hfqpofv", "bcblemb",
+                new AuthorizeRequest().withRemoteVolumeResourceId("bwvqvxkdi"), com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksMockTests.java
index 5b448484c18e..e294846daaea 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakFileLocksMockTests.java
@@ -29,8 +29,8 @@ public void testBreakFileLocks() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .breakFileLocks("chndbnwie", "olewjwi", "ubwefqs", "ap",
-                new BreakFileLocksRequest().withClientIp("tf").withConfirmRunningDisruptiveOperation(true),
+            .breakFileLocks("opqhewjptmc", "sbostzel", "dlat", "tmzlbiojlv",
+                new BreakFileLocksRequest().withClientIp("rbbpneqvcwwyy").withConfirmRunningDisruptiveOperation(true),
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationMockTests.java
index 14bbee959842..ce67c397c621 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesBreakReplicationMockTests.java
@@ -29,8 +29,8 @@ public void testBreakReplication() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .breakReplication("mcjn", "zqdqxt", "jw", "nyfusfzsvtuikzh",
-                new BreakReplicationRequest().withForceBreakReplication(true), com.azure.core.util.Context.NONE);
+            .breakReplication("s", "yrio", "vzidsxwaab", "mifrygznmma",
+                new BreakReplicationRequest().withForceBreakReplication(false), com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationMockTests.java
index c84dc5d430fd..dbfa3d33a44c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesDeleteReplicationMockTests.java
@@ -28,7 +28,7 @@ public void testDeleteReplication() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .deleteReplication("kqscazuawxtzx", "uamwabzxrvxc", "s", "sphaivmxyasflvg",
+            .deleteReplication("ujlzqnhcvsqltn", "oibgsxg", "xfyqonmpqoxwdo", "dbxiqx",
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationMockTests.java
index df88cbb736ed..3943511abea6 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesFinalizeRelocationMockTests.java
@@ -27,9 +27,7 @@ public void testFinalizeRelocation() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.volumes()
-            .finalizeRelocation("ophzfylsgcrp", "bcunezzceze", "fwyfwlwxjwet", "psihcla",
-                com.azure.core.util.Context.NONE);
+        manager.volumes().finalizeRelocation("wwp", "jx", "nptfujgi", "gaao", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserMockTests.java
index cb152aee75c7..14b831fe4d3e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListGetGroupIdListForLdapUserMockTests.java
@@ -21,8 +21,7 @@
 public final class VolumesListGetGroupIdListForLdapUserMockTests {
     @Test
     public void testListGetGroupIdListForLdapUser() throws Exception {
-        String responseStr
-            = "{\"groupIdsForLdapUser\":[\"btqwpwyawbzas\",\"bucljgkyexaogu\",\"aipidsdaultxi\",\"jumfqwazlnq\"]}";
+        String responseStr = "{\"groupIdsForLdapUser\":[\"ap\",\"qtferrqwexjkmf\",\"apjwogqqnobpudcd\"]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,9 +31,9 @@ public void testListGetGroupIdListForLdapUser() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         GetGroupIdListForLdapUserResponse response = manager.volumes()
-            .listGetGroupIdListForLdapUser("q", "ex", "kmfx", "pjwogqqno",
-                new GetGroupIdListForLdapUserRequest().withUsername("pud"), com.azure.core.util.Context.NONE);
+            .listGetGroupIdListForLdapUser("ochpprpr", "nmokayzejnhlbk", "bzpcpiljhahzvec", "ndbnwieh",
+                new GetGroupIdListForLdapUserRequest().withUsername("lewjwiuubwef"), com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("btqwpwyawbzas", response.groupIdsForLdapUser().get(0));
+        Assertions.assertEquals("ap", response.groupIdsForLdapUser().get(0));
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListQuotaReportMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListQuotaReportMockTests.java
new file mode 100644
index 000000000000..52f803a96a41
--- /dev/null
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListQuotaReportMockTests.java
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.netapp.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
+import com.azure.resourcemanager.netapp.models.ListQuotaReportResponse;
+import com.azure.resourcemanager.netapp.models.Type;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class VolumesListQuotaReportMockTests {
+    @Test
+    public void testListQuotaReport() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"quotaType\":\"DefaultUserQuota\",\"quotaTarget\":\"zqdqxt\",\"quotaLimitUsedInKiBs\":6287732006458517592,\"quotaLimitTotalInKiBs\":2893338623366966580,\"percentageUsed\":10.898357,\"isDerivedQuota\":true},{\"quotaType\":\"IndividualUserQuota\",\"quotaTarget\":\"uik\",\"quotaLimitUsedInKiBs\":7886043925821923309,\"quotaLimitTotalInKiBs\":6452147471355395920,\"percentageUsed\":10.355675,\"isDerivedQuota\":true},{\"quotaType\":\"IndividualUserQuota\",\"quotaTarget\":\"ryxynqnzrd\",\"quotaLimitUsedInKiBs\":3232521207125821036,\"quotaLimitTotalInKiBs\":3377551222466265483,\"percentageUsed\":69.74501,\"isDerivedQuota\":true},{\"quotaType\":\"IndividualGroupQuota\",\"quotaTarget\":\"ybbabpfhvfsl\",\"quotaLimitUsedInKiBs\":4611734614609465007,\"quotaLimitTotalInKiBs\":2580697924370368031,\"percentageUsed\":67.33186,\"isDerivedQuota\":true}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        NetAppFilesManager manager = NetAppFilesManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        ListQuotaReportResponse response = manager.volumes()
+            .listQuotaReport("btqwpwyawbzas", "bucljgkyexaogu", "aipidsdaultxi", "jumfqwazlnq",
+                com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals(Type.DEFAULT_USER_QUOTA, response.value().get(0).quotaType());
+        Assertions.assertEquals("zqdqxt", response.value().get(0).quotaTarget());
+        Assertions.assertEquals(6287732006458517592L, response.value().get(0).quotaLimitUsedInKiBs());
+        Assertions.assertEquals(2893338623366966580L, response.value().get(0).quotaLimitTotalInKiBs());
+        Assertions.assertEquals(10.898357F, response.value().get(0).percentageUsed());
+        Assertions.assertTrue(response.value().get(0).isDerivedQuota());
+    }
+}
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsMockTests.java
index 0014491aec91..ec016e7778d1 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesListReplicationsMockTests.java
@@ -24,7 +24,7 @@ public final class VolumesListReplicationsMockTests {
     @Test
     public void testListReplications() throws Exception {
         String responseStr
-            = "{\"value\":[{\"replicationId\":\"phslhcawjutifdw\",\"endpointType\":\"dst\",\"replicationSchedule\":\"daily\",\"remoteVolumeResourceId\":\"orq\",\"remoteVolumeRegion\":\"ttzhra\"}]}";
+            = "{\"value\":[{\"replicationId\":\"amwabzxrvxcushsp\",\"endpointType\":\"dst\",\"replicationSchedule\":\"daily\",\"remoteVolumeResourceId\":\"xyasflvgsgzw\",\"remoteVolumeRegion\":\"akoi\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,12 +34,11 @@ public void testListReplications() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<Replication> response = manager.volumes()
-            .listReplications("mifrygznmma", "ri", "kzobgopxlhsln", "lxieixynllxecwcr",
-                com.azure.core.util.Context.NONE);
+            .listReplications("opmx", "lnwcltyjed", "xxmlfmkqscazua", "xtzx", com.azure.core.util.Context.NONE);
 
         Assertions.assertEquals(EndpointType.DST, response.iterator().next().endpointType());
         Assertions.assertEquals(ReplicationSchedule.DAILY, response.iterator().next().replicationSchedule());
-        Assertions.assertEquals("orq", response.iterator().next().remoteVolumeResourceId());
-        Assertions.assertEquals("ttzhra", response.iterator().next().remoteVolumeRegion());
+        Assertions.assertEquals("xyasflvgsgzw", response.iterator().next().remoteVolumeResourceId());
+        Assertions.assertEquals("akoi", response.iterator().next().remoteVolumeRegion());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterMockTests.java
index 6e4c66991ff6..4d63c7f653b3 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPeerExternalClusterMockTests.java
@@ -22,7 +22,7 @@
 public final class VolumesPeerExternalClusterMockTests {
     @Test
     public void testPeerExternalCluster() throws Exception {
-        String responseStr = "{\"peerAcceptCommand\":\"lembnkbwvqvxkdi\"}";
+        String responseStr = "{\"peerAcceptCommand\":\"rz\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,10 +32,10 @@ public void testPeerExternalCluster() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ClusterPeerCommandResponse response = manager.volumes()
-            .peerExternalCluster("xfyqonmpqoxwdo", "dbxiqx", "iiqbi", "htmwwinh",
-                new PeerClusterForVolumeMigrationRequest().withPeerIpAddresses(Arrays.asList("f", "pofvwb")),
+            .peerExternalCluster("ggbqi", "kxkbsazgakgacyr", "m", "dmspof",
+                new PeerClusterForVolumeMigrationRequest().withPeerIpAddresses(Arrays.asList("vuhrylni")),
                 com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("lembnkbwvqvxkdi", response.peerAcceptCommand());
+        Assertions.assertEquals("rz", response.peerAcceptCommand());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeMockTests.java
index b5bb4fb4227f..48fadeba177c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesPoolChangeMockTests.java
@@ -29,8 +29,8 @@ public void testPoolChange() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .poolChange("kxkbsazgakgacyr", "m", "dmspof", "pv", new PoolChangeRequest().withNewPoolResourceId("hryl"),
-                com.azure.core.util.Context.NONE);
+            .poolChange("ophzfylsgcrp", "bcunezzceze", "fwyfwlwxjwet", "psihcla",
+                new PoolChangeRequest().withNewPoolResourceId("zvaylptrsqqw"), com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationMockTests.java
index 92c11c3bcd1b..18210555dcee 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReInitializeReplicationMockTests.java
@@ -28,7 +28,7 @@ public void testReInitializeReplication() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .reInitializeReplication("tayx", "nsup", "ujlzqnhcvsqltn", "oibgsxg", com.azure.core.util.Context.NONE);
+            .reInitializeReplication("qihebw", "swbzuwfmdurage", "izvcjfe", "isdju", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusWithResponseMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusWithResponseMockTests.java
index e5f380fa631e..6c3755d163df 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusWithResponseMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesReplicationStatusWithResponseMockTests.java
@@ -10,7 +10,6 @@
 import com.azure.core.models.AzureCloud;
 import com.azure.core.test.http.MockHttpResponse;
 import com.azure.resourcemanager.netapp.NetAppFilesManager;
-import com.azure.resourcemanager.netapp.models.MirrorState;
 import com.azure.resourcemanager.netapp.models.RelationshipStatus;
 import com.azure.resourcemanager.netapp.models.ReplicationStatus;
 import java.nio.charset.StandardCharsets;
@@ -23,7 +22,7 @@ public final class VolumesReplicationStatusWithResponseMockTests {
     @Test
     public void testReplicationStatusWithResponse() throws Exception {
         String responseStr
-            = "{\"healthy\":false,\"relationshipStatus\":\"Failed\",\"mirrorState\":\"Mirrored\",\"totalProgress\":\"lrigjkskyri\",\"errorMessage\":\"vzidsxwaab\"}";
+            = "{\"healthy\":true,\"relationshipStatus\":\"Transferring\",\"mirrorState\":\"Mirrored\",\"totalProgress\":\"igorqjbttzhragl\",\"errorMessage\":\"fhonqjujeickpzvc\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,14 +32,13 @@ public void testReplicationStatusWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ReplicationStatus response = manager.volumes()
-            .replicationStatusWithResponse("glcfhmlrqryxyn", "nzrdpsovwxz", "ptgoeiybbabp", "hv",
+            .replicationStatusWithResponse("zkzobgopxlhslnel", "ieixynllxe", "wcrojphslhcaw", "u",
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertFalse(response.healthy());
-        Assertions.assertEquals(RelationshipStatus.FAILED, response.relationshipStatus());
-        Assertions.assertEquals(MirrorState.MIRRORED, response.mirrorState());
-        Assertions.assertEquals("lrigjkskyri", response.totalProgress());
-        Assertions.assertEquals("vzidsxwaab", response.errorMessage());
+        Assertions.assertTrue(response.healthy());
+        Assertions.assertEquals(RelationshipStatus.TRANSFERRING, response.relationshipStatus());
+        Assertions.assertEquals("igorqjbttzhragl", response.totalProgress());
+        Assertions.assertEquals("fhonqjujeickpzvc", response.errorMessage());
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationMockTests.java
index f41b07c6ceec..1b392dd959f7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesResyncReplicationMockTests.java
@@ -28,7 +28,8 @@ public void testResyncReplication() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .resyncReplication("lkafhonqjuje", "ckpzvcpopmxeln", "clt", "jedexxmlf", com.azure.core.util.Context.NONE);
+            .resyncReplication("knsmjblmljhlnymz", "tqyryuzcbmqqv", "mv", "fgtayxonsup",
+                com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertMockTests.java
index 82befa505d92..e4c92ee1203c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertMockTests.java
@@ -29,8 +29,8 @@ public void testRevert() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .revert("q", "bkwvzg", "zvd", "bzdixzmq", new VolumeRevert().withSnapshotId("odawopqhewjptmcg"),
-                com.azure.core.util.Context.NONE);
+            .revert("ibcysihsgqc", "dhohsdtmcdzsuf", "ohdxbzlmcmu", "pcvhdbevwqqxeys",
+                new VolumeRevert().withSnapshotId("nqzi"), com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationMockTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationMockTests.java
index 877d88f1be18..2529bc419ea9 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationMockTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/VolumesRevertRelocationMockTests.java
@@ -28,7 +28,7 @@ public void testRevertRelocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.volumes()
-            .revertRelocation("zvaylptrsqqw", "tcmwqkchc", "waxfewzjkj", "xfdeqvhpsyl",
+            .revertRelocation("pttaqutd", "wemxswvruunzz", "gehkfkimrtixokff", "yinljqe",
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/WeeklyScheduleTests.java b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/WeeklyScheduleTests.java
index d8b31252fe4e..e39f9da53dd2 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/WeeklyScheduleTests.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/test/java/com/azure/resourcemanager/netapp/generated/WeeklyScheduleTests.java
@@ -12,27 +12,27 @@ public final class WeeklyScheduleTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         WeeklySchedule model = BinaryData.fromString(
-            "{\"snapshotsToKeep\":860507177,\"day\":\"ejhzisxg\",\"hour\":1767346003,\"minute\":1351567723,\"usedBytes\":555329664048541191}")
+            "{\"snapshotsToKeep\":214137082,\"day\":\"msbvdkcrodtjinf\",\"hour\":1492452539,\"minute\":274733430,\"usedBytes\":3850222588525127321}")
             .toObject(WeeklySchedule.class);
-        Assertions.assertEquals(860507177, model.snapshotsToKeep());
-        Assertions.assertEquals("ejhzisxg", model.day());
-        Assertions.assertEquals(1767346003, model.hour());
-        Assertions.assertEquals(1351567723, model.minute());
-        Assertions.assertEquals(555329664048541191L, model.usedBytes());
+        Assertions.assertEquals(214137082, model.snapshotsToKeep());
+        Assertions.assertEquals("msbvdkcrodtjinf", model.day());
+        Assertions.assertEquals(1492452539, model.hour());
+        Assertions.assertEquals(274733430, model.minute());
+        Assertions.assertEquals(3850222588525127321L, model.usedBytes());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        WeeklySchedule model = new WeeklySchedule().withSnapshotsToKeep(860507177)
-            .withDay("ejhzisxg")
-            .withHour(1767346003)
-            .withMinute(1351567723)
-            .withUsedBytes(555329664048541191L);
+        WeeklySchedule model = new WeeklySchedule().withSnapshotsToKeep(214137082)
+            .withDay("msbvdkcrodtjinf")
+            .withHour(1492452539)
+            .withMinute(274733430)
+            .withUsedBytes(3850222588525127321L);
         model = BinaryData.fromObject(model).toObject(WeeklySchedule.class);
-        Assertions.assertEquals(860507177, model.snapshotsToKeep());
-        Assertions.assertEquals("ejhzisxg", model.day());
-        Assertions.assertEquals(1767346003, model.hour());
-        Assertions.assertEquals(1351567723, model.minute());
-        Assertions.assertEquals(555329664048541191L, model.usedBytes());
+        Assertions.assertEquals(214137082, model.snapshotsToKeep());
+        Assertions.assertEquals("msbvdkcrodtjinf", model.day());
+        Assertions.assertEquals(1492452539, model.hour());
+        Assertions.assertEquals(274733430, model.minute());
+        Assertions.assertEquals(3850222588525127321L, model.usedBytes());
     }
 }
diff --git a/sdk/network/azure-resourcemanager-network/CHANGELOG.md b/sdk/network/azure-resourcemanager-network/CHANGELOG.md
index 4f06e319f405..bc60081483c3 100644
--- a/sdk/network/azure-resourcemanager-network/CHANGELOG.md
+++ b/sdk/network/azure-resourcemanager-network/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 2.54.0-beta.1 (Unreleased)
+## 2.55.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,18 @@
 
 ### Other Changes
 
+## 2.54.0 (2025-10-13)
+
+### Bugs Fixed
+
+- Fixed a bug that `ApplicationGateway.availabilityZones()` throws exception.
+
+### Other Changes
+
+#### Dependency Updates
+
+- Updated `api-version` to `2024-10-01`.
+
 ## 2.53.4 (2025-09-24)
 
 ### Other Changes
diff --git a/sdk/network/azure-resourcemanager-network/README.md b/sdk/network/azure-resourcemanager-network/README.md
index 72a47b22ad47..6d91a39e46eb 100644
--- a/sdk/network/azure-resourcemanager-network/README.md
+++ b/sdk/network/azure-resourcemanager-network/README.md
@@ -18,7 +18,7 @@ For documentation on how to use this package, please see [Azure Management Libra
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-network</artifactId>
-    <version>2.53.3</version>
+    <version>2.54.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/network/azure-resourcemanager-network/assets.json b/sdk/network/azure-resourcemanager-network/assets.json
index c0eb8a466a90..c0a1ccb031ca 100644
--- a/sdk/network/azure-resourcemanager-network/assets.json
+++ b/sdk/network/azure-resourcemanager-network/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/network/azure-resourcemanager-network",
-  "Tag": "java/network/azure-resourcemanager-network_3f51b0e6d8"
+  "Tag": "java/network/azure-resourcemanager-network_e635b5da2b"
 }
diff --git a/sdk/network/azure-resourcemanager-network/pom.xml b/sdk/network/azure-resourcemanager-network/pom.xml
index 29e06cebdb6b..62ec9cc74759 100644
--- a/sdk/network/azure-resourcemanager-network/pom.xml
+++ b/sdk/network/azure-resourcemanager-network/pom.xml
@@ -14,7 +14,7 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-network</artifactId>
-  <version>2.54.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
+  <version>2.55.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Network Management</name>
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/AzureFirewallsClient.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/AzureFirewallsClient.java
index a68e8249949a..563b05f3afc7 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/AzureFirewallsClient.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/AzureFirewallsClient.java
@@ -14,6 +14,7 @@
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.network.fluent.models.AzureFirewallInner;
+import com.azure.resourcemanager.network.fluent.models.AzureFirewallPacketCaptureResponseInner;
 import com.azure.resourcemanager.network.fluent.models.IpPrefixesListInner;
 import com.azure.resourcemanager.network.models.FirewallPacketCaptureParameters;
 import com.azure.resourcemanager.network.models.TagsObject;
@@ -657,4 +658,115 @@ Mono<Void> packetCaptureAsync(String resourceGroupName, String azureFirewallName
     @ServiceMethod(returns = ReturnType.SINGLE)
     void packetCapture(String resourceGroupName, String azureFirewallName, FirewallPacketCaptureParameters parameters,
         Context context);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<Flux<ByteBuffer>>> packetCaptureOperationWithResponseAsync(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    PollerFlux<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperationAsync(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperation(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperation(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters, Context context);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<AzureFirewallPacketCaptureResponseInner> packetCaptureOperationAsync(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    AzureFirewallPacketCaptureResponseInner packetCaptureOperation(String resourceGroupName, String azureFirewallName,
+        FirewallPacketCaptureParameters parameters);
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    AzureFirewallPacketCaptureResponseInner packetCaptureOperation(String resourceGroupName, String azureFirewallName,
+        FirewallPacketCaptureParameters parameters, Context context);
 }
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkManagementClient.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkManagementClient.java
index b61e6d57c26a..d6a23a81934f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkManagementClient.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkManagementClient.java
@@ -692,6 +692,13 @@ public interface NetworkManagementClient {
      */
     NetworkSecurityPerimeterOperationStatusesClient getNetworkSecurityPerimeterOperationStatuses();
 
+    /**
+     * Gets the NetworkSecurityPerimeterServiceTagsClient object to access its operations.
+     * 
+     * @return the NetworkSecurityPerimeterServiceTagsClient object.
+     */
+    NetworkSecurityPerimeterServiceTagsClient getNetworkSecurityPerimeterServiceTags();
+
     /**
      * Gets the ReachabilityAnalysisIntentsClient object to access its operations.
      * 
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkSecurityPerimeterServiceTagsClient.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkSecurityPerimeterServiceTagsClient.java
new file mode 100644
index 000000000000..4bcf0f1853ed
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/NetworkSecurityPerimeterServiceTagsClient.java
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.network.fluent.models.NspServiceTagsResourceInner;
+
+/**
+ * An instance of this class provides access to all the operations defined in NetworkSecurityPerimeterServiceTagsClient.
+ */
+public interface NetworkSecurityPerimeterServiceTagsClient {
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<NspServiceTagsResourceInner> listAsync(String location);
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NspServiceTagsResourceInner> list(String location);
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NspServiceTagsResourceInner> list(String location, Context context);
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VirtualNetworkGatewaysClient.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VirtualNetworkGatewaysClient.java
index 9fb469b4ed7b..5ad92404a13a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VirtualNetworkGatewaysClient.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VirtualNetworkGatewaysClient.java
@@ -19,6 +19,7 @@
 import com.azure.resourcemanager.network.fluent.models.GatewayResiliencyInformationInner;
 import com.azure.resourcemanager.network.fluent.models.GatewayRouteListResultInner;
 import com.azure.resourcemanager.network.fluent.models.GatewayRouteSetsInformationInner;
+import com.azure.resourcemanager.network.fluent.models.RadiusAuthServerListResultInner;
 import com.azure.resourcemanager.network.fluent.models.VirtualNetworkGatewayConnectionListEntityInner;
 import com.azure.resourcemanager.network.fluent.models.VirtualNetworkGatewayInner;
 import com.azure.resourcemanager.network.fluent.models.VpnClientConnectionHealthDetailListResultInner;
@@ -1241,6 +1242,63 @@ Response<String> supportedVpnDevicesWithResponse(String resourceGroupName, Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     String supportedVpnDevices(String resourceGroupName, String virtualNetworkGatewayName);
 
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecretsWithResponseAsync(String resourceGroupName,
+        String virtualNetworkGatewayName);
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<RadiusAuthServerListResultInner> listRadiusSecretsAsync(String resourceGroupName,
+        String virtualNetworkGatewayName);
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<RadiusAuthServerListResultInner> listRadiusSecretsWithResponse(String resourceGroupName,
+        String virtualNetworkGatewayName, Context context);
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    RadiusAuthServerListResultInner listRadiusSecrets(String resourceGroupName, String virtualNetworkGatewayName);
+
     /**
      * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from
      * BGP peers.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VpnServerConfigurationsClient.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VpnServerConfigurationsClient.java
index a6324a51567d..64d1b6bd10ed 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VpnServerConfigurationsClient.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/VpnServerConfigurationsClient.java
@@ -13,6 +13,7 @@
 import com.azure.core.util.Context;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.network.fluent.models.RadiusAuthServerListResultInner;
 import com.azure.resourcemanager.network.fluent.models.VpnServerConfigurationInner;
 import com.azure.resourcemanager.network.models.TagsObject;
 import com.azure.resourcemanager.resources.fluentcore.collection.InnerSupportsDelete;
@@ -419,4 +420,61 @@ SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<VpnServerConfigurationInner> list(Context context);
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecretsWithResponseAsync(String resourceGroupName,
+        String vpnServerConfigurationName);
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<RadiusAuthServerListResultInner> listRadiusSecretsAsync(String resourceGroupName,
+        String vpnServerConfigurationName);
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<RadiusAuthServerListResultInner> listRadiusSecretsWithResponse(String resourceGroupName,
+        String vpnServerConfigurationName, Context context);
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    RadiusAuthServerListResultInner listRadiusSecrets(String resourceGroupName, String vpnServerConfigurationName);
 }
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/ApplicationGatewayBackendHttpSettingsPropertiesFormat.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/ApplicationGatewayBackendHttpSettingsPropertiesFormat.java
index 8902fa0ba99c..f4904cac1e60 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/ApplicationGatewayBackendHttpSettingsPropertiesFormat.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/ApplicationGatewayBackendHttpSettingsPropertiesFormat.java
@@ -90,6 +90,29 @@ public final class ApplicationGatewayBackendHttpSettingsPropertiesFormat
      */
     private String path;
 
+    /*
+     * Enable or disable dedicated connection per backend server. Default is set to false.
+     */
+    private Boolean dedicatedBackendConnection;
+
+    /*
+     * Verify or skip both chain and expiry validations of the certificate on the backend server. Default is set to
+     * true.
+     */
+    private Boolean validateCertChainAndExpiry;
+
+    /*
+     * When enabled, verifies if the Common Name of the certificate provided by the backend server matches the Server
+     * Name Indication (SNI) value. Default value is true.
+     */
+    private Boolean validateSni;
+
+    /*
+     * Specify an SNI value to match the common name of the certificate on the backend. By default, the application
+     * gateway uses the incoming request’s host header as the SNI. Default value is null.
+     */
+    private String sniName;
+
     /*
      * The provisioning state of the backend HTTP settings resource.
      */
@@ -374,6 +397,96 @@ public ApplicationGatewayBackendHttpSettingsPropertiesFormat withPath(String pat
         return this;
     }
 
+    /**
+     * Get the dedicatedBackendConnection property: Enable or disable dedicated connection per backend server. Default
+     * is set to false.
+     * 
+     * @return the dedicatedBackendConnection value.
+     */
+    public Boolean dedicatedBackendConnection() {
+        return this.dedicatedBackendConnection;
+    }
+
+    /**
+     * Set the dedicatedBackendConnection property: Enable or disable dedicated connection per backend server. Default
+     * is set to false.
+     * 
+     * @param dedicatedBackendConnection the dedicatedBackendConnection value to set.
+     * @return the ApplicationGatewayBackendHttpSettingsPropertiesFormat object itself.
+     */
+    public ApplicationGatewayBackendHttpSettingsPropertiesFormat
+        withDedicatedBackendConnection(Boolean dedicatedBackendConnection) {
+        this.dedicatedBackendConnection = dedicatedBackendConnection;
+        return this;
+    }
+
+    /**
+     * Get the validateCertChainAndExpiry property: Verify or skip both chain and expiry validations of the certificate
+     * on the backend server. Default is set to true.
+     * 
+     * @return the validateCertChainAndExpiry value.
+     */
+    public Boolean validateCertChainAndExpiry() {
+        return this.validateCertChainAndExpiry;
+    }
+
+    /**
+     * Set the validateCertChainAndExpiry property: Verify or skip both chain and expiry validations of the certificate
+     * on the backend server. Default is set to true.
+     * 
+     * @param validateCertChainAndExpiry the validateCertChainAndExpiry value to set.
+     * @return the ApplicationGatewayBackendHttpSettingsPropertiesFormat object itself.
+     */
+    public ApplicationGatewayBackendHttpSettingsPropertiesFormat
+        withValidateCertChainAndExpiry(Boolean validateCertChainAndExpiry) {
+        this.validateCertChainAndExpiry = validateCertChainAndExpiry;
+        return this;
+    }
+
+    /**
+     * Get the validateSni property: When enabled, verifies if the Common Name of the certificate provided by the
+     * backend server matches the Server Name Indication (SNI) value. Default value is true.
+     * 
+     * @return the validateSni value.
+     */
+    public Boolean validateSni() {
+        return this.validateSni;
+    }
+
+    /**
+     * Set the validateSni property: When enabled, verifies if the Common Name of the certificate provided by the
+     * backend server matches the Server Name Indication (SNI) value. Default value is true.
+     * 
+     * @param validateSni the validateSni value to set.
+     * @return the ApplicationGatewayBackendHttpSettingsPropertiesFormat object itself.
+     */
+    public ApplicationGatewayBackendHttpSettingsPropertiesFormat withValidateSni(Boolean validateSni) {
+        this.validateSni = validateSni;
+        return this;
+    }
+
+    /**
+     * Get the sniName property: Specify an SNI value to match the common name of the certificate on the backend. By
+     * default, the application gateway uses the incoming request’s host header as the SNI. Default value is null.
+     * 
+     * @return the sniName value.
+     */
+    public String sniName() {
+        return this.sniName;
+    }
+
+    /**
+     * Set the sniName property: Specify an SNI value to match the common name of the certificate on the backend. By
+     * default, the application gateway uses the incoming request’s host header as the SNI. Default value is null.
+     * 
+     * @param sniName the sniName value to set.
+     * @return the ApplicationGatewayBackendHttpSettingsPropertiesFormat object itself.
+     */
+    public ApplicationGatewayBackendHttpSettingsPropertiesFormat withSniName(String sniName) {
+        this.sniName = sniName;
+        return this;
+    }
+
     /**
      * Get the provisioningState property: The provisioning state of the backend HTTP settings resource.
      * 
@@ -416,6 +529,10 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("affinityCookieName", this.affinityCookieName);
         jsonWriter.writeBooleanField("probeEnabled", this.probeEnabled);
         jsonWriter.writeStringField("path", this.path);
+        jsonWriter.writeBooleanField("dedicatedBackendConnection", this.dedicatedBackendConnection);
+        jsonWriter.writeBooleanField("validateCertChainAndExpiry", this.validateCertChainAndExpiry);
+        jsonWriter.writeBooleanField("validateSNI", this.validateSni);
+        jsonWriter.writeStringField("sniName", this.sniName);
         return jsonWriter.writeEndObject();
     }
 
@@ -477,6 +594,17 @@ public static ApplicationGatewayBackendHttpSettingsPropertiesFormat fromJson(Jso
                         = reader.getNullable(JsonReader::getBoolean);
                 } else if ("path".equals(fieldName)) {
                     deserializedApplicationGatewayBackendHttpSettingsPropertiesFormat.path = reader.getString();
+                } else if ("dedicatedBackendConnection".equals(fieldName)) {
+                    deserializedApplicationGatewayBackendHttpSettingsPropertiesFormat.dedicatedBackendConnection
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("validateCertChainAndExpiry".equals(fieldName)) {
+                    deserializedApplicationGatewayBackendHttpSettingsPropertiesFormat.validateCertChainAndExpiry
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("validateSNI".equals(fieldName)) {
+                    deserializedApplicationGatewayBackendHttpSettingsPropertiesFormat.validateSni
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("sniName".equals(fieldName)) {
+                    deserializedApplicationGatewayBackendHttpSettingsPropertiesFormat.sniName = reader.getString();
                 } else if ("provisioningState".equals(fieldName)) {
                     deserializedApplicationGatewayBackendHttpSettingsPropertiesFormat.provisioningState
                         = ProvisioningState.fromString(reader.getString());
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallInner.java
index 657c69aaee2e..5c0aab737198 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallInner.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallInner.java
@@ -18,6 +18,7 @@
 import com.azure.resourcemanager.network.models.AzureFirewallNetworkRuleCollection;
 import com.azure.resourcemanager.network.models.AzureFirewallSku;
 import com.azure.resourcemanager.network.models.AzureFirewallThreatIntelMode;
+import com.azure.resourcemanager.network.models.ExtendedLocation;
 import com.azure.resourcemanager.network.models.HubIpAddresses;
 import com.azure.resourcemanager.network.models.ProvisioningState;
 import java.io.IOException;
@@ -34,6 +35,11 @@ public final class AzureFirewallInner extends Resource {
      */
     private AzureFirewallPropertiesFormat innerProperties;
 
+    /*
+     * The extended location of type local virtual network gateway.
+     */
+    private ExtendedLocation extendedLocation;
+
     /*
      * A list of availability zones denoting where the resource needs to come from.
      */
@@ -74,6 +80,26 @@ private AzureFirewallPropertiesFormat innerProperties() {
         return this.innerProperties;
     }
 
+    /**
+     * Get the extendedLocation property: The extended location of type local virtual network gateway.
+     * 
+     * @return the extendedLocation value.
+     */
+    public ExtendedLocation extendedLocation() {
+        return this.extendedLocation;
+    }
+
+    /**
+     * Set the extendedLocation property: The extended location of type local virtual network gateway.
+     * 
+     * @param extendedLocation the extendedLocation value to set.
+     * @return the AzureFirewallInner object itself.
+     */
+    public AzureFirewallInner withExtendedLocation(ExtendedLocation extendedLocation) {
+        this.extendedLocation = extendedLocation;
+        return this;
+    }
+
     /**
      * Get the zones property: A list of availability zones denoting where the resource needs to come from.
      * 
@@ -468,6 +494,9 @@ public void validate() {
         if (innerProperties() != null) {
             innerProperties().validate();
         }
+        if (extendedLocation() != null) {
+            extendedLocation().validate();
+        }
     }
 
     /**
@@ -479,6 +508,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("location", location());
         jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
         jsonWriter.writeJsonField("properties", this.innerProperties);
+        jsonWriter.writeJsonField("extendedLocation", this.extendedLocation);
         jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
         jsonWriter.writeStringField("id", this.id);
         return jsonWriter.writeEndObject();
@@ -511,6 +541,8 @@ public static AzureFirewallInner fromJson(JsonReader jsonReader) throws IOExcept
                     deserializedAzureFirewallInner.withTags(tags);
                 } else if ("properties".equals(fieldName)) {
                     deserializedAzureFirewallInner.innerProperties = AzureFirewallPropertiesFormat.fromJson(reader);
+                } else if ("extendedLocation".equals(fieldName)) {
+                    deserializedAzureFirewallInner.extendedLocation = ExtendedLocation.fromJson(reader);
                 } else if ("zones".equals(fieldName)) {
                     List<String> zones = reader.readArray(reader1 -> reader1.getString());
                     deserializedAzureFirewallInner.zones = zones;
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallPacketCaptureResponseInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallPacketCaptureResponseInner.java
new file mode 100644
index 000000000000..98c253697546
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/AzureFirewallPacketCaptureResponseInner.java
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.network.models.AzureFirewallPacketCaptureResponseCode;
+import java.io.IOException;
+
+/**
+ * Response of an Azure Firewall Packet Capture Operation.
+ */
+@Fluent
+public final class AzureFirewallPacketCaptureResponseInner
+    implements JsonSerializable<AzureFirewallPacketCaptureResponseInner> {
+    /*
+     * The response code of the performed packet capture operation
+     */
+    private AzureFirewallPacketCaptureResponseCode statusCode;
+
+    /*
+     * Localized Message String of The Result Of The Azure Firewall Packet Capture Operation
+     */
+    private String message;
+
+    /**
+     * Creates an instance of AzureFirewallPacketCaptureResponseInner class.
+     */
+    public AzureFirewallPacketCaptureResponseInner() {
+    }
+
+    /**
+     * Get the statusCode property: The response code of the performed packet capture operation.
+     * 
+     * @return the statusCode value.
+     */
+    public AzureFirewallPacketCaptureResponseCode statusCode() {
+        return this.statusCode;
+    }
+
+    /**
+     * Set the statusCode property: The response code of the performed packet capture operation.
+     * 
+     * @param statusCode the statusCode value to set.
+     * @return the AzureFirewallPacketCaptureResponseInner object itself.
+     */
+    public AzureFirewallPacketCaptureResponseInner withStatusCode(AzureFirewallPacketCaptureResponseCode statusCode) {
+        this.statusCode = statusCode;
+        return this;
+    }
+
+    /**
+     * Get the message property: Localized Message String of The Result Of The Azure Firewall Packet Capture Operation.
+     * 
+     * @return the message value.
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Set the message property: Localized Message String of The Result Of The Azure Firewall Packet Capture Operation.
+     * 
+     * @param message the message value to set.
+     * @return the AzureFirewallPacketCaptureResponseInner object itself.
+     */
+    public AzureFirewallPacketCaptureResponseInner withMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("statusCode", this.statusCode == null ? null : this.statusCode.toString());
+        jsonWriter.writeStringField("message", this.message);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AzureFirewallPacketCaptureResponseInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AzureFirewallPacketCaptureResponseInner if the JsonReader was pointing to an instance of
+     * it, or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the AzureFirewallPacketCaptureResponseInner.
+     */
+    public static AzureFirewallPacketCaptureResponseInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AzureFirewallPacketCaptureResponseInner deserializedAzureFirewallPacketCaptureResponseInner
+                = new AzureFirewallPacketCaptureResponseInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("statusCode".equals(fieldName)) {
+                    deserializedAzureFirewallPacketCaptureResponseInner.statusCode
+                        = AzureFirewallPacketCaptureResponseCode.fromString(reader.getString());
+                } else if ("message".equals(fieldName)) {
+                    deserializedAzureFirewallPacketCaptureResponseInner.message = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAzureFirewallPacketCaptureResponseInner;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualApplianceInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualApplianceInner.java
index b682fc5cda56..312bcfc5a9e3 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualApplianceInner.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualApplianceInner.java
@@ -14,6 +14,7 @@
 import com.azure.resourcemanager.network.models.InternetIngressPublicIpsProperties;
 import com.azure.resourcemanager.network.models.ManagedServiceIdentity;
 import com.azure.resourcemanager.network.models.NetworkVirtualAppliancePropertiesFormatNetworkProfile;
+import com.azure.resourcemanager.network.models.NvaInterfaceConfigurationsProperties;
 import com.azure.resourcemanager.network.models.PartnerManagedResourceProperties;
 import com.azure.resourcemanager.network.models.ProvisioningState;
 import com.azure.resourcemanager.network.models.VirtualApplianceAdditionalNicProperties;
@@ -366,7 +367,8 @@ public NetworkVirtualAppliancePropertiesFormatNetworkProfile networkProfile() {
     }
 
     /**
-     * Get the additionalNics property: Details required for Additional Network Interface.
+     * Get the additionalNics property: Details required for Additional Network Interface. This property is not
+     * compatible with the NVA deployed in VNets.
      * 
      * @return the additionalNics value.
      */
@@ -375,7 +377,8 @@ public List<VirtualApplianceAdditionalNicProperties> additionalNics() {
     }
 
     /**
-     * Set the additionalNics property: Details required for Additional Network Interface.
+     * Set the additionalNics property: Details required for Additional Network Interface. This property is not
+     * compatible with the NVA deployed in VNets.
      * 
      * @param additionalNics the additionalNics value to set.
      * @return the NetworkVirtualApplianceInner object itself.
@@ -459,7 +462,7 @@ public String deploymentType() {
     }
 
     /**
-     * Get the delegation property: The delegation for the Virtual Appliance.
+     * Get the delegation property: The delegation for the Virtual Appliance. Only appliable for SaaS NVA.
      * 
      * @return the delegation value.
      */
@@ -468,7 +471,7 @@ public DelegationProperties delegation() {
     }
 
     /**
-     * Set the delegation property: The delegation for the Virtual Appliance.
+     * Set the delegation property: The delegation for the Virtual Appliance. Only appliable for SaaS NVA.
      * 
      * @param delegation the delegation value to set.
      * @return the NetworkVirtualApplianceInner object itself.
@@ -505,6 +508,40 @@ public PartnerManagedResourceProperties partnerManagedResource() {
         return this;
     }
 
+    /**
+     * Get the nvaInterfaceConfigurations property: The NVA in VNet interface configurations.
+     * 
+     * @return the nvaInterfaceConfigurations value.
+     */
+    public List<NvaInterfaceConfigurationsProperties> nvaInterfaceConfigurations() {
+        return this.innerProperties() == null ? null : this.innerProperties().nvaInterfaceConfigurations();
+    }
+
+    /**
+     * Set the nvaInterfaceConfigurations property: The NVA in VNet interface configurations.
+     * 
+     * @param nvaInterfaceConfigurations the nvaInterfaceConfigurations value to set.
+     * @return the NetworkVirtualApplianceInner object itself.
+     */
+    public NetworkVirtualApplianceInner
+        withNvaInterfaceConfigurations(List<NvaInterfaceConfigurationsProperties> nvaInterfaceConfigurations) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new NetworkVirtualAppliancePropertiesFormat();
+        }
+        this.innerProperties().withNvaInterfaceConfigurations(nvaInterfaceConfigurations);
+        return this;
+    }
+
+    /**
+     * Get the privateIpAddress property: A Internal Load Balancer's HA port frontend IP address. Can be used to set
+     * routes &amp; UDR to load balance traffic between NVA instances.
+     * 
+     * @return the privateIpAddress value.
+     */
+    public String privateIpAddress() {
+        return this.innerProperties() == null ? null : this.innerProperties().privateIpAddress();
+    }
+
     /**
      * Validates the instance.
      * 
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualAppliancePropertiesFormat.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualAppliancePropertiesFormat.java
index f1f05854884c..18adb581dfd1 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualAppliancePropertiesFormat.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NetworkVirtualAppliancePropertiesFormat.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.network.models.DelegationProperties;
 import com.azure.resourcemanager.network.models.InternetIngressPublicIpsProperties;
 import com.azure.resourcemanager.network.models.NetworkVirtualAppliancePropertiesFormatNetworkProfile;
+import com.azure.resourcemanager.network.models.NvaInterfaceConfigurationsProperties;
 import com.azure.resourcemanager.network.models.PartnerManagedResourceProperties;
 import com.azure.resourcemanager.network.models.ProvisioningState;
 import com.azure.resourcemanager.network.models.VirtualApplianceAdditionalNicProperties;
@@ -78,7 +79,8 @@ public final class NetworkVirtualAppliancePropertiesFormat
     private NetworkVirtualAppliancePropertiesFormatNetworkProfile networkProfile;
 
     /*
-     * Details required for Additional Network Interface.
+     * Details required for Additional Network Interface. This property is not compatible with the NVA deployed in
+     * VNets.
      */
     private List<VirtualApplianceAdditionalNicProperties> additionalNics;
 
@@ -113,7 +115,7 @@ public final class NetworkVirtualAppliancePropertiesFormat
     private String deploymentType;
 
     /*
-     * The delegation for the Virtual Appliance
+     * The delegation for the Virtual Appliance. Only appliable for SaaS NVA.
      */
     private DelegationProperties delegation;
 
@@ -122,6 +124,17 @@ public final class NetworkVirtualAppliancePropertiesFormat
      */
     private PartnerManagedResourceProperties partnerManagedResource;
 
+    /*
+     * The NVA in VNet interface configurations
+     */
+    private List<NvaInterfaceConfigurationsProperties> nvaInterfaceConfigurations;
+
+    /*
+     * A Internal Load Balancer's HA port frontend IP address. Can be used to set routes & UDR to load balance traffic
+     * between NVA instances
+     */
+    private String privateIpAddress;
+
     /**
      * Creates an instance of NetworkVirtualAppliancePropertiesFormat class.
      */
@@ -312,7 +325,8 @@ public NetworkVirtualAppliancePropertiesFormatNetworkProfile networkProfile() {
     }
 
     /**
-     * Get the additionalNics property: Details required for Additional Network Interface.
+     * Get the additionalNics property: Details required for Additional Network Interface. This property is not
+     * compatible with the NVA deployed in VNets.
      * 
      * @return the additionalNics value.
      */
@@ -321,7 +335,8 @@ public List<VirtualApplianceAdditionalNicProperties> additionalNics() {
     }
 
     /**
-     * Set the additionalNics property: Details required for Additional Network Interface.
+     * Set the additionalNics property: Details required for Additional Network Interface. This property is not
+     * compatible with the NVA deployed in VNets.
      * 
      * @param additionalNics the additionalNics value to set.
      * @return the NetworkVirtualAppliancePropertiesFormat object itself.
@@ -399,7 +414,7 @@ public String deploymentType() {
     }
 
     /**
-     * Get the delegation property: The delegation for the Virtual Appliance.
+     * Get the delegation property: The delegation for the Virtual Appliance. Only appliable for SaaS NVA.
      * 
      * @return the delegation value.
      */
@@ -408,7 +423,7 @@ public DelegationProperties delegation() {
     }
 
     /**
-     * Set the delegation property: The delegation for the Virtual Appliance.
+     * Set the delegation property: The delegation for the Virtual Appliance. Only appliable for SaaS NVA.
      * 
      * @param delegation the delegation value to set.
      * @return the NetworkVirtualAppliancePropertiesFormat object itself.
@@ -439,6 +454,37 @@ public PartnerManagedResourceProperties partnerManagedResource() {
         return this;
     }
 
+    /**
+     * Get the nvaInterfaceConfigurations property: The NVA in VNet interface configurations.
+     * 
+     * @return the nvaInterfaceConfigurations value.
+     */
+    public List<NvaInterfaceConfigurationsProperties> nvaInterfaceConfigurations() {
+        return this.nvaInterfaceConfigurations;
+    }
+
+    /**
+     * Set the nvaInterfaceConfigurations property: The NVA in VNet interface configurations.
+     * 
+     * @param nvaInterfaceConfigurations the nvaInterfaceConfigurations value to set.
+     * @return the NetworkVirtualAppliancePropertiesFormat object itself.
+     */
+    public NetworkVirtualAppliancePropertiesFormat
+        withNvaInterfaceConfigurations(List<NvaInterfaceConfigurationsProperties> nvaInterfaceConfigurations) {
+        this.nvaInterfaceConfigurations = nvaInterfaceConfigurations;
+        return this;
+    }
+
+    /**
+     * Get the privateIpAddress property: A Internal Load Balancer's HA port frontend IP address. Can be used to set
+     * routes &amp; UDR to load balance traffic between NVA instances.
+     * 
+     * @return the privateIpAddress value.
+     */
+    public String privateIpAddress() {
+        return this.privateIpAddress;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -466,6 +512,9 @@ public void validate() {
         if (partnerManagedResource() != null) {
             partnerManagedResource().validate();
         }
+        if (nvaInterfaceConfigurations() != null) {
+            nvaInterfaceConfigurations().forEach(e -> e.validate());
+        }
     }
 
     /**
@@ -490,6 +539,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             (writer, element) -> writer.writeJson(element));
         jsonWriter.writeJsonField("delegation", this.delegation);
         jsonWriter.writeJsonField("partnerManagedResource", this.partnerManagedResource);
+        jsonWriter.writeArrayField("nvaInterfaceConfigurations", this.nvaInterfaceConfigurations,
+            (writer, element) -> writer.writeJson(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -570,6 +621,13 @@ public static NetworkVirtualAppliancePropertiesFormat fromJson(JsonReader jsonRe
                 } else if ("partnerManagedResource".equals(fieldName)) {
                     deserializedNetworkVirtualAppliancePropertiesFormat.partnerManagedResource
                         = PartnerManagedResourceProperties.fromJson(reader);
+                } else if ("nvaInterfaceConfigurations".equals(fieldName)) {
+                    List<NvaInterfaceConfigurationsProperties> nvaInterfaceConfigurations
+                        = reader.readArray(reader1 -> NvaInterfaceConfigurationsProperties.fromJson(reader1));
+                    deserializedNetworkVirtualAppliancePropertiesFormat.nvaInterfaceConfigurations
+                        = nvaInterfaceConfigurations;
+                } else if ("privateIpAddress".equals(fieldName)) {
+                    deserializedNetworkVirtualAppliancePropertiesFormat.privateIpAddress = reader.getString();
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NspServiceTagsResourceInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NspServiceTagsResourceInner.java
new file mode 100644
index 000000000000..df013097897e
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/NspServiceTagsResourceInner.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Resource containing list of NSP service tags.
+ */
+@Fluent
+public final class NspServiceTagsResourceInner implements JsonSerializable<NspServiceTagsResourceInner> {
+    /*
+     * NSP service tags.
+     */
+    private List<String> serviceTags;
+
+    /**
+     * Creates an instance of NspServiceTagsResourceInner class.
+     */
+    public NspServiceTagsResourceInner() {
+    }
+
+    /**
+     * Get the serviceTags property: NSP service tags.
+     * 
+     * @return the serviceTags value.
+     */
+    public List<String> serviceTags() {
+        return this.serviceTags;
+    }
+
+    /**
+     * Set the serviceTags property: NSP service tags.
+     * 
+     * @param serviceTags the serviceTags value to set.
+     * @return the NspServiceTagsResourceInner object itself.
+     */
+    public NspServiceTagsResourceInner withServiceTags(List<String> serviceTags) {
+        this.serviceTags = serviceTags;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("serviceTags", this.serviceTags, (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NspServiceTagsResourceInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NspServiceTagsResourceInner if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NspServiceTagsResourceInner.
+     */
+    public static NspServiceTagsResourceInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NspServiceTagsResourceInner deserializedNspServiceTagsResourceInner = new NspServiceTagsResourceInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("serviceTags".equals(fieldName)) {
+                    List<String> serviceTags = reader.readArray(reader1 -> reader1.getString());
+                    deserializedNspServiceTagsResourceInner.serviceTags = serviceTags;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNspServiceTagsResourceInner;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/RadiusAuthServerListResultInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/RadiusAuthServerListResultInner.java
new file mode 100644
index 000000000000..a4f596492ce3
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/RadiusAuthServerListResultInner.java
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.network.models.RadiusAuthServer;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * List of Radius servers with respective radius secrets.
+ */
+@Fluent
+public final class RadiusAuthServerListResultInner implements JsonSerializable<RadiusAuthServerListResultInner> {
+    /*
+     * List of Radius servers with respective radius secrets.
+     */
+    private List<RadiusAuthServer> value;
+
+    /*
+     * URL to get the next set of operation list results if there are any.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of RadiusAuthServerListResultInner class.
+     */
+    public RadiusAuthServerListResultInner() {
+    }
+
+    /**
+     * Get the value property: List of Radius servers with respective radius secrets.
+     * 
+     * @return the value value.
+     */
+    public List<RadiusAuthServer> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: List of Radius servers with respective radius secrets.
+     * 
+     * @param value the value value to set.
+     * @return the RadiusAuthServerListResultInner object itself.
+     */
+    public RadiusAuthServerListResultInner withValue(List<RadiusAuthServer> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: URL to get the next set of operation list results if there are any.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the nextLink property: URL to get the next set of operation list results if there are any.
+     * 
+     * @param nextLink the nextLink value to set.
+     * @return the RadiusAuthServerListResultInner object itself.
+     */
+    public RadiusAuthServerListResultInner withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of RadiusAuthServerListResultInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of RadiusAuthServerListResultInner if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the RadiusAuthServerListResultInner.
+     */
+    public static RadiusAuthServerListResultInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            RadiusAuthServerListResultInner deserializedRadiusAuthServerListResultInner
+                = new RadiusAuthServerListResultInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<RadiusAuthServer> value = reader.readArray(reader1 -> RadiusAuthServer.fromJson(reader1));
+                    deserializedRadiusAuthServerListResultInner.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedRadiusAuthServerListResultInner.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedRadiusAuthServerListResultInner;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityInner.java
index 183f14b49e19..d52e15f6ab16 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityInner.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityInner.java
@@ -329,7 +329,9 @@ public VirtualNetworkGatewayConnectionMode connectionMode() {
     }
 
     /**
-     * Get the sharedKey property: The IPSec shared key.
+     * Get the sharedKey property: The IPSec shared key. We will no longer return sharedKey in
+     * VirtualNetworkGatewayConnection Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGatewayConnection GetSharedKey API to fetch connection sharedKey.
      * 
      * @return the sharedKey value.
      */
@@ -338,7 +340,9 @@ public String sharedKey() {
     }
 
     /**
-     * Set the sharedKey property: The IPSec shared key.
+     * Set the sharedKey property: The IPSec shared key. We will no longer return sharedKey in
+     * VirtualNetworkGatewayConnection Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGatewayConnection GetSharedKey API to fetch connection sharedKey.
      * 
      * @param sharedKey the sharedKey value to set.
      * @return the VirtualNetworkGatewayConnectionListEntityInner object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityPropertiesFormat.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityPropertiesFormat.java
index 6f29cbee8e51..ac181775f417 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityPropertiesFormat.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VirtualNetworkGatewayConnectionListEntityPropertiesFormat.java
@@ -71,7 +71,9 @@ public final class VirtualNetworkGatewayConnectionListEntityPropertiesFormat
     private VirtualNetworkGatewayConnectionMode connectionMode;
 
     /*
-     * The IPSec shared key.
+     * The IPSec shared key. We will no longer return sharedKey in VirtualNetworkGatewayConnection
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VirtualNetworkGatewayConnection GetSharedKey API to
+     * fetch connection sharedKey.
      */
     private String sharedKey;
 
@@ -319,7 +321,9 @@ public VirtualNetworkGatewayConnectionMode connectionMode() {
     }
 
     /**
-     * Get the sharedKey property: The IPSec shared key.
+     * Get the sharedKey property: The IPSec shared key. We will no longer return sharedKey in
+     * VirtualNetworkGatewayConnection Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGatewayConnection GetSharedKey API to fetch connection sharedKey.
      * 
      * @return the sharedKey value.
      */
@@ -328,7 +332,9 @@ public String sharedKey() {
     }
 
     /**
-     * Set the sharedKey property: The IPSec shared key.
+     * Set the sharedKey property: The IPSec shared key. We will no longer return sharedKey in
+     * VirtualNetworkGatewayConnection Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGatewayConnection GetSharedKey API to fetch connection sharedKey.
      * 
      * @param sharedKey the sharedKey value to set.
      * @return the VirtualNetworkGatewayConnectionListEntityPropertiesFormat object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionInner.java
index f92c71344d84..f37ddd9d27e7 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionInner.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionInner.java
@@ -237,7 +237,7 @@ public VpnConnectionInner withConnectionBandwidth(Integer connectionBandwidth) {
     }
 
     /**
-     * Get the sharedKey property: SharedKey for the vpn connection.
+     * Get the sharedKey property: Deprecated: SharedKey for the vpn connection. This is no more used.
      * 
      * @return the sharedKey value.
      */
@@ -246,7 +246,7 @@ public String sharedKey() {
     }
 
     /**
-     * Set the sharedKey property: SharedKey for the vpn connection.
+     * Set the sharedKey property: Deprecated: SharedKey for the vpn connection. This is no more used.
      * 
      * @param sharedKey the sharedKey value to set.
      * @return the VpnConnectionInner object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionProperties.java
index 67f107ea19fa..1358c4c2bab4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionProperties.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnConnectionProperties.java
@@ -65,7 +65,7 @@ public final class VpnConnectionProperties implements JsonSerializable<VpnConnec
     private Integer connectionBandwidth;
 
     /*
-     * SharedKey for the vpn connection.
+     * Deprecated: SharedKey for the vpn connection. This is no more used.
      */
     private String sharedKey;
 
@@ -254,7 +254,7 @@ public VpnConnectionProperties withConnectionBandwidth(Integer connectionBandwid
     }
 
     /**
-     * Get the sharedKey property: SharedKey for the vpn connection.
+     * Get the sharedKey property: Deprecated: SharedKey for the vpn connection. This is no more used.
      * 
      * @return the sharedKey value.
      */
@@ -263,7 +263,7 @@ public String sharedKey() {
     }
 
     /**
-     * Set the sharedKey property: SharedKey for the vpn connection.
+     * Set the sharedKey property: Deprecated: SharedKey for the vpn connection. This is no more used.
      * 
      * @param sharedKey the sharedKey value to set.
      * @return the VpnConnectionProperties object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationInner.java
index 042669dabdd9..d91eb5983fce 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationInner.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationInner.java
@@ -349,7 +349,9 @@ public VpnServerConfigurationInner withRadiusServerAddress(String radiusServerAd
 
     /**
      * Get the radiusServerSecret property: The radius secret property of the VpnServerConfiguration resource for point
-     * to site client connection.
+     * to site client connection. We will no longer return radiusServerSecret in VpnServerConfiguration
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VpnServerConfiguration ListRadiusSecrets API to fetch
+     * radius server secrets.
      * 
      * @return the radiusServerSecret value.
      */
@@ -359,7 +361,9 @@ public String radiusServerSecret() {
 
     /**
      * Set the radiusServerSecret property: The radius secret property of the VpnServerConfiguration resource for point
-     * to site client connection.
+     * to site client connection. We will no longer return radiusServerSecret in VpnServerConfiguration
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VpnServerConfiguration ListRadiusSecrets API to fetch
+     * radius server secrets.
      * 
      * @param radiusServerSecret the radiusServerSecret value to set.
      * @return the VpnServerConfigurationInner object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationProperties.java
index 64c7ad840d43..08071035136d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationProperties.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnServerConfigurationProperties.java
@@ -72,7 +72,9 @@ public final class VpnServerConfigurationProperties implements JsonSerializable<
     private String radiusServerAddress;
 
     /*
-     * The radius secret property of the VpnServerConfiguration resource for point to site client connection.
+     * The radius secret property of the VpnServerConfiguration resource for point to site client connection. We will no
+     * longer return radiusServerSecret in VpnServerConfiguration Create/Update/Get/List/UpdateTags APIs response.
+     * Please use VpnServerConfiguration ListRadiusSecrets API to fetch radius server secrets.
      */
     private String radiusServerSecret;
 
@@ -302,7 +304,9 @@ public VpnServerConfigurationProperties withRadiusServerAddress(String radiusSer
 
     /**
      * Get the radiusServerSecret property: The radius secret property of the VpnServerConfiguration resource for point
-     * to site client connection.
+     * to site client connection. We will no longer return radiusServerSecret in VpnServerConfiguration
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VpnServerConfiguration ListRadiusSecrets API to fetch
+     * radius server secrets.
      * 
      * @return the radiusServerSecret value.
      */
@@ -312,7 +316,9 @@ public String radiusServerSecret() {
 
     /**
      * Set the radiusServerSecret property: The radius secret property of the VpnServerConfiguration resource for point
-     * to site client connection.
+     * to site client connection. We will no longer return radiusServerSecret in VpnServerConfiguration
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VpnServerConfiguration ListRadiusSecrets API to fetch
+     * radius server secrets.
      * 
      * @param radiusServerSecret the radiusServerSecret value to set.
      * @return the VpnServerConfigurationProperties object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionInner.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionInner.java
index 5ebc88ec20ac..8972252e91c6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionInner.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionInner.java
@@ -251,7 +251,9 @@ public VpnSiteLinkConnectionInner withConnectionBandwidth(Integer connectionBand
     }
 
     /**
-     * Get the sharedKey property: SharedKey for the vpn connection.
+     * Get the sharedKey property: SharedKey for the vpn link connection. We will no longer return sharedKey in any
+     * Create/Update/Get/List/UpdateTags VpnGateway/VpnConnection/VpnLinkConnection APIs response. Please use 'Vpn Link
+     * Connections - List Default Shared Key' API to fetch Vpn link connection sharedKey.
      * 
      * @return the sharedKey value.
      */
@@ -260,7 +262,9 @@ public String sharedKey() {
     }
 
     /**
-     * Set the sharedKey property: SharedKey for the vpn connection.
+     * Set the sharedKey property: SharedKey for the vpn link connection. We will no longer return sharedKey in any
+     * Create/Update/Get/List/UpdateTags VpnGateway/VpnConnection/VpnLinkConnection APIs response. Please use 'Vpn Link
+     * Connections - List Default Shared Key' API to fetch Vpn link connection sharedKey.
      * 
      * @param sharedKey the sharedKey value to set.
      * @return the VpnSiteLinkConnectionInner object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionProperties.java
index ab362175a7ef..835ac2105b76 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionProperties.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/fluent/models/VpnSiteLinkConnectionProperties.java
@@ -65,7 +65,9 @@ public final class VpnSiteLinkConnectionProperties implements JsonSerializable<V
     private Integer connectionBandwidth;
 
     /*
-     * SharedKey for the vpn connection.
+     * SharedKey for the vpn link connection. We will no longer return sharedKey in any
+     * Create/Update/Get/List/UpdateTags VpnGateway/VpnConnection/VpnLinkConnection APIs response. Please use 'Vpn Link
+     * Connections - List Default Shared Key' API to fetch Vpn link connection sharedKey.
      */
     private String sharedKey;
 
@@ -254,7 +256,9 @@ public VpnSiteLinkConnectionProperties withConnectionBandwidth(Integer connectio
     }
 
     /**
-     * Get the sharedKey property: SharedKey for the vpn connection.
+     * Get the sharedKey property: SharedKey for the vpn link connection. We will no longer return sharedKey in any
+     * Create/Update/Get/List/UpdateTags VpnGateway/VpnConnection/VpnLinkConnection APIs response. Please use 'Vpn Link
+     * Connections - List Default Shared Key' API to fetch Vpn link connection sharedKey.
      * 
      * @return the sharedKey value.
      */
@@ -263,7 +267,9 @@ public String sharedKey() {
     }
 
     /**
-     * Set the sharedKey property: SharedKey for the vpn connection.
+     * Set the sharedKey property: SharedKey for the vpn link connection. We will no longer return sharedKey in any
+     * Create/Update/Get/List/UpdateTags VpnGateway/VpnConnection/VpnLinkConnection APIs response. Please use 'Vpn Link
+     * Connections - List Default Shared Key' API to fetch Vpn link connection sharedKey.
      * 
      * @param sharedKey the sharedKey value to set.
      * @return the VpnSiteLinkConnectionProperties object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRuleCollectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRuleCollectionsClientImpl.java
index a1d7d104e374..2927720cdf54 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRuleCollectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRuleCollectionsClientImpl.java
@@ -68,7 +68,7 @@ public final class AdminRuleCollectionsClientImpl implements AdminRuleCollection
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAdminRuleCollections")
     public interface AdminRuleCollectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections")
@@ -167,7 +167,7 @@ private Mono<PagedResponse<AdminRuleCollectionInner>> listSinglePageAsync(String
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -218,7 +218,7 @@ private Mono<PagedResponse<AdminRuleCollectionInner>> listSinglePageAsync(String
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -382,7 +382,7 @@ public Mono<Response<AdminRuleCollectionInner>> getWithResponseAsync(String reso
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -431,7 +431,7 @@ private Mono<Response<AdminRuleCollectionInner>> getWithResponseAsync(String res
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -542,7 +542,7 @@ public Mono<Response<AdminRuleCollectionInner>> createOrUpdateWithResponseAsync(
         } else {
             ruleCollection.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -598,7 +598,7 @@ private Mono<Response<AdminRuleCollectionInner>> createOrUpdateWithResponseAsync
         } else {
             ruleCollection.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -709,7 +709,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -761,7 +761,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRulesClientImpl.java
index 01a634d972fb..208bcb5b48a6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AdminRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class AdminRulesClientImpl implements AdminRulesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAdminRules")
     public interface AdminRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules")
@@ -172,7 +172,7 @@ private Mono<PagedResponse<BaseAdminRuleInner>> listSinglePageAsync(String resou
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -230,7 +230,7 @@ private Mono<PagedResponse<BaseAdminRuleInner>> listSinglePageAsync(String resou
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -400,7 +400,7 @@ public Mono<Response<BaseAdminRuleInner>> getWithResponseAsync(String resourceGr
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -454,7 +454,7 @@ private Mono<Response<BaseAdminRuleInner>> getWithResponseAsync(String resourceG
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -572,7 +572,7 @@ public Mono<Response<BaseAdminRuleInner>> createOrUpdateWithResponseAsync(String
         } else {
             adminRule.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -632,7 +632,7 @@ private Mono<Response<BaseAdminRuleInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             adminRule.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -750,7 +750,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -806,7 +806,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java
index 558c7bbd7d54..f11257176987 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayImpl.java
@@ -68,13 +68,13 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -1488,7 +1488,7 @@ public Map<String, ApplicationGatewayUrlPathMap> urlPathMaps() {
 
     @Override
     public Set<AvailabilityZoneId> availabilityZones() {
-        Set<AvailabilityZoneId> zones = new TreeSet<>();
+        Set<AvailabilityZoneId> zones = new LinkedHashSet<>();
         if (this.innerModel().zones() != null) {
             for (String zone : this.innerModel().zones()) {
                 zones.add(AvailabilityZoneId.fromString(zone));
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateEndpointConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateEndpointConnectionsClientImpl.java
index 87761f22f5a5..d5b8281a0bac 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateEndpointConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateEndpointConnectionsClientImpl.java
@@ -70,7 +70,7 @@ public final class ApplicationGatewayPrivateEndpointConnectionsClientImpl
      * to be used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientApplicationGatewayPrivateEndpointConnections")
     public interface ApplicationGatewayPrivateEndpointConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/privateEndpointConnections/{connectionName}")
@@ -156,7 +156,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -198,7 +198,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, connectionName,
@@ -392,7 +392,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceG
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -442,7 +442,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, connectionName,
@@ -658,7 +658,7 @@ public ApplicationGatewayPrivateEndpointConnectionInner update(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -701,7 +701,7 @@ private Mono<Response<ApplicationGatewayPrivateEndpointConnectionInner>> getWith
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, connectionName,
@@ -792,7 +792,7 @@ public ApplicationGatewayPrivateEndpointConnectionInner get(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -834,7 +834,7 @@ public ApplicationGatewayPrivateEndpointConnectionInner get(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateLinkResourcesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateLinkResourcesClientImpl.java
index aab59840190e..568b5c96073c 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateLinkResourcesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayPrivateLinkResourcesClientImpl.java
@@ -62,7 +62,7 @@ public final class ApplicationGatewayPrivateLinkResourcesClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientApplicationGatewayPrivateLinkResources")
     public interface ApplicationGatewayPrivateLinkResourcesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/privateLinkResources")
@@ -113,7 +113,7 @@ Mono<Response<ApplicationGatewayPrivateLinkResourceListResult>> listNext(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -155,7 +155,7 @@ Mono<Response<ApplicationGatewayPrivateLinkResourceListResult>> listNext(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsClientImpl.java
index 0a8880b425e6..81e162032ac2 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsClientImpl.java
@@ -62,7 +62,7 @@ public final class ApplicationGatewayWafDynamicManifestsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientApplicationGatewayWafDynamicManifests")
     public interface ApplicationGatewayWafDynamicManifestsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/applicationGatewayWafDynamicManifests")
@@ -104,7 +104,7 @@ private Mono<PagedResponse<ApplicationGatewayWafDynamicManifestResultInner>> get
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), location, apiVersion,
@@ -140,7 +140,7 @@ private Mono<PagedResponse<ApplicationGatewayWafDynamicManifestResultInner>> get
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -215,8 +215,8 @@ public PagedIterable<ApplicationGatewayWafDynamicManifestResultInner> get(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ApplicationGatewayWafDynamicManifests API service call along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return the regional application gateway waf manifest along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationGatewayWafDynamicManifestResultInner>>
@@ -244,8 +244,8 @@ public PagedIterable<ApplicationGatewayWafDynamicManifestResultInner> get(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ApplicationGatewayWafDynamicManifests API service call along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return the regional application gateway waf manifest along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationGatewayWafDynamicManifestResultInner>> getNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsDefaultsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsDefaultsClientImpl.java
index 726ea8323ec9..d129ae2d94bb 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsDefaultsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewayWafDynamicManifestsDefaultsClientImpl.java
@@ -57,7 +57,7 @@ public final class ApplicationGatewayWafDynamicManifestsDefaultsClientImpl
      * to be used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientApplicationGatewayWafDynamicManifestsDefaults")
     public interface ApplicationGatewayWafDynamicManifestsDefaultsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/applicationGatewayWafDynamicManifests/dafault")
@@ -91,7 +91,7 @@ public Mono<Response<ApplicationGatewayWafDynamicManifestResultInner>> getWithRe
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), location, apiVersion,
@@ -124,7 +124,7 @@ private Mono<Response<ApplicationGatewayWafDynamicManifestResultInner>> getWithR
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), location, apiVersion, this.client.getSubscriptionId(), accept,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysClientImpl.java
index e84efa13c467..e4b68bacc886 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationGatewaysClientImpl.java
@@ -84,7 +84,7 @@ public final class ApplicationGatewaysClientImpl implements InnerSupportsGet<App
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientApplicationGateways")
     public interface ApplicationGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}")
@@ -298,7 +298,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -336,7 +336,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, apiVersion,
@@ -505,7 +505,7 @@ public Mono<Response<ApplicationGatewayInner>> getByResourceGroupWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -543,7 +543,7 @@ private Mono<Response<ApplicationGatewayInner>> getByResourceGroupWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -634,7 +634,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -678,7 +678,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, apiVersion,
@@ -871,7 +871,7 @@ public Mono<Response<ApplicationGatewayInner>> updateTagsWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -915,7 +915,7 @@ private Mono<Response<ApplicationGatewayInner>> updateTagsWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, apiVersion,
@@ -999,7 +999,7 @@ private Mono<PagedResponse<ApplicationGatewayInner>> listByResourceGroupSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1035,7 +1035,7 @@ private Mono<PagedResponse<ApplicationGatewayInner>> listByResourceGroupSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1123,7 +1123,7 @@ private Mono<PagedResponse<ApplicationGatewayInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1153,7 +1153,7 @@ private Mono<PagedResponse<ApplicationGatewayInner>> listSinglePageAsync(Context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1243,7 +1243,7 @@ public Mono<Response<Flux<ByteBuffer>>> startWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.start(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -1281,7 +1281,7 @@ private Mono<Response<Flux<ByteBuffer>>> startWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.start(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, apiVersion,
@@ -1449,7 +1449,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stop(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -1487,7 +1487,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stop(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, apiVersion,
@@ -1657,7 +1657,7 @@ public Mono<Response<Flux<ByteBuffer>>> backendHealthWithResponseAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.backendHealth(this.client.getEndpoint(), resourceGroupName,
@@ -1697,7 +1697,7 @@ private Mono<Response<Flux<ByteBuffer>>> backendHealthWithResponseAsync(String r
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.backendHealth(this.client.getEndpoint(), resourceGroupName, applicationGatewayName, apiVersion,
@@ -1940,7 +1940,7 @@ public Mono<Response<Flux<ByteBuffer>>> backendHealthOnDemandWithResponseAsync(S
         } else {
             probeRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.backendHealthOnDemand(this.client.getEndpoint(), resourceGroupName,
@@ -1988,7 +1988,7 @@ private Mono<Response<Flux<ByteBuffer>>> backendHealthOnDemandWithResponseAsync(
         } else {
             probeRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.backendHealthOnDemand(this.client.getEndpoint(), resourceGroupName, applicationGatewayName,
@@ -2251,7 +2251,7 @@ public Mono<Response<List<String>>> listAvailableServerVariablesWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableServerVariables(this.client.getEndpoint(), apiVersion,
@@ -2279,7 +2279,7 @@ private Mono<Response<List<String>>> listAvailableServerVariablesWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAvailableServerVariables(this.client.getEndpoint(), apiVersion,
@@ -2343,7 +2343,7 @@ public Mono<Response<List<String>>> listAvailableRequestHeadersWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableRequestHeaders(this.client.getEndpoint(), apiVersion,
@@ -2371,7 +2371,7 @@ private Mono<Response<List<String>>> listAvailableRequestHeadersWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAvailableRequestHeaders(this.client.getEndpoint(), apiVersion,
@@ -2435,7 +2435,7 @@ public Mono<Response<List<String>>> listAvailableResponseHeadersWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableResponseHeaders(this.client.getEndpoint(), apiVersion,
@@ -2463,7 +2463,7 @@ private Mono<Response<List<String>>> listAvailableResponseHeadersWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAvailableResponseHeaders(this.client.getEndpoint(), apiVersion,
@@ -2528,7 +2528,7 @@ public List<String> listAvailableResponseHeaders() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableWafRuleSets(this.client.getEndpoint(), apiVersion,
@@ -2557,7 +2557,7 @@ public List<String> listAvailableResponseHeaders() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAvailableWafRuleSets(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -2622,7 +2622,7 @@ public Mono<Response<ApplicationGatewayAvailableSslOptionsInner>> listAvailableS
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableSslOptions(this.client.getEndpoint(), apiVersion,
@@ -2651,7 +2651,7 @@ public Mono<Response<ApplicationGatewayAvailableSslOptionsInner>> listAvailableS
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAvailableSslOptions(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -2716,7 +2716,7 @@ public ApplicationGatewayAvailableSslOptionsInner listAvailableSslOptions() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableSslPredefinedPolicies(this.client.getEndpoint(), apiVersion,
@@ -2748,7 +2748,7 @@ public ApplicationGatewayAvailableSslOptionsInner listAvailableSslOptions() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -2843,7 +2843,7 @@ public PagedIterable<ApplicationGatewaySslPredefinedPolicyInner> listAvailableSs
             return Mono
                 .error(new IllegalArgumentException("Parameter predefinedPolicyName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getSslPredefinedPolicy(this.client.getEndpoint(), apiVersion,
@@ -2877,7 +2877,7 @@ public PagedIterable<ApplicationGatewaySslPredefinedPolicyInner> listAvailableSs
             return Mono
                 .error(new IllegalArgumentException("Parameter predefinedPolicyName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getSslPredefinedPolicy(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -2989,8 +2989,8 @@ private Mono<PagedResponse<ApplicationGatewayInner>> listNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListApplicationGateways API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the application gateways in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationGatewayInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -3017,8 +3017,8 @@ private Mono<PagedResponse<ApplicationGatewayInner>> listAllNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListApplicationGateways API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the application gateways in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationGatewayInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationSecurityGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationSecurityGroupsClientImpl.java
index bad64f700fd9..bb703d87d91f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationSecurityGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ApplicationSecurityGroupsClientImpl.java
@@ -74,7 +74,7 @@ public final class ApplicationSecurityGroupsClientImpl implements InnerSupportsG
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientApplicationSecurityGroups")
     public interface ApplicationSecurityGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}")
@@ -180,7 +180,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -218,7 +218,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, applicationSecurityGroupName, apiVersion,
@@ -390,7 +390,7 @@ public Mono<Response<ApplicationSecurityGroupInner>> getByResourceGroupWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -429,7 +429,7 @@ private Mono<Response<ApplicationSecurityGroupInner>> getByResourceGroupWithResp
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, applicationSecurityGroupName,
@@ -522,7 +522,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -567,7 +567,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, applicationSecurityGroupName,
@@ -766,7 +766,7 @@ public Mono<Response<ApplicationSecurityGroupInner>> updateTagsWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -811,7 +811,7 @@ private Mono<Response<ApplicationSecurityGroupInner>> updateTagsWithResponseAsyn
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, applicationSecurityGroupName,
@@ -891,7 +891,7 @@ private Mono<PagedResponse<ApplicationSecurityGroupInner>> listSinglePageAsync()
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -921,7 +921,7 @@ private Mono<PagedResponse<ApplicationSecurityGroupInner>> listSinglePageAsync(C
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1007,7 +1007,7 @@ public PagedIterable<ApplicationSecurityGroupInner> list(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1043,7 +1043,7 @@ public PagedIterable<ApplicationSecurityGroupInner> list(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1121,8 +1121,8 @@ public PagedIterable<ApplicationSecurityGroupInner> listByResourceGroup(String r
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of application security groups along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all application security groups in a subscription along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationSecurityGroupInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1149,8 +1149,8 @@ private Mono<PagedResponse<ApplicationSecurityGroupInner>> listAllNextSinglePage
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of application security groups along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all application security groups in a subscription along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationSecurityGroupInner>> listAllNextSinglePageAsync(String nextLink,
@@ -1176,8 +1176,8 @@ private Mono<PagedResponse<ApplicationSecurityGroupInner>> listAllNextSinglePage
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of application security groups along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all the application security groups in a resource group along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationSecurityGroupInner>> listNextSinglePageAsync(String nextLink) {
@@ -1203,8 +1203,8 @@ private Mono<PagedResponse<ApplicationSecurityGroupInner>> listNextSinglePageAsy
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of application security groups along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all the application security groups in a resource group along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ApplicationSecurityGroupInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableDelegationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableDelegationsClientImpl.java
index 4cfbb8e1f576..52e0033ecec5 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableDelegationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableDelegationsClientImpl.java
@@ -60,7 +60,7 @@ public final class AvailableDelegationsClientImpl implements AvailableDelegation
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAvailableDelegations")
     public interface AvailableDelegationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availableDelegations")
@@ -102,7 +102,7 @@ private Mono<PagedResponse<AvailableDelegationInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, apiVersion,
@@ -136,7 +136,7 @@ private Mono<PagedResponse<AvailableDelegationInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -215,8 +215,8 @@ public PagedIterable<AvailableDelegationInner> list(String location, Context con
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available delegations along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all of the available subnet delegations for this subscription in this region along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableDelegationInner>> listNextSinglePageAsync(String nextLink) {
@@ -242,8 +242,8 @@ private Mono<PagedResponse<AvailableDelegationInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available delegations along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all of the available subnet delegations for this subscription in this region along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableDelegationInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableEndpointServicesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableEndpointServicesClientImpl.java
index 0b63c4f85c02..fc1ecccef846 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableEndpointServicesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableEndpointServicesClientImpl.java
@@ -60,7 +60,7 @@ public final class AvailableEndpointServicesClientImpl implements AvailableEndpo
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAvailableEndpointServices")
     public interface AvailableEndpointServicesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/virtualNetworkAvailableEndpointServices")
@@ -102,7 +102,7 @@ private Mono<PagedResponse<EndpointServiceResultInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, apiVersion,
@@ -136,7 +136,7 @@ private Mono<PagedResponse<EndpointServiceResultInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailablePrivateEndpointTypesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailablePrivateEndpointTypesClientImpl.java
index aba7d4c8a40f..275afcece3fd 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailablePrivateEndpointTypesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailablePrivateEndpointTypesClientImpl.java
@@ -60,7 +60,7 @@ public final class AvailablePrivateEndpointTypesClientImpl implements AvailableP
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAvailablePrivateEndpointTypes")
     public interface AvailablePrivateEndpointTypesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availablePrivateEndpointTypes")
@@ -119,7 +119,7 @@ private Mono<PagedResponse<AvailablePrivateEndpointTypeInner>> listSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, apiVersion,
@@ -154,7 +154,7 @@ private Mono<PagedResponse<AvailablePrivateEndpointTypeInner>> listSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -251,7 +251,7 @@ private Mono<PagedResponse<AvailablePrivateEndpointTypeInner>> listByResourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), location, resourceGroupName,
@@ -291,7 +291,7 @@ private Mono<PagedResponse<AvailablePrivateEndpointTypeInner>> listByResourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableResourceGroupDelegationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableResourceGroupDelegationsClientImpl.java
index 7d54fd5c995c..7a17ab27c323 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableResourceGroupDelegationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableResourceGroupDelegationsClientImpl.java
@@ -60,7 +60,7 @@ public final class AvailableResourceGroupDelegationsClientImpl implements Availa
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAvailableResourceGroupDelegations")
     public interface AvailableResourceGroupDelegationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/availableDelegations")
@@ -109,7 +109,7 @@ private Mono<PagedResponse<AvailableDelegationInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, resourceGroupName,
@@ -149,7 +149,7 @@ private Mono<PagedResponse<AvailableDelegationInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -234,8 +234,8 @@ public PagedIterable<AvailableDelegationInner> list(String location, String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available delegations along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all of the available subnet delegations for this resource group in this region along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableDelegationInner>> listNextSinglePageAsync(String nextLink) {
@@ -261,8 +261,8 @@ private Mono<PagedResponse<AvailableDelegationInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available delegations along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all of the available subnet delegations for this resource group in this region along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableDelegationInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableServiceAliasesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableServiceAliasesClientImpl.java
index 7c32cda341c9..5f84f193eafc 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableServiceAliasesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AvailableServiceAliasesClientImpl.java
@@ -60,7 +60,7 @@ public final class AvailableServiceAliasesClientImpl implements AvailableService
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAvailableServiceAliases")
     public interface AvailableServiceAliasesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availableServiceAliases")
@@ -119,7 +119,7 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, this.client.getSubscriptionId(),
@@ -153,7 +153,7 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -254,7 +254,7 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listByResourceGroupSingl
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName, location,
@@ -294,7 +294,7 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listByResourceGroupSingl
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -381,8 +381,8 @@ public PagedIterable<AvailableServiceAliasInner> listByResourceGroup(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available service aliases along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all available service aliases for this subscription in this region along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableServiceAliasInner>> listNextSinglePageAsync(String nextLink) {
@@ -408,8 +408,8 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available service aliases along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all available service aliases for this subscription in this region along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableServiceAliasInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -434,8 +434,8 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available service aliases along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all available service aliases for this resource group in this region along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableServiceAliasInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -463,8 +463,8 @@ private Mono<PagedResponse<AvailableServiceAliasInner>> listByResourceGroupNextS
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return an array of available service aliases along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all available service aliases for this resource group in this region along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AvailableServiceAliasInner>> listByResourceGroupNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallFqdnTagsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallFqdnTagsClientImpl.java
index d09c35792c12..635b406ac412 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallFqdnTagsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallFqdnTagsClientImpl.java
@@ -60,7 +60,7 @@ public final class AzureFirewallFqdnTagsClientImpl implements AzureFirewallFqdnT
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAzureFirewallFqdnTags")
     public interface AzureFirewallFqdnTagsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureFirewallFqdnTags")
@@ -97,7 +97,7 @@ private Mono<PagedResponse<AzureFirewallFqdnTagInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -127,7 +127,7 @@ private Mono<PagedResponse<AzureFirewallFqdnTagInner>> listSinglePageAsync(Conte
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -195,7 +195,7 @@ public PagedIterable<AzureFirewallFqdnTagInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAzureFirewallFqdnTags API service call along with {@link PagedResponse} on successful
+     * @return all the Azure Firewall FQDN Tags in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -223,7 +223,7 @@ private Mono<PagedResponse<AzureFirewallFqdnTagInner>> listAllNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAzureFirewallFqdnTags API service call along with {@link PagedResponse} on successful
+     * @return all the Azure Firewall FQDN Tags in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallsClientImpl.java
index 07247c9837a4..4402ff8e823a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/AzureFirewallsClientImpl.java
@@ -35,6 +35,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.network.fluent.AzureFirewallsClient;
 import com.azure.resourcemanager.network.fluent.models.AzureFirewallInner;
+import com.azure.resourcemanager.network.fluent.models.AzureFirewallPacketCaptureResponseInner;
 import com.azure.resourcemanager.network.fluent.models.IpPrefixesListInner;
 import com.azure.resourcemanager.network.models.AzureFirewallListResult;
 import com.azure.resourcemanager.network.models.FirewallPacketCaptureParameters;
@@ -77,7 +78,7 @@ public final class AzureFirewallsClientImpl implements InnerSupportsGet<AzureFir
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientAzureFirewalls")
     public interface AzureFirewallsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}")
@@ -154,6 +155,17 @@ Mono<Response<Flux<ByteBuffer>>> packetCapture(@HostParam("$host") String endpoi
             @BodyParam("application/json") FirewallPacketCaptureParameters parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/azureFirewalls/{azureFirewallName}/packetCaptureOperation")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> packetCaptureOperation(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("azureFirewallName") String azureFirewallName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") FirewallPacketCaptureParameters parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -199,7 +211,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, azureFirewallName,
@@ -237,7 +249,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, azureFirewallName, apiVersion,
@@ -404,7 +416,7 @@ public Mono<Response<AzureFirewallInner>> getByResourceGroupWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -442,7 +454,7 @@ private Mono<Response<AzureFirewallInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, azureFirewallName, apiVersion,
@@ -532,7 +544,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -576,7 +588,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, azureFirewallName, apiVersion,
@@ -767,7 +779,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, azureFirewallName,
@@ -811,7 +823,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, azureFirewallName, apiVersion,
@@ -990,7 +1002,7 @@ private Mono<PagedResponse<AzureFirewallInner>> listByResourceGroupSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1026,7 +1038,7 @@ private Mono<PagedResponse<AzureFirewallInner>> listByResourceGroupSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1114,7 +1126,7 @@ private Mono<PagedResponse<AzureFirewallInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1144,7 +1156,7 @@ private Mono<PagedResponse<AzureFirewallInner>> listSinglePageAsync(Context cont
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1235,7 +1247,7 @@ public Mono<Response<Flux<ByteBuffer>>> listLearnedPrefixesWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listLearnedPrefixes(this.client.getEndpoint(), resourceGroupName,
@@ -1274,7 +1286,7 @@ private Mono<Response<Flux<ByteBuffer>>> listLearnedPrefixesWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listLearnedPrefixes(this.client.getEndpoint(), resourceGroupName, azureFirewallName, apiVersion,
@@ -1455,7 +1467,7 @@ public Mono<Response<Flux<ByteBuffer>>> packetCaptureWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.packetCapture(this.client.getEndpoint(), resourceGroupName,
@@ -1499,7 +1511,7 @@ private Mono<Response<Flux<ByteBuffer>>> packetCaptureWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.packetCapture(this.client.getEndpoint(), resourceGroupName, azureFirewallName, apiVersion,
@@ -1653,6 +1665,252 @@ public void packetCapture(String resourceGroupName, String azureFirewallName,
         packetCaptureAsync(resourceGroupName, azureFirewallName, parameters, context).block();
     }
 
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<Flux<ByteBuffer>>> packetCaptureOperationWithResponseAsync(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (azureFirewallName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.packetCaptureOperation(this.client.getEndpoint(), resourceGroupName,
+                azureFirewallName, apiVersion, this.client.getSubscriptionId(), parameters, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> packetCaptureOperationWithResponseAsync(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (azureFirewallName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter azureFirewallName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.packetCaptureOperation(this.client.getEndpoint(), resourceGroupName, azureFirewallName,
+            apiVersion, this.client.getSubscriptionId(), parameters, accept, context);
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperationAsync(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = packetCaptureOperationWithResponseAsync(resourceGroupName, azureFirewallName, parameters);
+        return this.client
+            .<AzureFirewallPacketCaptureResponseInner, AzureFirewallPacketCaptureResponseInner>getLroResult(mono,
+                this.client.getHttpPipeline(), AzureFirewallPacketCaptureResponseInner.class,
+                AzureFirewallPacketCaptureResponseInner.class, this.client.getContext());
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperationAsync(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters, Context context) {
+        context = this.client.mergeContext(context);
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = packetCaptureOperationWithResponseAsync(resourceGroupName, azureFirewallName, parameters, context);
+        return this.client
+            .<AzureFirewallPacketCaptureResponseInner, AzureFirewallPacketCaptureResponseInner>getLroResult(mono,
+                this.client.getHttpPipeline(), AzureFirewallPacketCaptureResponseInner.class,
+                AzureFirewallPacketCaptureResponseInner.class, context);
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperation(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters) {
+        return this.beginPacketCaptureOperationAsync(resourceGroupName, azureFirewallName, parameters).getSyncPoller();
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<AzureFirewallPacketCaptureResponseInner>, AzureFirewallPacketCaptureResponseInner>
+        beginPacketCaptureOperation(String resourceGroupName, String azureFirewallName,
+            FirewallPacketCaptureParameters parameters, Context context) {
+        return this.beginPacketCaptureOperationAsync(resourceGroupName, azureFirewallName, parameters, context)
+            .getSyncPoller();
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<AzureFirewallPacketCaptureResponseInner> packetCaptureOperationAsync(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters) {
+        return beginPacketCaptureOperationAsync(resourceGroupName, azureFirewallName, parameters).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<AzureFirewallPacketCaptureResponseInner> packetCaptureOperationAsync(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters, Context context) {
+        return beginPacketCaptureOperationAsync(resourceGroupName, azureFirewallName, parameters, context).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public AzureFirewallPacketCaptureResponseInner packetCaptureOperation(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters) {
+        return packetCaptureOperationAsync(resourceGroupName, azureFirewallName, parameters).block();
+    }
+
+    /**
+     * Runs a packet capture operation on AzureFirewall.
+     * 
+     * @param resourceGroupName The name of the resource group.
+     * @param azureFirewallName The name of the azure firewall.
+     * @param parameters Parameters supplied to run packet capture on azure firewall.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return response of an Azure Firewall Packet Capture Operation.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public AzureFirewallPacketCaptureResponseInner packetCaptureOperation(String resourceGroupName,
+        String azureFirewallName, FirewallPacketCaptureParameters parameters, Context context) {
+        return packetCaptureOperationAsync(resourceGroupName, azureFirewallName, parameters, context).block();
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -1713,8 +1971,8 @@ private Mono<PagedResponse<AzureFirewallInner>> listNextSinglePageAsync(String n
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAzureFirewalls API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Azure Firewalls in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AzureFirewallInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1741,8 +1999,8 @@ private Mono<PagedResponse<AzureFirewallInner>> listAllNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAzureFirewalls API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Azure Firewalls in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AzureFirewallInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BastionHostsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BastionHostsClientImpl.java
index 0b0b559208c0..cb126d647f75 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BastionHostsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BastionHostsClientImpl.java
@@ -74,7 +74,7 @@ public final class BastionHostsClientImpl implements InnerSupportsGet<BastionHos
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientBastionHosts")
     public interface BastionHostsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}")
@@ -176,7 +176,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, bastionHostname,
@@ -214,7 +214,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, bastionHostname, apiVersion,
@@ -381,7 +381,7 @@ public Mono<Response<BastionHostInner>> getByResourceGroupWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -419,7 +419,7 @@ private Mono<Response<BastionHostInner>> getByResourceGroupWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, bastionHostname, apiVersion,
@@ -509,7 +509,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -553,7 +553,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, bastionHostname, apiVersion,
@@ -744,7 +744,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -788,7 +788,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -961,7 +961,7 @@ private Mono<PagedResponse<BastionHostInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -991,7 +991,7 @@ private Mono<PagedResponse<BastionHostInner>> listSinglePageAsync(Context contex
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1076,7 +1076,7 @@ private Mono<PagedResponse<BastionHostInner>> listByResourceGroupSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1112,7 +1112,7 @@ private Mono<PagedResponse<BastionHostInner>> listByResourceGroupSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BgpServiceCommunitiesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BgpServiceCommunitiesClientImpl.java
index cc00b7536296..bab7ccdb20df 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BgpServiceCommunitiesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/BgpServiceCommunitiesClientImpl.java
@@ -60,7 +60,7 @@ public final class BgpServiceCommunitiesClientImpl implements BgpServiceCommunit
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientBgpServiceCommunities")
     public interface BgpServiceCommunitiesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/bgpServiceCommunities")
@@ -97,7 +97,7 @@ private Mono<PagedResponse<BgpServiceCommunityInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -127,7 +127,7 @@ private Mono<PagedResponse<BgpServiceCommunityInner>> listSinglePageAsync(Contex
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -195,8 +195,8 @@ public PagedIterable<BgpServiceCommunityInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListServiceCommunity API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the available bgp service communities along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<BgpServiceCommunityInner>> listNextSinglePageAsync(String nextLink) {
@@ -222,8 +222,8 @@ private Mono<PagedResponse<BgpServiceCommunityInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListServiceCommunity API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the available bgp service communities along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<BgpServiceCommunityInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConfigurationPolicyGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConfigurationPolicyGroupsClientImpl.java
index 800888a54936..253d888656b0 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConfigurationPolicyGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConfigurationPolicyGroupsClientImpl.java
@@ -68,7 +68,7 @@ public final class ConfigurationPolicyGroupsClientImpl implements ConfigurationP
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientConfigurationPolicyGroups")
     public interface ConfigurationPolicyGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}/configurationPolicyGroups/{configurationPolicyGroupName}")
@@ -168,7 +168,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             vpnServerConfigurationPolicyGroupParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -222,7 +222,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             vpnServerConfigurationPolicyGroupParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -452,7 +452,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(
                 new IllegalArgumentException("Parameter configurationPolicyGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -496,7 +496,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter configurationPolicyGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -689,7 +689,7 @@ public Mono<Response<VpnServerConfigurationPolicyGroupInner>> getWithResponseAsy
             return Mono.error(
                 new IllegalArgumentException("Parameter configurationPolicyGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -734,7 +734,7 @@ private Mono<Response<VpnServerConfigurationPolicyGroupInner>> getWithResponseAs
             return Mono.error(
                 new IllegalArgumentException("Parameter configurationPolicyGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -826,7 +826,7 @@ public VpnServerConfigurationPolicyGroupInner get(String resourceGroupName, Stri
             return Mono.error(
                 new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByVpnServerConfiguration(this.client.getEndpoint(),
@@ -868,7 +868,7 @@ private Mono<PagedResponse<VpnServerConfigurationPolicyGroupInner>> listByVpnSer
             return Mono.error(
                 new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectionMonitorsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectionMonitorsClientImpl.java
index 2de2b9ed50de..6e600fb303bb 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectionMonitorsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectionMonitorsClientImpl.java
@@ -72,7 +72,7 @@ public final class ConnectionMonitorsClientImpl implements ConnectionMonitorsCli
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientConnectionMonitors")
     public interface ConnectionMonitorsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/connectionMonitors/{connectionMonitorName}")
@@ -183,7 +183,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -236,7 +236,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -499,7 +499,7 @@ public Mono<Response<ConnectionMonitorResultInner>> getWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -542,7 +542,7 @@ private Mono<Response<ConnectionMonitorResultInner>> getWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkWatcherName, connectionMonitorName,
@@ -636,7 +636,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -679,7 +679,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName, connectionMonitorName,
@@ -873,7 +873,7 @@ public Mono<Response<ConnectionMonitorResultInner>> updateTagsWithResponseAsync(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -923,7 +923,7 @@ private Mono<Response<ConnectionMonitorResultInner>> updateTagsWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -1022,7 +1022,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stop(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -1065,7 +1065,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stop(this.client.getEndpoint(), resourceGroupName, networkWatcherName, connectionMonitorName,
@@ -1247,7 +1247,7 @@ private Mono<PagedResponse<ConnectionMonitorResultInner>> listSinglePageAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -1287,7 +1287,7 @@ private Mono<PagedResponse<ConnectionMonitorResultInner>> listSinglePageAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectivityConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectivityConfigurationsClientImpl.java
index 41e524a6312b..a4968dae8717 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectivityConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ConnectivityConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class ConnectivityConfigurationsClientImpl implements ConnectivityC
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientConnectivityConfigurations")
     public interface ConnectivityConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/connectivityConfigurations/{configurationName}")
@@ -159,7 +159,7 @@ public Mono<Response<ConnectivityConfigurationInner>> getWithResponseAsync(Strin
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -204,7 +204,7 @@ private Mono<Response<ConnectivityConfigurationInner>> getWithResponseAsync(Stri
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -313,7 +313,7 @@ public Mono<Response<ConnectivityConfigurationInner>> createOrUpdateWithResponse
         } else {
             connectivityConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -367,7 +367,7 @@ private Mono<Response<ConnectivityConfigurationInner>> createOrUpdateWithRespons
         } else {
             connectivityConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -473,7 +473,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -520,7 +520,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -772,7 +772,7 @@ private Mono<PagedResponse<ConnectivityConfigurationInner>> listSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -818,7 +818,7 @@ private Mono<PagedResponse<ConnectivityConfigurationInner>> listSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/CustomIpPrefixesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/CustomIpPrefixesClientImpl.java
index d512e5fd42c7..d65a59739fd2 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/CustomIpPrefixesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/CustomIpPrefixesClientImpl.java
@@ -74,7 +74,7 @@ public final class CustomIpPrefixesClientImpl implements InnerSupportsGet<Custom
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientCustomIpPrefixes")
     public interface CustomIpPrefixesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/customIpPrefixes/{customIpPrefixName}")
@@ -178,7 +178,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, customIpPrefixName,
@@ -216,7 +216,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, customIpPrefixName, apiVersion,
@@ -385,7 +385,7 @@ public Mono<Response<CustomIpPrefixInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -425,7 +425,7 @@ private Mono<Response<CustomIpPrefixInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, customIpPrefixName, apiVersion,
@@ -518,7 +518,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -562,7 +562,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, customIpPrefixName, apiVersion,
@@ -754,7 +754,7 @@ public Mono<Response<CustomIpPrefixInner>> updateTagsWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, customIpPrefixName,
@@ -798,7 +798,7 @@ private Mono<Response<CustomIpPrefixInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, customIpPrefixName, apiVersion,
@@ -875,7 +875,7 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -905,7 +905,7 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -990,7 +990,7 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1026,7 +1026,7 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1103,8 +1103,8 @@ public PagedIterable<CustomIpPrefixInner> listByResourceGroup(String resourceGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListCustomIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the custom IP prefixes in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<CustomIpPrefixInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1131,8 +1131,8 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListCustomIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the custom IP prefixes in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<CustomIpPrefixInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1157,8 +1157,8 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListCustomIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all custom IP prefixes in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<CustomIpPrefixInner>> listNextSinglePageAsync(String nextLink) {
@@ -1184,8 +1184,8 @@ private Mono<PagedResponse<CustomIpPrefixInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListCustomIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all custom IP prefixes in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<CustomIpPrefixInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosCustomPoliciesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosCustomPoliciesClientImpl.java
index ff6e519f1eb3..064d928b4ec0 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosCustomPoliciesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosCustomPoliciesClientImpl.java
@@ -68,7 +68,7 @@ public final class DdosCustomPoliciesClientImpl
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientDdosCustomPolicies")
     public interface DdosCustomPoliciesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosCustomPolicies/{ddosCustomPolicyName}")
@@ -142,7 +142,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, ddosCustomPolicyName,
@@ -180,7 +180,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, ddosCustomPolicyName, apiVersion,
@@ -349,7 +349,7 @@ public Mono<Response<DdosCustomPolicyInner>> getByResourceGroupWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -388,7 +388,7 @@ private Mono<Response<DdosCustomPolicyInner>> getByResourceGroupWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, ddosCustomPolicyName,
@@ -479,7 +479,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -524,7 +524,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, ddosCustomPolicyName, apiVersion,
@@ -718,7 +718,7 @@ public Mono<Response<DdosCustomPolicyInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -763,7 +763,7 @@ private Mono<Response<DdosCustomPolicyInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, ddosCustomPolicyName, apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosProtectionPlansClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosProtectionPlansClientImpl.java
index ea521a237e84..a74b3bf4d4e2 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosProtectionPlansClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DdosProtectionPlansClientImpl.java
@@ -74,7 +74,7 @@ public final class DdosProtectionPlansClientImpl implements InnerSupportsGet<Ddo
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientDdosProtectionPlans")
     public interface DdosProtectionPlansService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ddosProtectionPlans/{ddosProtectionPlanName}")
@@ -180,7 +180,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, ddosProtectionPlanName,
@@ -218,7 +218,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, ddosProtectionPlanName, apiVersion,
@@ -388,7 +388,7 @@ public Mono<Response<DdosProtectionPlanInner>> getByResourceGroupWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -427,7 +427,7 @@ private Mono<Response<DdosProtectionPlanInner>> getByResourceGroupWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, ddosProtectionPlanName,
@@ -519,7 +519,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -564,7 +564,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, ddosProtectionPlanName, apiVersion,
@@ -758,7 +758,7 @@ public Mono<Response<DdosProtectionPlanInner>> updateTagsWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -803,7 +803,7 @@ private Mono<Response<DdosProtectionPlanInner>> updateTagsWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, ddosProtectionPlanName, apiVersion,
@@ -881,7 +881,7 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -911,7 +911,7 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listSinglePageAsync(Context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -996,7 +996,7 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listByResourceGroupSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1032,7 +1032,7 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listByResourceGroupSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1109,7 +1109,7 @@ public PagedIterable<DdosProtectionPlanInner> listByResourceGroup(String resourc
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of DDoS protection plans along with {@link PagedResponse} on successful completion of
+     * @return all DDoS protection plans in a subscription along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1136,7 +1136,7 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of DDoS protection plans along with {@link PagedResponse} on successful completion of
+     * @return all DDoS protection plans in a subscription along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1162,8 +1162,8 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of DDoS protection plans along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all the DDoS protection plans in a resource group along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DdosProtectionPlanInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -1191,8 +1191,8 @@ private Mono<PagedResponse<DdosProtectionPlanInner>> listByResourceGroupNextSing
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of DDoS protection plans along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all the DDoS protection plans in a resource group along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DdosProtectionPlanInner>> listByResourceGroupNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DefaultSecurityRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DefaultSecurityRulesClientImpl.java
index 737a33503302..52389870bea2 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DefaultSecurityRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DefaultSecurityRulesClientImpl.java
@@ -60,7 +60,7 @@ public final class DefaultSecurityRulesClientImpl implements DefaultSecurityRule
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientDefaultSecurityRules")
     public interface DefaultSecurityRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/defaultSecurityRules")
@@ -121,7 +121,7 @@ private Mono<PagedResponse<SecurityRuleInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -162,7 +162,7 @@ private Mono<PagedResponse<SecurityRuleInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -273,7 +273,7 @@ public Mono<Response<SecurityRuleInner>> getWithResponseAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -317,7 +317,7 @@ private Mono<Response<SecurityRuleInner>> getWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -386,8 +386,8 @@ public SecurityRuleInner get(String resourceGroupName, String networkSecurityGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSecurityRule API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all default security rules in a network security group along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SecurityRuleInner>> listNextSinglePageAsync(String nextLink) {
@@ -413,8 +413,8 @@ private Mono<PagedResponse<SecurityRuleInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSecurityRule API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all default security rules in a network security group along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SecurityRuleInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DscpConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DscpConfigurationsClientImpl.java
index 2048a7f9c7f7..b95ccf85be54 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DscpConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/DscpConfigurationsClientImpl.java
@@ -72,7 +72,7 @@ public final class DscpConfigurationsClientImpl implements InnerSupportsGet<Dscp
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientDscpConfigurations")
     public interface DscpConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/dscpConfigurations/{dscpConfigurationName}")
@@ -174,7 +174,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -219,7 +219,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, dscpConfigurationName, apiVersion,
@@ -412,7 +412,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, dscpConfigurationName,
@@ -450,7 +450,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, dscpConfigurationName, apiVersion,
@@ -618,7 +618,7 @@ public Mono<Response<DscpConfigurationInner>> getByResourceGroupWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -656,7 +656,7 @@ private Mono<Response<DscpConfigurationInner>> getByResourceGroupWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, dscpConfigurationName,
@@ -735,7 +735,7 @@ private Mono<PagedResponse<DscpConfigurationInner>> listByResourceGroupSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -770,7 +770,7 @@ private Mono<PagedResponse<DscpConfigurationInner>> listByResourceGroupSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -858,7 +858,7 @@ private Mono<PagedResponse<DscpConfigurationInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -888,7 +888,7 @@ private Mono<PagedResponse<DscpConfigurationInner>> listSinglePageAsync(Context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -956,8 +956,7 @@ public PagedIterable<DscpConfigurationInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the DscpConfigurationList API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return a DSCP Configuration along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DscpConfigurationInner>> listNextSinglePageAsync(String nextLink) {
@@ -983,8 +982,7 @@ private Mono<PagedResponse<DscpConfigurationInner>> listNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the DscpConfigurationList API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return a DSCP Configuration along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DscpConfigurationInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -1009,8 +1007,8 @@ private Mono<PagedResponse<DscpConfigurationInner>> listNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the DscpConfigurationList API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all dscp configurations in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DscpConfigurationInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1037,8 +1035,8 @@ private Mono<PagedResponse<DscpConfigurationInner>> listAllNextSinglePageAsync(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the DscpConfigurationList API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all dscp configurations in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DscpConfigurationInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitAuthorizationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitAuthorizationsClientImpl.java
index 48fe61bc294a..64d4c4de1d96 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitAuthorizationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitAuthorizationsClientImpl.java
@@ -68,7 +68,7 @@ public final class ExpressRouteCircuitAuthorizationsClientImpl implements Expres
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteCircuitAuthorizations")
     public interface ExpressRouteCircuitAuthorizationsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/authorizations/{authorizationName}")
@@ -149,7 +149,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -191,7 +191,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, circuitName, authorizationName, apiVersion,
@@ -376,7 +376,7 @@ public Mono<Response<ExpressRouteCircuitAuthorizationInner>> getWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -419,7 +419,7 @@ private Mono<Response<ExpressRouteCircuitAuthorizationInner>> getWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, circuitName, authorizationName, apiVersion,
@@ -522,7 +522,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             authorizationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -575,7 +575,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             authorizationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName, authorizationName,
@@ -789,7 +789,7 @@ private Mono<PagedResponse<ExpressRouteCircuitAuthorizationInner>> listSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -829,7 +829,7 @@ private Mono<PagedResponse<ExpressRouteCircuitAuthorizationInner>> listSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -912,8 +912,8 @@ public PagedIterable<ExpressRouteCircuitAuthorizationInner> list(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAuthorizations API service call retrieves all authorizations that belongs to an
-     * ExpressRouteCircuit along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all authorizations in an express route circuit along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCircuitAuthorizationInner>> listNextSinglePageAsync(String nextLink) {
@@ -939,8 +939,8 @@ private Mono<PagedResponse<ExpressRouteCircuitAuthorizationInner>> listNextSingl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAuthorizations API service call retrieves all authorizations that belongs to an
-     * ExpressRouteCircuit along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all authorizations in an express route circuit along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCircuitAuthorizationInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitConnectionsClientImpl.java
index 3f90edd728f9..c3489f08972d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitConnectionsClientImpl.java
@@ -68,7 +68,7 @@ public final class ExpressRouteCircuitConnectionsClientImpl implements ExpressRo
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteCircuitConnections")
     public interface ExpressRouteCircuitConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/connections/{connectionName}")
@@ -155,7 +155,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -200,7 +200,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName, connectionName,
@@ -399,7 +399,7 @@ public Mono<Response<ExpressRouteCircuitConnectionInner>> getWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -445,7 +445,7 @@ private Mono<Response<ExpressRouteCircuitConnectionInner>> getWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName, connectionName,
@@ -556,7 +556,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             expressRouteCircuitConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -612,7 +612,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             expressRouteCircuitConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -851,7 +851,7 @@ private Mono<PagedResponse<ExpressRouteCircuitConnectionInner>> listSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -895,7 +895,7 @@ private Mono<PagedResponse<ExpressRouteCircuitConnectionInner>> listSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -988,9 +988,8 @@ public PagedIterable<ExpressRouteCircuitConnectionInner> list(String resourceGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListConnections API service call retrieves all global reach connections that belongs to a
-     * Private Peering for an ExpressRouteCircuit along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all global reach connections associated with a private peering in an express route circuit along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCircuitConnectionInner>> listNextSinglePageAsync(String nextLink) {
@@ -1016,9 +1015,8 @@ private Mono<PagedResponse<ExpressRouteCircuitConnectionInner>> listNextSinglePa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListConnections API service call retrieves all global reach connections that belongs to a
-     * Private Peering for an ExpressRouteCircuit along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all global reach connections associated with a private peering in an express route circuit along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCircuitConnectionInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsClientImpl.java
index 1d52d3166426..2cd627c2af38 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitPeeringsClientImpl.java
@@ -68,7 +68,7 @@ public final class ExpressRouteCircuitPeeringsClientImpl implements ExpressRoute
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteCircuitPeerings")
     public interface ExpressRouteCircuitPeeringsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}")
@@ -149,7 +149,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -190,7 +190,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName, apiVersion,
@@ -372,7 +372,7 @@ public Mono<Response<ExpressRouteCircuitPeeringInner>> getWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -414,7 +414,7 @@ private Mono<Response<ExpressRouteCircuitPeeringInner>> getWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName, apiVersion,
@@ -513,7 +513,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             peeringParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -562,7 +562,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             peeringParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -763,7 +763,7 @@ private Mono<PagedResponse<ExpressRouteCircuitPeeringInner>> listSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -803,7 +803,7 @@ private Mono<PagedResponse<ExpressRouteCircuitPeeringInner>> listSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -886,8 +886,8 @@ public PagedIterable<ExpressRouteCircuitPeeringInner> list(String resourceGroupN
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPeering API service call retrieves all peerings that belong to an ExpressRouteCircuit
-     * along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all peerings in a specified express route circuit along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCircuitPeeringInner>> listNextSinglePageAsync(String nextLink) {
@@ -913,8 +913,8 @@ private Mono<PagedResponse<ExpressRouteCircuitPeeringInner>> listNextSinglePageA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPeering API service call retrieves all peerings that belong to an ExpressRouteCircuit
-     * along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all peerings in a specified express route circuit along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCircuitPeeringInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitsClientImpl.java
index 18454cb5cc71..1c3326a5dd92 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCircuitsClientImpl.java
@@ -79,7 +79,7 @@ public final class ExpressRouteCircuitsClientImpl implements InnerSupportsGet<Ex
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteCircuits")
     public interface ExpressRouteCircuitsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}")
@@ -227,7 +227,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -264,7 +264,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -430,7 +430,7 @@ public Mono<Response<ExpressRouteCircuitInner>> getByResourceGroupWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -468,7 +468,7 @@ private Mono<Response<ExpressRouteCircuitInner>> getByResourceGroupWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -557,7 +557,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -600,7 +600,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -791,7 +791,7 @@ public Mono<Response<ExpressRouteCircuitInner>> updateTagsWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -834,7 +834,7 @@ private Mono<Response<ExpressRouteCircuitInner>> updateTagsWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -930,7 +930,7 @@ public Mono<Response<Flux<ByteBuffer>>> listArpTableWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listArpTable(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -976,7 +976,7 @@ private Mono<Response<Flux<ByteBuffer>>> listArpTableWithResponseAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listArpTable(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName, devicePath,
@@ -1194,7 +1194,7 @@ public Mono<Response<Flux<ByteBuffer>>> listRoutesTableWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listRoutesTable(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -1240,7 +1240,7 @@ private Mono<Response<Flux<ByteBuffer>>> listRoutesTableWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listRoutesTable(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -1458,7 +1458,7 @@ public Mono<Response<Flux<ByteBuffer>>> listRoutesTableSummaryWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listRoutesTableSummary(this.client.getEndpoint(), resourceGroupName,
@@ -1504,7 +1504,7 @@ private Mono<Response<Flux<ByteBuffer>>> listRoutesTableSummaryWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listRoutesTableSummary(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -1719,7 +1719,7 @@ public Mono<Response<ExpressRouteCircuitStatsInner>> getStatsWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getStats(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -1757,7 +1757,7 @@ private Mono<Response<ExpressRouteCircuitStatsInner>> getStatsWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getStats(this.client.getEndpoint(), resourceGroupName, circuitName, apiVersion,
@@ -1845,7 +1845,7 @@ public Mono<Response<ExpressRouteCircuitStatsInner>> getPeeringStatsWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getPeeringStats(this.client.getEndpoint(), resourceGroupName, circuitName,
@@ -1887,7 +1887,7 @@ private Mono<Response<ExpressRouteCircuitStatsInner>> getPeeringStatsWithRespons
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getPeeringStats(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -1971,7 +1971,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listByResourceGroupSingleP
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -2007,7 +2007,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listByResourceGroupSingleP
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -2095,7 +2095,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -2125,7 +2125,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listSinglePageAsync(Contex
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -2193,7 +2193,7 @@ public PagedIterable<ExpressRouteCircuitInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListExpressRouteCircuit API service call along with {@link PagedResponse} on successful
+     * @return all the express route circuits in a resource group along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -2220,7 +2220,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListExpressRouteCircuit API service call along with {@link PagedResponse} on successful
+     * @return all the express route circuits in a resource group along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -2246,7 +2246,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListExpressRouteCircuit API service call along with {@link PagedResponse} on successful
+     * @return all the express route circuits in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -2274,7 +2274,7 @@ private Mono<PagedResponse<ExpressRouteCircuitInner>> listAllNextSinglePageAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListExpressRouteCircuit API service call along with {@link PagedResponse} on successful
+     * @return all the express route circuits in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteConnectionsClientImpl.java
index c210e92f9818..2376e46c20d9 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteConnectionsClientImpl.java
@@ -64,7 +64,7 @@ public final class ExpressRouteConnectionsClientImpl implements ExpressRouteConn
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteConnections")
     public interface ExpressRouteConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteGateways/{expressRouteGatewayName}/expressRouteConnections/{connectionName}")
@@ -150,7 +150,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             putExpressRouteConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -201,7 +201,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             putExpressRouteConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName,
@@ -416,7 +416,7 @@ public Mono<Response<ExpressRouteConnectionInner>> getWithResponseAsync(String r
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName,
@@ -459,7 +459,7 @@ private Mono<Response<ExpressRouteConnectionInner>> getWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName, connectionName,
@@ -552,7 +552,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -594,7 +594,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName, connectionName,
@@ -776,7 +776,7 @@ public Mono<Response<ExpressRouteConnectionListInner>> listWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName,
@@ -814,7 +814,7 @@ private Mono<Response<ExpressRouteConnectionListInner>> listWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName, apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionPeeringsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionPeeringsClientImpl.java
index 2e598f610b80..f3c0def4f2ee 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionPeeringsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionPeeringsClientImpl.java
@@ -68,7 +68,7 @@ public final class ExpressRouteCrossConnectionPeeringsClientImpl implements Expr
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteCrossConnectionPeerings")
     public interface ExpressRouteCrossConnectionPeeringsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCrossConnections/{crossConnectionName}/peerings")
@@ -149,7 +149,7 @@ private Mono<PagedResponse<ExpressRouteCrossConnectionPeeringInner>> listSingleP
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, crossConnectionName,
@@ -191,7 +191,7 @@ private Mono<PagedResponse<ExpressRouteCrossConnectionPeeringInner>> listSingleP
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -302,7 +302,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, crossConnectionName,
@@ -344,7 +344,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, crossConnectionName, peeringName,
@@ -529,7 +529,7 @@ public Mono<Response<ExpressRouteCrossConnectionPeeringInner>> getWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, crossConnectionName,
@@ -572,7 +572,7 @@ private Mono<Response<ExpressRouteCrossConnectionPeeringInner>> getWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, crossConnectionName, peeringName, apiVersion,
@@ -674,7 +674,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             peeringParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -727,7 +727,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             peeringParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, crossConnectionName, peeringName,
@@ -920,8 +920,8 @@ public ExpressRouteCrossConnectionPeeringInner createOrUpdate(String resourceGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPeering API service call retrieves all peerings that belong to an
-     * ExpressRouteCrossConnection along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all peerings in a specified ExpressRouteCrossConnection along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCrossConnectionPeeringInner>> listNextSinglePageAsync(String nextLink) {
@@ -948,8 +948,8 @@ private Mono<PagedResponse<ExpressRouteCrossConnectionPeeringInner>> listNextSin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPeering API service call retrieves all peerings that belong to an
-     * ExpressRouteCrossConnection along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all peerings in a specified ExpressRouteCrossConnection along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteCrossConnectionPeeringInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionsClientImpl.java
index eb543c7cb329..ca533f9bad41 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteCrossConnectionsClientImpl.java
@@ -76,7 +76,7 @@ public final class ExpressRouteCrossConnectionsClientImpl implements InnerSuppor
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteCrossConnections")
     public interface ExpressRouteCrossConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteCrossConnections")
@@ -193,7 +193,7 @@ private Mono<PagedResponse<ExpressRouteCrossConnectionInner>> listSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -225,7 +225,7 @@ private Mono<PagedResponse<ExpressRouteCrossConnectionInner>> listSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -338,7 +338,7 @@ public PagedIterable<ExpressRouteCrossConnectionInner> list(String filter, Conte
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -374,7 +374,7 @@ public PagedIterable<ExpressRouteCrossConnectionInner> list(String filter, Conte
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -480,7 +480,7 @@ public PagedIterable<ExpressRouteCrossConnectionInner> listByResourceGroup(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -519,7 +519,7 @@ public PagedIterable<ExpressRouteCrossConnectionInner> listByResourceGroup(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, crossConnectionName, apiVersion,
@@ -611,7 +611,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -656,7 +656,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, crossConnectionName, apiVersion,
@@ -856,7 +856,7 @@ public Mono<Response<ExpressRouteCrossConnectionInner>> updateTagsWithResponseAs
         } else {
             crossConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -903,7 +903,7 @@ private Mono<Response<ExpressRouteCrossConnectionInner>> updateTagsWithResponseA
         } else {
             crossConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, crossConnectionName, apiVersion,
@@ -1003,7 +1003,7 @@ public Mono<Response<Flux<ByteBuffer>>> listArpTableWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1051,7 +1051,7 @@ private Mono<Response<Flux<ByteBuffer>>> listArpTableWithResponseAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listArpTable(this.client.getEndpoint(), resourceGroupName, crossConnectionName, peeringName,
@@ -1274,7 +1274,7 @@ public Mono<Response<Flux<ByteBuffer>>> listRoutesTableSummaryWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listRoutesTableSummary(this.client.getEndpoint(), resourceGroupName,
@@ -1322,7 +1322,7 @@ private Mono<Response<Flux<ByteBuffer>>> listRoutesTableSummaryWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listRoutesTableSummary(this.client.getEndpoint(), resourceGroupName, crossConnectionName,
@@ -1549,7 +1549,7 @@ public Mono<Response<Flux<ByteBuffer>>> listRoutesTableWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1598,7 +1598,7 @@ private Mono<Response<Flux<ByteBuffer>>> listRoutesTableWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listRoutesTable(this.client.getEndpoint(), resourceGroupName, crossConnectionName, peeringName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteGatewaysClientImpl.java
index 7d08b4f7821f..ffc045ad44b9 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteGatewaysClientImpl.java
@@ -69,7 +69,7 @@ public final class ExpressRouteGatewaysClientImpl
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteGateways")
     public interface ExpressRouteGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteGateways")
@@ -148,7 +148,7 @@ public Mono<Response<ExpressRouteGatewayListInner>> listBySubscriptionWithRespon
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listBySubscription(this.client.getEndpoint(), apiVersion,
@@ -175,7 +175,7 @@ private Mono<Response<ExpressRouteGatewayListInner>> listBySubscriptionWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listBySubscription(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -243,7 +243,7 @@ public Mono<Response<ExpressRouteGatewayListInner>> listByResourceGroupWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -276,7 +276,7 @@ private Mono<Response<ExpressRouteGatewayListInner>> listByResourceGroupWithResp
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName, apiVersion,
@@ -363,7 +363,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             putExpressRouteGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -409,7 +409,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             putExpressRouteGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName, apiVersion,
@@ -614,7 +614,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             expressRouteGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -659,7 +659,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             expressRouteGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -852,7 +852,7 @@ public Mono<Response<ExpressRouteGatewayInner>> getByResourceGroupWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -890,7 +890,7 @@ private Mono<Response<ExpressRouteGatewayInner>> getByResourceGroupWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName,
@@ -976,7 +976,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -1015,7 +1015,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, expressRouteGatewayName, apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteLinksClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteLinksClientImpl.java
index af6ba86251ae..4c8bce061e65 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteLinksClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteLinksClientImpl.java
@@ -60,7 +60,7 @@ public final class ExpressRouteLinksClientImpl implements ExpressRouteLinksClien
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteLinks")
     public interface ExpressRouteLinksService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}/links/{linkName}")
@@ -124,7 +124,7 @@ public Mono<Response<ExpressRouteLinkInner>> getWithResponseAsync(String resourc
         if (linkName == null) {
             return Mono.error(new IllegalArgumentException("Parameter linkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -166,7 +166,7 @@ private Mono<Response<ExpressRouteLinkInner>> getWithResponseAsync(String resour
         if (linkName == null) {
             return Mono.error(new IllegalArgumentException("Parameter linkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, resourceGroupName,
@@ -254,7 +254,7 @@ private Mono<PagedResponse<ExpressRouteLinkInner>> listSinglePageAsync(String re
             return Mono
                 .error(new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -294,7 +294,7 @@ private Mono<PagedResponse<ExpressRouteLinkInner>> listSinglePageAsync(String re
             return Mono
                 .error(new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortAuthorizationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortAuthorizationsClientImpl.java
index 703e489e673d..3d9bdd4af22f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortAuthorizationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortAuthorizationsClientImpl.java
@@ -68,7 +68,7 @@ public final class ExpressRoutePortAuthorizationsClientImpl implements ExpressRo
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRoutePortAuthorizations")
     public interface ExpressRoutePortAuthorizationsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRoutePorts/{expressRoutePortName}/authorizations/{authorizationName}")
@@ -155,7 +155,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, expressRoutePortName,
@@ -198,7 +198,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, expressRoutePortName, authorizationName,
@@ -386,7 +386,7 @@ public Mono<Response<ExpressRoutePortAuthorizationInner>> getWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, expressRoutePortName,
@@ -430,7 +430,7 @@ private Mono<Response<ExpressRoutePortAuthorizationInner>> getWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, expressRoutePortName, authorizationName,
@@ -534,7 +534,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             authorizationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -587,7 +587,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             authorizationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, expressRoutePortName,
@@ -805,7 +805,7 @@ private Mono<PagedResponse<ExpressRoutePortAuthorizationInner>> listSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, expressRoutePortName,
@@ -846,7 +846,7 @@ private Mono<PagedResponse<ExpressRoutePortAuthorizationInner>> listSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -931,7 +931,7 @@ public PagedIterable<ExpressRoutePortAuthorizationInner> list(String resourceGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return expressRoute Port Authorization List Result along with {@link PagedResponse} on successful completion of
+     * @return all authorizations in an express route port along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -958,7 +958,7 @@ private Mono<PagedResponse<ExpressRoutePortAuthorizationInner>> listNextSinglePa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return expressRoute Port Authorization List Result along with {@link PagedResponse} on successful completion of
+     * @return all authorizations in an express route port along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsClientImpl.java
index 003795dcdd90..a8bad067ae8a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsClientImpl.java
@@ -77,7 +77,7 @@ public final class ExpressRoutePortsClientImpl implements InnerSupportsGet<Expre
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRoutePorts")
     public interface ExpressRoutePortsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ExpressRoutePorts/{expressRoutePortName}")
@@ -195,7 +195,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -233,7 +233,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, resourceGroupName,
@@ -401,7 +401,7 @@ public Mono<Response<ExpressRoutePortInner>> getByResourceGroupWithResponseAsync
             return Mono
                 .error(new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(),
@@ -439,7 +439,7 @@ private Mono<Response<ExpressRoutePortInner>> getByResourceGroupWithResponseAsyn
             return Mono
                 .error(new IllegalArgumentException("Parameter expressRoutePortName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -529,7 +529,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -573,7 +573,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -766,7 +766,7 @@ public Mono<Response<ExpressRoutePortInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -810,7 +810,7 @@ private Mono<Response<ExpressRoutePortInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -893,7 +893,7 @@ private Mono<PagedResponse<ExpressRoutePortInner>> listByResourceGroupSinglePage
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -928,7 +928,7 @@ private Mono<PagedResponse<ExpressRoutePortInner>> listByResourceGroupSinglePage
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1015,7 +1015,7 @@ private Mono<PagedResponse<ExpressRoutePortInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1044,7 +1044,7 @@ private Mono<PagedResponse<ExpressRoutePortInner>> listSinglePageAsync(Context c
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -1141,7 +1141,7 @@ public Mono<Response<GenerateExpressRoutePortsLoaResultInner>> generateLoaWithRe
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.generateLoa(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1187,7 +1187,7 @@ private Mono<Response<GenerateExpressRoutePortsLoaResultInner>> generateLoaWithR
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.generateLoa(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsLocationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsLocationsClientImpl.java
index bc67bebe1e1e..3fd49415f9e6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsLocationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRoutePortsLocationsClientImpl.java
@@ -60,7 +60,7 @@ public final class ExpressRoutePortsLocationsClientImpl implements ExpressRouteP
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRoutePortsLocations")
     public interface ExpressRoutePortsLocationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/ExpressRoutePortsLocations")
@@ -106,7 +106,7 @@ private Mono<PagedResponse<ExpressRoutePortsLocationInner>> listSinglePageAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -137,7 +137,7 @@ private Mono<PagedResponse<ExpressRoutePortsLocationInner>> listSinglePageAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -225,7 +225,7 @@ public Mono<Response<ExpressRoutePortsLocationInner>> getWithResponseAsync(Strin
         if (locationName == null) {
             return Mono.error(new IllegalArgumentException("Parameter locationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -257,7 +257,7 @@ private Mono<Response<ExpressRoutePortsLocationInner>> getWithResponseAsync(Stri
         if (locationName == null) {
             return Mono.error(new IllegalArgumentException("Parameter locationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, locationName, accept,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteProviderPortsLocationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteProviderPortsLocationsClientImpl.java
index c22b38b8bddb..f2affaad7b32 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteProviderPortsLocationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteProviderPortsLocationsClientImpl.java
@@ -55,7 +55,7 @@ public final class ExpressRouteProviderPortsLocationsClientImpl implements Expre
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteProviderPortsLocations")
     public interface ExpressRouteProviderPortsLocationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteProviderPorts")
@@ -86,7 +86,7 @@ public Mono<Response<ExpressRouteProviderPortListResultInner>> listWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -116,7 +116,7 @@ private Mono<Response<ExpressRouteProviderPortListResultInner>> listWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), filter, accept,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteServiceProvidersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteServiceProvidersClientImpl.java
index 43c4df91cb37..4b8bfd7b5be9 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteServiceProvidersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ExpressRouteServiceProvidersClientImpl.java
@@ -60,7 +60,7 @@ public final class ExpressRouteServiceProvidersClientImpl implements ExpressRout
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientExpressRouteServiceProviders")
     public interface ExpressRouteServiceProvidersService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/expressRouteServiceProviders")
@@ -97,7 +97,7 @@ private Mono<PagedResponse<ExpressRouteServiceProviderInner>> listSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -127,7 +127,7 @@ private Mono<PagedResponse<ExpressRouteServiceProviderInner>> listSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -195,8 +195,8 @@ public PagedIterable<ExpressRouteServiceProviderInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListExpressRouteServiceProvider API service call along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return all the available express route service providers along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteServiceProviderInner>> listNextSinglePageAsync(String nextLink) {
@@ -222,8 +222,8 @@ private Mono<PagedResponse<ExpressRouteServiceProviderInner>> listNextSinglePage
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListExpressRouteServiceProvider API service call along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return all the available express route service providers along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ExpressRouteServiceProviderInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPoliciesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPoliciesClientImpl.java
index d4eaf6482cbd..716f51fcbe67 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPoliciesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPoliciesClientImpl.java
@@ -74,7 +74,7 @@ public final class FirewallPoliciesClientImpl implements InnerSupportsGet<Firewa
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicies")
     public interface FirewallPoliciesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}")
@@ -178,7 +178,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -216,7 +216,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, apiVersion,
@@ -384,7 +384,7 @@ public Mono<Response<FirewallPolicyInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -423,7 +423,7 @@ private Mono<Response<FirewallPolicyInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, apiVersion,
@@ -516,7 +516,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -560,7 +560,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, apiVersion,
@@ -752,7 +752,7 @@ public Mono<Response<FirewallPolicyInner>> updateTagsWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -796,7 +796,7 @@ private Mono<Response<FirewallPolicyInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, apiVersion,
@@ -879,7 +879,7 @@ private Mono<PagedResponse<FirewallPolicyInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -915,7 +915,7 @@ private Mono<PagedResponse<FirewallPolicyInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1003,7 +1003,7 @@ private Mono<PagedResponse<FirewallPolicyInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1033,7 +1033,7 @@ private Mono<PagedResponse<FirewallPolicyInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1154,8 +1154,8 @@ private Mono<PagedResponse<FirewallPolicyInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListFirewallPolicies API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Firewall Policies in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<FirewallPolicyInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1182,8 +1182,8 @@ private Mono<PagedResponse<FirewallPolicyInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListFirewallPolicies API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Firewall Policies in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<FirewallPolicyInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDeploymentsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDeploymentsClientImpl.java
index 42f054ca8be3..0a98287f284f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDeploymentsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDeploymentsClientImpl.java
@@ -59,7 +59,7 @@ public final class FirewallPolicyDeploymentsClientImpl implements FirewallPolicy
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyDeployments")
     public interface FirewallPolicyDeploymentsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/deploy")
@@ -101,7 +101,7 @@ public Mono<Response<Flux<ByteBuffer>>> deployWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.deploy(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -139,7 +139,7 @@ private Mono<Response<Flux<ByteBuffer>>> deployWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.deploy(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDraftsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDraftsClientImpl.java
index 0ba870c18e6b..ef9828dbeb34 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDraftsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyDraftsClientImpl.java
@@ -59,7 +59,7 @@ public final class FirewallPolicyDraftsClientImpl implements InnerSupportsDelete
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyDrafts")
     public interface FirewallPolicyDraftsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/firewallPolicyDrafts/default")
@@ -128,7 +128,7 @@ public Mono<Response<FirewallPolicyDraftInner>> createOrUpdateWithResponseAsync(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -172,7 +172,7 @@ private Mono<Response<FirewallPolicyDraftInner>> createOrUpdateWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -260,7 +260,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -298,7 +298,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -379,7 +379,7 @@ public Mono<Response<FirewallPolicyDraftInner>> getWithResponseAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -417,7 +417,7 @@ private Mono<Response<FirewallPolicyDraftInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesClientImpl.java
index fb9fcc677975..ddd4015cf0e1 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesClientImpl.java
@@ -57,7 +57,7 @@ public final class FirewallPolicyIdpsSignaturesClientImpl implements FirewallPol
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyIdpsSignatures")
     public interface FirewallPolicyIdpsSignaturesService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/listIdpsSignatures")
@@ -107,7 +107,7 @@ public Mono<Response<QueryResultsInner>> listWithResponseAsync(String resourceGr
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -152,7 +152,7 @@ private Mono<Response<QueryResultsInner>> listWithResponseAsync(String resourceG
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesFilterValuesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesFilterValuesClientImpl.java
index cb70bf319e0e..0daef674c4f5 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesFilterValuesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesFilterValuesClientImpl.java
@@ -59,7 +59,7 @@ public final class FirewallPolicyIdpsSignaturesFilterValuesClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyIdpsSignaturesFilterValues")
     public interface FirewallPolicyIdpsSignaturesFilterValuesService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/listIdpsFilterOptions")
@@ -109,7 +109,7 @@ public Mono<Response<SignatureOverridesFilterValuesResponseInner>> listWithRespo
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -154,7 +154,7 @@ private Mono<Response<SignatureOverridesFilterValuesResponseInner>> listWithResp
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesOverridesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesOverridesClientImpl.java
index 732eabc0428f..acc0577d4b04 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesOverridesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyIdpsSignaturesOverridesClientImpl.java
@@ -61,7 +61,7 @@ public final class FirewallPolicyIdpsSignaturesOverridesClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyIdpsSignaturesOverrides")
     public interface FirewallPolicyIdpsSignaturesOverridesService {
         @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/signatureOverrides/default")
@@ -142,7 +142,7 @@ public Mono<Response<SignaturesOverridesInner>> patchWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.patch(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -187,7 +187,7 @@ private Mono<Response<SignaturesOverridesInner>> patchWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.patch(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -283,7 +283,7 @@ public Mono<Response<SignaturesOverridesInner>> putWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.put(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -328,7 +328,7 @@ private Mono<Response<SignaturesOverridesInner>> putWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.put(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -418,7 +418,7 @@ public Mono<Response<SignaturesOverridesInner>> getWithResponseAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -457,7 +457,7 @@ private Mono<Response<SignaturesOverridesInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -542,7 +542,7 @@ public Mono<Response<SignaturesOverridesListInner>> listWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -581,7 +581,7 @@ private Mono<Response<SignaturesOverridesListInner>> listWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupDraftsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupDraftsClientImpl.java
index 97e41c827127..364a7a7b8a03 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupDraftsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupDraftsClientImpl.java
@@ -60,7 +60,7 @@ public final class FirewallPolicyRuleCollectionGroupDraftsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyRuleCollectionGroupDrafts")
     public interface FirewallPolicyRuleCollectionGroupDraftsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleCollectionGroups/{ruleCollectionGroupName}/ruleCollectionGroupDrafts/default")
@@ -131,7 +131,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -174,7 +174,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, ruleCollectionGroupName,
@@ -272,7 +272,7 @@ public Mono<Response<FirewallPolicyRuleCollectionGroupDraftInner>> createOrUpdat
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -323,7 +323,7 @@ private Mono<Response<FirewallPolicyRuleCollectionGroupDraftInner>> createOrUpda
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -425,7 +425,7 @@ public Mono<Response<FirewallPolicyRuleCollectionGroupDraftInner>> getWithRespon
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -468,7 +468,7 @@ private Mono<Response<FirewallPolicyRuleCollectionGroupDraftInner>> getWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, ruleCollectionGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupsClientImpl.java
index 9348dcbf80aa..3f262bb7b860 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FirewallPolicyRuleCollectionGroupsClientImpl.java
@@ -68,7 +68,7 @@ public final class FirewallPolicyRuleCollectionGroupsClientImpl implements Firew
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFirewallPolicyRuleCollectionGroups")
     public interface FirewallPolicyRuleCollectionGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleCollectionGroups/{ruleCollectionGroupName}")
@@ -156,7 +156,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -199,7 +199,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, ruleCollectionGroupName,
@@ -387,7 +387,7 @@ public Mono<Response<FirewallPolicyRuleCollectionGroupInner>> getWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -431,7 +431,7 @@ private Mono<Response<FirewallPolicyRuleCollectionGroupInner>> getWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, firewallPolicyName, ruleCollectionGroupName,
@@ -531,7 +531,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -582,7 +582,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -789,7 +789,7 @@ private Mono<PagedResponse<FirewallPolicyRuleCollectionGroupInner>> listSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, firewallPolicyName,
@@ -830,7 +830,7 @@ private Mono<PagedResponse<FirewallPolicyRuleCollectionGroupInner>> listSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FlowLogsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FlowLogsClientImpl.java
index 7924e2ced857..ac4c83bcd1f8 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FlowLogsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/FlowLogsClientImpl.java
@@ -69,7 +69,7 @@ public final class FlowLogsClientImpl implements FlowLogsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientFlowLogs")
     public interface FlowLogsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/flowLogs/{flowLogName}")
@@ -169,7 +169,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -218,7 +218,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkWatcherName, flowLogName,
@@ -423,7 +423,7 @@ public Mono<Response<FlowLogInner>> updateTagsWithResponseAsync(String resourceG
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -471,7 +471,7 @@ private Mono<Response<FlowLogInner>> updateTagsWithResponseAsync(String resource
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, networkWatcherName, flowLogName,
@@ -569,7 +569,7 @@ public Mono<Response<FlowLogInner>> getWithResponseAsync(String resourceGroupNam
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -611,7 +611,7 @@ private Mono<Response<FlowLogInner>> getWithResponseAsync(String resourceGroupNa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkWatcherName, flowLogName, apiVersion,
@@ -702,7 +702,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -744,7 +744,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName, flowLogName, apiVersion,
@@ -923,7 +923,7 @@ private Mono<PagedResponse<FlowLogInner>> listSinglePageAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -963,7 +963,7 @@ private Mono<PagedResponse<FlowLogInner>> listSinglePageAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubRouteTablesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubRouteTablesClientImpl.java
index 9f529272f705..58fc2e37f1bf 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubRouteTablesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubRouteTablesClientImpl.java
@@ -68,7 +68,7 @@ public final class HubRouteTablesClientImpl implements HubRouteTablesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientHubRouteTables")
     public interface HubRouteTablesService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubRouteTables/{routeTableName}")
@@ -161,7 +161,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             routeTableParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -210,7 +210,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             routeTableParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -413,7 +413,7 @@ public Mono<Response<HubRouteTableInner>> getWithResponseAsync(String resourceGr
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -455,7 +455,7 @@ private Mono<Response<HubRouteTableInner>> getWithResponseAsync(String resourceG
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -545,7 +545,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -586,7 +586,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -766,7 +766,7 @@ private Mono<PagedResponse<HubRouteTableInner>> listSinglePageAsync(String resou
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -806,7 +806,7 @@ private Mono<PagedResponse<HubRouteTableInner>> listSinglePageAsync(String resou
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubVirtualNetworkConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubVirtualNetworkConnectionsClientImpl.java
index 2a7da2e5ea73..db7efaa9d5b4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubVirtualNetworkConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/HubVirtualNetworkConnectionsClientImpl.java
@@ -68,7 +68,7 @@ public final class HubVirtualNetworkConnectionsClientImpl implements HubVirtualN
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientHubVirtualNetworkConnections")
     public interface HubVirtualNetworkConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/hubVirtualNetworkConnections/{connectionName}")
@@ -163,7 +163,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             hubVirtualNetworkConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -215,7 +215,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             hubVirtualNetworkConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -435,7 +435,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -476,7 +476,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -660,7 +660,7 @@ public Mono<Response<HubVirtualNetworkConnectionInner>> getWithResponseAsync(Str
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -702,7 +702,7 @@ private Mono<Response<HubVirtualNetworkConnectionInner>> getWithResponseAsync(St
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -791,7 +791,7 @@ private Mono<PagedResponse<HubVirtualNetworkConnectionInner>> listSinglePageAsyn
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -831,7 +831,7 @@ private Mono<PagedResponse<HubVirtualNetworkConnectionInner>> listSinglePageAsyn
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundNatRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundNatRulesClientImpl.java
index e282d9993208..2081233890ea 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundNatRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundNatRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class InboundNatRulesClientImpl implements InboundNatRulesClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientInboundNatRules")
     public interface InboundNatRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatRules")
@@ -151,7 +151,7 @@ private Mono<PagedResponse<InboundNatRuleInner>> listSinglePageAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -192,7 +192,7 @@ private Mono<PagedResponse<InboundNatRuleInner>> listSinglePageAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -301,7 +301,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -344,7 +344,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, loadBalancerName, inboundNatRuleName,
@@ -531,7 +531,7 @@ public Mono<Response<InboundNatRuleInner>> getWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -576,7 +576,7 @@ private Mono<Response<InboundNatRuleInner>> getWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName, inboundNatRuleName,
@@ -681,7 +681,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             inboundNatRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -734,7 +734,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             inboundNatRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -916,8 +916,8 @@ public InboundNatRuleInner createOrUpdate(String resourceGroupName, String loadB
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListInboundNatRule API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the inbound NAT rules in a load balancer along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<InboundNatRuleInner>> listNextSinglePageAsync(String nextLink) {
@@ -943,8 +943,8 @@ private Mono<PagedResponse<InboundNatRuleInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListInboundNatRule API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the inbound NAT rules in a load balancer along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<InboundNatRuleInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundSecurityRuleOperationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundSecurityRuleOperationsClientImpl.java
index 514ac42424b8..8aecd42459e1 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundSecurityRuleOperationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/InboundSecurityRuleOperationsClientImpl.java
@@ -62,7 +62,7 @@ public final class InboundSecurityRuleOperationsClientImpl implements InboundSec
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientInboundSecurityRuleOperations")
     public interface InboundSecurityRuleOperationsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}/inboundSecurityRules/{ruleCollectionName}")
@@ -128,7 +128,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -180,7 +180,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName,
@@ -400,7 +400,7 @@ public Mono<Response<InboundSecurityRuleInner>> getWithResponseAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -444,7 +444,7 @@ private Mono<Response<InboundSecurityRuleInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpAllocationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpAllocationsClientImpl.java
index 36cd3037443c..9e752e801a0e 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpAllocationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpAllocationsClientImpl.java
@@ -74,7 +74,7 @@ public final class IpAllocationsClientImpl implements InnerSupportsGet<IpAllocat
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientIpAllocations")
     public interface IpAllocationsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/IpAllocations/{ipAllocationName}")
@@ -176,7 +176,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, ipAllocationName,
@@ -214,7 +214,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, ipAllocationName, apiVersion,
@@ -383,7 +383,7 @@ public Mono<Response<IpAllocationInner>> getByResourceGroupWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -423,7 +423,7 @@ private Mono<Response<IpAllocationInner>> getByResourceGroupWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, ipAllocationName, apiVersion,
@@ -516,7 +516,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -560,7 +560,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, ipAllocationName, apiVersion,
@@ -751,7 +751,7 @@ public Mono<Response<IpAllocationInner>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, ipAllocationName,
@@ -795,7 +795,7 @@ private Mono<Response<IpAllocationInner>> updateTagsWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, ipAllocationName, apiVersion,
@@ -872,7 +872,7 @@ private Mono<PagedResponse<IpAllocationInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -902,7 +902,7 @@ private Mono<PagedResponse<IpAllocationInner>> listSinglePageAsync(Context conte
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -987,7 +987,7 @@ private Mono<PagedResponse<IpAllocationInner>> listByResourceGroupSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1023,7 +1023,7 @@ private Mono<PagedResponse<IpAllocationInner>> listByResourceGroupSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1100,8 +1100,8 @@ public PagedIterable<IpAllocationInner> listByResourceGroup(String resourceGroup
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpAllocations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all IpAllocations in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpAllocationInner>> listNextSinglePageAsync(String nextLink) {
@@ -1127,8 +1127,8 @@ private Mono<PagedResponse<IpAllocationInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpAllocations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all IpAllocations in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpAllocationInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -1153,8 +1153,8 @@ private Mono<PagedResponse<IpAllocationInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpAllocations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all IpAllocations in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpAllocationInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -1182,8 +1182,8 @@ private Mono<PagedResponse<IpAllocationInner>> listByResourceGroupNextSinglePage
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpAllocations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all IpAllocations in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpAllocationInner>> listByResourceGroupNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpGroupsClientImpl.java
index ec69da4e128b..4837028de311 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpGroupsClientImpl.java
@@ -73,7 +73,7 @@ public final class IpGroupsClientImpl implements InnerSupportsGet<IpGroupInner>,
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientIpGroups")
     public interface IpGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ipGroups/{ipGroupsName}")
@@ -175,7 +175,7 @@ public Mono<Response<IpGroupInner>> getByResourceGroupWithResponseAsync(String r
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -214,7 +214,7 @@ private Mono<Response<IpGroupInner>> getByResourceGroupWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, ipGroupsName, apiVersion,
@@ -307,7 +307,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, ipGroupsName,
@@ -350,7 +350,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, ipGroupsName, apiVersion,
@@ -539,7 +539,7 @@ public Mono<Response<IpGroupInner>> updateGroupsWithResponseAsync(String resourc
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateGroups(this.client.getEndpoint(), resourceGroupName, ipGroupsName,
@@ -582,7 +582,7 @@ private Mono<Response<IpGroupInner>> updateGroupsWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateGroups(this.client.getEndpoint(), resourceGroupName, ipGroupsName, apiVersion,
@@ -667,7 +667,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, ipGroupsName,
@@ -704,7 +704,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, ipGroupsName, apiVersion,
@@ -865,7 +865,7 @@ private Mono<PagedResponse<IpGroupInner>> listByResourceGroupSinglePageAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -901,7 +901,7 @@ private Mono<PagedResponse<IpGroupInner>> listByResourceGroupSinglePageAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -988,7 +988,7 @@ private Mono<PagedResponse<IpGroupInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1017,7 +1017,7 @@ private Mono<PagedResponse<IpGroupInner>> listSinglePageAsync(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1085,8 +1085,8 @@ public PagedIterable<IpGroupInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpGroups API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all IpGroups in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpGroupInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -1114,8 +1114,8 @@ private Mono<PagedResponse<IpGroupInner>> listByResourceGroupNextSinglePageAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpGroups API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all IpGroups in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpGroupInner>> listByResourceGroupNextSinglePageAsync(String nextLink, Context context) {
@@ -1140,8 +1140,7 @@ private Mono<PagedResponse<IpGroupInner>> listByResourceGroupNextSinglePageAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpGroups API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all IpGroups in a subscription along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpGroupInner>> listNextSinglePageAsync(String nextLink) {
@@ -1167,8 +1166,7 @@ private Mono<PagedResponse<IpGroupInner>> listNextSinglePageAsync(String nextLin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListIpGroups API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all IpGroups in a subscription along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpGroupInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpamPoolsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpamPoolsClientImpl.java
index 2d0d881b38c8..20088c3a04e9 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpamPoolsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/IpamPoolsClientImpl.java
@@ -74,7 +74,7 @@ public final class IpamPoolsClientImpl implements IpamPoolsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientIpamPools")
     public interface IpamPoolsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/ipamPools")
@@ -202,7 +202,7 @@ private Mono<PagedResponse<IpamPoolInner>> listSinglePageAsync(String resourceGr
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -249,7 +249,7 @@ private Mono<PagedResponse<IpamPoolInner>> listSinglePageAsync(String resourceGr
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -412,7 +412,7 @@ public Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceG
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -462,7 +462,7 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -722,7 +722,7 @@ public Mono<Response<IpamPoolInner>> updateWithResponseAsync(String resourceGrou
         if (body != null) {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -770,7 +770,7 @@ private Mono<Response<IpamPoolInner>> updateWithResponseAsync(String resourceGro
         if (body != null) {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -869,7 +869,7 @@ public Mono<Response<IpamPoolInner>> getWithResponseAsync(String resourceGroupNa
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -911,7 +911,7 @@ private Mono<Response<IpamPoolInner>> getWithResponseAsync(String resourceGroupN
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1004,7 +1004,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1048,7 +1048,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1287,7 +1287,7 @@ public Mono<Response<PoolUsageInner>> getPoolUsageWithResponseAsync(String resou
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getPoolUsage(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1329,7 +1329,7 @@ private Mono<Response<PoolUsageInner>> getPoolUsageWithResponseAsync(String reso
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getPoolUsage(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1421,7 +1421,7 @@ private Mono<PagedResponse<PoolAssociationInner>> listAssociatedResourcesSingleP
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1466,7 +1466,7 @@ private Mono<PagedResponse<PoolAssociationInner>> listAssociatedResourcesSingleP
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1552,13 +1552,16 @@ public PagedIterable<PoolAssociationInner> listAssociatedResources(String resour
     }
 
     /**
+     * Gets list of Pool resources at Network Manager level.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of IpamPool along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of Pool resources at Network Manager level along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpamPoolInner>> listNextSinglePageAsync(String nextLink) {
@@ -1577,6 +1580,8 @@ private Mono<PagedResponse<IpamPoolInner>> listNextSinglePageAsync(String nextLi
     }
 
     /**
+     * Gets list of Pool resources at Network Manager level.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1584,7 +1589,8 @@ private Mono<PagedResponse<IpamPoolInner>> listNextSinglePageAsync(String nextLi
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of IpamPool along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of Pool resources at Network Manager level along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<IpamPoolInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -1603,6 +1609,8 @@ private Mono<PagedResponse<IpamPoolInner>> listNextSinglePageAsync(String nextLi
     }
 
     /**
+     * List Associated Resource in the Pool.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1630,6 +1638,8 @@ private Mono<PagedResponse<PoolAssociationInner>> listAssociatedResourcesNextSin
     }
 
     /**
+     * List Associated Resource in the Pool.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerBackendAddressPoolsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerBackendAddressPoolsClientImpl.java
index 5069abdaf079..07462fe3ba80 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerBackendAddressPoolsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerBackendAddressPoolsClientImpl.java
@@ -68,7 +68,7 @@ public final class LoadBalancerBackendAddressPoolsClientImpl implements LoadBala
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancerBackendAddressPools")
     public interface LoadBalancerBackendAddressPoolsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools")
@@ -152,7 +152,7 @@ private Mono<PagedResponse<BackendAddressPoolInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -193,7 +193,7 @@ private Mono<PagedResponse<BackendAddressPoolInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -303,7 +303,7 @@ public Mono<Response<BackendAddressPoolInner>> getWithResponseAsync(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -346,7 +346,7 @@ private Mono<Response<BackendAddressPoolInner>> getWithResponseAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName, backendAddressPoolName,
@@ -446,7 +446,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -496,7 +496,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -703,7 +703,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -746,7 +746,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, loadBalancerName, backendAddressPoolName,
@@ -906,8 +906,8 @@ public void delete(String resourceGroupName, String loadBalancerName, String bac
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListBackendAddressPool API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the load balancer backed address pools along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<BackendAddressPoolInner>> listNextSinglePageAsync(String nextLink) {
@@ -933,8 +933,8 @@ private Mono<PagedResponse<BackendAddressPoolInner>> listNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListBackendAddressPool API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the load balancer backed address pools along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<BackendAddressPoolInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendIpConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendIpConfigurationsClientImpl.java
index f86d146d394e..e0732bbbc388 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendIpConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerFrontendIpConfigurationsClientImpl.java
@@ -62,7 +62,7 @@ public final class LoadBalancerFrontendIpConfigurationsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancerFrontendIpConfigurations")
     public interface LoadBalancerFrontendIpConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/frontendIPConfigurations")
@@ -123,7 +123,7 @@ private Mono<PagedResponse<FrontendIpConfigurationInner>> listSinglePageAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -164,7 +164,7 @@ private Mono<PagedResponse<FrontendIpConfigurationInner>> listSinglePageAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -275,7 +275,7 @@ public Mono<Response<FrontendIpConfigurationInner>> getWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -319,7 +319,7 @@ private Mono<Response<FrontendIpConfigurationInner>> getWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName, frontendIpConfigurationName,
@@ -387,7 +387,7 @@ public FrontendIpConfigurationInner get(String resourceGroupName, String loadBal
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListFrontendIPConfiguration API service call along with {@link PagedResponse} on successful
+     * @return all the load balancer frontend IP configurations along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -414,7 +414,7 @@ private Mono<PagedResponse<FrontendIpConfigurationInner>> listNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListFrontendIPConfiguration API service call along with {@link PagedResponse} on successful
+     * @return all the load balancer frontend IP configurations along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerLoadBalancingRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerLoadBalancingRulesClientImpl.java
index 56eb2d38a420..e635ce3ff526 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerLoadBalancingRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerLoadBalancingRulesClientImpl.java
@@ -67,7 +67,7 @@ public final class LoadBalancerLoadBalancingRulesClientImpl implements LoadBalan
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancerLoadBalancingRules")
     public interface LoadBalancerLoadBalancingRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/loadBalancingRules")
@@ -138,7 +138,7 @@ private Mono<PagedResponse<LoadBalancingRuleInner>> listSinglePageAsync(String r
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -179,7 +179,7 @@ private Mono<PagedResponse<LoadBalancingRuleInner>> listSinglePageAsync(String r
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -290,7 +290,7 @@ public Mono<Response<LoadBalancingRuleInner>> getWithResponseAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -334,7 +334,7 @@ private Mono<Response<LoadBalancingRuleInner>> getWithResponseAsync(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName, loadBalancingRuleName,
@@ -427,7 +427,7 @@ public Mono<Response<Flux<ByteBuffer>>> healthWithResponseAsync(String groupName
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.health(this.client.getEndpoint(), groupName, loadBalancerName,
@@ -470,7 +470,7 @@ private Mono<Response<Flux<ByteBuffer>>> healthWithResponseAsync(String groupNam
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.health(this.client.getEndpoint(), groupName, loadBalancerName, loadBalancingRuleName, apiVersion,
@@ -635,8 +635,8 @@ public LoadBalancerHealthPerRuleInner health(String groupName, String loadBalanc
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLoadBalancingRule API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the load balancing rules in a load balancer along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<LoadBalancingRuleInner>> listNextSinglePageAsync(String nextLink) {
@@ -662,8 +662,8 @@ private Mono<PagedResponse<LoadBalancingRuleInner>> listNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLoadBalancingRule API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the load balancing rules in a load balancer along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<LoadBalancingRuleInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerNetworkInterfacesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerNetworkInterfacesClientImpl.java
index 6b20b4600474..8336637d4772 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerNetworkInterfacesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerNetworkInterfacesClientImpl.java
@@ -60,7 +60,7 @@ public final class LoadBalancerNetworkInterfacesClientImpl implements LoadBalanc
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancerNetworkInterfaces")
     public interface LoadBalancerNetworkInterfacesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/networkInterfaces")
@@ -110,7 +110,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listSinglePageAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -151,7 +151,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listSinglePageAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -234,8 +234,8 @@ public PagedIterable<NetworkInterfaceInner> list(String resourceGroupName, Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return associated load balancer network interfaces along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(String nextLink) {
@@ -261,8 +261,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return associated load balancer network interfaces along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerOutboundRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerOutboundRulesClientImpl.java
index 0f0d79e1d61d..48cc975d5b19 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerOutboundRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerOutboundRulesClientImpl.java
@@ -60,7 +60,7 @@ public final class LoadBalancerOutboundRulesClientImpl implements LoadBalancerOu
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancerOutboundRules")
     public interface LoadBalancerOutboundRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/outboundRules")
@@ -120,7 +120,7 @@ private Mono<PagedResponse<OutboundRuleInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -161,7 +161,7 @@ private Mono<PagedResponse<OutboundRuleInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -270,7 +270,7 @@ public Mono<Response<OutboundRuleInner>> getWithResponseAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -314,7 +314,7 @@ private Mono<Response<OutboundRuleInner>> getWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName, outboundRuleName, apiVersion,
@@ -380,8 +380,8 @@ public OutboundRuleInner get(String resourceGroupName, String loadBalancerName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListOutboundRule API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the outbound rules in a load balancer along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OutboundRuleInner>> listNextSinglePageAsync(String nextLink) {
@@ -407,8 +407,8 @@ private Mono<PagedResponse<OutboundRuleInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListOutboundRule API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the outbound rules in a load balancer along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<OutboundRuleInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerProbesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerProbesClientImpl.java
index d6711356c893..b0596c79c9f6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerProbesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancerProbesClientImpl.java
@@ -60,7 +60,7 @@ public final class LoadBalancerProbesClientImpl implements LoadBalancerProbesCli
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancerProbes")
     public interface LoadBalancerProbesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes")
@@ -118,7 +118,7 @@ private Mono<PagedResponse<ProbeInner>> listSinglePageAsync(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -158,7 +158,7 @@ private Mono<PagedResponse<ProbeInner>> listSinglePageAsync(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -265,7 +265,7 @@ public Mono<Response<ProbeInner>> getWithResponseAsync(String resourceGroupName,
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -307,7 +307,7 @@ private Mono<Response<ProbeInner>> getWithResponseAsync(String resourceGroupName
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, loadBalancerName, probeName, apiVersion,
@@ -372,8 +372,7 @@ public ProbeInner get(String resourceGroupName, String loadBalancerName, String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListProbe API service call along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all the load balancer probes along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ProbeInner>> listNextSinglePageAsync(String nextLink) {
@@ -399,8 +398,7 @@ private Mono<PagedResponse<ProbeInner>> listNextSinglePageAsync(String nextLink)
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListProbe API service call along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all the load balancer probes along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ProbeInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancersClientImpl.java
index e2d9d3b62785..a19a316e1d31 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LoadBalancersClientImpl.java
@@ -80,7 +80,7 @@ public final class LoadBalancersClientImpl implements InnerSupportsGet<LoadBalan
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLoadBalancers")
     public interface LoadBalancersService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}")
@@ -213,7 +213,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -251,7 +251,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, loadBalancerName, apiVersion,
@@ -419,7 +419,7 @@ public Mono<Response<LoadBalancerInner>> getByResourceGroupWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -458,7 +458,7 @@ private Mono<Response<LoadBalancerInner>> getByResourceGroupWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, loadBalancerName, apiVersion,
@@ -551,7 +551,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -595,7 +595,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, loadBalancerName, apiVersion,
@@ -786,7 +786,7 @@ public Mono<Response<LoadBalancerInner>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, loadBalancerName,
@@ -830,7 +830,7 @@ private Mono<Response<LoadBalancerInner>> updateTagsWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, loadBalancerName, apiVersion,
@@ -907,7 +907,7 @@ private Mono<PagedResponse<LoadBalancerInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -937,7 +937,7 @@ private Mono<PagedResponse<LoadBalancerInner>> listSinglePageAsync(Context conte
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1022,7 +1022,7 @@ private Mono<PagedResponse<LoadBalancerInner>> listByResourceGroupSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1058,7 +1058,7 @@ private Mono<PagedResponse<LoadBalancerInner>> listByResourceGroupSinglePageAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1157,7 +1157,7 @@ public Mono<Response<Flux<ByteBuffer>>> swapPublicIpAddressesWithResponseAsync(S
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.swapPublicIpAddresses(this.client.getEndpoint(), location, apiVersion,
@@ -1195,7 +1195,7 @@ private Mono<Response<Flux<ByteBuffer>>> swapPublicIpAddressesWithResponseAsync(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.swapPublicIpAddresses(this.client.getEndpoint(), location, apiVersion,
@@ -1376,7 +1376,7 @@ public Mono<Response<Flux<ByteBuffer>>> listInboundNatRulePortMappingsWithRespon
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listInboundNatRulePortMappings(this.client.getEndpoint(), groupName,
@@ -1427,7 +1427,7 @@ private Mono<Response<Flux<ByteBuffer>>> listInboundNatRulePortMappingsWithRespo
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listInboundNatRulePortMappings(this.client.getEndpoint(), groupName, loadBalancerName,
@@ -1642,7 +1642,7 @@ public Mono<Response<MigratedPoolsInner>> migrateToIpBasedWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.migrateToIpBased(this.client.getEndpoint(), groupName, loadBalancerName,
@@ -1684,7 +1684,7 @@ private Mono<Response<MigratedPoolsInner>> migrateToIpBasedWithResponseAsync(Str
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.migrateToIpBased(this.client.getEndpoint(), groupName, loadBalancerName, apiVersion,
@@ -1749,8 +1749,8 @@ public MigratedPoolsInner migrateToIpBased(String groupName, String loadBalancer
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLoadBalancers API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the load balancers in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<LoadBalancerInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1777,8 +1777,8 @@ private Mono<PagedResponse<LoadBalancerInner>> listAllNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLoadBalancers API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the load balancers in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<LoadBalancerInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1803,8 +1803,8 @@ private Mono<PagedResponse<LoadBalancerInner>> listAllNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLoadBalancers API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the load balancers in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<LoadBalancerInner>> listNextSinglePageAsync(String nextLink) {
@@ -1830,8 +1830,8 @@ private Mono<PagedResponse<LoadBalancerInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLoadBalancers API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the load balancers in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<LoadBalancerInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LocalNetworkGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LocalNetworkGatewaysClientImpl.java
index 399002a01e2d..8baaca4863b7 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LocalNetworkGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/LocalNetworkGatewaysClientImpl.java
@@ -73,7 +73,7 @@ public final class LocalNetworkGatewaysClientImpl
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientLocalNetworkGateways")
     public interface LocalNetworkGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/localNetworkGateways/{localNetworkGatewayName}")
@@ -170,7 +170,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -215,7 +215,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, localNetworkGatewayName, apiVersion,
@@ -405,7 +405,7 @@ public Mono<Response<LocalNetworkGatewayInner>> getByResourceGroupWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -444,7 +444,7 @@ private Mono<Response<LocalNetworkGatewayInner>> getByResourceGroupWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, localNetworkGatewayName,
@@ -529,7 +529,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -567,7 +567,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, localNetworkGatewayName, apiVersion,
@@ -743,7 +743,7 @@ public Mono<Response<LocalNetworkGatewayInner>> updateTagsWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -788,7 +788,7 @@ private Mono<Response<LocalNetworkGatewayInner>> updateTagsWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, localNetworkGatewayName, apiVersion,
@@ -872,7 +872,7 @@ private Mono<PagedResponse<LocalNetworkGatewayInner>> listByResourceGroupSingleP
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -908,7 +908,7 @@ private Mono<PagedResponse<LocalNetworkGatewayInner>> listByResourceGroupSingleP
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -985,7 +985,7 @@ public PagedIterable<LocalNetworkGatewayInner> listByResourceGroup(String resour
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLocalNetworkGateways API service call along with {@link PagedResponse} on successful
+     * @return all the local network gateways in a resource group along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1012,7 +1012,7 @@ private Mono<PagedResponse<LocalNetworkGatewayInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListLocalNetworkGateways API service call along with {@link PagedResponse} on successful
+     * @return all the local network gateways in a resource group along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ManagementGroupNetworkManagerConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ManagementGroupNetworkManagerConnectionsClientImpl.java
index 854387273cda..3a85c10aa1ce 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ManagementGroupNetworkManagerConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ManagementGroupNetworkManagerConnectionsClientImpl.java
@@ -66,7 +66,7 @@ public final class ManagementGroupNetworkManagerConnectionsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientManagementGroupNetworkManagerConnections")
     public interface ManagementGroupNetworkManagerConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/providers/Microsoft.Management/managementGroups/{managementGroupId}/providers/Microsoft.Network/networkManagerConnections/{networkManagerConnectionName}")
@@ -147,7 +147,7 @@ public Mono<Response<NetworkManagerConnectionInner>> createOrUpdateWithResponseA
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), managementGroupId,
@@ -188,7 +188,7 @@ private Mono<Response<NetworkManagerConnectionInner>> createOrUpdateWithResponse
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), managementGroupId, networkManagerConnectionName,
@@ -276,7 +276,7 @@ public Mono<Response<NetworkManagerConnectionInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), managementGroupId,
@@ -311,7 +311,7 @@ private Mono<Response<NetworkManagerConnectionInner>> getWithResponseAsync(Strin
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), managementGroupId, networkManagerConnectionName, apiVersion,
@@ -390,7 +390,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String managementGroupId, St
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), managementGroupId,
@@ -424,7 +424,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String managementGroupId, S
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), managementGroupId, networkManagerConnectionName, apiVersion,
@@ -504,7 +504,7 @@ private Mono<PagedResponse<NetworkManagerConnectionInner>> listSinglePageAsync(S
             return Mono
                 .error(new IllegalArgumentException("Parameter managementGroupId is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), managementGroupId, apiVersion, top,
@@ -541,7 +541,7 @@ private Mono<PagedResponse<NetworkManagerConnectionInner>> listSinglePageAsync(S
             return Mono
                 .error(new IllegalArgumentException("Parameter managementGroupId is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), managementGroupId, apiVersion, top, skipToken, accept, context)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatGatewaysClientImpl.java
index d7fe4d85799f..4d423a774ccd 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatGatewaysClientImpl.java
@@ -74,7 +74,7 @@ public final class NatGatewaysClientImpl implements InnerSupportsGet<NatGatewayI
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNatGateways")
     public interface NatGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}")
@@ -174,7 +174,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, natGatewayName,
@@ -211,7 +211,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, natGatewayName, apiVersion,
@@ -379,7 +379,7 @@ public Mono<Response<NatGatewayInner>> getByResourceGroupWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -418,7 +418,7 @@ private Mono<Response<NatGatewayInner>> getByResourceGroupWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, natGatewayName, apiVersion,
@@ -510,7 +510,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, natGatewayName,
@@ -553,7 +553,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, natGatewayName, apiVersion,
@@ -742,7 +742,7 @@ public Mono<Response<NatGatewayInner>> updateTagsWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, natGatewayName,
@@ -785,7 +785,7 @@ private Mono<Response<NatGatewayInner>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, natGatewayName, apiVersion,
@@ -862,7 +862,7 @@ private Mono<PagedResponse<NatGatewayInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -892,7 +892,7 @@ private Mono<PagedResponse<NatGatewayInner>> listSinglePageAsync(Context context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -977,7 +977,7 @@ private Mono<PagedResponse<NatGatewayInner>> listByResourceGroupSinglePageAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1013,7 +1013,7 @@ private Mono<PagedResponse<NatGatewayInner>> listByResourceGroupSinglePageAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1090,8 +1090,8 @@ public PagedIterable<NatGatewayInner> listByResourceGroup(String resourceGroupNa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNatGateways API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the Nat Gateways in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NatGatewayInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1118,8 +1118,8 @@ private Mono<PagedResponse<NatGatewayInner>> listAllNextSinglePageAsync(String n
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNatGateways API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all the Nat Gateways in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NatGatewayInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1144,8 +1144,8 @@ private Mono<PagedResponse<NatGatewayInner>> listAllNextSinglePageAsync(String n
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNatGateways API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all nat gateways in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NatGatewayInner>> listNextSinglePageAsync(String nextLink) {
@@ -1171,8 +1171,8 @@ private Mono<PagedResponse<NatGatewayInner>> listNextSinglePageAsync(String next
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNatGateways API service call along with {@link PagedResponse} on successful completion
-     * of {@link Mono}.
+     * @return all nat gateways in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NatGatewayInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatRulesClientImpl.java
index e7100161d393..1175fcde6a40 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NatRulesClientImpl.java
@@ -67,7 +67,7 @@ public final class NatRulesClientImpl implements NatRulesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNatRules")
     public interface NatRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/natRules/{natRuleName}")
@@ -150,7 +150,7 @@ public Mono<Response<VpnGatewayNatRuleInner>> getWithResponseAsync(String resour
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -191,7 +191,7 @@ private Mono<Response<VpnGatewayNatRuleInner>> getWithResponseAsync(String resou
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, gatewayName,
@@ -288,7 +288,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             natRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -336,7 +336,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             natRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -537,7 +537,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -578,7 +578,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -756,7 +756,7 @@ private Mono<PagedResponse<VpnGatewayNatRuleInner>> listByVpnGatewaySinglePageAs
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByVpnGateway(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -796,7 +796,7 @@ private Mono<PagedResponse<VpnGatewayNatRuleInner>> listByVpnGatewaySinglePageAs
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkGroupsClientImpl.java
index 605842d13a58..3748abe32019 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkGroupsClientImpl.java
@@ -69,7 +69,7 @@ public final class NetworkGroupsClientImpl implements NetworkGroupsClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkGroups")
     public interface NetworkGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/networkGroups/{networkGroupName}")
@@ -158,7 +158,7 @@ public Mono<Response<NetworkGroupInner>> getWithResponseAsync(String resourceGro
             return Mono
                 .error(new IllegalArgumentException("Parameter networkGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -201,7 +201,7 @@ private Mono<Response<NetworkGroupInner>> getWithResponseAsync(String resourceGr
             return Mono
                 .error(new IllegalArgumentException("Parameter networkGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -302,7 +302,7 @@ public Mono<NetworkGroupsCreateOrUpdateResponse> createOrUpdateWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -355,7 +355,7 @@ private Mono<NetworkGroupsCreateOrUpdateResponse> createOrUpdateWithResponseAsyn
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -461,7 +461,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter networkGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -506,7 +506,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter networkGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -748,7 +748,7 @@ private Mono<PagedResponse<NetworkGroupInner>> listSinglePageAsync(String resour
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -794,7 +794,7 @@ private Mono<PagedResponse<NetworkGroupInner>> listSinglePageAsync(String resour
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceIpConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceIpConfigurationsClientImpl.java
index e267ec7d6d9a..9c861ee18c3a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceIpConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceIpConfigurationsClientImpl.java
@@ -60,7 +60,7 @@ public final class NetworkInterfaceIpConfigurationsClientImpl implements Network
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkInterfaceIpConfigurations")
     public interface NetworkInterfaceIpConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/ipConfigurations")
@@ -121,7 +121,7 @@ private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>> listSinglePage
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -162,7 +162,7 @@ private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>> listSinglePage
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -275,7 +275,7 @@ public Mono<Response<NetworkInterfaceIpConfigurationInner>> getWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -319,7 +319,7 @@ private Mono<Response<NetworkInterfaceIpConfigurationInner>> getWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkInterfaceName, ipConfigurationName,
@@ -386,8 +386,8 @@ public NetworkInterfaceIpConfigurationInner get(String resourceGroupName, String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for list ip configurations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all ip configurations in a network interface along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>> listNextSinglePageAsync(String nextLink) {
@@ -413,8 +413,8 @@ private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>> listNextSingle
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for list ip configurations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all ip configurations in a network interface along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceLoadBalancersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceLoadBalancersClientImpl.java
index ebaefcfd5562..851f1bbf9d6f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceLoadBalancersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceLoadBalancersClientImpl.java
@@ -60,7 +60,7 @@ public final class NetworkInterfaceLoadBalancersClientImpl implements NetworkInt
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkInterfaceLoadBalancers")
     public interface NetworkInterfaceLoadBalancersService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/loadBalancers")
@@ -111,7 +111,7 @@ private Mono<PagedResponse<LoadBalancerInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -152,7 +152,7 @@ private Mono<PagedResponse<LoadBalancerInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceTapConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceTapConfigurationsClientImpl.java
index af362f703f58..93946b7ddcf2 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceTapConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfaceTapConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class NetworkInterfaceTapConfigurationsClientImpl implements Networ
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkInterfaceTapConfigurations")
     public interface NetworkInterfaceTapConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkInterfaces/{networkInterfaceName}/tapConfigurations/{tapConfigurationName}")
@@ -157,7 +157,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -200,7 +200,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkInterfaceName, tapConfigurationName,
@@ -388,7 +388,7 @@ public Mono<Response<NetworkInterfaceTapConfigurationInner>> getWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -432,7 +432,7 @@ private Mono<Response<NetworkInterfaceTapConfigurationInner>> getWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkInterfaceName, tapConfigurationName,
@@ -535,7 +535,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             tapConfigurationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -588,7 +588,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             tapConfigurationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -800,7 +800,7 @@ private Mono<PagedResponse<NetworkInterfaceTapConfigurationInner>> listSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -841,7 +841,7 @@ private Mono<PagedResponse<NetworkInterfaceTapConfigurationInner>> listSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -926,8 +926,8 @@ public PagedIterable<NetworkInterfaceTapConfigurationInner> list(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for list tap configurations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all Tap configurations in a network interface along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceTapConfigurationInner>> listNextSinglePageAsync(String nextLink) {
@@ -953,8 +953,8 @@ private Mono<PagedResponse<NetworkInterfaceTapConfigurationInner>> listNextSingl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for list tap configurations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all Tap configurations in a network interface along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceTapConfigurationInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfacesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfacesClientImpl.java
index 40ff1245560b..ca99ea73d721 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfacesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkInterfacesClientImpl.java
@@ -79,7 +79,7 @@ public final class NetworkInterfacesClientImpl implements InnerSupportsGet<Netwo
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkInterfaces")
     public interface NetworkInterfacesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/cloudServices/{cloudServiceName}/roleInstances/{roleInstanceName}/networkInterfaces")
@@ -339,7 +339,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listCloudServiceRoleInstanceN
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listCloudServiceRoleInstanceNetworkInterfaces(this.client.getEndpoint(),
@@ -386,7 +386,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listCloudServiceRoleInstanceN
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -508,7 +508,7 @@ public PagedIterable<NetworkInterfaceInner> listCloudServiceRoleInstanceNetworkI
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listCloudServiceNetworkInterfaces(this.client.getEndpoint(),
@@ -549,7 +549,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listCloudServiceNetworkInterf
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -672,7 +672,7 @@ public Mono<Response<NetworkInterfaceInner>> getCloudServiceNetworkInterfaceWith
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getCloudServiceNetworkInterface(this.client.getEndpoint(),
@@ -724,7 +724,7 @@ private Mono<Response<NetworkInterfaceInner>> getCloudServiceNetworkInterfaceWit
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getCloudServiceNetworkInterface(this.client.getEndpoint(), resourceGroupName, cloudServiceName,
@@ -822,7 +822,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -860,7 +860,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkInterfaceName, apiVersion,
@@ -1030,7 +1030,7 @@ public Mono<Response<NetworkInterfaceInner>> getByResourceGroupWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1070,7 +1070,7 @@ private Mono<Response<NetworkInterfaceInner>> getByResourceGroupWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -1164,7 +1164,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -1209,7 +1209,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkInterfaceName, apiVersion,
@@ -1403,7 +1403,7 @@ public Mono<Response<NetworkInterfaceInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -1448,7 +1448,7 @@ private Mono<Response<NetworkInterfaceInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, networkInterfaceName, apiVersion,
@@ -1526,7 +1526,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1556,7 +1556,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listSinglePageAsync(Context c
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1641,7 +1641,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listByResourceGroupSinglePage
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1677,7 +1677,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listByResourceGroupSinglePage
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1777,7 +1777,7 @@ public Mono<Response<Flux<ByteBuffer>>> getEffectiveRouteTableWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getEffectiveRouteTable(this.client.getEndpoint(), resourceGroupName,
@@ -1816,7 +1816,7 @@ private Mono<Response<Flux<ByteBuffer>>> getEffectiveRouteTableWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getEffectiveRouteTable(this.client.getEndpoint(), resourceGroupName, networkInterfaceName,
@@ -1995,7 +1995,7 @@ public EffectiveRouteListResultInner getEffectiveRouteTable(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listEffectiveNetworkSecurityGroups(this.client.getEndpoint(),
@@ -2034,7 +2034,7 @@ private Mono<Response<Flux<ByteBuffer>>> listEffectiveNetworkSecurityGroupsWithR
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listEffectiveNetworkSecurityGroups(this.client.getEndpoint(), resourceGroupName,
@@ -3106,8 +3106,8 @@ public NetworkInterfaceIpConfigurationInner getVirtualMachineScaleSetIpConfigura
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all network interfaces in a role instance in a cloud service along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>>
@@ -3136,8 +3136,8 @@ public NetworkInterfaceIpConfigurationInner getVirtualMachineScaleSetIpConfigura
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all network interfaces in a role instance in a cloud service along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>>
@@ -3164,8 +3164,8 @@ public NetworkInterfaceIpConfigurationInner getVirtualMachineScaleSetIpConfigura
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network interfaces in a cloud service along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>>
@@ -3194,8 +3194,8 @@ public NetworkInterfaceIpConfigurationInner getVirtualMachineScaleSetIpConfigura
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network interfaces in a cloud service along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>>
@@ -3221,8 +3221,8 @@ public NetworkInterfaceIpConfigurationInner getVirtualMachineScaleSetIpConfigura
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network interfaces in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -3249,8 +3249,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listAllNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network interfaces in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -3275,8 +3275,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listAllNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network interfaces in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(String nextLink) {
@@ -3302,8 +3302,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network interfaces in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -3328,8 +3328,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all network interfaces in a virtual machine in a virtual machine scale set along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>>
@@ -3358,8 +3358,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all network interfaces in a virtual machine in a virtual machine scale set along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceInner>>
@@ -3386,7 +3386,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
+     * @return all network interfaces in a virtual machine scale set along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -3416,7 +3416,7 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListNetworkInterface API service call along with {@link PagedResponse} on successful
+     * @return all network interfaces in a virtual machine scale set along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -3444,8 +3444,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for list ip configurations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return the specified network interface ip configuration in a virtual machine scale set along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>>
@@ -3474,8 +3474,8 @@ private Mono<PagedResponse<NetworkInterfaceInner>> listNextSinglePageAsync(Strin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for list ip configurations API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return the specified network interface ip configuration in a virtual machine scale set along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkInterfaceIpConfigurationInner>>
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagementClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagementClientImpl.java
index f6a6ae4d859b..8b1281f097f0 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagementClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagementClientImpl.java
@@ -120,6 +120,7 @@
 import com.azure.resourcemanager.network.fluent.NetworkSecurityPerimeterLoggingConfigurationsClient;
 import com.azure.resourcemanager.network.fluent.NetworkSecurityPerimeterOperationStatusesClient;
 import com.azure.resourcemanager.network.fluent.NetworkSecurityPerimeterProfilesClient;
+import com.azure.resourcemanager.network.fluent.NetworkSecurityPerimeterServiceTagsClient;
 import com.azure.resourcemanager.network.fluent.NetworkSecurityPerimetersClient;
 import com.azure.resourcemanager.network.fluent.NetworkVirtualApplianceConnectionsClient;
 import com.azure.resourcemanager.network.fluent.NetworkVirtualAppliancesClient;
@@ -1543,6 +1544,20 @@ public NetworkSecurityPerimeterOperationStatusesClient getNetworkSecurityPerimet
         return this.networkSecurityPerimeterOperationStatuses;
     }
 
+    /**
+     * The NetworkSecurityPerimeterServiceTagsClient object to access its operations.
+     */
+    private final NetworkSecurityPerimeterServiceTagsClient networkSecurityPerimeterServiceTags;
+
+    /**
+     * Gets the NetworkSecurityPerimeterServiceTagsClient object to access its operations.
+     * 
+     * @return the NetworkSecurityPerimeterServiceTagsClient object.
+     */
+    public NetworkSecurityPerimeterServiceTagsClient getNetworkSecurityPerimeterServiceTags() {
+        return this.networkSecurityPerimeterServiceTags;
+    }
+
     /**
      * The ReachabilityAnalysisIntentsClient object to access its operations.
      */
@@ -2566,6 +2581,7 @@ public WebApplicationFirewallPoliciesClient getWebApplicationFirewallPolicies()
         this.networkSecurityPerimeterLoggingConfigurations
             = new NetworkSecurityPerimeterLoggingConfigurationsClientImpl(this);
         this.networkSecurityPerimeterOperationStatuses = new NetworkSecurityPerimeterOperationStatusesClientImpl(this);
+        this.networkSecurityPerimeterServiceTags = new NetworkSecurityPerimeterServiceTagsClientImpl(this);
         this.reachabilityAnalysisIntents = new ReachabilityAnalysisIntentsClientImpl(this);
         this.reachabilityAnalysisRuns = new ReachabilityAnalysisRunsClientImpl(this);
         this.verifierWorkspaces = new VerifierWorkspacesClientImpl(this);
@@ -2641,7 +2657,7 @@ public WebApplicationFirewallPoliciesClient getWebApplicationFirewallPolicies()
      * REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClient")
     public interface NetworkManagementClientService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/bastionHosts/{bastionHostName}/createShareableLinks")
@@ -2863,7 +2879,7 @@ private Mono<PagedResponse<BastionShareableLinkInner>> putBastionShareableLinkSi
         } else {
             bslRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> {
             Mono<Response<Flux<ByteBuffer>>> mono
@@ -2919,7 +2935,7 @@ private Mono<PagedResponse<BastionShareableLinkInner>> putBastionShareableLinkSi
         } else {
             bslRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         Mono<Response<Flux<ByteBuffer>>> mono
@@ -3046,7 +3062,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteBastionShareableLinkWithResponseAs
         } else {
             bslRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.deleteBastionShareableLink(this.getEndpoint(), resourceGroupName,
@@ -3090,7 +3106,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteBastionShareableLinkWithResponseA
         } else {
             bslRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.deleteBastionShareableLink(this.getEndpoint(), resourceGroupName, bastionHostname, apiVersion,
@@ -3280,7 +3296,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteBastionShareableLinkByTokenWithRes
         } else {
             bslTokenRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.deleteBastionShareableLinkByToken(this.getEndpoint(), resourceGroupName,
@@ -3326,7 +3342,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteBastionShareableLinkByTokenWithRe
         } else {
             bslTokenRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.deleteBastionShareableLinkByToken(this.getEndpoint(), resourceGroupName, bastionHostname,
@@ -3518,7 +3534,7 @@ private Mono<PagedResponse<BastionShareableLinkInner>> getBastionShareableLinkSi
         } else {
             bslRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getBastionShareableLink(this.getEndpoint(), resourceGroupName,
@@ -3565,7 +3581,7 @@ private Mono<PagedResponse<BastionShareableLinkInner>> getBastionShareableLinkSi
         } else {
             bslRequest.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service
@@ -3679,7 +3695,7 @@ private Mono<PagedResponse<BastionActiveSessionInner>> getActiveSessionsSinglePa
             return Mono.error(
                 new IllegalArgumentException("Parameter this.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> {
             Mono<Response<Flux<ByteBuffer>>> mono
@@ -3728,7 +3744,7 @@ private Mono<PagedResponse<BastionActiveSessionInner>> getActiveSessionsSinglePa
             return Mono.error(
                 new IllegalArgumentException("Parameter this.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         Mono<Response<Flux<ByteBuffer>>> mono
@@ -3849,7 +3865,7 @@ private Mono<PagedResponse<BastionSessionStateInner>> disconnectActiveSessionsSi
         } else {
             sessionIds.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.disconnectActiveSessions(this.getEndpoint(), resourceGroupName,
@@ -3896,7 +3912,7 @@ private Mono<PagedResponse<BastionSessionStateInner>> disconnectActiveSessionsSi
         } else {
             sessionIds.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service
@@ -4011,7 +4027,7 @@ public Mono<Response<DnsNameAvailabilityResultInner>> checkDnsNameAvailabilityWi
             return Mono.error(
                 new IllegalArgumentException("Parameter this.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.checkDnsNameAvailability(this.getEndpoint(), location, domainNameLabel,
@@ -4050,7 +4066,7 @@ private Mono<Response<DnsNameAvailabilityResultInner>> checkDnsNameAvailabilityW
             return Mono.error(
                 new IllegalArgumentException("Parameter this.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.checkDnsNameAvailability(this.getEndpoint(), location, domainNameLabel, apiVersion,
@@ -4131,7 +4147,7 @@ public DnsNameAvailabilityResultInner checkDnsNameAvailability(String location,
             return Mono.error(
                 new IllegalArgumentException("Parameter this.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.expressRouteProviderPort(this.getEndpoint(), providerport, apiVersion,
@@ -4163,7 +4179,7 @@ private Mono<Response<ExpressRouteProviderPortInner>> expressRouteProviderPortWi
             return Mono.error(
                 new IllegalArgumentException("Parameter this.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.expressRouteProviderPort(this.getEndpoint(), providerport, apiVersion, this.getSubscriptionId(),
@@ -4253,7 +4269,7 @@ public ExpressRouteProviderPortInner expressRouteProviderPort(String providerpor
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listActiveConnectivityConfigurations(this.getEndpoint(), apiVersion,
@@ -4301,7 +4317,7 @@ public ExpressRouteProviderPortInner expressRouteProviderPort(String providerpor
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.listActiveConnectivityConfigurations(this.getEndpoint(), apiVersion, this.getSubscriptionId(),
@@ -4407,7 +4423,7 @@ public Mono<Response<ActiveSecurityAdminRulesListResultInner>> listActiveSecurit
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listActiveSecurityAdminRules(this.getEndpoint(), apiVersion,
@@ -4455,7 +4471,7 @@ private Mono<Response<ActiveSecurityAdminRulesListResultInner>> listActiveSecuri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.listActiveSecurityAdminRules(this.getEndpoint(), apiVersion, this.getSubscriptionId(),
@@ -4561,7 +4577,7 @@ public ActiveSecurityAdminRulesListResultInner listActiveSecurityAdminRules(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listNetworkManagerEffectiveConnectivityConfigurations(this.getEndpoint(),
@@ -4610,7 +4626,7 @@ public ActiveSecurityAdminRulesListResultInner listActiveSecurityAdminRules(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.listNetworkManagerEffectiveConnectivityConfigurations(this.getEndpoint(),
@@ -4721,7 +4737,7 @@ public ActiveSecurityAdminRulesListResultInner listActiveSecurityAdminRules(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listNetworkManagerEffectiveSecurityAdminRules(this.getEndpoint(),
@@ -4770,7 +4786,7 @@ public ActiveSecurityAdminRulesListResultInner listActiveSecurityAdminRules(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.listNetworkManagerEffectiveSecurityAdminRules(this.getEndpoint(), this.getSubscriptionId(),
@@ -4867,7 +4883,7 @@ public NetworkManagerEffectiveSecurityAdminRulesListResultInner listNetworkManag
         if (virtualWanName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualWanName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.supportedSecurityProviders(this.getEndpoint(), this.getSubscriptionId(),
@@ -4904,7 +4920,7 @@ public NetworkManagerEffectiveSecurityAdminRulesListResultInner listNetworkManag
         if (virtualWanName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualWanName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.supportedSecurityProviders(this.getEndpoint(), this.getSubscriptionId(), resourceGroupName,
@@ -4998,7 +5014,7 @@ public Mono<Response<Flux<ByteBuffer>>> generatevirtualwanvpnserverconfiguration
         } else {
             vpnClientParams.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.generatevirtualwanvpnserverconfigurationvpnprofile(this.getEndpoint(),
@@ -5046,7 +5062,7 @@ private Mono<Response<Flux<ByteBuffer>>> generatevirtualwanvpnserverconfiguratio
         } else {
             vpnClientParams.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.mergeContext(context);
         return service.generatevirtualwanvpnserverconfigurationvpnprofile(this.getEndpoint(), this.getSubscriptionId(),
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerCommitsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerCommitsClientImpl.java
index 586893c89b5f..9b807e999b72 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerCommitsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerCommitsClientImpl.java
@@ -61,7 +61,7 @@ public final class NetworkManagerCommitsClientImpl implements NetworkManagerComm
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkManagerCommits")
     public interface NetworkManagerCommitsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/commit")
@@ -110,7 +110,7 @@ public Mono<Response<Flux<ByteBuffer>>> postWithResponseAsync(String resourceGro
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.post(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -154,7 +154,7 @@ private Mono<Response<Flux<ByteBuffer>>> postWithResponseAsync(String resourceGr
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.post(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerDeploymentStatusOperationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerDeploymentStatusOperationsClientImpl.java
index af36e029efe1..865eab283b65 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerDeploymentStatusOperationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerDeploymentStatusOperationsClientImpl.java
@@ -59,7 +59,7 @@ public final class NetworkManagerDeploymentStatusOperationsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkManagerDeploymentStatusOperations")
     public interface NetworkManagerDeploymentStatusOperationsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/listDeploymentStatus")
@@ -112,7 +112,7 @@ public Mono<Response<NetworkManagerDeploymentStatusListResultInner>> listWithRes
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -160,7 +160,7 @@ private Mono<Response<NetworkManagerDeploymentStatusListResultInner>> listWithRe
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerRoutingConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerRoutingConfigurationsClientImpl.java
index c36118b87042..5b42a677c387 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerRoutingConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagerRoutingConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class NetworkManagerRoutingConfigurationsClientImpl implements Netw
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkManagerRoutingConfigurations")
     public interface NetworkManagerRoutingConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/routingConfigurations")
@@ -158,7 +158,7 @@ private Mono<PagedResponse<NetworkManagerRoutingConfigurationInner>> listSingleP
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -205,7 +205,7 @@ private Mono<PagedResponse<NetworkManagerRoutingConfigurationInner>> listSingleP
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -354,7 +354,7 @@ public Mono<Response<NetworkManagerRoutingConfigurationInner>> getWithResponseAs
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -397,7 +397,7 @@ private Mono<Response<NetworkManagerRoutingConfigurationInner>> getWithResponseA
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -499,7 +499,7 @@ public Mono<Response<NetworkManagerRoutingConfigurationInner>> createOrUpdateWit
         } else {
             routingConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -551,7 +551,7 @@ private Mono<Response<NetworkManagerRoutingConfigurationInner>> createOrUpdateWi
         } else {
             routingConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -654,7 +654,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -700,7 +700,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagersClientImpl.java
index 94d50f136e2c..0ed01901a558 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkManagersClientImpl.java
@@ -74,7 +74,7 @@ public final class NetworkManagersClientImpl implements InnerSupportsGet<Network
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkManagers")
     public interface NetworkManagersService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}")
@@ -183,7 +183,7 @@ public Mono<Response<NetworkManagerInner>> getByResourceGroupWithResponseAsync(S
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(),
@@ -221,7 +221,7 @@ private Mono<Response<NetworkManagerInner>> getByResourceGroupWithResponseAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -311,7 +311,7 @@ public Mono<Response<NetworkManagerInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -355,7 +355,7 @@ private Mono<Response<NetworkManagerInner>> createOrUpdateWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -446,7 +446,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -486,7 +486,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -711,7 +711,7 @@ public Mono<Response<NetworkManagerInner>> patchWithResponseAsync(String resourc
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.patch(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -755,7 +755,7 @@ private Mono<Response<NetworkManagerInner>> patchWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.patch(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -838,7 +838,7 @@ private Mono<PagedResponse<NetworkManagerInner>> listSinglePageAsync(Integer top
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -874,7 +874,7 @@ private Mono<PagedResponse<NetworkManagerInner>> listSinglePageAsync(Integer top
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1001,7 +1001,7 @@ private Mono<PagedResponse<NetworkManagerInner>> listByResourceGroupSinglePageAs
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -1042,7 +1042,7 @@ private Mono<PagedResponse<NetworkManagerInner>> listByResourceGroupSinglePageAs
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkProfilesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkProfilesClientImpl.java
index 0978c1aaa71f..6b94c41a89f4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkProfilesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkProfilesClientImpl.java
@@ -74,7 +74,7 @@ public final class NetworkProfilesClientImpl implements InnerSupportsGet<Network
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkProfiles")
     public interface NetworkProfilesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}")
@@ -178,7 +178,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkProfileName,
@@ -216,7 +216,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkProfileName, apiVersion,
@@ -385,7 +385,7 @@ public Mono<Response<NetworkProfileInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -425,7 +425,7 @@ private Mono<Response<NetworkProfileInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, networkProfileName, apiVersion,
@@ -518,7 +518,7 @@ public Mono<Response<NetworkProfileInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -562,7 +562,7 @@ private Mono<Response<NetworkProfileInner>> createOrUpdateWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkProfileName, apiVersion,
@@ -657,7 +657,7 @@ public Mono<Response<NetworkProfileInner>> updateTagsWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, networkProfileName,
@@ -701,7 +701,7 @@ private Mono<Response<NetworkProfileInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, networkProfileName, apiVersion,
@@ -778,7 +778,7 @@ private Mono<PagedResponse<NetworkProfileInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -808,7 +808,7 @@ private Mono<PagedResponse<NetworkProfileInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -893,7 +893,7 @@ private Mono<PagedResponse<NetworkProfileInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -929,7 +929,7 @@ private Mono<PagedResponse<NetworkProfileInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1006,8 +1006,8 @@ public PagedIterable<NetworkProfileInner> listByResourceGroup(String resourceGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkProfiles API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the network profiles in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkProfileInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1034,8 +1034,8 @@ private Mono<PagedResponse<NetworkProfileInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkProfiles API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the network profiles in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkProfileInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1060,8 +1060,8 @@ private Mono<PagedResponse<NetworkProfileInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkProfiles API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network profiles in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkProfileInner>> listNextSinglePageAsync(String nextLink) {
@@ -1087,8 +1087,8 @@ private Mono<PagedResponse<NetworkProfileInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkProfiles API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network profiles in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkProfileInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsClientImpl.java
index 3a24e8ca4202..142138b8051d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsClientImpl.java
@@ -74,7 +74,7 @@ public final class NetworkSecurityGroupsClientImpl implements InnerSupportsGet<N
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityGroups")
     public interface NetworkSecurityGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}")
@@ -180,7 +180,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -218,7 +218,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName, apiVersion,
@@ -389,7 +389,7 @@ public Mono<Response<NetworkSecurityGroupInner>> getByResourceGroupWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -429,7 +429,7 @@ private Mono<Response<NetworkSecurityGroupInner>> getByResourceGroupWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -525,7 +525,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -569,7 +569,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -764,7 +764,7 @@ public Mono<Response<NetworkSecurityGroupInner>> updateTagsWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -808,7 +808,7 @@ private Mono<Response<NetworkSecurityGroupInner>> updateTagsWithResponseAsync(St
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName, apiVersion,
@@ -886,7 +886,7 @@ private Mono<PagedResponse<NetworkSecurityGroupInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -916,7 +916,7 @@ private Mono<PagedResponse<NetworkSecurityGroupInner>> listSinglePageAsync(Conte
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1002,7 +1002,7 @@ public PagedIterable<NetworkSecurityGroupInner> list(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1038,7 +1038,7 @@ private Mono<PagedResponse<NetworkSecurityGroupInner>> listByResourceGroupSingle
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1115,8 +1115,8 @@ public PagedIterable<NetworkSecurityGroupInner> listByResourceGroup(String resou
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkSecurityGroups API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network security groups in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkSecurityGroupInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1143,8 +1143,8 @@ private Mono<PagedResponse<NetworkSecurityGroupInner>> listAllNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkSecurityGroups API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network security groups in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkSecurityGroupInner>> listAllNextSinglePageAsync(String nextLink,
@@ -1170,8 +1170,8 @@ private Mono<PagedResponse<NetworkSecurityGroupInner>> listAllNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkSecurityGroups API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network security groups in a resource group along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkSecurityGroupInner>> listNextSinglePageAsync(String nextLink) {
@@ -1197,8 +1197,8 @@ private Mono<PagedResponse<NetworkSecurityGroupInner>> listNextSinglePageAsync(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkSecurityGroups API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all network security groups in a resource group along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<NetworkSecurityGroupInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAccessRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAccessRulesClientImpl.java
index ef145bf50e1b..6bd3d3c25449 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAccessRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAccessRulesClientImpl.java
@@ -64,7 +64,7 @@ public final class NetworkSecurityPerimeterAccessRulesClientImpl implements Netw
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterAccessRules")
     public interface NetworkSecurityPerimeterAccessRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/profiles/{profileName}/accessRules/{accessRuleName}")
@@ -170,7 +170,7 @@ public Mono<Response<NspAccessRuleInner>> getWithResponseAsync(String resourceGr
         if (accessRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter accessRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -218,7 +218,7 @@ private Mono<Response<NspAccessRuleInner>> getWithResponseAsync(String resourceG
         if (accessRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter accessRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -326,7 +326,7 @@ public Mono<Response<NspAccessRuleInner>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -380,7 +380,7 @@ private Mono<Response<NspAccessRuleInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -486,7 +486,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
         if (accessRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter accessRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -533,7 +533,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (accessRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter accessRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -635,7 +635,7 @@ private Mono<PagedResponse<NspAccessRuleInner>> listSinglePageAsync(String resou
         if (profileName == null) {
             return Mono.error(new IllegalArgumentException("Parameter profileName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -686,7 +686,7 @@ private Mono<PagedResponse<NspAccessRuleInner>> listSinglePageAsync(String resou
         if (profileName == null) {
             return Mono.error(new IllegalArgumentException("Parameter profileName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -850,7 +850,7 @@ public Mono<Response<Object>> reconcileWithResponseAsync(String resourceGroupNam
         if (parameters == null) {
             return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.reconcile(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -902,7 +902,7 @@ private Mono<Response<Object>> reconcileWithResponseAsync(String resourceGroupNa
         if (parameters == null) {
             return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.reconcile(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociableResourceTypesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociableResourceTypesClientImpl.java
index bcb631cd2dc3..8027fe4064c6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociableResourceTypesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociableResourceTypesClientImpl.java
@@ -63,7 +63,7 @@ public final class NetworkSecurityPerimeterAssociableResourceTypesClientImpl
      * REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterAssociableResourceTypes")
     public interface NetworkSecurityPerimeterAssociableResourceTypesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/perimeterAssociableResourceTypes")
@@ -106,7 +106,7 @@ private Mono<PagedResponse<PerimeterAssociableResourceInner>> listSinglePageAsyn
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
@@ -142,7 +142,7 @@ private Mono<PagedResponse<PerimeterAssociableResourceInner>> listSinglePageAsyn
         if (location == null) {
             return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -221,8 +221,8 @@ public PagedIterable<PerimeterAssociableResourceInner> list(String location, Con
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return paged list of perimeter associable resources along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the list of resources that are onboarded with NSP along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PerimeterAssociableResourceInner>> listNextSinglePageAsync(String nextLink) {
@@ -248,8 +248,8 @@ private Mono<PagedResponse<PerimeterAssociableResourceInner>> listNextSinglePage
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return paged list of perimeter associable resources along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the list of resources that are onboarded with NSP along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PerimeterAssociableResourceInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociationsClientImpl.java
index 92ef827c0c93..c799a87bf866 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterAssociationsClientImpl.java
@@ -71,7 +71,7 @@ public final class NetworkSecurityPerimeterAssociationsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterAssociations")
     public interface NetworkSecurityPerimeterAssociationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/resourceAssociations/{associationName}")
@@ -173,7 +173,7 @@ public Mono<Response<NspAssociationInner>> getWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter associationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -217,7 +217,7 @@ private Mono<Response<NspAssociationInner>> getWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter associationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -319,7 +319,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -370,7 +370,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -580,7 +580,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter associationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -623,7 +623,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter associationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -812,7 +812,7 @@ private Mono<PagedResponse<NspAssociationInner>> listSinglePageAsync(String reso
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -858,7 +858,7 @@ private Mono<PagedResponse<NspAssociationInner>> listSinglePageAsync(String reso
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1011,7 +1011,7 @@ public Mono<Response<Object>> reconcileWithResponseAsync(String resourceGroupNam
         if (parameters == null) {
             return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.reconcile(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1059,7 +1059,7 @@ private Mono<Response<Object>> reconcileWithResponseAsync(String resourceGroupNa
         if (parameters == null) {
             return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.reconcile(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinkReferencesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinkReferencesClientImpl.java
index ce1cdad3322a..7a599ca0e8f7 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinkReferencesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinkReferencesClientImpl.java
@@ -68,7 +68,7 @@ public final class NetworkSecurityPerimeterLinkReferencesClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterLinkReferences")
     public interface NetworkSecurityPerimeterLinkReferencesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/linkReferences/{linkReferenceName}")
@@ -147,7 +147,7 @@ public Mono<Response<NspLinkReferenceInner>> getWithResponseAsync(String resourc
             return Mono
                 .error(new IllegalArgumentException("Parameter linkReferenceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -191,7 +191,7 @@ private Mono<Response<NspLinkReferenceInner>> getWithResponseAsync(String resour
             return Mono
                 .error(new IllegalArgumentException("Parameter linkReferenceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -287,7 +287,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter linkReferenceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -330,7 +330,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter linkReferenceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -520,7 +520,7 @@ private Mono<PagedResponse<NspLinkReferenceInner>> listSinglePageAsync(String re
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -566,7 +566,7 @@ private Mono<PagedResponse<NspLinkReferenceInner>> listSinglePageAsync(String re
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinksClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinksClientImpl.java
index 99fa0b1b658a..dc91b1d9a200 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinksClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLinksClientImpl.java
@@ -68,7 +68,7 @@ public final class NetworkSecurityPerimeterLinksClientImpl implements NetworkSec
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterLinks")
     public interface NetworkSecurityPerimeterLinksService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/links/{linkName}")
@@ -156,7 +156,7 @@ public Mono<Response<NspLinkInner>> getWithResponseAsync(String resourceGroupNam
         if (linkName == null) {
             return Mono.error(new IllegalArgumentException("Parameter linkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -198,7 +198,7 @@ private Mono<Response<NspLinkInner>> getWithResponseAsync(String resourceGroupNa
         if (linkName == null) {
             return Mono.error(new IllegalArgumentException("Parameter linkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -296,7 +296,7 @@ public Mono<Response<NspLinkInner>> createOrUpdateWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -345,7 +345,7 @@ private Mono<Response<NspLinkInner>> createOrUpdateWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -443,7 +443,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (linkName == null) {
             return Mono.error(new IllegalArgumentException("Parameter linkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -485,7 +485,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (linkName == null) {
             return Mono.error(new IllegalArgumentException("Parameter linkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -673,7 +673,7 @@ private Mono<PagedResponse<NspLinkInner>> listSinglePageAsync(String resourceGro
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -719,7 +719,7 @@ private Mono<PagedResponse<NspLinkInner>> listSinglePageAsync(String resourceGro
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLoggingConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLoggingConfigurationsClientImpl.java
index a86b09f968fe..e72f00502012 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLoggingConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterLoggingConfigurationsClientImpl.java
@@ -65,7 +65,7 @@ public final class NetworkSecurityPerimeterLoggingConfigurationsClientImpl
      * to be used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterLoggingConfigurations")
     public interface NetworkSecurityPerimeterLoggingConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/loggingConfigurations/{loggingConfigurationName}")
@@ -155,7 +155,7 @@ public Mono<Response<NspLoggingConfigurationInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter loggingConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -198,7 +198,7 @@ private Mono<Response<NspLoggingConfigurationInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter loggingConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -300,7 +300,7 @@ public Mono<Response<NspLoggingConfigurationInner>> createOrUpdateWithResponseAs
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -351,7 +351,7 @@ private Mono<Response<NspLoggingConfigurationInner>> createOrUpdateWithResponseA
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -451,7 +451,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
             return Mono.error(
                 new IllegalArgumentException("Parameter loggingConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -494,7 +494,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             return Mono.error(
                 new IllegalArgumentException("Parameter loggingConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -583,7 +583,7 @@ private Mono<PagedResponse<NspLoggingConfigurationInner>> listSinglePageAsync(St
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -624,7 +624,7 @@ private Mono<PagedResponse<NspLoggingConfigurationInner>> listSinglePageAsync(St
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterOperationStatusesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterOperationStatusesClientImpl.java
index 9ad5d4593ce4..92a82b39c398 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterOperationStatusesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterOperationStatusesClientImpl.java
@@ -57,7 +57,7 @@ public final class NetworkSecurityPerimeterOperationStatusesClientImpl
      * be used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterOperationStatuses")
     public interface NetworkSecurityPerimeterOperationStatusesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/networkSecurityPerimeterOperationStatuses/{operationId}")
@@ -96,7 +96,7 @@ public Mono<Response<OperationStatusResultInner>> getWithResponseAsync(String lo
         if (operationId == null) {
             return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
@@ -133,7 +133,7 @@ private Mono<Response<OperationStatusResultInner>> getWithResponseAsync(String l
         if (operationId == null) {
             return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), location, operationId,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterProfilesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterProfilesClientImpl.java
index a12bf9a8aa02..ec39accbd67a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterProfilesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterProfilesClientImpl.java
@@ -63,7 +63,7 @@ public final class NetworkSecurityPerimeterProfilesClientImpl implements Network
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterProfiles")
     public interface NetworkSecurityPerimeterProfilesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}/profiles/{profileName}")
@@ -151,7 +151,7 @@ public Mono<Response<NspProfileInner>> getWithResponseAsync(String resourceGroup
         if (profileName == null) {
             return Mono.error(new IllegalArgumentException("Parameter profileName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -193,7 +193,7 @@ private Mono<Response<NspProfileInner>> getWithResponseAsync(String resourceGrou
         if (profileName == null) {
             return Mono.error(new IllegalArgumentException("Parameter profileName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -292,7 +292,7 @@ public Mono<Response<NspProfileInner>> createOrUpdateWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -341,7 +341,7 @@ private Mono<Response<NspProfileInner>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -439,7 +439,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
         if (profileName == null) {
             return Mono.error(new IllegalArgumentException("Parameter profileName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -481,7 +481,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
         if (profileName == null) {
             return Mono.error(new IllegalArgumentException("Parameter profileName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -573,7 +573,7 @@ private Mono<PagedResponse<NspProfileInner>> listSinglePageAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -619,7 +619,7 @@ private Mono<PagedResponse<NspProfileInner>> listSinglePageAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterServiceTagsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterServiceTagsClientImpl.java
new file mode 100644
index 000000000000..729ea91b306a
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimeterServiceTagsClientImpl.java
@@ -0,0 +1,259 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.implementation;
+
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.resourcemanager.network.fluent.NetworkSecurityPerimeterServiceTagsClient;
+import com.azure.resourcemanager.network.fluent.models.NspServiceTagsResourceInner;
+import com.azure.resourcemanager.network.models.NspServiceTagsListResult;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in NetworkSecurityPerimeterServiceTagsClient.
+ */
+public final class NetworkSecurityPerimeterServiceTagsClientImpl implements NetworkSecurityPerimeterServiceTagsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final NetworkSecurityPerimeterServiceTagsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final NetworkManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkSecurityPerimeterServiceTagsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    NetworkSecurityPerimeterServiceTagsClientImpl(NetworkManagementClientImpl client) {
+        this.service = RestProxy.create(NetworkSecurityPerimeterServiceTagsService.class, client.getHttpPipeline(),
+            client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for NetworkManagementClientNetworkSecurityPerimeterServiceTags to be used
+     * by the proxy service to perform REST calls.
+     */
+    @Host("{$host}")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeterServiceTags")
+    public interface NetworkSecurityPerimeterServiceTagsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/nspServiceTags")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NspServiceTagsListResult>> list(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NspServiceTagsListResult>> listNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NspServiceTagsResourceInner>> listSinglePageAsync(String location) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), location,
+                apiVersion, accept, context))
+            .<PagedResponse<NspServiceTagsResourceInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NspServiceTagsResourceInner>> listSinglePageAsync(String location, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (location == null) {
+            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service
+            .list(this.client.getEndpoint(), this.client.getSubscriptionId(), location, apiVersion, accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedFlux<NspServiceTagsResourceInner> listAsync(String location) {
+        return new PagedFlux<>(() -> listSinglePageAsync(location), nextLink -> listNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<NspServiceTagsResourceInner> listAsync(String location, Context context) {
+        return new PagedFlux<>(() -> listSinglePageAsync(location, context),
+            nextLink -> listNextSinglePageAsync(nextLink, context));
+    }
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NspServiceTagsResourceInner> list(String location) {
+        return new PagedIterable<>(listAsync(location));
+    }
+
+    /**
+     * Gets the list of service tags supported by NSP. These service tags can be used to create access rules in NSP.
+     * 
+     * @param location The location of network security perimeter.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NspServiceTagsResourceInner> list(String location, Context context) {
+        return new PagedIterable<>(listAsync(location, context));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NspServiceTagsResourceInner>> listNextSinglePageAsync(String nextLink) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.listNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<NspServiceTagsResourceInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the list of service tags supported by NSP along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NspServiceTagsResourceInner>> listNextSinglePageAsync(String nextLink, Context context) {
+        if (nextLink == null) {
+            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
+            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
+                res.getValue().value(), res.getValue().nextLink(), null));
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimetersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimetersClientImpl.java
index ac60a104052b..4f571bdf5deb 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimetersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityPerimetersClientImpl.java
@@ -74,7 +74,7 @@ public final class NetworkSecurityPerimetersClientImpl implements InnerSupportsG
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkSecurityPerimeters")
     public interface NetworkSecurityPerimetersService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityPerimeters/{networkSecurityPerimeterName}")
@@ -186,7 +186,7 @@ public Mono<Response<NetworkSecurityPerimeterInner>> getByResourceGroupWithRespo
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -226,7 +226,7 @@ private Mono<Response<NetworkSecurityPerimeterInner>> getByResourceGroupWithResp
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -319,7 +319,7 @@ public Mono<Response<NetworkSecurityPerimeterInner>> createOrUpdateWithResponseA
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -364,7 +364,7 @@ private Mono<Response<NetworkSecurityPerimeterInner>> createOrUpdateWithResponse
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -456,7 +456,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -495,7 +495,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter networkSecurityPerimeterName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -722,7 +722,7 @@ public Mono<Response<NetworkSecurityPerimeterInner>> patchWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.patch(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -767,7 +767,7 @@ private Mono<Response<NetworkSecurityPerimeterInner>> patchWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.patch(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -851,7 +851,7 @@ private Mono<PagedResponse<NetworkSecurityPerimeterInner>> listSinglePageAsync(I
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -887,7 +887,7 @@ private Mono<PagedResponse<NetworkSecurityPerimeterInner>> listSinglePageAsync(I
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1014,7 +1014,7 @@ public PagedIterable<NetworkSecurityPerimeterInner> list(Integer top, String ski
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -1055,7 +1055,7 @@ public PagedIterable<NetworkSecurityPerimeterInner> list(Integer top, String ski
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityRuleImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityRuleImpl.java
index 967552477135..be5d518cf4aa 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityRuleImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityRuleImpl.java
@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
+import java.util.TreeMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -27,8 +27,8 @@ class NetworkSecurityRuleImpl
     extends ChildResourceImpl<SecurityRuleInner, NetworkSecurityGroupImpl, NetworkSecurityGroup>
     implements NetworkSecurityRule, NetworkSecurityRule.Definition<NetworkSecurityGroup.DefinitionStages.WithCreate>,
     NetworkSecurityRule.UpdateDefinition<NetworkSecurityGroup.Update>, NetworkSecurityRule.Update {
-    private Map<String, ApplicationSecurityGroupInner> sourceAsgs = new HashMap<>();
-    private Map<String, ApplicationSecurityGroupInner> destinationAsgs = new HashMap<>();
+    private Map<String, ApplicationSecurityGroupInner> sourceAsgs = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    private Map<String, ApplicationSecurityGroupInner> destinationAsgs = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
     private final ClientLogger logger = new ClientLogger(getClass());
 
     NetworkSecurityRuleImpl(SecurityRuleInner inner, NetworkSecurityGroupImpl parent) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualApplianceConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualApplianceConnectionsClientImpl.java
index 3919433378a9..6be234e28032 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualApplianceConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualApplianceConnectionsClientImpl.java
@@ -68,7 +68,7 @@ public final class NetworkVirtualApplianceConnectionsClientImpl implements Netwo
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkVirtualApplianceConnections")
     public interface NetworkVirtualApplianceConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}/networkVirtualApplianceConnections/{connectionName}")
@@ -166,7 +166,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             networkVirtualApplianceConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -219,7 +219,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             networkVirtualApplianceConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -444,7 +444,7 @@ public Mono<Response<NetworkVirtualApplianceConnectionInner>> getWithResponseAsy
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -487,7 +487,7 @@ private Mono<Response<NetworkVirtualApplianceConnectionInner>> getWithResponseAs
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -580,7 +580,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -622,7 +622,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -805,7 +805,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceConnectionInner>> listSinglePa
             return Mono.error(
                 new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -846,7 +846,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceConnectionInner>> listSinglePa
             return Mono.error(
                 new IllegalArgumentException("Parameter networkVirtualApplianceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualAppliancesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualAppliancesClientImpl.java
index 5fac4705f098..86bd89fd6ff4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualAppliancesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkVirtualAppliancesClientImpl.java
@@ -78,7 +78,7 @@ public final class NetworkVirtualAppliancesClientImpl implements InnerSupportsGe
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkVirtualAppliances")
     public interface NetworkVirtualAppliancesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}")
@@ -217,7 +217,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -255,7 +255,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName, apiVersion,
@@ -427,7 +427,7 @@ public Mono<Response<NetworkVirtualApplianceInner>> getByResourceGroupWithRespon
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -467,7 +467,7 @@ private Mono<Response<NetworkVirtualApplianceInner>> getByResourceGroupWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName,
@@ -564,7 +564,7 @@ public Mono<Response<NetworkVirtualApplianceInner>> updateTagsWithResponseAsync(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -608,7 +608,7 @@ private Mono<Response<NetworkVirtualApplianceInner>> updateTagsWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -704,7 +704,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -748,7 +748,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName,
@@ -946,7 +946,7 @@ public Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(String resource
         if (networkVirtualApplianceInstanceIds != null) {
             networkVirtualApplianceInstanceIds.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -992,7 +992,7 @@ private Mono<Response<Flux<ByteBuffer>>> restartWithResponseAsync(String resourc
         if (networkVirtualApplianceInstanceIds != null) {
             networkVirtualApplianceInstanceIds.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.restart(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName, apiVersion,
@@ -1255,7 +1255,7 @@ public Mono<Response<Flux<ByteBuffer>>> reimageWithResponseAsync(String resource
         if (networkVirtualApplianceInstanceIds != null) {
             networkVirtualApplianceInstanceIds.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1301,7 +1301,7 @@ private Mono<Response<Flux<ByteBuffer>>> reimageWithResponseAsync(String resourc
         if (networkVirtualApplianceInstanceIds != null) {
             networkVirtualApplianceInstanceIds.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.reimage(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName, apiVersion,
@@ -1563,7 +1563,7 @@ public Mono<Response<Flux<ByteBuffer>>> getBootDiagnosticLogsWithResponseAsync(S
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getBootDiagnosticLogs(this.client.getEndpoint(), resourceGroupName,
@@ -1607,7 +1607,7 @@ private Mono<Response<Flux<ByteBuffer>>> getBootDiagnosticLogsWithResponseAsync(
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getBootDiagnosticLogs(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName,
@@ -1796,7 +1796,7 @@ public NetworkVirtualApplianceInstanceIdInner getBootDiagnosticLogs(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1832,7 +1832,7 @@ public NetworkVirtualApplianceInstanceIdInner getBootDiagnosticLogs(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1923,7 +1923,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceInner>> listSinglePageAsync()
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1953,7 +1953,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceInner>> listSinglePageAsync(Co
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -2077,7 +2077,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceInner>> listByResourceGroupNex
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkVirtualAppliances API service call along with {@link PagedResponse} on successful
+     * @return all Network Virtual Appliances in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -2104,7 +2104,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceInner>> listNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListNetworkVirtualAppliances API service call along with {@link PagedResponse} on successful
+     * @return all Network Virtual Appliances in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkWatchersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkWatchersClientImpl.java
index a0b948112d69..9270ba919443 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkWatchersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkWatchersClientImpl.java
@@ -96,7 +96,7 @@ public final class NetworkWatchersClientImpl implements InnerSupportsGet<Network
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientNetworkWatchers")
     public interface NetworkWatchersService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}")
@@ -321,7 +321,7 @@ public Mono<Response<NetworkWatcherInner>> createOrUpdateWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -365,7 +365,7 @@ private Mono<Response<NetworkWatcherInner>> createOrUpdateWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -455,7 +455,7 @@ public Mono<Response<NetworkWatcherInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -494,7 +494,7 @@ private Mono<Response<NetworkWatcherInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -578,7 +578,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -616,7 +616,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -789,7 +789,7 @@ public Mono<Response<NetworkWatcherInner>> updateTagsWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -833,7 +833,7 @@ private Mono<Response<NetworkWatcherInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -916,7 +916,7 @@ private Mono<PagedResponse<NetworkWatcherInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -952,7 +952,7 @@ private Mono<PagedResponse<NetworkWatcherInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1038,7 +1038,7 @@ private Mono<PagedResponse<NetworkWatcherInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1068,7 +1068,7 @@ private Mono<PagedResponse<NetworkWatcherInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1164,7 +1164,7 @@ public Mono<Response<TopologyInner>> getTopologyWithResponseAsync(String resourc
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getTopology(this.client.getEndpoint(), resourceGroupName,
@@ -1209,7 +1209,7 @@ private Mono<Response<TopologyInner>> getTopologyWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getTopology(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -1305,7 +1305,7 @@ public Mono<Response<Flux<ByteBuffer>>> verifyIpFlowWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.verifyIpFlow(this.client.getEndpoint(), resourceGroupName,
@@ -1350,7 +1350,7 @@ private Mono<Response<Flux<ByteBuffer>>> verifyIpFlowWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.verifyIpFlow(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -1543,7 +1543,7 @@ public Mono<Response<Flux<ByteBuffer>>> getNextHopWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getNextHop(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -1587,7 +1587,7 @@ private Mono<Response<Flux<ByteBuffer>>> getNextHopWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getNextHop(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -1779,7 +1779,7 @@ public Mono<Response<Flux<ByteBuffer>>> getVMSecurityRulesWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getVMSecurityRules(this.client.getEndpoint(), resourceGroupName,
@@ -1824,7 +1824,7 @@ private Mono<Response<Flux<ByteBuffer>>> getVMSecurityRulesWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getVMSecurityRules(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -2027,7 +2027,7 @@ public Mono<Response<Flux<ByteBuffer>>> getTroubleshootingWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getTroubleshooting(this.client.getEndpoint(), resourceGroupName,
@@ -2072,7 +2072,7 @@ private Mono<Response<Flux<ByteBuffer>>> getTroubleshootingWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getTroubleshooting(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -2266,7 +2266,7 @@ public Mono<Response<Flux<ByteBuffer>>> getTroubleshootingResultWithResponseAsyn
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getTroubleshootingResult(this.client.getEndpoint(), resourceGroupName,
@@ -2311,7 +2311,7 @@ private Mono<Response<Flux<ByteBuffer>>> getTroubleshootingResultWithResponseAsy
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getTroubleshootingResult(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -2511,7 +2511,7 @@ public Mono<Response<Flux<ByteBuffer>>> setFlowLogConfigurationWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.setFlowLogConfiguration(this.client.getEndpoint(), resourceGroupName,
@@ -2556,7 +2556,7 @@ private Mono<Response<Flux<ByteBuffer>>> setFlowLogConfigurationWithResponseAsyn
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.setFlowLogConfiguration(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -2757,7 +2757,7 @@ public Mono<Response<Flux<ByteBuffer>>> getFlowLogStatusWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getFlowLogStatus(this.client.getEndpoint(), resourceGroupName,
@@ -2802,7 +2802,7 @@ private Mono<Response<Flux<ByteBuffer>>> getFlowLogStatusWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getFlowLogStatus(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -3003,7 +3003,7 @@ public Mono<Response<Flux<ByteBuffer>>> checkConnectivityWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.checkConnectivity(this.client.getEndpoint(), resourceGroupName,
@@ -3049,7 +3049,7 @@ private Mono<Response<Flux<ByteBuffer>>> checkConnectivityWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.checkConnectivity(this.client.getEndpoint(), resourceGroupName, networkWatcherName, apiVersion,
@@ -3254,7 +3254,7 @@ public Mono<Response<Flux<ByteBuffer>>> getAzureReachabilityReportWithResponseAs
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getAzureReachabilityReport(this.client.getEndpoint(), resourceGroupName,
@@ -3299,7 +3299,7 @@ private Mono<Response<Flux<ByteBuffer>>> getAzureReachabilityReportWithResponseA
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getAzureReachabilityReport(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -3508,7 +3508,7 @@ public Mono<Response<Flux<ByteBuffer>>> listAvailableProvidersWithResponseAsync(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAvailableProviders(this.client.getEndpoint(), resourceGroupName,
@@ -3554,7 +3554,7 @@ private Mono<Response<Flux<ByteBuffer>>> listAvailableProvidersWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAvailableProviders(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -3763,7 +3763,7 @@ public Mono<Response<Flux<ByteBuffer>>> getNetworkConfigurationDiagnosticWithRes
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -3813,7 +3813,7 @@ private Mono<Response<Flux<ByteBuffer>>> getNetworkConfigurationDiagnosticWithRe
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getNetworkConfigurationDiagnostic(this.client.getEndpoint(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/OperationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/OperationsClientImpl.java
index b029b334d2be..5f8f85d856fd 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/OperationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/OperationsClientImpl.java
@@ -60,7 +60,7 @@ public final class OperationsClientImpl implements OperationsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientOperations")
     public interface OperationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/providers/Microsoft.Network/operations")
@@ -91,7 +91,7 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync() {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.list(this.client.getEndpoint(), apiVersion, accept, context))
             .<PagedResponse<OperationInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
@@ -115,7 +115,7 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context)
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, accept, context)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/P2SVpnGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/P2SVpnGatewaysClientImpl.java
index f3868c274ea6..98f6687a7a50 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/P2SVpnGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/P2SVpnGatewaysClientImpl.java
@@ -80,7 +80,7 @@ public final class P2SVpnGatewaysClientImpl implements InnerSupportsGet<P2SVpnGa
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientP2SVpnGateways")
     public interface P2SVpnGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}")
@@ -234,7 +234,7 @@ public Mono<Response<P2SVpnGatewayInner>> getByResourceGroupWithResponseAsync(St
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(),
@@ -271,7 +271,7 @@ private Mono<Response<P2SVpnGatewayInner>> getByResourceGroupWithResponseAsync(S
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -361,7 +361,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             p2SVpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -405,7 +405,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             p2SVpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -597,7 +597,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             p2SVpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -641,7 +641,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             p2SVpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -825,7 +825,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -862,7 +862,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1023,7 +1023,7 @@ private Mono<PagedResponse<P2SVpnGatewayInner>> listByResourceGroupSinglePageAsy
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -1059,7 +1059,7 @@ private Mono<PagedResponse<P2SVpnGatewayInner>> listByResourceGroupSinglePageAsy
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1147,7 +1147,7 @@ private Mono<PagedResponse<P2SVpnGatewayInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1177,7 +1177,7 @@ private Mono<PagedResponse<P2SVpnGatewayInner>> listSinglePageAsync(Context cont
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -1265,7 +1265,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.reset(this.client.getEndpoint(), resourceGroupName, gatewayName, apiVersion,
@@ -1302,7 +1302,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.reset(this.client.getEndpoint(), resourceGroupName, gatewayName, apiVersion,
@@ -1478,7 +1478,7 @@ public Mono<Response<Flux<ByteBuffer>>> generateVpnProfileWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.generateVpnProfile(this.client.getEndpoint(), resourceGroupName,
@@ -1522,7 +1522,7 @@ private Mono<Response<Flux<ByteBuffer>>> generateVpnProfileWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.generateVpnProfile(this.client.getEndpoint(), resourceGroupName, gatewayName, apiVersion,
@@ -1708,7 +1708,7 @@ public Mono<Response<Flux<ByteBuffer>>> getP2SVpnConnectionHealthWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getP2SVpnConnectionHealth(this.client.getEndpoint(), resourceGroupName,
@@ -1746,7 +1746,7 @@ private Mono<Response<Flux<ByteBuffer>>> getP2SVpnConnectionHealthWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getP2SVpnConnectionHealth(this.client.getEndpoint(), resourceGroupName, gatewayName, apiVersion,
@@ -1933,7 +1933,7 @@ public Mono<Response<Flux<ByteBuffer>>> getP2SVpnConnectionHealthDetailedWithRes
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getP2SVpnConnectionHealthDetailed(this.client.getEndpoint(),
@@ -1978,7 +1978,7 @@ private Mono<Response<Flux<ByteBuffer>>> getP2SVpnConnectionHealthDetailedWithRe
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getP2SVpnConnectionHealthDetailed(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -2193,7 +2193,7 @@ public Mono<Response<Flux<ByteBuffer>>> disconnectP2SVpnConnectionsWithResponseA
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.disconnectP2SVpnConnections(this.client.getEndpoint(),
@@ -2238,7 +2238,7 @@ private Mono<Response<Flux<ByteBuffer>>> disconnectP2SVpnConnectionsWithResponse
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.disconnectP2SVpnConnections(this.client.getEndpoint(), this.client.getSubscriptionId(),
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PacketCapturesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PacketCapturesClientImpl.java
index fdc2f857e346..d313ff63bdf9 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PacketCapturesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PacketCapturesClientImpl.java
@@ -71,7 +71,7 @@ public final class PacketCapturesClientImpl implements PacketCapturesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPacketCaptures")
     public interface PacketCapturesService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkWatchers/{networkWatcherName}/packetCaptures/{packetCaptureName}")
@@ -176,7 +176,7 @@ public Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceG
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -226,7 +226,7 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), resourceGroupName, networkWatcherName, packetCaptureName,
@@ -429,7 +429,7 @@ public Mono<Response<PacketCaptureResultInner>> getWithResponseAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -472,7 +472,7 @@ private Mono<Response<PacketCaptureResultInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkWatcherName, packetCaptureName,
@@ -565,7 +565,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -608,7 +608,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkWatcherName, packetCaptureName,
@@ -793,7 +793,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stop(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -836,7 +836,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stop(this.client.getEndpoint(), resourceGroupName, networkWatcherName, packetCaptureName,
@@ -1021,7 +1021,7 @@ public Mono<Response<Flux<ByteBuffer>>> getStatusWithResponseAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getStatus(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -1064,7 +1064,7 @@ private Mono<Response<Flux<ByteBuffer>>> getStatusWithResponseAsync(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getStatus(this.client.getEndpoint(), resourceGroupName, networkWatcherName, packetCaptureName,
@@ -1254,7 +1254,7 @@ private Mono<PagedResponse<PacketCaptureResultInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkWatcherName,
@@ -1295,7 +1295,7 @@ private Mono<PagedResponse<PacketCaptureResultInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PeerExpressRouteCircuitConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PeerExpressRouteCircuitConnectionsClientImpl.java
index 5a4ee3f64d8a..1f74be5cc1ce 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PeerExpressRouteCircuitConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PeerExpressRouteCircuitConnectionsClientImpl.java
@@ -60,7 +60,7 @@ public final class PeerExpressRouteCircuitConnectionsClientImpl implements PeerE
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPeerExpressRouteCircuitConnections")
     public interface PeerExpressRouteCircuitConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}/peerings/{peeringName}/peerConnections/{connectionName}")
@@ -127,7 +127,7 @@ public Mono<Response<PeerExpressRouteCircuitConnectionInner>> getWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -173,7 +173,7 @@ private Mono<Response<PeerExpressRouteCircuitConnectionInner>> getWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName, connectionName,
@@ -271,7 +271,7 @@ private Mono<PagedResponse<PeerExpressRouteCircuitConnectionInner>> listSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, circuitName, peeringName,
@@ -315,7 +315,7 @@ private Mono<PagedResponse<PeerExpressRouteCircuitConnectionInner>> listSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -408,9 +408,8 @@ public PagedIterable<PeerExpressRouteCircuitConnectionInner> list(String resourc
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPeeredConnections API service call retrieves all global reach peer circuit connections
-     * that belongs to a Private Peering for an ExpressRouteCircuit along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all global reach peer connections associated with a private peering in an express route circuit along
+     * with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PeerExpressRouteCircuitConnectionInner>> listNextSinglePageAsync(String nextLink) {
@@ -436,9 +435,8 @@ private Mono<PagedResponse<PeerExpressRouteCircuitConnectionInner>> listNextSing
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPeeredConnections API service call retrieves all global reach peer circuit connections
-     * that belongs to a Private Peering for an ExpressRouteCircuit along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all global reach peer connections associated with a private peering in an express route circuit along
+     * with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PeerExpressRouteCircuitConnectionInner>> listNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateDnsZoneGroupsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateDnsZoneGroupsClientImpl.java
index 1cc2c4d3da6b..f83706b9419d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateDnsZoneGroupsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateDnsZoneGroupsClientImpl.java
@@ -69,7 +69,7 @@ public final class PrivateDnsZoneGroupsClientImpl implements PrivateDnsZoneGroup
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPrivateDnsZoneGroups")
     public interface PrivateDnsZoneGroupsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}/privateDnsZoneGroups/{privateDnsZoneGroupName}")
@@ -157,7 +157,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, privateEndpointName,
@@ -200,7 +200,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, privateEndpointName,
@@ -389,7 +389,7 @@ public Mono<Response<PrivateDnsZoneGroupInner>> getWithResponseAsync(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, privateEndpointName,
@@ -433,7 +433,7 @@ private Mono<Response<PrivateDnsZoneGroupInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, privateEndpointName, privateDnsZoneGroupName,
@@ -535,7 +535,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -586,7 +586,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, privateEndpointName,
@@ -792,7 +792,7 @@ private Mono<PagedResponse<PrivateDnsZoneGroupInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), privateEndpointName, resourceGroupName,
@@ -833,7 +833,7 @@ private Mono<PagedResponse<PrivateDnsZoneGroupInner>> listSinglePageAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -916,7 +916,7 @@ public PagedIterable<PrivateDnsZoneGroupInner> list(String privateEndpointName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateDnsZoneGroups API service call along with {@link PagedResponse} on successful
+     * @return all private dns zone groups in a private endpoint along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -943,7 +943,7 @@ private Mono<PagedResponse<PrivateDnsZoneGroupInner>> listNextSinglePageAsync(St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateDnsZoneGroups API service call along with {@link PagedResponse} on successful
+     * @return all private dns zone groups in a private endpoint along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateEndpointsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateEndpointsClientImpl.java
index 62d82d190402..bceeca79b7e3 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateEndpointsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateEndpointsClientImpl.java
@@ -72,7 +72,7 @@ public final class PrivateEndpointsClientImpl implements InnerSupportsGet<Privat
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPrivateEndpoints")
     public interface PrivateEndpointsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateEndpoints/{privateEndpointName}")
@@ -166,7 +166,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, privateEndpointName,
@@ -204,7 +204,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, privateEndpointName, apiVersion,
@@ -374,7 +374,7 @@ public Mono<Response<PrivateEndpointInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -414,7 +414,7 @@ private Mono<Response<PrivateEndpointInner>> getByResourceGroupWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, privateEndpointName, apiVersion,
@@ -507,7 +507,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -551,7 +551,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, privateEndpointName, apiVersion,
@@ -732,7 +732,7 @@ private Mono<PagedResponse<PrivateEndpointInner>> listByResourceGroupSinglePageA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -768,7 +768,7 @@ private Mono<PagedResponse<PrivateEndpointInner>> listByResourceGroupSinglePageA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -856,7 +856,7 @@ private Mono<PagedResponse<PrivateEndpointInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -886,7 +886,7 @@ private Mono<PagedResponse<PrivateEndpointInner>> listSinglePageAsync(Context co
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -955,8 +955,8 @@ public PagedIterable<PrivateEndpointInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateEndpoints API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private endpoints in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointInner>> listNextSinglePageAsync(String nextLink) {
@@ -982,8 +982,8 @@ private Mono<PagedResponse<PrivateEndpointInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateEndpoints API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private endpoints in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -1008,8 +1008,8 @@ private Mono<PagedResponse<PrivateEndpointInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateEndpoints API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private endpoints in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
@@ -1037,8 +1037,8 @@ private Mono<PagedResponse<PrivateEndpointInner>> listBySubscriptionNextSinglePa
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateEndpoints API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private endpoints in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateEndpointInner>> listBySubscriptionNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateLinkServicesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateLinkServicesClientImpl.java
index 2ef82e062b73..e832d3b5dc6a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateLinkServicesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PrivateLinkServicesClientImpl.java
@@ -80,7 +80,7 @@ public final class PrivateLinkServicesClientImpl implements InnerSupportsGet<Pri
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPrivateLinkServices")
     public interface PrivateLinkServicesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/privateLinkServices/{serviceName}")
@@ -272,7 +272,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, serviceName,
@@ -309,7 +309,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, serviceName, apiVersion,
@@ -476,7 +476,7 @@ public Mono<Response<PrivateLinkServiceInner>> getByResourceGroupWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -515,7 +515,7 @@ private Mono<Response<PrivateLinkServiceInner>> getByResourceGroupWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, serviceName, apiVersion,
@@ -607,7 +607,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, serviceName,
@@ -650,7 +650,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, serviceName, apiVersion,
@@ -831,7 +831,7 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listByResourceGroupSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -867,7 +867,7 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listByResourceGroupSinglePa
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -955,7 +955,7 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -985,7 +985,7 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listSinglePageAsync(Context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1082,7 +1082,7 @@ public Mono<Response<PrivateEndpointConnectionInner>> getPrivateEndpointConnecti
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getPrivateEndpointConnection(this.client.getEndpoint(), resourceGroupName,
@@ -1126,7 +1126,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> getPrivateEndpointConnect
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getPrivateEndpointConnection(this.client.getEndpoint(), resourceGroupName, serviceName,
@@ -1233,7 +1233,7 @@ public Mono<Response<PrivateEndpointConnectionInner>> updatePrivateEndpointConne
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updatePrivateEndpointConnection(this.client.getEndpoint(),
@@ -1283,7 +1283,7 @@ private Mono<Response<PrivateEndpointConnectionInner>> updatePrivateEndpointConn
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updatePrivateEndpointConnection(this.client.getEndpoint(), resourceGroupName, serviceName,
@@ -1382,7 +1382,7 @@ public Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1425,7 +1425,7 @@ private Mono<Response<Flux<ByteBuffer>>> deletePrivateEndpointConnectionWithResp
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.deletePrivateEndpointConnection(this.client.getEndpoint(), resourceGroupName, serviceName,
@@ -1610,7 +1610,7 @@ public void deletePrivateEndpointConnection(String resourceGroupName, String ser
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listPrivateEndpointConnections(this.client.getEndpoint(), resourceGroupName,
@@ -1650,7 +1650,7 @@ public void deletePrivateEndpointConnection(String resourceGroupName, String ser
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1763,7 +1763,7 @@ public Mono<Response<Flux<ByteBuffer>>> checkPrivateLinkServiceVisibilityWithRes
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.checkPrivateLinkServiceVisibility(this.client.getEndpoint(), location,
@@ -1802,7 +1802,7 @@ private Mono<Response<Flux<ByteBuffer>>> checkPrivateLinkServiceVisibilityWithRe
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.checkPrivateLinkServiceVisibility(this.client.getEndpoint(), location, apiVersion,
@@ -1996,7 +1996,7 @@ public Mono<Response<Flux<ByteBuffer>>> checkPrivateLinkServiceVisibilityByResou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.checkPrivateLinkServiceVisibilityByResourceGroup(this.client.getEndpoint(),
@@ -2041,7 +2041,7 @@ private Mono<Response<Flux<ByteBuffer>>> checkPrivateLinkServiceVisibilityByReso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.checkPrivateLinkServiceVisibilityByResourceGroup(this.client.getEndpoint(), location,
@@ -2241,7 +2241,7 @@ public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByReso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAutoApprovedPrivateLinkServices(this.client.getEndpoint(), location,
@@ -2277,7 +2277,7 @@ public PrivateLinkServiceVisibilityInner checkPrivateLinkServiceVisibilityByReso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -2387,7 +2387,7 @@ public PagedIterable<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivat
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -2430,7 +2430,7 @@ public PagedIterable<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivat
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -2528,8 +2528,8 @@ private PagedFlux<AutoApprovedPrivateLinkServiceInner> listAutoApprovedPrivateLi
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateLinkService API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private link services in a resource group along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkServiceInner>> listNextSinglePageAsync(String nextLink) {
@@ -2555,8 +2555,8 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateLinkService API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private link services in a resource group along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkServiceInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -2581,8 +2581,8 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateLinkService API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private link service in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkServiceInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
@@ -2610,8 +2610,8 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listBySubscriptionNextSingl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateLinkService API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all private link service in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PrivateLinkServiceInner>> listBySubscriptionNextSinglePageAsync(String nextLink,
@@ -2637,7 +2637,7 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listBySubscriptionNextSingl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateEndpointConnection API service call along with {@link PagedResponse} on
+     * @return all private end point connections for a specific private link service along with {@link PagedResponse} on
      * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -2666,7 +2666,7 @@ private Mono<PagedResponse<PrivateLinkServiceInner>> listBySubscriptionNextSingl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListPrivateEndpointConnection API service call along with {@link PagedResponse} on
+     * @return all private end point connections for a specific private link service along with {@link PagedResponse} on
      * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpAddressesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpAddressesClientImpl.java
index 94d6a79cc3d5..4981e319ef2a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpAddressesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpAddressesClientImpl.java
@@ -76,7 +76,7 @@ public final class PublicIpAddressesClientImpl implements InnerSupportsGet<Publi
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPublicIpAddresses")
     public interface PublicIpAddressesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/cloudServices/{cloudServiceName}/publicipaddresses")
@@ -293,7 +293,7 @@ Mono<Response<PublicIpAddressListResult>> listVirtualMachineScaleSetVMPublicIpAd
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listCloudServicePublicIpAddresses(this.client.getEndpoint(),
@@ -334,7 +334,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listCloudServicePublicIpAddres
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -465,7 +465,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listCloudServiceRoleInstancePu
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listCloudServiceRoleInstancePublicIpAddresses(this.client.getEndpoint(),
@@ -523,7 +523,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listCloudServiceRoleInstancePu
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -678,7 +678,7 @@ public Mono<Response<PublicIpAddressInner>> getCloudServicePublicIpAddressWithRe
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getCloudServicePublicIpAddress(this.client.getEndpoint(), resourceGroupName,
@@ -740,7 +740,7 @@ private Mono<Response<PublicIpAddressInner>> getCloudServicePublicIpAddressWithR
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getCloudServicePublicIpAddress(this.client.getEndpoint(), resourceGroupName, cloudServiceName,
@@ -847,7 +847,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, publicIpAddressName,
@@ -885,7 +885,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, publicIpAddressName, apiVersion,
@@ -1055,7 +1055,7 @@ public Mono<Response<PublicIpAddressInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1095,7 +1095,7 @@ private Mono<Response<PublicIpAddressInner>> getByResourceGroupWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, publicIpAddressName, apiVersion,
@@ -1188,7 +1188,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -1232,7 +1232,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, publicIpAddressName, apiVersion,
@@ -1424,7 +1424,7 @@ public Mono<Response<PublicIpAddressInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -1468,7 +1468,7 @@ private Mono<Response<PublicIpAddressInner>> updateTagsWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, publicIpAddressName, apiVersion,
@@ -1546,7 +1546,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1576,7 +1576,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listSinglePageAsync(Context co
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1661,7 +1661,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listByResourceGroupSinglePageA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1697,7 +1697,7 @@ private Mono<PagedResponse<PublicIpAddressInner>> listByResourceGroupSinglePageA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1797,7 +1797,7 @@ public Mono<Response<Flux<ByteBuffer>>> ddosProtectionStatusWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.ddosProtectionStatus(this.client.getEndpoint(), resourceGroupName,
@@ -1836,7 +1836,7 @@ private Mono<Response<Flux<ByteBuffer>>> ddosProtectionStatusWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.ddosProtectionStatus(this.client.getEndpoint(), resourceGroupName, publicIpAddressName,
@@ -2567,8 +2567,8 @@ public PublicIpAddressInner getVirtualMachineScaleSetPublicIpAddress(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses on a cloud service level along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2597,8 +2597,8 @@ public PublicIpAddressInner getVirtualMachineScaleSetPublicIpAddress(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses on a cloud service level along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2624,8 +2624,8 @@ public PublicIpAddressInner getVirtualMachineScaleSetPublicIpAddress(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses in a role instance IP configuration in a cloud service along
+     * with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2654,8 +2654,8 @@ public PublicIpAddressInner getVirtualMachineScaleSetPublicIpAddress(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses in a role instance IP configuration in a cloud service along
+     * with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2682,8 +2682,8 @@ public PublicIpAddressInner getVirtualMachineScaleSetPublicIpAddress(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the public IP addresses in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -2710,8 +2710,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listAllNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the public IP addresses in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -2736,8 +2736,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listAllNextSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all public IP addresses in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String nextLink) {
@@ -2763,8 +2763,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all public IP addresses in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -2789,8 +2789,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses on a virtual machine scale set level along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2819,8 +2819,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses on a virtual machine scale set level along with
+     * {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2847,8 +2847,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses in a virtual machine IP configuration in a virtual machine
+     * scale set along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
@@ -2877,8 +2877,8 @@ private Mono<PagedResponse<PublicIpAddressInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpAddresses API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return information about all public IP addresses in a virtual machine IP configuration in a virtual machine
+     * scale set along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpAddressInner>>
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpPrefixesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpPrefixesClientImpl.java
index d3df8795613f..765643c56c9d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpPrefixesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/PublicIpPrefixesClientImpl.java
@@ -74,7 +74,7 @@ public final class PublicIpPrefixesClientImpl implements InnerSupportsGet<Public
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientPublicIpPrefixes")
     public interface PublicIpPrefixesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIpPrefixName}")
@@ -178,7 +178,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, publicIpPrefixName,
@@ -216,7 +216,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, publicIpPrefixName, apiVersion,
@@ -385,7 +385,7 @@ public Mono<Response<PublicIpPrefixInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -425,7 +425,7 @@ private Mono<Response<PublicIpPrefixInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, publicIpPrefixName, apiVersion,
@@ -518,7 +518,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -562,7 +562,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, publicIpPrefixName, apiVersion,
@@ -754,7 +754,7 @@ public Mono<Response<PublicIpPrefixInner>> updateTagsWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, publicIpPrefixName,
@@ -798,7 +798,7 @@ private Mono<Response<PublicIpPrefixInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, publicIpPrefixName, apiVersion,
@@ -875,7 +875,7 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -905,7 +905,7 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -990,7 +990,7 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1026,7 +1026,7 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1103,8 +1103,8 @@ public PagedIterable<PublicIpPrefixInner> listByResourceGroup(String resourceGro
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the public IP prefixes in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpPrefixInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1131,8 +1131,8 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the public IP prefixes in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpPrefixInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1157,8 +1157,8 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all public IP prefixes in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpPrefixInner>> listNextSinglePageAsync(String nextLink) {
@@ -1184,8 +1184,8 @@ private Mono<PagedResponse<PublicIpPrefixInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListPublicIpPrefixes API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all public IP prefixes in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpPrefixInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisIntentsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisIntentsClientImpl.java
index 784d4f33f948..181483831212 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisIntentsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisIntentsClientImpl.java
@@ -63,7 +63,7 @@ public final class ReachabilityAnalysisIntentsClientImpl implements Reachability
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientReachabilityAnalysisIntents")
     public interface ReachabilityAnalysisIntentsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/verifierWorkspaces/{workspaceName}/reachabilityAnalysisIntents")
@@ -163,7 +163,7 @@ private Mono<PagedResponse<ReachabilityAnalysisIntentInner>> listSinglePageAsync
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -215,7 +215,7 @@ private Mono<PagedResponse<ReachabilityAnalysisIntentInner>> listSinglePageAsync
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -382,7 +382,7 @@ public Mono<Response<ReachabilityAnalysisIntentInner>> getWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter reachabilityAnalysisIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -429,7 +429,7 @@ private Mono<Response<ReachabilityAnalysisIntentInner>> getWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter reachabilityAnalysisIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -540,7 +540,7 @@ public Mono<Response<ReachabilityAnalysisIntentInner>> createWithResponseAsync(S
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), apiVersion,
@@ -596,7 +596,7 @@ private Mono<Response<ReachabilityAnalysisIntentInner>> createWithResponseAsync(
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -704,7 +704,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
             return Mono.error(new IllegalArgumentException(
                 "Parameter reachabilityAnalysisIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -752,7 +752,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             return Mono.error(new IllegalArgumentException(
                 "Parameter reachabilityAnalysisIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -817,13 +817,15 @@ public void delete(String resourceGroupName, String networkManagerName, String w
     }
 
     /**
+     * Gets list of Reachability Analysis Intents .
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of Reachability Analysis Intents along with {@link PagedResponse} on successful completion of
+     * @return list of Reachability Analysis Intents along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -843,6 +845,8 @@ private Mono<PagedResponse<ReachabilityAnalysisIntentInner>> listNextSinglePageA
     }
 
     /**
+     * Gets list of Reachability Analysis Intents .
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -850,7 +854,7 @@ private Mono<PagedResponse<ReachabilityAnalysisIntentInner>> listNextSinglePageA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of Reachability Analysis Intents along with {@link PagedResponse} on successful completion of
+     * @return list of Reachability Analysis Intents along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisRunsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisRunsClientImpl.java
index 0586be0ee354..2240880e25af 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisRunsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ReachabilityAnalysisRunsClientImpl.java
@@ -68,7 +68,7 @@ public final class ReachabilityAnalysisRunsClientImpl implements ReachabilityAna
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientReachabilityAnalysisRuns")
     public interface ReachabilityAnalysisRunsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/verifierWorkspaces/{workspaceName}/reachabilityAnalysisRuns")
@@ -168,7 +168,7 @@ private Mono<PagedResponse<ReachabilityAnalysisRunInner>> listSinglePageAsync(St
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -220,7 +220,7 @@ private Mono<PagedResponse<ReachabilityAnalysisRunInner>> listSinglePageAsync(St
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -387,7 +387,7 @@ public Mono<Response<ReachabilityAnalysisRunInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter reachabilityAnalysisRunName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -434,7 +434,7 @@ private Mono<Response<ReachabilityAnalysisRunInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter reachabilityAnalysisRunName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -545,7 +545,7 @@ public Mono<Response<ReachabilityAnalysisRunInner>> createWithResponseAsync(Stri
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), apiVersion,
@@ -601,7 +601,7 @@ private Mono<Response<ReachabilityAnalysisRunInner>> createWithResponseAsync(Str
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -708,7 +708,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(
                 new IllegalArgumentException("Parameter reachabilityAnalysisRunName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -756,7 +756,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter reachabilityAnalysisRunName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -924,13 +924,15 @@ public void delete(String resourceGroupName, String networkManagerName, String w
     }
 
     /**
+     * Gets list of Reachability Analysis Runs.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of Reachability Analysis Run along with {@link PagedResponse} on successful completion of
+     * @return list of Reachability Analysis Runs along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -950,6 +952,8 @@ private Mono<PagedResponse<ReachabilityAnalysisRunInner>> listNextSinglePageAsyn
     }
 
     /**
+     * Gets list of Reachability Analysis Runs.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -957,7 +961,7 @@ private Mono<PagedResponse<ReachabilityAnalysisRunInner>> listNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of Reachability Analysis Run along with {@link PagedResponse} on successful completion of
+     * @return list of Reachability Analysis Runs along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ResourceNavigationLinksClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ResourceNavigationLinksClientImpl.java
index f0f2b88d6bf3..68e957d2db0f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ResourceNavigationLinksClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ResourceNavigationLinksClientImpl.java
@@ -55,7 +55,7 @@ public final class ResourceNavigationLinksClientImpl implements ResourceNavigati
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientResourceNavigationLinks")
     public interface ResourceNavigationLinksService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/ResourceNavigationLinks")
@@ -102,7 +102,7 @@ public Mono<Response<ResourceNavigationLinksListResultInner>> listWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -145,7 +145,7 @@ private Mono<Response<ResourceNavigationLinksListResultInner>> listWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, subnetName, apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterRulesClientImpl.java
index 523c5b026c2b..127a01dc03e1 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFilterRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class RouteFilterRulesClientImpl implements RouteFilterRulesClient
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRouteFilterRules")
     public interface RouteFilterRulesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}/routeFilterRules/{ruleName}")
@@ -152,7 +152,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, routeFilterName,
@@ -194,7 +194,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, routeFilterName, ruleName, apiVersion,
@@ -377,7 +377,7 @@ public Mono<Response<RouteFilterRuleInner>> getWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, routeFilterName, ruleName,
@@ -420,7 +420,7 @@ private Mono<Response<RouteFilterRuleInner>> getWithResponseAsync(String resourc
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, routeFilterName, ruleName, apiVersion,
@@ -518,7 +518,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             routeFilterRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -568,7 +568,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             routeFilterRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, routeFilterName, ruleName,
@@ -770,7 +770,7 @@ private Mono<PagedResponse<RouteFilterRuleInner>> listByRouteFilterSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByRouteFilter(this.client.getEndpoint(), resourceGroupName,
@@ -811,7 +811,7 @@ private Mono<PagedResponse<RouteFilterRuleInner>> listByRouteFilterSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -894,8 +894,8 @@ public PagedIterable<RouteFilterRuleInner> listByRouteFilter(String resourceGrou
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteFilterRules API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all RouteFilterRules in a route filter along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteFilterRuleInner>> listByRouteFilterNextSinglePageAsync(String nextLink) {
@@ -922,8 +922,8 @@ private Mono<PagedResponse<RouteFilterRuleInner>> listByRouteFilterNextSinglePag
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteFilterRules API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all RouteFilterRules in a route filter along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteFilterRuleInner>> listByRouteFilterNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFiltersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFiltersClientImpl.java
index 47578fe2b7a9..845c63a62d80 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFiltersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteFiltersClientImpl.java
@@ -74,7 +74,7 @@ public final class RouteFiltersClientImpl implements InnerSupportsGet<RouteFilte
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRouteFilters")
     public interface RouteFiltersService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeFilters/{routeFilterName}")
@@ -176,7 +176,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, routeFilterName,
@@ -214,7 +214,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, routeFilterName, apiVersion,
@@ -382,7 +382,7 @@ public Mono<Response<RouteFilterInner>> getByResourceGroupWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -421,7 +421,7 @@ private Mono<Response<RouteFilterInner>> getByResourceGroupWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, routeFilterName, apiVersion,
@@ -515,7 +515,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             routeFilterParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -560,7 +560,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             routeFilterParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, routeFilterName, apiVersion,
@@ -752,7 +752,7 @@ public Mono<Response<RouteFilterInner>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, routeFilterName,
@@ -796,7 +796,7 @@ private Mono<Response<RouteFilterInner>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, routeFilterName, apiVersion,
@@ -879,7 +879,7 @@ private Mono<PagedResponse<RouteFilterInner>> listByResourceGroupSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -915,7 +915,7 @@ private Mono<PagedResponse<RouteFilterInner>> listByResourceGroupSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1003,7 +1003,7 @@ private Mono<PagedResponse<RouteFilterInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1033,7 +1033,7 @@ private Mono<PagedResponse<RouteFilterInner>> listSinglePageAsync(Context contex
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1101,8 +1101,8 @@ public PagedIterable<RouteFilterInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteFilters API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route filters in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteFilterInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -1130,8 +1130,8 @@ private Mono<PagedResponse<RouteFilterInner>> listByResourceGroupNextSinglePageA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteFilters API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route filters in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteFilterInner>> listByResourceGroupNextSinglePageAsync(String nextLink,
@@ -1157,8 +1157,8 @@ private Mono<PagedResponse<RouteFilterInner>> listByResourceGroupNextSinglePageA
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteFilters API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route filters in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteFilterInner>> listNextSinglePageAsync(String nextLink) {
@@ -1184,8 +1184,8 @@ private Mono<PagedResponse<RouteFilterInner>> listNextSinglePageAsync(String nex
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteFilters API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route filters in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteFilterInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteMapsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteMapsClientImpl.java
index 9323e68f2cbb..98ac59648f24 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteMapsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteMapsClientImpl.java
@@ -68,7 +68,7 @@ public final class RouteMapsClientImpl implements RouteMapsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRouteMaps")
     public interface RouteMapsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeMaps/{routeMapName}")
@@ -153,7 +153,7 @@ public Mono<Response<RouteMapInner>> getWithResponseAsync(String resourceGroupNa
         if (routeMapName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeMapName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -195,7 +195,7 @@ private Mono<Response<RouteMapInner>> getWithResponseAsync(String resourceGroupN
         if (routeMapName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeMapName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -293,7 +293,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             routeMapParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -342,7 +342,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             routeMapParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -543,7 +543,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (routeMapName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeMapName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -584,7 +584,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (routeMapName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeMapName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -763,7 +763,7 @@ private Mono<PagedResponse<RouteMapInner>> listSinglePageAsync(String resourceGr
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -803,7 +803,7 @@ private Mono<PagedResponse<RouteMapInner>> listSinglePageAsync(String resourceGr
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteTablesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteTablesClientImpl.java
index 2b8698af4640..cab0447585df 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteTablesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RouteTablesClientImpl.java
@@ -74,7 +74,7 @@ public final class RouteTablesClientImpl implements InnerSupportsGet<RouteTableI
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRouteTables")
     public interface RouteTablesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}")
@@ -174,7 +174,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, routeTableName,
@@ -211,7 +211,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, routeTableName, apiVersion,
@@ -378,7 +378,7 @@ public Mono<Response<RouteTableInner>> getByResourceGroupWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -416,7 +416,7 @@ private Mono<Response<RouteTableInner>> getByResourceGroupWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, routeTableName, apiVersion,
@@ -508,7 +508,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, routeTableName,
@@ -551,7 +551,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, routeTableName, apiVersion,
@@ -740,7 +740,7 @@ public Mono<Response<RouteTableInner>> updateTagsWithResponseAsync(String resour
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, routeTableName,
@@ -783,7 +783,7 @@ private Mono<Response<RouteTableInner>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, routeTableName, apiVersion,
@@ -866,7 +866,7 @@ private Mono<PagedResponse<RouteTableInner>> listByResourceGroupSinglePageAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -902,7 +902,7 @@ private Mono<PagedResponse<RouteTableInner>> listByResourceGroupSinglePageAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -990,7 +990,7 @@ private Mono<PagedResponse<RouteTableInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1020,7 +1020,7 @@ private Mono<PagedResponse<RouteTableInner>> listSinglePageAsync(Context context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1088,8 +1088,8 @@ public PagedIterable<RouteTableInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteTable API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route tables in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteTableInner>> listNextSinglePageAsync(String nextLink) {
@@ -1115,8 +1115,8 @@ private Mono<PagedResponse<RouteTableInner>> listNextSinglePageAsync(String next
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteTable API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route tables in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteTableInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -1141,8 +1141,8 @@ private Mono<PagedResponse<RouteTableInner>> listNextSinglePageAsync(String next
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteTable API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route tables in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteTableInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1169,8 +1169,8 @@ private Mono<PagedResponse<RouteTableInner>> listAllNextSinglePageAsync(String n
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRouteTable API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all route tables in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteTableInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutesClientImpl.java
index 8867f47510e5..9f21d4d18ad4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutesClientImpl.java
@@ -67,7 +67,7 @@ public final class RoutesClientImpl implements RoutesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRoutes")
     public interface RoutesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/routeTables/{routeTableName}/routes/{routeName}")
@@ -149,7 +149,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, routeTableName,
@@ -190,7 +190,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, routeTableName, routeName, apiVersion,
@@ -372,7 +372,7 @@ public Mono<Response<RouteInner>> getWithResponseAsync(String resourceGroupName,
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, routeTableName, routeName,
@@ -414,7 +414,7 @@ private Mono<Response<RouteInner>> getWithResponseAsync(String resourceGroupName
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, routeTableName, routeName, apiVersion,
@@ -511,7 +511,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             routeParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, routeTableName,
@@ -559,7 +559,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             routeParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, routeTableName, routeName,
@@ -752,7 +752,7 @@ private Mono<PagedResponse<RouteInner>> listSinglePageAsync(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, routeTableName,
@@ -791,7 +791,7 @@ private Mono<PagedResponse<RouteInner>> listSinglePageAsync(String resourceGroup
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -872,8 +872,7 @@ public PagedIterable<RouteInner> list(String resourceGroupName, String routeTabl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRoute API service call along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all routes in a route table along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteInner>> listNextSinglePageAsync(String nextLink) {
@@ -899,8 +898,7 @@ private Mono<PagedResponse<RouteInner>> listNextSinglePageAsync(String nextLink)
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListRoute API service call along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all routes in a route table along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<RouteInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingIntentsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingIntentsClientImpl.java
index fbdb42b7a7f6..c313b44ca2cd 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingIntentsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingIntentsClientImpl.java
@@ -68,7 +68,7 @@ public final class RoutingIntentsClientImpl implements RoutingIntentsClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRoutingIntents")
     public interface RoutingIntentsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routingIntent/{routingIntentName}")
@@ -163,7 +163,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             routingIntentParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -214,7 +214,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             routingIntentParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -422,7 +422,7 @@ public Mono<Response<RoutingIntentInner>> getWithResponseAsync(String resourceGr
             return Mono
                 .error(new IllegalArgumentException("Parameter routingIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -465,7 +465,7 @@ private Mono<Response<RoutingIntentInner>> getWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter routingIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -557,7 +557,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter routingIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -599,7 +599,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter routingIntentName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -779,7 +779,7 @@ private Mono<PagedResponse<RoutingIntentInner>> listSinglePageAsync(String resou
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -819,7 +819,7 @@ private Mono<PagedResponse<RoutingIntentInner>> listSinglePageAsync(String resou
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRuleCollectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRuleCollectionsClientImpl.java
index 469e3c357bcc..eb50d9d32c10 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRuleCollectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRuleCollectionsClientImpl.java
@@ -68,7 +68,7 @@ public final class RoutingRuleCollectionsClientImpl implements RoutingRuleCollec
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRoutingRuleCollections")
     public interface RoutingRuleCollectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/routingConfigurations/{configurationName}/ruleCollections")
@@ -167,7 +167,7 @@ private Mono<PagedResponse<RoutingRuleCollectionInner>> listSinglePageAsync(Stri
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -218,7 +218,7 @@ private Mono<PagedResponse<RoutingRuleCollectionInner>> listSinglePageAsync(Stri
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -380,7 +380,7 @@ public Mono<Response<RoutingRuleCollectionInner>> getWithResponseAsync(String re
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -429,7 +429,7 @@ private Mono<Response<RoutingRuleCollectionInner>> getWithResponseAsync(String r
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -540,7 +540,7 @@ public Mono<Response<RoutingRuleCollectionInner>> createOrUpdateWithResponseAsyn
         } else {
             ruleCollection.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -596,7 +596,7 @@ private Mono<Response<RoutingRuleCollectionInner>> createOrUpdateWithResponseAsy
         } else {
             ruleCollection.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -707,7 +707,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -759,7 +759,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRulesClientImpl.java
index 5795efb3ac46..7af811d1e111 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/RoutingRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class RoutingRulesClientImpl implements RoutingRulesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientRoutingRules")
     public interface RoutingRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/routingConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules")
@@ -172,7 +172,7 @@ private Mono<PagedResponse<RoutingRuleInner>> listSinglePageAsync(String resourc
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -230,7 +230,7 @@ private Mono<PagedResponse<RoutingRuleInner>> listSinglePageAsync(String resourc
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -400,7 +400,7 @@ public Mono<Response<RoutingRuleInner>> getWithResponseAsync(String resourceGrou
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -454,7 +454,7 @@ private Mono<Response<RoutingRuleInner>> getWithResponseAsync(String resourceGro
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -572,7 +572,7 @@ public Mono<Response<RoutingRuleInner>> createOrUpdateWithResponseAsync(String r
         } else {
             routingRule.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -632,7 +632,7 @@ private Mono<Response<RoutingRuleInner>> createOrUpdateWithResponseAsync(String
         } else {
             routingRule.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -750,7 +750,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -806,7 +806,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ScopeConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ScopeConnectionsClientImpl.java
index 0ff29fc23cd1..d0a0c5e10792 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ScopeConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ScopeConnectionsClientImpl.java
@@ -63,7 +63,7 @@ public final class ScopeConnectionsClientImpl implements ScopeConnectionsClient
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientScopeConnections")
     public interface ScopeConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/scopeConnections/{scopeConnectionName}")
@@ -159,7 +159,7 @@ public Mono<Response<ScopeConnectionInner>> createOrUpdateWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -208,7 +208,7 @@ private Mono<Response<ScopeConnectionInner>> createOrUpdateWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -308,7 +308,7 @@ public Mono<Response<ScopeConnectionInner>> getWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter scopeConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -352,7 +352,7 @@ private Mono<Response<ScopeConnectionInner>> getWithResponseAsync(String resourc
             return Mono
                 .error(new IllegalArgumentException("Parameter scopeConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -445,7 +445,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
             return Mono
                 .error(new IllegalArgumentException("Parameter scopeConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -488,7 +488,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             return Mono
                 .error(new IllegalArgumentException("Parameter scopeConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -579,7 +579,7 @@ private Mono<PagedResponse<ScopeConnectionInner>> listSinglePageAsync(String res
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -624,7 +624,7 @@ private Mono<PagedResponse<ScopeConnectionInner>> listSinglePageAsync(String res
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityAdminConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityAdminConfigurationsClientImpl.java
index 401b8cf5ae03..878a7265c2ff 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityAdminConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityAdminConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class SecurityAdminConfigurationsClientImpl implements SecurityAdmi
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSecurityAdminConfigurations")
     public interface SecurityAdminConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityAdminConfigurations")
@@ -158,7 +158,7 @@ private Mono<PagedResponse<SecurityAdminConfigurationInner>> listSinglePageAsync
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -204,7 +204,7 @@ private Mono<PagedResponse<SecurityAdminConfigurationInner>> listSinglePageAsync
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -352,7 +352,7 @@ public Mono<Response<SecurityAdminConfigurationInner>> getWithResponseAsync(Stri
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -396,7 +396,7 @@ private Mono<Response<SecurityAdminConfigurationInner>> getWithResponseAsync(Str
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -499,7 +499,7 @@ public Mono<Response<SecurityAdminConfigurationInner>> createOrUpdateWithRespons
         } else {
             securityAdminConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -552,7 +552,7 @@ private Mono<Response<SecurityAdminConfigurationInner>> createOrUpdateWithRespon
         } else {
             securityAdminConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -655,7 +655,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -701,7 +701,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityPartnerProvidersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityPartnerProvidersClientImpl.java
index 4a9807d5d7e0..a42e59bf9ee0 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityPartnerProvidersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityPartnerProvidersClientImpl.java
@@ -74,7 +74,7 @@ public final class SecurityPartnerProvidersClientImpl implements InnerSupportsGe
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSecurityPartnerProviders")
     public interface SecurityPartnerProvidersService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/securityPartnerProviders/{securityPartnerProviderName}")
@@ -180,7 +180,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -218,7 +218,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, securityPartnerProviderName, apiVersion,
@@ -389,7 +389,7 @@ public Mono<Response<SecurityPartnerProviderInner>> getByResourceGroupWithRespon
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -428,7 +428,7 @@ private Mono<Response<SecurityPartnerProviderInner>> getByResourceGroupWithRespo
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, securityPartnerProviderName,
@@ -520,7 +520,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -564,7 +564,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, securityPartnerProviderName,
@@ -761,7 +761,7 @@ public Mono<Response<SecurityPartnerProviderInner>> updateTagsWithResponseAsync(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -805,7 +805,7 @@ private Mono<Response<SecurityPartnerProviderInner>> updateTagsWithResponseAsync
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, securityPartnerProviderName, apiVersion,
@@ -891,7 +891,7 @@ public SecurityPartnerProviderInner updateTags(String resourceGroupName, String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -927,7 +927,7 @@ public SecurityPartnerProviderInner updateTags(String resourceGroupName, String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1018,7 +1018,7 @@ private Mono<PagedResponse<SecurityPartnerProviderInner>> listSinglePageAsync()
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1048,7 +1048,7 @@ private Mono<PagedResponse<SecurityPartnerProviderInner>> listSinglePageAsync(Co
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1172,7 +1172,7 @@ private Mono<PagedResponse<SecurityPartnerProviderInner>> listByResourceGroupNex
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSecurityPartnerProviders API service call along with {@link PagedResponse} on successful
+     * @return all the Security Partner Providers in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1199,7 +1199,7 @@ private Mono<PagedResponse<SecurityPartnerProviderInner>> listNextSinglePageAsyn
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSecurityPartnerProviders API service call along with {@link PagedResponse} on successful
+     * @return all the Security Partner Providers in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityRulesClientImpl.java
index 8151b3c67090..6b2b650ef70f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class SecurityRulesClientImpl implements SecurityRulesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSecurityRules")
     public interface SecurityRulesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}/securityRules/{securityRuleName}")
@@ -154,7 +154,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -198,7 +198,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName, securityRuleName,
@@ -385,7 +385,7 @@ public Mono<Response<SecurityRuleInner>> getWithResponseAsync(String resourceGro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -428,7 +428,7 @@ private Mono<Response<SecurityRuleInner>> getWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName, securityRuleName,
@@ -528,7 +528,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             securityRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -580,7 +580,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             securityRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -785,7 +785,7 @@ private Mono<PagedResponse<SecurityRuleInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, networkSecurityGroupName,
@@ -826,7 +826,7 @@ private Mono<PagedResponse<SecurityRuleInner>> listSinglePageAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -909,7 +909,7 @@ public PagedIterable<SecurityRuleInner> list(String resourceGroupName, String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSecurityRule API service call along with {@link PagedResponse} on successful completion
+     * @return all security rules in a network security group along with {@link PagedResponse} on successful completion
      * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -936,7 +936,7 @@ private Mono<PagedResponse<SecurityRuleInner>> listNextSinglePageAsync(String ne
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSecurityRule API service call along with {@link PagedResponse} on successful completion
+     * @return all security rules in a network security group along with {@link PagedResponse} on successful completion
      * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserConfigurationsClientImpl.java
index 436fe408a865..fbc481406edc 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class SecurityUserConfigurationsClientImpl implements SecurityUserC
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSecurityUserConfigurations")
     public interface SecurityUserConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations")
@@ -158,7 +158,7 @@ private Mono<PagedResponse<SecurityUserConfigurationInner>> listSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -204,7 +204,7 @@ private Mono<PagedResponse<SecurityUserConfigurationInner>> listSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -352,7 +352,7 @@ public Mono<Response<SecurityUserConfigurationInner>> getWithResponseAsync(Strin
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -396,7 +396,7 @@ private Mono<Response<SecurityUserConfigurationInner>> getWithResponseAsync(Stri
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -498,7 +498,7 @@ public Mono<Response<SecurityUserConfigurationInner>> createOrUpdateWithResponse
         } else {
             securityUserConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -551,7 +551,7 @@ private Mono<Response<SecurityUserConfigurationInner>> createOrUpdateWithRespons
         } else {
             securityUserConfiguration.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -653,7 +653,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -699,7 +699,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRuleCollectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRuleCollectionsClientImpl.java
index 1ecab0d4c867..f3fe567ca1ea 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRuleCollectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRuleCollectionsClientImpl.java
@@ -68,7 +68,7 @@ public final class SecurityUserRuleCollectionsClientImpl implements SecurityUser
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSecurityUserRuleCollections")
     public interface SecurityUserRuleCollectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections")
@@ -167,7 +167,7 @@ private Mono<PagedResponse<SecurityUserRuleCollectionInner>> listSinglePageAsync
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -218,7 +218,7 @@ private Mono<PagedResponse<SecurityUserRuleCollectionInner>> listSinglePageAsync
             return Mono
                 .error(new IllegalArgumentException("Parameter configurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -380,7 +380,7 @@ public Mono<Response<SecurityUserRuleCollectionInner>> getWithResponseAsync(Stri
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -429,7 +429,7 @@ private Mono<Response<SecurityUserRuleCollectionInner>> getWithResponseAsync(Str
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -542,7 +542,7 @@ public Mono<Response<SecurityUserRuleCollectionInner>> createOrUpdateWithRespons
         } else {
             securityUserRuleCollection.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -600,7 +600,7 @@ private Mono<Response<SecurityUserRuleCollectionInner>> createOrUpdateWithRespon
         } else {
             securityUserRuleCollection.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -713,7 +713,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -765,7 +765,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRulesClientImpl.java
index 3a3b4509bf61..c5ef48e139d4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SecurityUserRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class SecurityUserRulesClientImpl implements SecurityUserRulesClien
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSecurityUserRules")
     public interface SecurityUserRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/securityUserConfigurations/{configurationName}/ruleCollections/{ruleCollectionName}/rules")
@@ -172,7 +172,7 @@ private Mono<PagedResponse<SecurityUserRuleInner>> listSinglePageAsync(String re
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -229,7 +229,7 @@ private Mono<PagedResponse<SecurityUserRuleInner>> listSinglePageAsync(String re
             return Mono
                 .error(new IllegalArgumentException("Parameter ruleCollectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -398,7 +398,7 @@ public Mono<Response<SecurityUserRuleInner>> getWithResponseAsync(String resourc
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -452,7 +452,7 @@ private Mono<Response<SecurityUserRuleInner>> getWithResponseAsync(String resour
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -571,7 +571,7 @@ public Mono<Response<SecurityUserRuleInner>> createOrUpdateWithResponseAsync(Str
         } else {
             securityUserRule.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -632,7 +632,7 @@ private Mono<Response<SecurityUserRuleInner>> createOrUpdateWithResponseAsync(St
         } else {
             securityUserRule.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -750,7 +750,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -806,7 +806,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (ruleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ruleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceAssociationLinksClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceAssociationLinksClientImpl.java
index f97656ff6b2a..bba1bc55b94d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceAssociationLinksClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceAssociationLinksClientImpl.java
@@ -55,7 +55,7 @@ public final class ServiceAssociationLinksClientImpl implements ServiceAssociati
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientServiceAssociationLinks")
     public interface ServiceAssociationLinksService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/ServiceAssociationLinks")
@@ -102,7 +102,7 @@ public Mono<Response<ServiceAssociationLinksListResultInner>> listWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -145,7 +145,7 @@ private Mono<Response<ServiceAssociationLinksListResultInner>> listWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, subnetName, apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPoliciesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPoliciesClientImpl.java
index 59214ad02b34..d8d69ca258a3 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPoliciesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPoliciesClientImpl.java
@@ -74,7 +74,7 @@ public final class ServiceEndpointPoliciesClientImpl implements InnerSupportsGet
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientServiceEndpointPolicies")
     public interface ServiceEndpointPoliciesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}")
@@ -180,7 +180,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -218,7 +218,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName, apiVersion,
@@ -389,7 +389,7 @@ public Mono<Response<ServiceEndpointPolicyInner>> getByResourceGroupWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -429,7 +429,7 @@ private Mono<Response<ServiceEndpointPolicyInner>> getByResourceGroupWithRespons
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName,
@@ -526,7 +526,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -570,7 +570,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName,
@@ -765,7 +765,7 @@ public Mono<Response<ServiceEndpointPolicyInner>> updateTagsWithResponseAsync(St
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -809,7 +809,7 @@ private Mono<Response<ServiceEndpointPolicyInner>> updateTagsWithResponseAsync(S
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName, apiVersion,
@@ -888,7 +888,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -918,7 +918,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyInner>> listSinglePageAsync(Cont
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1004,7 +1004,7 @@ public PagedIterable<ServiceEndpointPolicyInner> list(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1040,7 +1040,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyInner>> listByResourceGroupSingl
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1117,7 +1117,7 @@ public PagedIterable<ServiceEndpointPolicyInner> listByResourceGroup(String reso
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListServiceEndpointPolicies API service call along with {@link PagedResponse} on successful
+     * @return all the service endpoint policies in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1144,7 +1144,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListServiceEndpointPolicies API service call along with {@link PagedResponse} on successful
+     * @return all the service endpoint policies in a subscription along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1170,7 +1170,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListServiceEndpointPolicies API service call along with {@link PagedResponse} on successful
+     * @return all service endpoint Policies in a resource group along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -1199,7 +1199,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyInner>> listByResourceGroupNextS
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListServiceEndpointPolicies API service call along with {@link PagedResponse} on successful
+     * @return all service endpoint Policies in a resource group along with {@link PagedResponse} on successful
      * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPolicyDefinitionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPolicyDefinitionsClientImpl.java
index 9d3d82d7be9e..2a70c16d0a48 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPolicyDefinitionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceEndpointPolicyDefinitionsClientImpl.java
@@ -68,7 +68,7 @@ public final class ServiceEndpointPolicyDefinitionsClientImpl implements Service
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientServiceEndpointPolicyDefinitions")
     public interface ServiceEndpointPolicyDefinitionsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/serviceEndpointPolicies/{serviceEndpointPolicyName}/serviceEndpointPolicyDefinitions/{serviceEndpointPolicyDefinitionName}")
@@ -157,7 +157,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -201,7 +201,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName,
@@ -395,7 +395,7 @@ public Mono<Response<ServiceEndpointPolicyDefinitionInner>> getWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName,
@@ -439,7 +439,7 @@ private Mono<Response<ServiceEndpointPolicyDefinitionInner>> getWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName,
@@ -546,7 +546,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             serviceEndpointPolicyDefinitions.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -599,7 +599,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             serviceEndpointPolicyDefinitions.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, serviceEndpointPolicyName,
@@ -826,7 +826,7 @@ public ServiceEndpointPolicyDefinitionInner createOrUpdate(String resourceGroupN
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -867,7 +867,7 @@ private Mono<PagedResponse<ServiceEndpointPolicyDefinitionInner>> listByResource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -957,7 +957,7 @@ public PagedIterable<ServiceEndpointPolicyDefinitionInner> listByResourceGroup(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListServiceEndpointPolicyDefinition API service call along with {@link PagedResponse} on
+     * @return all service endpoint policy definitions in a service end point policy along with {@link PagedResponse} on
      * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -987,7 +987,7 @@ public PagedIterable<ServiceEndpointPolicyDefinitionInner> listByResourceGroup(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListServiceEndpointPolicyDefinition API service call along with {@link PagedResponse} on
+     * @return all service endpoint policy definitions in a service end point policy along with {@link PagedResponse} on
      * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagInformationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagInformationsClientImpl.java
index 4730c3b437ab..b6d06e5cd83f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagInformationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagInformationsClientImpl.java
@@ -60,7 +60,7 @@ public final class ServiceTagInformationsClientImpl implements ServiceTagInforma
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientServiceTagInformations")
     public interface ServiceTagInformationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/serviceTagDetails")
@@ -109,7 +109,7 @@ private Mono<PagedResponse<ServiceTagInformationInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, apiVersion,
@@ -148,7 +148,7 @@ private Mono<PagedResponse<ServiceTagInformationInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -264,8 +264,8 @@ public PagedIterable<ServiceTagInformationInner> list(String location, Boolean n
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for Get ServiceTagInformation API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return a list of service tag information resources with pagination along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ServiceTagInformationInner>> listNextSinglePageAsync(String nextLink) {
@@ -291,8 +291,8 @@ private Mono<PagedResponse<ServiceTagInformationInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for Get ServiceTagInformation API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return a list of service tag information resources with pagination along with {@link PagedResponse} on
+     * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<ServiceTagInformationInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagsClientImpl.java
index a77710a4615f..6937a3f8af1e 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/ServiceTagsClientImpl.java
@@ -55,7 +55,7 @@ public final class ServiceTagsClientImpl implements ServiceTagsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientServiceTags")
     public interface ServiceTagsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/serviceTags")
@@ -91,7 +91,7 @@ public Mono<Response<ServiceTagsListResultInner>> listWithResponseAsync(String l
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, apiVersion,
@@ -125,7 +125,7 @@ private Mono<Response<ServiceTagsListResultInner>> listWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), location, apiVersion, this.client.getSubscriptionId(), accept,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticCidrsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticCidrsClientImpl.java
index 1895ee884ddb..2ac92e51951c 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticCidrsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticCidrsClientImpl.java
@@ -68,7 +68,7 @@ public final class StaticCidrsClientImpl implements StaticCidrsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientStaticCidrs")
     public interface StaticCidrsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/ipamPools/{poolName}/staticCidrs")
@@ -163,7 +163,7 @@ private Mono<PagedResponse<StaticCidrInner>> listSinglePageAsync(String resource
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -215,7 +215,7 @@ private Mono<PagedResponse<StaticCidrInner>> listSinglePageAsync(String resource
         if (poolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter poolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -381,7 +381,7 @@ public Mono<Response<StaticCidrInner>> createWithResponseAsync(String resourceGr
         if (body != null) {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -431,7 +431,7 @@ private Mono<Response<StaticCidrInner>> createWithResponseAsync(String resourceG
         if (body != null) {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -536,7 +536,7 @@ public Mono<Response<StaticCidrInner>> getWithResponseAsync(String resourceGroup
         if (staticCidrName == null) {
             return Mono.error(new IllegalArgumentException("Parameter staticCidrName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -582,7 +582,7 @@ private Mono<Response<StaticCidrInner>> getWithResponseAsync(String resourceGrou
         if (staticCidrName == null) {
             return Mono.error(new IllegalArgumentException("Parameter staticCidrName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -683,7 +683,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (staticCidrName == null) {
             return Mono.error(new IllegalArgumentException("Parameter staticCidrName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -729,7 +729,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (staticCidrName == null) {
             return Mono.error(new IllegalArgumentException("Parameter staticCidrName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -892,13 +892,16 @@ public void delete(String resourceGroupName, String networkManagerName, String p
     }
 
     /**
+     * Gets list of Static CIDR resources at Network Manager level.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of StaticCidr along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of Static CIDR resources at Network Manager level along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<StaticCidrInner>> listNextSinglePageAsync(String nextLink) {
@@ -917,6 +920,8 @@ private Mono<PagedResponse<StaticCidrInner>> listNextSinglePageAsync(String next
     }
 
     /**
+     * Gets list of Static CIDR resources at Network Manager level.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -924,7 +929,8 @@ private Mono<PagedResponse<StaticCidrInner>> listNextSinglePageAsync(String next
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of StaticCidr along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of Static CIDR resources at Network Manager level along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<StaticCidrInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticMembersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticMembersClientImpl.java
index 01a4664f237a..8ca1b5681894 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticMembersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/StaticMembersClientImpl.java
@@ -63,7 +63,7 @@ public final class StaticMembersClientImpl implements StaticMembersClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientStaticMembers")
     public interface StaticMembersService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/networkGroups/{networkGroupName}/staticMembers/{staticMemberName}")
@@ -161,7 +161,7 @@ public Mono<Response<StaticMemberInner>> getWithResponseAsync(String resourceGro
             return Mono
                 .error(new IllegalArgumentException("Parameter staticMemberName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -209,7 +209,7 @@ private Mono<Response<StaticMemberInner>> getWithResponseAsync(String resourceGr
             return Mono
                 .error(new IllegalArgumentException("Parameter staticMemberName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -319,7 +319,7 @@ public Mono<Response<StaticMemberInner>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -375,7 +375,7 @@ private Mono<Response<StaticMemberInner>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -482,7 +482,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, St
             return Mono
                 .error(new IllegalArgumentException("Parameter staticMemberName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -530,7 +530,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String resourceGroupName, S
             return Mono
                 .error(new IllegalArgumentException("Parameter staticMemberName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -633,7 +633,7 @@ private Mono<PagedResponse<StaticMemberInner>> listSinglePageAsync(String resour
             return Mono
                 .error(new IllegalArgumentException("Parameter networkGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -684,7 +684,7 @@ private Mono<PagedResponse<StaticMemberInner>> listSinglePageAsync(String resour
             return Mono
                 .error(new IllegalArgumentException("Parameter networkGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubnetsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubnetsClientImpl.java
index e343cea170eb..c4c1e4ee15b6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubnetsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubnetsClientImpl.java
@@ -70,7 +70,7 @@ public final class SubnetsClientImpl implements SubnetsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSubnets")
     public interface SubnetsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}")
@@ -175,7 +175,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -217,7 +217,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, subnetName, apiVersion,
@@ -403,7 +403,7 @@ public Mono<Response<SubnetInner>> getWithResponseAsync(String resourceGroupName
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -447,7 +447,7 @@ private Mono<Response<SubnetInner>> getWithResponseAsync(String resourceGroupNam
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, subnetName, apiVersion,
@@ -549,7 +549,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             subnetParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -600,7 +600,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             subnetParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, subnetName,
@@ -811,7 +811,7 @@ public Mono<Response<Flux<ByteBuffer>>> prepareNetworkPoliciesWithResponseAsync(
         } else {
             prepareNetworkPoliciesRequestParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.prepareNetworkPolicies(this.client.getEndpoint(), resourceGroupName,
@@ -863,7 +863,7 @@ private Mono<Response<Flux<ByteBuffer>>> prepareNetworkPoliciesWithResponseAsync
         } else {
             prepareNetworkPoliciesRequestParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.prepareNetworkPolicies(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -1088,7 +1088,7 @@ public Mono<Response<Flux<ByteBuffer>>> unprepareNetworkPoliciesWithResponseAsyn
         } else {
             unprepareNetworkPoliciesRequestParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.unprepareNetworkPolicies(this.client.getEndpoint(), resourceGroupName,
@@ -1140,7 +1140,7 @@ private Mono<Response<Flux<ByteBuffer>>> unprepareNetworkPoliciesWithResponseAsy
         } else {
             unprepareNetworkPoliciesRequestParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.unprepareNetworkPolicies(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -1352,7 +1352,7 @@ private Mono<PagedResponse<SubnetInner>> listSinglePageAsync(String resourceGrou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -1393,7 +1393,7 @@ private Mono<PagedResponse<SubnetInner>> listSinglePageAsync(String resourceGrou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1474,8 +1474,8 @@ public PagedIterable<SubnetInner> list(String resourceGroupName, String virtualN
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSubnets API service callRetrieves all subnet that belongs to a virtual network along
-     * with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all subnets in a virtual network along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SubnetInner>> listNextSinglePageAsync(String nextLink) {
@@ -1501,8 +1501,8 @@ private Mono<PagedResponse<SubnetInner>> listNextSinglePageAsync(String nextLink
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSubnets API service callRetrieves all subnet that belongs to a virtual network along
-     * with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all subnets in a virtual network along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<SubnetInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubscriptionNetworkManagerConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubscriptionNetworkManagerConnectionsClientImpl.java
index 812b274c2fa2..472b37ea780a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubscriptionNetworkManagerConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/SubscriptionNetworkManagerConnectionsClientImpl.java
@@ -65,7 +65,7 @@ public final class SubscriptionNetworkManagerConnectionsClientImpl
      * used by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientSubscriptionNetworkManagerConnections")
     public interface SubscriptionNetworkManagerConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkManagerConnections/{networkManagerConnectionName}")
@@ -145,7 +145,7 @@ Mono<Response<NetworkManagerConnectionListResult>> listNext(
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -185,7 +185,7 @@ private Mono<Response<NetworkManagerConnectionInner>> createOrUpdateWithResponse
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -266,7 +266,7 @@ public Mono<Response<NetworkManagerConnectionInner>> getWithResponseAsync(String
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -300,7 +300,7 @@ private Mono<Response<NetworkManagerConnectionInner>> getWithResponseAsync(Strin
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), networkManagerConnectionName,
@@ -374,7 +374,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(String networkManagerConnect
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -406,7 +406,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(String networkManagerConnec
             return Mono.error(
                 new IllegalArgumentException("Parameter networkManagerConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), networkManagerConnectionName,
@@ -479,7 +479,7 @@ private Mono<PagedResponse<NetworkManagerConnectionInner>> listSinglePageAsync(I
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -515,7 +515,7 @@ private Mono<PagedResponse<NetworkManagerConnectionInner>> listSinglePageAsync(I
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/UsagesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/UsagesClientImpl.java
index 2cba58025dd2..6116d70d83ba 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/UsagesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/UsagesClientImpl.java
@@ -59,7 +59,7 @@ public final class UsagesClientImpl implements UsagesClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientUsages")
     public interface UsagesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/usages")
@@ -100,7 +100,7 @@ private Mono<PagedResponse<UsageInner>> listSinglePageAsync(String location) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), location, apiVersion,
@@ -134,7 +134,7 @@ private Mono<PagedResponse<UsageInner>> listSinglePageAsync(String location, Con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VerifierWorkspacesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VerifierWorkspacesClientImpl.java
index c4f3e201cbb2..bd5011165bda 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VerifierWorkspacesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VerifierWorkspacesClientImpl.java
@@ -70,7 +70,7 @@ public final class VerifierWorkspacesClientImpl implements VerifierWorkspacesCli
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVerifierWorkspaces")
     public interface VerifierWorkspacesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkManagers/{networkManagerName}/verifierWorkspaces")
@@ -171,7 +171,7 @@ private Mono<PagedResponse<VerifierWorkspaceInner>> listSinglePageAsync(String r
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -217,7 +217,7 @@ private Mono<PagedResponse<VerifierWorkspaceInner>> listSinglePageAsync(String r
             return Mono
                 .error(new IllegalArgumentException("Parameter networkManagerName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -372,7 +372,7 @@ public Mono<Response<VerifierWorkspaceInner>> getWithResponseAsync(String resour
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -414,7 +414,7 @@ private Mono<Response<VerifierWorkspaceInner>> getWithResponseAsync(String resou
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -514,7 +514,7 @@ public Mono<Response<VerifierWorkspaceInner>> createWithResponseAsync(String res
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -565,7 +565,7 @@ private Mono<Response<VerifierWorkspaceInner>> createWithResponseAsync(String re
         } else {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -673,7 +673,7 @@ public Mono<Response<VerifierWorkspaceInner>> updateWithResponseAsync(String res
         if (body != null) {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -723,7 +723,7 @@ private Mono<Response<VerifierWorkspaceInner>> updateWithResponseAsync(String re
         if (body != null) {
             body.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -826,7 +826,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -871,7 +871,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (workspaceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter workspaceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -1079,13 +1079,15 @@ public void delete(String resourceGroupName, String networkManagerName, String w
     }
 
     /**
+     * Gets list of Verifier Workspaces.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of Verifier Workspace along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of Verifier Workspaces along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VerifierWorkspaceInner>> listNextSinglePageAsync(String nextLink) {
@@ -1104,6 +1106,8 @@ private Mono<PagedResponse<VerifierWorkspaceInner>> listNextSinglePageAsync(Stri
     }
 
     /**
+     * Gets list of Verifier Workspaces.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1111,7 +1115,7 @@ private Mono<PagedResponse<VerifierWorkspaceInner>> listNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of Verifier Workspace along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of Verifier Workspaces along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VerifierWorkspaceInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VipSwapsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VipSwapsClientImpl.java
index f333684e5e43..977aa1df4424 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VipSwapsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VipSwapsClientImpl.java
@@ -62,7 +62,7 @@ public final class VipSwapsClientImpl implements VipSwapsClient {
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVipSwaps")
     public interface VipSwapsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Compute/cloudServices/{resourceName}/providers/Microsoft.Network/cloudServiceSlots/{singletonResource}")
@@ -123,7 +123,7 @@ public Mono<Response<SwapResourceInner>> getWithResponseAsync(String groupName,
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         final String singletonResource = "swap";
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), groupName, resourceName, singletonResource,
@@ -162,7 +162,7 @@ private Mono<Response<SwapResourceInner>> getWithResponseAsync(String groupName,
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         final String singletonResource = "swap";
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), groupName, resourceName, singletonResource, apiVersion,
@@ -255,7 +255,7 @@ public Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String groupName
             parameters.validate();
         }
         final String singletonResource = "swap";
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), groupName, resourceName,
@@ -299,7 +299,7 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String groupNam
             parameters.validate();
         }
         final String singletonResource = "swap";
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), groupName, resourceName, singletonResource, apiVersion,
@@ -484,7 +484,7 @@ public Mono<Response<SwapResourceListResultInner>> listWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), groupName, resourceName, apiVersion,
@@ -522,7 +522,7 @@ private Mono<Response<SwapResourceListResultInner>> listWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), groupName, resourceName, apiVersion,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSitesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSitesClientImpl.java
index 280b7b5187b6..e3abb2346388 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSitesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSitesClientImpl.java
@@ -68,7 +68,7 @@ public final class VirtualApplianceSitesClientImpl implements VirtualApplianceSi
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualApplianceSites")
     public interface VirtualApplianceSitesService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkVirtualAppliances/{networkVirtualApplianceName}/virtualApplianceSites/{siteName}")
@@ -154,7 +154,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -196,7 +196,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName, siteName,
@@ -381,7 +381,7 @@ public Mono<Response<VirtualApplianceSiteInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName,
@@ -424,7 +424,7 @@ private Mono<Response<VirtualApplianceSiteInner>> getWithResponseAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName, siteName,
@@ -523,7 +523,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -572,7 +572,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, networkVirtualApplianceName,
@@ -776,7 +776,7 @@ private Mono<PagedResponse<VirtualApplianceSiteInner>> listSinglePageAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName,
@@ -817,7 +817,7 @@ private Mono<PagedResponse<VirtualApplianceSiteInner>> listSinglePageAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSkusClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSkusClientImpl.java
index ffb46964677a..37d2c3c38379 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSkusClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualApplianceSkusClientImpl.java
@@ -60,7 +60,7 @@ public final class VirtualApplianceSkusClientImpl implements VirtualApplianceSku
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualApplianceSkus")
     public interface VirtualApplianceSkusService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkVirtualApplianceSkus")
@@ -105,7 +105,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceSkuInner>> listSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -135,7 +135,7 @@ private Mono<PagedResponse<NetworkVirtualApplianceSkuInner>> listSinglePageAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -223,7 +223,7 @@ public Mono<Response<NetworkVirtualApplianceSkuInner>> getWithResponseAsync(Stri
         if (skuName == null) {
             return Mono.error(new IllegalArgumentException("Parameter skuName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -255,7 +255,7 @@ private Mono<Response<NetworkVirtualApplianceSkuInner>> getWithResponseAsync(Str
         if (skuName == null) {
             return Mono.error(new IllegalArgumentException("Parameter skuName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, skuName, accept,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubBgpConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubBgpConnectionsClientImpl.java
index 89c5ec20e057..3d42774bd653 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubBgpConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubBgpConnectionsClientImpl.java
@@ -73,7 +73,7 @@ public final class VirtualHubBgpConnectionsClientImpl implements VirtualHubBgpCo
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualHubBgpConnections")
     public interface VirtualHubBgpConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/bgpConnections/{connectionName}")
@@ -175,7 +175,7 @@ public Mono<Response<BgpConnectionInner>> getWithResponseAsync(String resourceGr
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -216,7 +216,7 @@ private Mono<Response<BgpConnectionInner>> getWithResponseAsync(String resourceG
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -312,7 +312,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -359,7 +359,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -558,7 +558,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -599,7 +599,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -778,7 +778,7 @@ private Mono<PagedResponse<BgpConnectionInner>> listSinglePageAsync(String resou
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -817,7 +817,7 @@ private Mono<PagedResponse<BgpConnectionInner>> listSinglePageAsync(String resou
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -924,7 +924,7 @@ public Mono<Response<Flux<ByteBuffer>>> listLearnedRoutesWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listLearnedRoutes(this.client.getEndpoint(), resourceGroupName, hubName,
@@ -966,7 +966,7 @@ private Mono<Response<Flux<ByteBuffer>>> listLearnedRoutesWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listLearnedRoutes(this.client.getEndpoint(), resourceGroupName, hubName, connectionName,
@@ -1159,7 +1159,7 @@ public Mono<Response<Flux<ByteBuffer>>> listAdvertisedRoutesWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listAdvertisedRoutes(this.client.getEndpoint(), resourceGroupName, hubName,
@@ -1201,7 +1201,7 @@ private Mono<Response<Flux<ByteBuffer>>> listAdvertisedRoutesWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listAdvertisedRoutes(this.client.getEndpoint(), resourceGroupName, hubName, connectionName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubIpConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubIpConfigurationsClientImpl.java
index 28cfeca0d9af..6b65a5926a20 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubIpConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubIpConfigurationsClientImpl.java
@@ -68,7 +68,7 @@ public final class VirtualHubIpConfigurationsClientImpl implements VirtualHubIpC
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualHubIpConfigurations")
     public interface VirtualHubIpConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/ipConfigurations/{ipConfigName}")
@@ -153,7 +153,7 @@ public Mono<Response<HubIpConfigurationInner>> getWithResponseAsync(String resou
         if (ipConfigName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ipConfigName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -194,7 +194,7 @@ private Mono<Response<HubIpConfigurationInner>> getWithResponseAsync(String reso
         if (ipConfigName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ipConfigName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -292,7 +292,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -340,7 +340,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -549,7 +549,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (ipConfigName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ipConfigName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -590,7 +590,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (ipConfigName == null) {
             return Mono.error(new IllegalArgumentException("Parameter ipConfigName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -770,7 +770,7 @@ private Mono<PagedResponse<HubIpConfigurationInner>> listSinglePageAsync(String
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -810,7 +810,7 @@ private Mono<PagedResponse<HubIpConfigurationInner>> listSinglePageAsync(String
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubRouteTableV2SClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubRouteTableV2SClientImpl.java
index f01cf406f8a1..be930f9ef838 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubRouteTableV2SClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubRouteTableV2SClientImpl.java
@@ -69,7 +69,7 @@ public final class VirtualHubRouteTableV2SClientImpl implements VirtualHubRouteT
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualHubRouteTableV2S")
     public interface VirtualHubRouteTableV2SService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}/routeTables/{routeTableName}")
@@ -154,7 +154,7 @@ public Mono<Response<VirtualHubRouteTableV2Inner>> getWithResponseAsync(String r
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -195,7 +195,7 @@ private Mono<Response<VirtualHubRouteTableV2Inner>> getWithResponseAsync(String
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -293,7 +293,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             virtualHubRouteTableV2Parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -343,7 +343,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             virtualHubRouteTableV2Parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -553,7 +553,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -594,7 +594,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (routeTableName == null) {
             return Mono.error(new IllegalArgumentException("Parameter routeTableName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -774,7 +774,7 @@ private Mono<PagedResponse<VirtualHubRouteTableV2Inner>> listSinglePageAsync(Str
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -814,7 +814,7 @@ private Mono<PagedResponse<VirtualHubRouteTableV2Inner>> listSinglePageAsync(Str
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubsClientImpl.java
index 976a6d9fa5c0..63912e4266a6 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualHubsClientImpl.java
@@ -80,7 +80,7 @@ public final class VirtualHubsClientImpl implements InnerSupportsGet<VirtualHubI
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualHubs")
     public interface VirtualHubsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualHubs/{virtualHubName}")
@@ -218,7 +218,7 @@ public Mono<Response<VirtualHubInner>> getByResourceGroupWithResponseAsync(Strin
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(),
@@ -255,7 +255,7 @@ private Mono<Response<VirtualHubInner>> getByResourceGroupWithResponseAsync(Stri
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -345,7 +345,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             virtualHubParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -389,7 +389,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             virtualHubParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -581,7 +581,7 @@ public Mono<Response<VirtualHubInner>> updateTagsWithResponseAsync(String resour
         } else {
             virtualHubParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -625,7 +625,7 @@ private Mono<Response<VirtualHubInner>> updateTagsWithResponseAsync(String resou
         } else {
             virtualHubParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -712,7 +712,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -749,7 +749,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (virtualHubName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualHubName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -911,7 +911,7 @@ private Mono<PagedResponse<VirtualHubInner>> listByResourceGroupSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -947,7 +947,7 @@ private Mono<PagedResponse<VirtualHubInner>> listByResourceGroupSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1035,7 +1035,7 @@ private Mono<PagedResponse<VirtualHubInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1065,7 +1065,7 @@ private Mono<PagedResponse<VirtualHubInner>> listSinglePageAsync(Context context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -1159,7 +1159,7 @@ public Mono<Response<Flux<ByteBuffer>>> getEffectiveVirtualHubRoutesWithResponse
         if (effectiveRoutesParameters != null) {
             effectiveRoutesParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getEffectiveVirtualHubRoutes(this.client.getEndpoint(),
@@ -1202,7 +1202,7 @@ private Mono<Response<Flux<ByteBuffer>>> getEffectiveVirtualHubRoutesWithRespons
         if (effectiveRoutesParameters != null) {
             effectiveRoutesParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getEffectiveVirtualHubRoutes(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1453,7 +1453,7 @@ public Mono<Response<Flux<ByteBuffer>>> getInboundRoutesWithResponseAsync(String
         } else {
             getInboundRoutesParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getInboundRoutes(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1498,7 +1498,7 @@ private Mono<Response<Flux<ByteBuffer>>> getInboundRoutesWithResponseAsync(Strin
         } else {
             getInboundRoutesParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getInboundRoutes(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1704,7 +1704,7 @@ public Mono<Response<Flux<ByteBuffer>>> getOutboundRoutesWithResponseAsync(Strin
         } else {
             getOutboundRoutesParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1750,7 +1750,7 @@ private Mono<Response<Flux<ByteBuffer>>> getOutboundRoutesWithResponseAsync(Stri
         } else {
             getOutboundRoutesParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getOutboundRoutes(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayConnectionsClientImpl.java
index e68fb7c6813f..b3bbd97a5ee7 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayConnectionsClientImpl.java
@@ -80,7 +80,7 @@ public final class VirtualNetworkGatewayConnectionsClientImpl
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualNetworkGatewayConnections")
     public interface VirtualNetworkGatewayConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/connections/{virtualNetworkGatewayConnectionName}")
@@ -252,7 +252,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -298,7 +298,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -494,7 +494,7 @@ public VirtualNetworkGatewayConnectionInner createOrUpdate(String resourceGroupN
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -533,7 +533,7 @@ private Mono<Response<VirtualNetworkGatewayConnectionInner>> getByResourceGroupW
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -622,7 +622,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -660,7 +660,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -839,7 +839,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -885,7 +885,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -1086,7 +1086,7 @@ public Mono<Response<Flux<ByteBuffer>>> setSharedKeyWithResponseAsync(String res
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.setSharedKey(this.client.getEndpoint(), resourceGroupName,
@@ -1134,7 +1134,7 @@ private Mono<Response<Flux<ByteBuffer>>> setSharedKeyWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.setSharedKey(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -1343,7 +1343,7 @@ public Mono<Response<ConnectionSharedKeyInner>> getSharedKeyWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getSharedKey(this.client.getEndpoint(), resourceGroupName,
@@ -1383,7 +1383,7 @@ private Mono<Response<ConnectionSharedKeyInner>> getSharedKeyWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getSharedKey(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -1469,7 +1469,7 @@ public ConnectionSharedKeyInner getSharedKey(String resourceGroupName, String vi
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1506,7 +1506,7 @@ public ConnectionSharedKeyInner getSharedKey(String resourceGroupName, String vi
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1625,7 +1625,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetSharedKeyWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.resetSharedKey(this.client.getEndpoint(), resourceGroupName,
@@ -1674,7 +1674,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetSharedKeyWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.resetSharedKey(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -1898,7 +1898,7 @@ public Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.startPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -1942,7 +1942,7 @@ private Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Str
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.startPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -2182,7 +2182,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -2228,7 +2228,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -2427,7 +2427,7 @@ public Mono<Response<Flux<ByteBuffer>>> getIkeSasWithResponseAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getIkeSas(this.client.getEndpoint(), resourceGroupName,
@@ -2465,7 +2465,7 @@ private Mono<Response<Flux<ByteBuffer>>> getIkeSasWithResponseAsync(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getIkeSas(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayConnectionName,
@@ -2640,7 +2640,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetConnectionWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.resetConnection(this.client.getEndpoint(), resourceGroupName,
@@ -2678,7 +2678,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetConnectionWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.resetConnection(this.client.getEndpoint(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayNatRulesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayNatRulesClientImpl.java
index 9e6200b31c67..04e588a9733c 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayNatRulesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewayNatRulesClientImpl.java
@@ -68,7 +68,7 @@ public final class VirtualNetworkGatewayNatRulesClientImpl implements VirtualNet
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualNetworkGatewayNatRules")
     public interface VirtualNetworkGatewayNatRulesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/natRules/{natRuleName}")
@@ -157,7 +157,7 @@ public Mono<Response<VirtualNetworkGatewayNatRuleInner>> getWithResponseAsync(St
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -200,7 +200,7 @@ private Mono<Response<VirtualNetworkGatewayNatRuleInner>> getWithResponseAsync(S
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -301,7 +301,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             natRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -353,7 +353,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             natRuleParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -565,7 +565,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -607,7 +607,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (natRuleName == null) {
             return Mono.error(new IllegalArgumentException("Parameter natRuleName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -790,7 +790,7 @@ public void delete(String resourceGroupName, String virtualNetworkGatewayName, S
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.listByVirtualNetworkGateway(this.client.getEndpoint(),
             this.client.getSubscriptionId(), resourceGroupName, virtualNetworkGatewayName, apiVersion, accept, context))
@@ -830,7 +830,7 @@ private Mono<PagedResponse<VirtualNetworkGatewayNatRuleInner>> listByVirtualNetw
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewaysClientImpl.java
index ef723653b1cc..3cac52c1990e 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkGatewaysClientImpl.java
@@ -41,6 +41,7 @@
 import com.azure.resourcemanager.network.fluent.models.GatewayResiliencyInformationInner;
 import com.azure.resourcemanager.network.fluent.models.GatewayRouteListResultInner;
 import com.azure.resourcemanager.network.fluent.models.GatewayRouteSetsInformationInner;
+import com.azure.resourcemanager.network.fluent.models.RadiusAuthServerListResultInner;
 import com.azure.resourcemanager.network.fluent.models.VirtualNetworkGatewayConnectionListEntityInner;
 import com.azure.resourcemanager.network.fluent.models.VirtualNetworkGatewayInner;
 import com.azure.resourcemanager.network.fluent.models.VpnClientConnectionHealthDetailListResultInner;
@@ -94,7 +95,7 @@ public final class VirtualNetworkGatewaysClientImpl
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualNetworkGateways")
     public interface VirtualNetworkGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}")
@@ -228,6 +229,16 @@ Mono<Response<String>> supportedVpnDevices(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/listRadiusSecrets")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecrets(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("virtualNetworkGatewayName") String virtualNetworkGatewayName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getLearnedRoutes")
         @ExpectedResponses({ 200, 202 })
@@ -481,7 +492,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -526,7 +537,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -716,7 +727,7 @@ public Mono<Response<VirtualNetworkGatewayInner>> getByResourceGroupWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -755,7 +766,7 @@ private Mono<Response<VirtualNetworkGatewayInner>> getByResourceGroupWithRespons
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -840,7 +851,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName,
@@ -878,7 +889,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName, apiVersion,
@@ -1054,7 +1065,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName,
@@ -1099,7 +1110,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName, apiVersion,
@@ -1282,7 +1293,7 @@ public VirtualNetworkGatewayInner updateTags(String resourceGroupName, String vi
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1318,7 +1329,7 @@ private Mono<PagedResponse<VirtualNetworkGatewayInner>> listByResourceGroupSingl
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1418,7 +1429,7 @@ public PagedIterable<VirtualNetworkGatewayInner> listByResourceGroup(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listConnections(this.client.getEndpoint(), resourceGroupName,
@@ -1460,7 +1471,7 @@ public PagedIterable<VirtualNetworkGatewayInner> listByResourceGroup(String reso
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1571,7 +1582,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.reset(this.client.getEndpoint(), resourceGroupName,
@@ -1612,7 +1623,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.reset(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName, gatewayVip,
@@ -1841,7 +1852,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetVpnClientSharedKeyWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.resetVpnClientSharedKey(this.client.getEndpoint(), resourceGroupName,
@@ -1879,7 +1890,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetVpnClientSharedKeyWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.resetVpnClientSharedKey(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -2058,7 +2069,7 @@ public Mono<Response<Flux<ByteBuffer>>> generatevpnclientpackageWithResponseAsyn
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.generatevpnclientpackage(this.client.getEndpoint(), resourceGroupName,
@@ -2102,7 +2113,7 @@ private Mono<Response<Flux<ByteBuffer>>> generatevpnclientpackageWithResponseAsy
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.generatevpnclientpackage(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -2298,7 +2309,7 @@ public Mono<Response<Flux<ByteBuffer>>> generateVpnProfileWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.generateVpnProfile(this.client.getEndpoint(), resourceGroupName,
@@ -2343,7 +2354,7 @@ private Mono<Response<Flux<ByteBuffer>>> generateVpnProfileWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.generateVpnProfile(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -2540,7 +2551,7 @@ public Mono<Response<Flux<ByteBuffer>>> getVpnProfilePackageUrlWithResponseAsync
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getVpnProfilePackageUrl(this.client.getEndpoint(), resourceGroupName,
@@ -2580,7 +2591,7 @@ private Mono<Response<Flux<ByteBuffer>>> getVpnProfilePackageUrlWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getVpnProfilePackageUrl(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -2771,7 +2782,7 @@ public Mono<Response<Flux<ByteBuffer>>> getBgpPeerStatusWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getBgpPeerStatus(this.client.getEndpoint(), resourceGroupName,
@@ -2811,7 +2822,7 @@ private Mono<Response<Flux<ByteBuffer>>> getBgpPeerStatusWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getBgpPeerStatus(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName, peer,
@@ -3039,7 +3050,7 @@ public Mono<Response<String>> supportedVpnDevicesWithResponseAsync(String resour
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.supportedVpnDevices(this.client.getEndpoint(), resourceGroupName,
@@ -3078,7 +3089,7 @@ private Mono<Response<String>> supportedVpnDevicesWithResponseAsync(String resou
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.supportedVpnDevices(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -3133,6 +3144,132 @@ public String supportedVpnDevices(String resourceGroupName, String virtualNetwor
         return supportedVpnDevicesWithResponse(resourceGroupName, virtualNetworkGatewayName, Context.NONE).getValue();
     }
 
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecretsWithResponseAsync(String resourceGroupName,
+        String virtualNetworkGatewayName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (virtualNetworkGatewayName == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listRadiusSecrets(this.client.getEndpoint(), resourceGroupName,
+                virtualNetworkGatewayName, apiVersion, this.client.getSubscriptionId(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecretsWithResponseAsync(String resourceGroupName,
+        String virtualNetworkGatewayName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (virtualNetworkGatewayName == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listRadiusSecrets(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
+            apiVersion, this.client.getSubscriptionId(), accept, context);
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<RadiusAuthServerListResultInner> listRadiusSecretsAsync(String resourceGroupName,
+        String virtualNetworkGatewayName) {
+        return listRadiusSecretsWithResponseAsync(resourceGroupName, virtualNetworkGatewayName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<RadiusAuthServerListResultInner> listRadiusSecretsWithResponse(String resourceGroupName,
+        String virtualNetworkGatewayName, Context context) {
+        return listRadiusSecretsWithResponseAsync(resourceGroupName, virtualNetworkGatewayName, context).block();
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from virtual network gateway VpnClientConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param virtualNetworkGatewayName The name of the virtual network gateway.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public RadiusAuthServerListResultInner listRadiusSecrets(String resourceGroupName,
+        String virtualNetworkGatewayName) {
+        return listRadiusSecretsWithResponse(resourceGroupName, virtualNetworkGatewayName, Context.NONE).getValue();
+    }
+
     /**
      * This operation retrieves a list of routes the virtual network gateway has learned, including routes learned from
      * BGP peers.
@@ -3164,7 +3301,7 @@ public Mono<Response<Flux<ByteBuffer>>> getLearnedRoutesWithResponseAsync(String
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getLearnedRoutes(this.client.getEndpoint(), resourceGroupName,
@@ -3204,7 +3341,7 @@ private Mono<Response<Flux<ByteBuffer>>> getLearnedRoutesWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getLearnedRoutes(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -3395,7 +3532,7 @@ public Mono<Response<Flux<ByteBuffer>>> getAdvertisedRoutesWithResponseAsync(Str
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getAdvertisedRoutes(this.client.getEndpoint(), resourceGroupName,
@@ -3438,7 +3575,7 @@ private Mono<Response<Flux<ByteBuffer>>> getAdvertisedRoutesWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getAdvertisedRoutes(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -3629,7 +3766,7 @@ public Mono<Response<Flux<ByteBuffer>>> getResiliencyInformationWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getResiliencyInformation(this.client.getEndpoint(), resourceGroupName,
@@ -3670,7 +3807,7 @@ private Mono<Response<Flux<ByteBuffer>>> getResiliencyInformationWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getResiliencyInformation(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -3915,7 +4052,7 @@ public Mono<Response<Flux<ByteBuffer>>> getRoutesInformationWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getRoutesInformation(this.client.getEndpoint(), resourceGroupName,
@@ -3955,7 +4092,7 @@ private Mono<Response<Flux<ByteBuffer>>> getRoutesInformationWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getRoutesInformation(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -4198,7 +4335,7 @@ public Mono<Response<Flux<ByteBuffer>>> setVpnclientIpsecParametersWithResponseA
         } else {
             vpnclientIpsecParams.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.setVpnclientIpsecParameters(this.client.getEndpoint(), resourceGroupName,
@@ -4247,7 +4384,7 @@ private Mono<Response<Flux<ByteBuffer>>> setVpnclientIpsecParametersWithResponse
         } else {
             vpnclientIpsecParams.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.setVpnclientIpsecParameters(this.client.getEndpoint(), resourceGroupName,
@@ -4467,7 +4604,7 @@ public Mono<Response<Flux<ByteBuffer>>> getVpnclientIpsecParametersWithResponseA
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getVpnclientIpsecParameters(this.client.getEndpoint(), resourceGroupName,
@@ -4507,7 +4644,7 @@ private Mono<Response<Flux<ByteBuffer>>> getVpnclientIpsecParametersWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getVpnclientIpsecParameters(this.client.getEndpoint(), resourceGroupName,
@@ -4706,7 +4843,7 @@ public Mono<Response<String>> vpnDeviceConfigurationScriptWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.vpnDeviceConfigurationScript(this.client.getEndpoint(), resourceGroupName,
@@ -4753,7 +4890,7 @@ private Mono<Response<String>> vpnDeviceConfigurationScriptWithResponseAsync(Str
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.vpnDeviceConfigurationScript(this.client.getEndpoint(), resourceGroupName,
@@ -4852,7 +4989,7 @@ public Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.startPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -4894,7 +5031,7 @@ private Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Str
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.startPacketCapture(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -5123,7 +5260,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Strin
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -5167,7 +5304,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Stri
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName, virtualNetworkGatewayName,
@@ -5360,7 +5497,7 @@ public Mono<Response<Flux<ByteBuffer>>> getFailoverAllTestDetailsWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getFailoverAllTestDetails(this.client.getEndpoint(), resourceGroupName,
@@ -5405,7 +5542,7 @@ private Mono<Response<Flux<ByteBuffer>>> getFailoverAllTestDetailsWithResponseAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getFailoverAllTestDetails(this.client.getEndpoint(), resourceGroupName,
@@ -5637,7 +5774,7 @@ public Mono<Response<Flux<ByteBuffer>>> getFailoverSingleTestDetailsWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getFailoverSingleTestDetails(this.client.getEndpoint(), resourceGroupName,
@@ -5687,7 +5824,7 @@ private Mono<Response<Flux<ByteBuffer>>> getFailoverSingleTestDetailsWithRespons
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getFailoverSingleTestDetails(this.client.getEndpoint(), resourceGroupName,
@@ -5919,7 +6056,7 @@ public Mono<Response<Flux<ByteBuffer>>> startExpressRouteSiteFailoverSimulationW
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.startExpressRouteSiteFailoverSimulation(this.client.getEndpoint(),
@@ -5963,7 +6100,7 @@ private Mono<Response<Flux<ByteBuffer>>> startExpressRouteSiteFailoverSimulation
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.startExpressRouteSiteFailoverSimulation(this.client.getEndpoint(), resourceGroupName,
@@ -6164,7 +6301,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopExpressRouteSiteFailoverSimulationWi
         } else {
             stopParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stopExpressRouteSiteFailoverSimulation(this.client.getEndpoint(),
@@ -6211,7 +6348,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopExpressRouteSiteFailoverSimulationW
         } else {
             stopParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stopExpressRouteSiteFailoverSimulation(this.client.getEndpoint(), resourceGroupName,
@@ -6416,7 +6553,7 @@ public Mono<Response<Flux<ByteBuffer>>> getVpnclientConnectionHealthWithResponse
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getVpnclientConnectionHealth(this.client.getEndpoint(), resourceGroupName,
@@ -6456,7 +6593,7 @@ private Mono<Response<Flux<ByteBuffer>>> getVpnclientConnectionHealthWithRespons
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getVpnclientConnectionHealth(this.client.getEndpoint(), resourceGroupName,
@@ -6666,7 +6803,7 @@ public Mono<Response<Flux<ByteBuffer>>> disconnectVirtualNetworkGatewayVpnConnec
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.disconnectVirtualNetworkGatewayVpnConnections(this.client.getEndpoint(),
@@ -6711,7 +6848,7 @@ private Mono<Response<Flux<ByteBuffer>>> disconnectVirtualNetworkGatewayVpnConne
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.disconnectVirtualNetworkGatewayVpnConnections(this.client.getEndpoint(),
@@ -6911,7 +7048,7 @@ public Mono<Response<Flux<ByteBuffer>>> invokePrepareMigrationWithResponseAsync(
         } else {
             migrationParams.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -6958,7 +7095,7 @@ private Mono<Response<Flux<ByteBuffer>>> invokePrepareMigrationWithResponseAsync
         } else {
             migrationParams.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.invokePrepareMigration(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -7153,7 +7290,7 @@ public Mono<Response<Flux<ByteBuffer>>> invokeExecuteMigrationWithResponseAsync(
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -7192,7 +7329,7 @@ private Mono<Response<Flux<ByteBuffer>>> invokeExecuteMigrationWithResponseAsync
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.invokeExecuteMigration(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -7365,7 +7502,7 @@ public Mono<Response<Flux<ByteBuffer>>> invokeCommitMigrationWithResponseAsync(S
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -7404,7 +7541,7 @@ private Mono<Response<Flux<ByteBuffer>>> invokeCommitMigrationWithResponseAsync(
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.invokeCommitMigration(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -7577,7 +7714,7 @@ public Mono<Response<Flux<ByteBuffer>>> invokeAbortMigrationWithResponseAsync(St
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -7616,7 +7753,7 @@ private Mono<Response<Flux<ByteBuffer>>> invokeAbortMigrationWithResponseAsync(S
             return Mono.error(
                 new IllegalArgumentException("Parameter virtualNetworkGatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.invokeAbortMigration(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -7767,8 +7904,8 @@ public void invokeAbortMigration(String resourceGroupName, String virtualNetwork
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListVirtualNetworkGateways API service call along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return all virtual network gateways by resource group along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkGatewayInner>> listNextSinglePageAsync(String nextLink) {
@@ -7794,8 +7931,8 @@ private Mono<PagedResponse<VirtualNetworkGatewayInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListVirtualNetworkGateways API service call along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return all virtual network gateways by resource group along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkGatewayInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -7820,8 +7957,8 @@ private Mono<PagedResponse<VirtualNetworkGatewayInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the VirtualNetworkGatewayListConnections API service call along with {@link PagedResponse}
-     * on successful completion of {@link Mono}.
+     * @return all the connections in a virtual network gateway along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkGatewayConnectionListEntityInner>>
@@ -7850,8 +7987,8 @@ private Mono<PagedResponse<VirtualNetworkGatewayInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the VirtualNetworkGatewayListConnections API service call along with {@link PagedResponse}
-     * on successful completion of {@link Mono}.
+     * @return all the connections in a virtual network gateway along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkGatewayConnectionListEntityInner>>
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkPeeringsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkPeeringsClientImpl.java
index 940a5c5fe1b1..1e89fc14c580 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkPeeringsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkPeeringsClientImpl.java
@@ -69,7 +69,7 @@ public final class VirtualNetworkPeeringsClientImpl implements VirtualNetworkPee
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualNetworkPeerings")
     public interface VirtualNetworkPeeringsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/virtualNetworkPeerings/{virtualNetworkPeeringName}")
@@ -158,7 +158,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -201,7 +201,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -390,7 +390,7 @@ public Mono<Response<VirtualNetworkPeeringInner>> getWithResponseAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -434,7 +434,7 @@ private Mono<Response<VirtualNetworkPeeringInner>> getWithResponseAsync(String r
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, virtualNetworkPeeringName,
@@ -541,7 +541,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             virtualNetworkPeeringParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -598,7 +598,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             virtualNetworkPeeringParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -882,7 +882,7 @@ private Mono<PagedResponse<VirtualNetworkPeeringInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -923,7 +923,7 @@ private Mono<PagedResponse<VirtualNetworkPeeringInner>> listSinglePageAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1006,8 +1006,8 @@ public PagedIterable<VirtualNetworkPeeringInner> list(String resourceGroupName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSubnets API service call along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all virtual network peerings in a virtual network along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkPeeringInner>> listNextSinglePageAsync(String nextLink) {
@@ -1033,8 +1033,8 @@ private Mono<PagedResponse<VirtualNetworkPeeringInner>> listNextSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListSubnets API service call along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all virtual network peerings in a virtual network along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkPeeringInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkTapsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkTapsClientImpl.java
index 5e6df1a45d0c..2230687073d0 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkTapsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworkTapsClientImpl.java
@@ -74,7 +74,7 @@ public final class VirtualNetworkTapsClientImpl implements InnerSupportsGet<Virt
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualNetworkTaps")
     public interface VirtualNetworkTapsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkTaps/{tapName}")
@@ -174,7 +174,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, tapName, apiVersion,
@@ -211,7 +211,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, tapName, apiVersion,
@@ -376,7 +376,7 @@ public Mono<Response<VirtualNetworkTapInner>> getByResourceGroupWithResponseAsyn
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, tapName,
@@ -414,7 +414,7 @@ private Mono<Response<VirtualNetworkTapInner>> getByResourceGroupWithResponseAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, tapName, apiVersion,
@@ -503,7 +503,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, tapName,
@@ -546,7 +546,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, tapName, apiVersion,
@@ -736,7 +736,7 @@ public Mono<Response<VirtualNetworkTapInner>> updateTagsWithResponseAsync(String
         } else {
             tapParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, tapName,
@@ -779,7 +779,7 @@ private Mono<Response<VirtualNetworkTapInner>> updateTagsWithResponseAsync(Strin
         } else {
             tapParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, tapName, apiVersion,
@@ -856,7 +856,7 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -886,7 +886,7 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listSinglePageAsync(Context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -971,7 +971,7 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listByResourceGroupSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1007,7 +1007,7 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listByResourceGroupSinglePag
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1084,8 +1084,8 @@ public PagedIterable<VirtualNetworkTapInner> listByResourceGroup(String resource
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListVirtualNetworkTap API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the VirtualNetworkTaps in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkTapInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1112,8 +1112,8 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listAllNextSinglePageAsync(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListVirtualNetworkTap API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the VirtualNetworkTaps in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkTapInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1138,8 +1138,8 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listAllNextSinglePageAsync(S
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListVirtualNetworkTap API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the VirtualNetworkTaps in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkTapInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
@@ -1167,8 +1167,8 @@ private Mono<PagedResponse<VirtualNetworkTapInner>> listByResourceGroupNextSingl
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListVirtualNetworkTap API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the VirtualNetworkTaps in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkTapInner>> listByResourceGroupNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworksClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworksClientImpl.java
index 1e287ecd869b..bc57ec2a349c 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworksClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualNetworksClientImpl.java
@@ -80,7 +80,7 @@ public final class VirtualNetworksClientImpl implements InnerSupportsGet<Virtual
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualNetworks")
     public interface VirtualNetworksService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}")
@@ -229,7 +229,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -267,7 +267,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, apiVersion,
@@ -436,7 +436,7 @@ public Mono<Response<VirtualNetworkInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -476,7 +476,7 @@ private Mono<Response<VirtualNetworkInner>> getByResourceGroupWithResponseAsync(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, apiVersion,
@@ -569,7 +569,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -613,7 +613,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, apiVersion,
@@ -805,7 +805,7 @@ public Mono<Response<VirtualNetworkInner>> updateTagsWithResponseAsync(String re
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -849,7 +849,7 @@ private Mono<Response<VirtualNetworkInner>> updateTagsWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), resourceGroupName, virtualNetworkName, apiVersion,
@@ -926,7 +926,7 @@ private Mono<PagedResponse<VirtualNetworkInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -956,7 +956,7 @@ private Mono<PagedResponse<VirtualNetworkInner>> listSinglePageAsync(Context con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1041,7 +1041,7 @@ private Mono<PagedResponse<VirtualNetworkInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -1077,7 +1077,7 @@ private Mono<PagedResponse<VirtualNetworkInner>> listByResourceGroupSinglePageAs
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1181,7 +1181,7 @@ public Mono<Response<IpAddressAvailabilityResultInner>> checkIpAddressAvailabili
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.checkIpAddressAvailability(this.client.getEndpoint(), resourceGroupName,
@@ -1224,7 +1224,7 @@ private Mono<Response<IpAddressAvailabilityResultInner>> checkIpAddressAvailabil
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.checkIpAddressAvailability(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -1316,7 +1316,7 @@ private Mono<PagedResponse<VirtualNetworkUsageInner>> listUsageSinglePageAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listUsage(this.client.getEndpoint(), resourceGroupName, virtualNetworkName,
@@ -1357,7 +1357,7 @@ private Mono<PagedResponse<VirtualNetworkUsageInner>> listUsageSinglePageAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1467,7 +1467,7 @@ private Mono<PagedResponse<PublicIpDdosProtectionStatusResultInner>> listDdosPro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> {
             Mono<Response<Flux<ByteBuffer>>> mono = service
@@ -1521,7 +1521,7 @@ private Mono<PagedResponse<PublicIpDdosProtectionStatusResultInner>> listDdosPro
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         Mono<Response<Flux<ByteBuffer>>> mono = service
@@ -1651,8 +1651,8 @@ public PagedIterable<PublicIpDdosProtectionStatusResultInner> listDdosProtection
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListVirtualNetworks API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all virtual networks in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -1679,8 +1679,8 @@ private Mono<PagedResponse<VirtualNetworkInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListVirtualNetworks API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all virtual networks in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkInner>> listAllNextSinglePageAsync(String nextLink, Context context) {
@@ -1705,8 +1705,8 @@ private Mono<PagedResponse<VirtualNetworkInner>> listAllNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListVirtualNetworks API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all virtual networks in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkInner>> listNextSinglePageAsync(String nextLink) {
@@ -1732,8 +1732,8 @@ private Mono<PagedResponse<VirtualNetworkInner>> listNextSinglePageAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for the ListVirtualNetworks API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all virtual networks in a resource group along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualNetworkInner>> listNextSinglePageAsync(String nextLink, Context context) {
@@ -1813,8 +1813,8 @@ private Mono<PagedResponse<VirtualNetworkUsageInner>> listUsageNextSinglePageAsy
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for GetVirtualNetworkDdosProtectionStatusOperation along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return the Ddos Protection Status of all IP Addresses under the Virtual Network along with {@link PagedResponse}
+     * on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpDdosProtectionStatusResultInner>>
@@ -1844,8 +1844,8 @@ private Mono<PagedResponse<VirtualNetworkUsageInner>> listUsageNextSinglePageAsy
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for GetVirtualNetworkDdosProtectionStatusOperation along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return the Ddos Protection Status of all IP Addresses under the Virtual Network along with {@link PagedResponse}
+     * on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<PublicIpDdosProtectionStatusResultInner>>
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRouterPeeringsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRouterPeeringsClientImpl.java
index a6c33cbf8599..b240f2daee86 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRouterPeeringsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRouterPeeringsClientImpl.java
@@ -68,7 +68,7 @@ public final class VirtualRouterPeeringsClientImpl implements VirtualRouterPeeri
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualRouterPeerings")
     public interface VirtualRouterPeeringsService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}/peerings/{peeringName}")
@@ -152,7 +152,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, virtualRouterName,
@@ -194,7 +194,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualRouterName, peeringName, apiVersion,
@@ -379,7 +379,7 @@ public Mono<Response<VirtualRouterPeeringInner>> getWithResponseAsync(String res
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), resourceGroupName, virtualRouterName,
@@ -422,7 +422,7 @@ private Mono<Response<VirtualRouterPeeringInner>> getWithResponseAsync(String re
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), resourceGroupName, virtualRouterName, peeringName, apiVersion,
@@ -520,7 +520,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -569,7 +569,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualRouterName, peeringName,
@@ -768,7 +768,7 @@ private Mono<PagedResponse<VirtualRouterPeeringInner>> listSinglePageAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), resourceGroupName, virtualRouterName,
@@ -809,7 +809,7 @@ private Mono<PagedResponse<VirtualRouterPeeringInner>> listSinglePageAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRoutersClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRoutersClientImpl.java
index 4db04168f696..b20ee0fa6f2a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRoutersClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualRoutersClientImpl.java
@@ -72,7 +72,7 @@ public final class VirtualRoutersClientImpl implements InnerSupportsGet<VirtualR
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualRouters")
     public interface VirtualRoutersService {
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualRouters/{virtualRouterName}")
@@ -165,7 +165,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, virtualRouterName,
@@ -203,7 +203,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, virtualRouterName, apiVersion,
@@ -371,7 +371,7 @@ public Mono<Response<VirtualRouterInner>> getByResourceGroupWithResponseAsync(St
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -410,7 +410,7 @@ private Mono<Response<VirtualRouterInner>> getByResourceGroupWithResponseAsync(S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, virtualRouterName, apiVersion,
@@ -503,7 +503,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName,
@@ -547,7 +547,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, virtualRouterName, apiVersion,
@@ -727,7 +727,7 @@ private Mono<PagedResponse<VirtualRouterInner>> listByResourceGroupSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -763,7 +763,7 @@ private Mono<PagedResponse<VirtualRouterInner>> listByResourceGroupSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -851,7 +851,7 @@ private Mono<PagedResponse<VirtualRouterInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -881,7 +881,7 @@ private Mono<PagedResponse<VirtualRouterInner>> listSinglePageAsync(Context cont
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -1005,8 +1005,8 @@ private Mono<PagedResponse<VirtualRouterInner>> listByResourceGroupNextSinglePag
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListVirtualRouters API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Virtual Routers in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualRouterInner>> listNextSinglePageAsync(String nextLink) {
@@ -1032,8 +1032,8 @@ private Mono<PagedResponse<VirtualRouterInner>> listNextSinglePageAsync(String n
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ErrorException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListVirtualRouters API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Virtual Routers in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<VirtualRouterInner>> listNextSinglePageAsync(String nextLink, Context context) {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualWansClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualWansClientImpl.java
index 8679f4be65d0..5cbcbde397aa 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualWansClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VirtualWansClientImpl.java
@@ -74,7 +74,7 @@ public final class VirtualWansClientImpl implements InnerSupportsGet<VirtualWanI
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVirtualWans")
     public interface VirtualWansService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{VirtualWANName}")
@@ -178,7 +178,7 @@ public Mono<Response<VirtualWanInner>> getByResourceGroupWithResponseAsync(Strin
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -215,7 +215,7 @@ private Mono<Response<VirtualWanInner>> getByResourceGroupWithResponseAsync(Stri
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, virtualWanName, apiVersion,
@@ -304,7 +304,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             wanParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -347,7 +347,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             wanParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -537,7 +537,7 @@ public Mono<Response<VirtualWanInner>> updateTagsWithResponseAsync(String resour
         } else {
             wanParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -580,7 +580,7 @@ private Mono<Response<VirtualWanInner>> updateTagsWithResponseAsync(String resou
         } else {
             wanParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -666,7 +666,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (virtualWanName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualWanName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -703,7 +703,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (virtualWanName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualWanName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -865,7 +865,7 @@ private Mono<PagedResponse<VirtualWanInner>> listByResourceGroupSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -901,7 +901,7 @@ private Mono<PagedResponse<VirtualWanInner>> listByResourceGroupSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -989,7 +989,7 @@ private Mono<PagedResponse<VirtualWanInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1019,7 +1019,7 @@ private Mono<PagedResponse<VirtualWanInner>> listSinglePageAsync(Context context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnConnectionsClientImpl.java
index 24f9acb0d084..b8a8f6a51c8f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnConnectionsClientImpl.java
@@ -71,7 +71,7 @@ public final class VpnConnectionsClientImpl implements VpnConnectionsClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnConnections")
     public interface VpnConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}")
@@ -176,7 +176,7 @@ public Mono<Response<VpnConnectionInner>> getWithResponseAsync(String resourceGr
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -217,7 +217,7 @@ private Mono<Response<VpnConnectionInner>> getWithResponseAsync(String resourceG
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, gatewayName,
@@ -314,7 +314,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             vpnConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -362,7 +362,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             vpnConnectionParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -564,7 +564,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -605,7 +605,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -793,7 +793,7 @@ public Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -842,7 +842,7 @@ private Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Str
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.startPacketCapture(this.client.getEndpoint(), resourceGroupName, gatewayName, vpnConnectionName,
@@ -1092,7 +1092,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Strin
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName, gatewayName,
@@ -1139,7 +1139,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName, gatewayName, vpnConnectionName,
@@ -1374,7 +1374,7 @@ private Mono<PagedResponse<VpnConnectionInner>> listByVpnGatewaySinglePageAsync(
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByVpnGateway(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1414,7 +1414,7 @@ private Mono<PagedResponse<VpnConnectionInner>> listByVpnGatewaySinglePageAsync(
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnGatewaysClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnGatewaysClientImpl.java
index c639d217005b..51dea72628fd 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnGatewaysClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnGatewaysClientImpl.java
@@ -77,7 +77,7 @@ public final class VpnGatewaysClientImpl implements InnerSupportsGet<VpnGatewayI
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnGateways")
     public interface VpnGatewaysService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}")
@@ -209,7 +209,7 @@ public Mono<Response<VpnGatewayInner>> getByResourceGroupWithResponseAsync(Strin
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(),
@@ -246,7 +246,7 @@ private Mono<Response<VpnGatewayInner>> getByResourceGroupWithResponseAsync(Stri
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -336,7 +336,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             vpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -380,7 +380,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             vpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -572,7 +572,7 @@ public Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String resou
         } else {
             vpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -616,7 +616,7 @@ private Mono<Response<Flux<ByteBuffer>>> updateTagsWithResponseAsync(String reso
         } else {
             vpnGatewayParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -798,7 +798,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -835,7 +835,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (gatewayName == null) {
             return Mono.error(new IllegalArgumentException("Parameter gatewayName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1001,7 +1001,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetWithResponseAsync(String resourceGr
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.reset(this.client.getEndpoint(), resourceGroupName, gatewayName,
@@ -1039,7 +1039,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.reset(this.client.getEndpoint(), resourceGroupName, gatewayName, ipConfigurationId, apiVersion,
@@ -1262,7 +1262,7 @@ public Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.startPacketCapture(this.client.getEndpoint(), resourceGroupName,
@@ -1303,7 +1303,7 @@ private Mono<Response<Flux<ByteBuffer>>> startPacketCaptureWithResponseAsync(Str
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.startPacketCapture(this.client.getEndpoint(), resourceGroupName, gatewayName, apiVersion,
@@ -1527,7 +1527,7 @@ public Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Strin
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName, gatewayName,
@@ -1568,7 +1568,7 @@ private Mono<Response<Flux<ByteBuffer>>> stopPacketCaptureWithResponseAsync(Stri
         if (parameters != null) {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.stopPacketCapture(this.client.getEndpoint(), resourceGroupName, gatewayName, apiVersion,
@@ -1783,7 +1783,7 @@ private Mono<PagedResponse<VpnGatewayInner>> listByResourceGroupSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -1819,7 +1819,7 @@ private Mono<PagedResponse<VpnGatewayInner>> listByResourceGroupSinglePageAsync(
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1907,7 +1907,7 @@ private Mono<PagedResponse<VpnGatewayInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1937,7 +1937,7 @@ private Mono<PagedResponse<VpnGatewayInner>> listSinglePageAsync(Context context
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnLinkConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnLinkConnectionsClientImpl.java
index 86156778ecfc..1001bc7a4a1a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnLinkConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnLinkConnectionsClientImpl.java
@@ -70,7 +70,7 @@ public final class VpnLinkConnectionsClientImpl implements VpnLinkConnectionsCli
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnLinkConnections")
     public interface VpnLinkConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}/resetconnection")
@@ -203,7 +203,7 @@ public Mono<Response<Flux<ByteBuffer>>> resetConnectionWithResponseAsync(String
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.resetConnection(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -249,7 +249,7 @@ private Mono<Response<Flux<ByteBuffer>>> resetConnectionWithResponseAsync(String
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.resetConnection(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -453,7 +453,7 @@ private Mono<PagedResponse<ConnectionSharedKeyResultInner>> getAllSharedKeysSing
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getAllSharedKeys(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -503,7 +503,7 @@ private Mono<PagedResponse<ConnectionSharedKeyResultInner>> getAllSharedKeysSing
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -630,7 +630,7 @@ public Mono<Response<ConnectionSharedKeyResultInner>> getDefaultSharedKeyWithRes
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -679,7 +679,7 @@ private Mono<Response<ConnectionSharedKeyResultInner>> getDefaultSharedKeyWithRe
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getDefaultSharedKey(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -791,7 +791,7 @@ public Mono<Response<Flux<ByteBuffer>>> setOrInitDefaultSharedKeyWithResponseAsy
         } else {
             connectionSharedKeyParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.setOrInitDefaultSharedKey(this.client.getEndpoint(),
@@ -848,7 +848,7 @@ private Mono<Response<Flux<ByteBuffer>>> setOrInitDefaultSharedKeyWithResponseAs
         } else {
             connectionSharedKeyParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.setOrInitDefaultSharedKey(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1093,7 +1093,7 @@ public Mono<Response<ConnectionSharedKeyResultInner>> listDefaultSharedKeyWithRe
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1142,7 +1142,7 @@ private Mono<Response<ConnectionSharedKeyResultInner>> listDefaultSharedKeyWithR
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.listDefaultSharedKey(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1244,7 +1244,7 @@ public Mono<Response<Flux<ByteBuffer>>> getIkeSasWithResponseAsync(String resour
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getIkeSas(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -1290,7 +1290,7 @@ private Mono<Response<Flux<ByteBuffer>>> getIkeSasWithResponseAsync(String resou
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getIkeSas(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -1489,7 +1489,7 @@ private Mono<PagedResponse<VpnSiteLinkConnectionInner>> listByVpnConnectionSingl
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -1534,7 +1534,7 @@ private Mono<PagedResponse<VpnSiteLinkConnectionInner>> listByVpnConnectionSingl
         if (connectionName == null) {
             return Mono.error(new IllegalArgumentException("Parameter connectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsAssociatedWithVirtualWansClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsAssociatedWithVirtualWansClientImpl.java
index b6291086f943..4850bbf02683 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsAssociatedWithVirtualWansClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsAssociatedWithVirtualWansClientImpl.java
@@ -63,7 +63,7 @@ public final class VpnServerConfigurationsAssociatedWithVirtualWansClientImpl
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnServerConfigurationsAssociatedWithVirtualWans")
     public interface VpnServerConfigurationsAssociatedWithVirtualWansService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/vpnServerConfigurations")
@@ -104,7 +104,7 @@ public Mono<Response<Flux<ByteBuffer>>> listWithResponseAsync(String resourceGro
         if (virtualWanName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualWanName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -142,7 +142,7 @@ private Mono<Response<Flux<ByteBuffer>>> listWithResponseAsync(String resourceGr
         if (virtualWanName == null) {
             return Mono.error(new IllegalArgumentException("Parameter virtualWanName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsClientImpl.java
index 692b814bccf6..02583617c17a 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnServerConfigurationsClientImpl.java
@@ -14,6 +14,7 @@
 import com.azure.core.annotation.HostParam;
 import com.azure.core.annotation.Patch;
 import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Post;
 import com.azure.core.annotation.Put;
 import com.azure.core.annotation.QueryParam;
 import com.azure.core.annotation.ReturnType;
@@ -33,6 +34,7 @@
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.network.fluent.VpnServerConfigurationsClient;
+import com.azure.resourcemanager.network.fluent.models.RadiusAuthServerListResultInner;
 import com.azure.resourcemanager.network.fluent.models.VpnServerConfigurationInner;
 import com.azure.resourcemanager.network.models.ListVpnServerConfigurationsResult;
 import com.azure.resourcemanager.network.models.TagsObject;
@@ -74,7 +76,7 @@ public final class VpnServerConfigurationsClientImpl implements InnerSupportsGet
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnServerConfigurations")
     public interface VpnServerConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}")
@@ -137,6 +139,16 @@ Mono<Response<ListVpnServerConfigurationsResult>> list(@HostParam("$host") Strin
             @PathParam("subscriptionId") String subscriptionId, @QueryParam("api-version") String apiVersion,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnServerConfigurations/{vpnServerConfigurationName}/listRadiusSecrets")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecrets(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("vpnServerConfigurationName") String vpnServerConfigurationName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -183,7 +195,7 @@ public Mono<Response<VpnServerConfigurationInner>> getByResourceGroupWithRespons
             return Mono.error(
                 new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(
@@ -222,7 +234,7 @@ private Mono<Response<VpnServerConfigurationInner>> getByResourceGroupWithRespon
             return Mono.error(
                 new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -314,7 +326,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             vpnServerConfigurationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -361,7 +373,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             vpnServerConfigurationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -568,7 +580,7 @@ public Mono<Response<VpnServerConfigurationInner>> updateTagsWithResponseAsync(S
         } else {
             vpnServerConfigurationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -614,7 +626,7 @@ private Mono<Response<VpnServerConfigurationInner>> updateTagsWithResponseAsync(
         } else {
             vpnServerConfigurationParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -705,7 +717,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(
                 new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -743,7 +755,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(
                 new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -908,7 +920,7 @@ public void delete(String resourceGroupName, String vpnServerConfigurationName,
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -944,7 +956,7 @@ public void delete(String resourceGroupName, String vpnServerConfigurationName,
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -1034,7 +1046,7 @@ private Mono<PagedResponse<VpnServerConfigurationInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1064,7 +1076,7 @@ private Mono<PagedResponse<VpnServerConfigurationInner>> listSinglePageAsync(Con
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -1127,6 +1139,132 @@ public PagedIterable<VpnServerConfigurationInner> list(Context context) {
         return new PagedIterable<>(listAsync(context));
     }
 
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecretsWithResponseAsync(String resourceGroupName,
+        String vpnServerConfigurationName) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (vpnServerConfigurationName == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listRadiusSecrets(this.client.getEndpoint(), resourceGroupName,
+                vpnServerConfigurationName, apiVersion, this.client.getSubscriptionId(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response} on successful
+     * completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<RadiusAuthServerListResultInner>> listRadiusSecretsWithResponseAsync(String resourceGroupName,
+        String vpnServerConfigurationName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            return Mono
+                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (vpnServerConfigurationName == null) {
+            return Mono.error(
+                new IllegalArgumentException("Parameter vpnServerConfigurationName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            return Mono.error(new IllegalArgumentException(
+                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String apiVersion = "2024-10-01";
+        final String accept = "application/json";
+        context = this.client.mergeContext(context);
+        return service.listRadiusSecrets(this.client.getEndpoint(), resourceGroupName, vpnServerConfigurationName,
+            apiVersion, this.client.getSubscriptionId(), accept, context);
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Mono<RadiusAuthServerListResultInner> listRadiusSecretsAsync(String resourceGroupName,
+        String vpnServerConfigurationName) {
+        return listRadiusSecretsWithResponseAsync(resourceGroupName, vpnServerConfigurationName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<RadiusAuthServerListResultInner> listRadiusSecretsWithResponse(String resourceGroupName,
+        String vpnServerConfigurationName, Context context) {
+        return listRadiusSecretsWithResponseAsync(resourceGroupName, vpnServerConfigurationName, context).block();
+    }
+
+    /**
+     * List all Radius servers with respective radius secrets from VpnServerConfiguration.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param vpnServerConfigurationName The name of the VpnServerConfiguration.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return list of Radius servers with respective radius secrets.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public RadiusAuthServerListResultInner listRadiusSecrets(String resourceGroupName,
+        String vpnServerConfigurationName) {
+        return listRadiusSecretsWithResponse(resourceGroupName, vpnServerConfigurationName, Context.NONE).getValue();
+    }
+
     /**
      * Get the next page of items.
      * 
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinkConnectionsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinkConnectionsClientImpl.java
index 5e10ada874ce..63c4fbf31c83 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinkConnectionsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinkConnectionsClientImpl.java
@@ -55,7 +55,7 @@ public final class VpnSiteLinkConnectionsClientImpl implements VpnSiteLinkConnec
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnSiteLinkConnections")
     public interface VpnSiteLinkConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/vpnConnections/{connectionName}/vpnLinkConnections/{linkConnectionName}")
@@ -106,7 +106,7 @@ public Mono<Response<VpnSiteLinkConnectionInner>> getWithResponseAsync(String re
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -152,7 +152,7 @@ private Mono<Response<VpnSiteLinkConnectionInner>> getWithResponseAsync(String r
             return Mono
                 .error(new IllegalArgumentException("Parameter linkConnectionName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, gatewayName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinksClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinksClientImpl.java
index f08f01a9aa24..6c1a29ab1a84 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinksClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSiteLinksClientImpl.java
@@ -60,7 +60,7 @@ public final class VpnSiteLinksClientImpl implements VpnSiteLinksClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnSiteLinks")
     public interface VpnSiteLinksService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}/vpnSiteLinks/{vpnSiteLinkName}")
@@ -123,7 +123,7 @@ public Mono<Response<VpnSiteLinkInner>> getWithResponseAsync(String resourceGrou
             return Mono
                 .error(new IllegalArgumentException("Parameter vpnSiteLinkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -165,7 +165,7 @@ private Mono<Response<VpnSiteLinkInner>> getWithResponseAsync(String resourceGro
             return Mono
                 .error(new IllegalArgumentException("Parameter vpnSiteLinkName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, vpnSiteName,
@@ -252,7 +252,7 @@ private Mono<PagedResponse<VpnSiteLinkInner>> listByVpnSiteSinglePageAsync(Strin
         if (vpnSiteName == null) {
             return Mono.error(new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByVpnSite(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -292,7 +292,7 @@ private Mono<PagedResponse<VpnSiteLinkInner>> listByVpnSiteSinglePageAsync(Strin
         if (vpnSiteName == null) {
             return Mono.error(new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesClientImpl.java
index 0eca3cf769f6..203c592f592d 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesClientImpl.java
@@ -73,7 +73,7 @@ public final class VpnSitesClientImpl implements InnerSupportsGet<VpnSiteInner>,
      * perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnSites")
     public interface VpnSitesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnSites/{vpnSiteName}")
@@ -174,7 +174,7 @@ public Mono<Response<VpnSiteInner>> getByResourceGroupWithResponseAsync(String r
         if (vpnSiteName == null) {
             return Mono.error(new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(),
@@ -211,7 +211,7 @@ private Mono<Response<VpnSiteInner>> getByResourceGroupWithResponseAsync(String
         if (vpnSiteName == null) {
             return Mono.error(new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -301,7 +301,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             vpnSiteParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -345,7 +345,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             vpnSiteParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -536,7 +536,7 @@ public Mono<Response<VpnSiteInner>> updateTagsWithResponseAsync(String resourceG
         } else {
             vpnSiteParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -580,7 +580,7 @@ private Mono<Response<VpnSiteInner>> updateTagsWithResponseAsync(String resource
         } else {
             vpnSiteParameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.updateTags(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -666,7 +666,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (vpnSiteName == null) {
             return Mono.error(new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -703,7 +703,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (vpnSiteName == null) {
             return Mono.error(new IllegalArgumentException("Parameter vpnSiteName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
@@ -864,7 +864,7 @@ private Mono<PagedResponse<VpnSiteInner>> listByResourceGroupSinglePageAsync(Str
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(),
@@ -900,7 +900,7 @@ private Mono<PagedResponse<VpnSiteInner>> listByResourceGroupSinglePageAsync(Str
             return Mono
                 .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -988,7 +988,7 @@ private Mono<PagedResponse<VpnSiteInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -1018,7 +1018,7 @@ private Mono<PagedResponse<VpnSiteInner>> listSinglePageAsync(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesConfigurationsClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesConfigurationsClientImpl.java
index a2ebd0921601..6c2fb39b4918 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesConfigurationsClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/VpnSitesConfigurationsClientImpl.java
@@ -61,7 +61,7 @@ public final class VpnSitesConfigurationsClientImpl implements VpnSitesConfigura
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientVpnSitesConfigurations")
     public interface VpnSitesConfigurationsService {
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualWans/{virtualWANName}/vpnConfiguration")
@@ -109,7 +109,7 @@ public Mono<Response<Flux<ByteBuffer>>> downloadWithResponseAsync(String resourc
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.download(this.client.getEndpoint(), this.client.getSubscriptionId(),
@@ -152,7 +152,7 @@ private Mono<Response<Flux<ByteBuffer>>> downloadWithResponseAsync(String resour
         } else {
             request.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.download(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebApplicationFirewallPoliciesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebApplicationFirewallPoliciesClientImpl.java
index 1862d8eaa77e..d0e66a0e164b 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebApplicationFirewallPoliciesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebApplicationFirewallPoliciesClientImpl.java
@@ -73,7 +73,7 @@ public final class WebApplicationFirewallPoliciesClientImpl implements
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientWebApplicationFirewallPolicies")
     public interface WebApplicationFirewallPoliciesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies")
@@ -162,7 +162,7 @@ Mono<Response<WebApplicationFirewallPolicyListResult>> listAllNext(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), resourceGroupName,
@@ -198,7 +198,7 @@ Mono<Response<WebApplicationFirewallPolicyListResult>> listAllNext(
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -292,7 +292,7 @@ private Mono<PagedResponse<WebApplicationFirewallPolicyInner>> listSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion,
@@ -322,7 +322,7 @@ private Mono<PagedResponse<WebApplicationFirewallPolicyInner>> listSinglePageAsy
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), this.client.getSubscriptionId(), apiVersion, accept, context)
@@ -412,7 +412,7 @@ public PagedIterable<WebApplicationFirewallPolicyInner> list(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, policyName,
@@ -450,7 +450,7 @@ public PagedIterable<WebApplicationFirewallPolicyInner> list(Context context) {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, policyName,
@@ -541,7 +541,7 @@ public Mono<Response<WebApplicationFirewallPolicyInner>> createOrUpdateWithRespo
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, policyName,
@@ -585,7 +585,7 @@ private Mono<Response<WebApplicationFirewallPolicyInner>> createOrUpdateWithResp
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), resourceGroupName, policyName,
@@ -672,7 +672,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), resourceGroupName, policyName,
@@ -709,7 +709,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), resourceGroupName, policyName, this.client.getSubscriptionId(),
@@ -907,8 +907,8 @@ private Mono<PagedResponse<WebApplicationFirewallPolicyInner>> listNextSinglePag
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list WebApplicationFirewallPolicies along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return all the WAF policies in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<WebApplicationFirewallPolicyInner>> listAllNextSinglePageAsync(String nextLink) {
@@ -935,8 +935,8 @@ private Mono<PagedResponse<WebApplicationFirewallPolicyInner>> listAllNextSingle
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return result of the request to list WebApplicationFirewallPolicies along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return all the WAF policies in a subscription along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<WebApplicationFirewallPolicyInner>> listAllNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebCategoriesClientImpl.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebCategoriesClientImpl.java
index 90e081645acf..eb8688e174c0 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebCategoriesClientImpl.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/WebCategoriesClientImpl.java
@@ -60,7 +60,7 @@ public final class WebCategoriesClientImpl implements WebCategoriesClient {
      * to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "NetworkManagementCli")
+    @ServiceInterface(name = "NetworkManagementClientWebCategories")
     public interface WebCategoriesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Network/azureWebCategories/{name}")
@@ -110,7 +110,7 @@ public Mono<Response<AzureWebCategoryInner>> getWithResponseAsync(String name, S
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), name, apiVersion,
@@ -142,7 +142,7 @@ private Mono<Response<AzureWebCategoryInner>> getWithResponseAsync(String name,
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), name, apiVersion, this.client.getSubscriptionId(), expand, accept,
@@ -213,7 +213,7 @@ private Mono<PagedResponse<AzureWebCategoryInner>> listSinglePageAsync() {
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -243,7 +243,7 @@ private Mono<PagedResponse<AzureWebCategoryInner>> listSinglePageAsync(Context c
             return Mono.error(new IllegalArgumentException(
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
-        final String apiVersion = "2024-07-01";
+        final String apiVersion = "2024-10-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), accept, context)
@@ -312,8 +312,8 @@ public PagedIterable<AzureWebCategoryInner> list(Context context) {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAzureWebCategories API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Azure Web Categories in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AzureWebCategoryInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
@@ -341,8 +341,8 @@ private Mono<PagedResponse<AzureWebCategoryInner>> listBySubscriptionNextSingleP
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return response for ListAzureWebCategories API service call along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all the Azure Web Categories in a subscription along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AzureWebCategoryInner>> listBySubscriptionNextSinglePageAsync(String nextLink,
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/ApplicationGatewayBackendHttpSettings.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/ApplicationGatewayBackendHttpSettings.java
index d02240edeeda..356ee828231f 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/ApplicationGatewayBackendHttpSettings.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/ApplicationGatewayBackendHttpSettings.java
@@ -412,6 +412,106 @@ public ApplicationGatewayBackendHttpSettings withPath(String path) {
         return this;
     }
 
+    /**
+     * Get the dedicatedBackendConnection property: Enable or disable dedicated connection per backend server. Default
+     * is set to false.
+     * 
+     * @return the dedicatedBackendConnection value.
+     */
+    public Boolean dedicatedBackendConnection() {
+        return this.innerProperties() == null ? null : this.innerProperties().dedicatedBackendConnection();
+    }
+
+    /**
+     * Set the dedicatedBackendConnection property: Enable or disable dedicated connection per backend server. Default
+     * is set to false.
+     * 
+     * @param dedicatedBackendConnection the dedicatedBackendConnection value to set.
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withDedicatedBackendConnection(Boolean dedicatedBackendConnection) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ApplicationGatewayBackendHttpSettingsPropertiesFormat();
+        }
+        this.innerProperties().withDedicatedBackendConnection(dedicatedBackendConnection);
+        return this;
+    }
+
+    /**
+     * Get the validateCertChainAndExpiry property: Verify or skip both chain and expiry validations of the certificate
+     * on the backend server. Default is set to true.
+     * 
+     * @return the validateCertChainAndExpiry value.
+     */
+    public Boolean validateCertChainAndExpiry() {
+        return this.innerProperties() == null ? null : this.innerProperties().validateCertChainAndExpiry();
+    }
+
+    /**
+     * Set the validateCertChainAndExpiry property: Verify or skip both chain and expiry validations of the certificate
+     * on the backend server. Default is set to true.
+     * 
+     * @param validateCertChainAndExpiry the validateCertChainAndExpiry value to set.
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withValidateCertChainAndExpiry(Boolean validateCertChainAndExpiry) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ApplicationGatewayBackendHttpSettingsPropertiesFormat();
+        }
+        this.innerProperties().withValidateCertChainAndExpiry(validateCertChainAndExpiry);
+        return this;
+    }
+
+    /**
+     * Get the validateSni property: When enabled, verifies if the Common Name of the certificate provided by the
+     * backend server matches the Server Name Indication (SNI) value. Default value is true.
+     * 
+     * @return the validateSni value.
+     */
+    public Boolean validateSni() {
+        return this.innerProperties() == null ? null : this.innerProperties().validateSni();
+    }
+
+    /**
+     * Set the validateSni property: When enabled, verifies if the Common Name of the certificate provided by the
+     * backend server matches the Server Name Indication (SNI) value. Default value is true.
+     * 
+     * @param validateSni the validateSni value to set.
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withValidateSni(Boolean validateSni) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ApplicationGatewayBackendHttpSettingsPropertiesFormat();
+        }
+        this.innerProperties().withValidateSni(validateSni);
+        return this;
+    }
+
+    /**
+     * Get the sniName property: Specify an SNI value to match the common name of the certificate on the backend. By
+     * default, the application gateway uses the incoming request’s host header as the SNI. Default value is null.
+     * 
+     * @return the sniName value.
+     */
+    public String sniName() {
+        return this.innerProperties() == null ? null : this.innerProperties().sniName();
+    }
+
+    /**
+     * Set the sniName property: Specify an SNI value to match the common name of the certificate on the backend. By
+     * default, the application gateway uses the incoming request’s host header as the SNI. Default value is null.
+     * 
+     * @param sniName the sniName value to set.
+     * @return the ApplicationGatewayBackendHttpSettings object itself.
+     */
+    public ApplicationGatewayBackendHttpSettings withSniName(String sniName) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ApplicationGatewayBackendHttpSettingsPropertiesFormat();
+        }
+        this.innerProperties().withSniName(sniName);
+        return this;
+    }
+
     /**
      * Get the provisioningState property: The provisioning state of the backend HTTP settings resource.
      * 
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/AzureFirewallPacketCaptureOperationType.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/AzureFirewallPacketCaptureOperationType.java
new file mode 100644
index 000000000000..45cb2c0a1c09
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/AzureFirewallPacketCaptureOperationType.java
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The packet capture operation to perform. If the Start operation is selected, please provide all the fields in the
+ * firewallPacketCaptureParameters to successfully initiate the packet capture. If the Status or Stop operation is
+ * selected, only the operation field is required; all other fields in the firewallPacketCaptureParameters can be
+ * omitted to successfully retrieve the capture status or stop the capture.
+ */
+public final class AzureFirewallPacketCaptureOperationType
+    extends ExpandableStringEnum<AzureFirewallPacketCaptureOperationType> {
+    /**
+     * Static value Start for AzureFirewallPacketCaptureOperationType.
+     */
+    public static final AzureFirewallPacketCaptureOperationType START = fromString("Start");
+
+    /**
+     * Static value Status for AzureFirewallPacketCaptureOperationType.
+     */
+    public static final AzureFirewallPacketCaptureOperationType STATUS = fromString("Status");
+
+    /**
+     * Static value Stop for AzureFirewallPacketCaptureOperationType.
+     */
+    public static final AzureFirewallPacketCaptureOperationType STOP = fromString("Stop");
+
+    /**
+     * Creates a new instance of AzureFirewallPacketCaptureOperationType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AzureFirewallPacketCaptureOperationType() {
+    }
+
+    /**
+     * Creates or finds a AzureFirewallPacketCaptureOperationType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AzureFirewallPacketCaptureOperationType.
+     */
+    public static AzureFirewallPacketCaptureOperationType fromString(String name) {
+        return fromString(name, AzureFirewallPacketCaptureOperationType.class);
+    }
+
+    /**
+     * Gets known AzureFirewallPacketCaptureOperationType values.
+     * 
+     * @return known AzureFirewallPacketCaptureOperationType values.
+     */
+    public static Collection<AzureFirewallPacketCaptureOperationType> values() {
+        return values(AzureFirewallPacketCaptureOperationType.class);
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/AzureFirewallPacketCaptureResponseCode.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/AzureFirewallPacketCaptureResponseCode.java
new file mode 100644
index 000000000000..267a95ff6508
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/AzureFirewallPacketCaptureResponseCode.java
@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The packet capture operation response codes.
+ */
+public final class AzureFirewallPacketCaptureResponseCode
+    extends ExpandableStringEnum<AzureFirewallPacketCaptureResponseCode> {
+    /**
+     * Static value NotImplemented for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode NOT_IMPLEMENTED = fromString("NotImplemented");
+
+    /**
+     * Static value AzureFirewallPacketCaptureStartSucceeded for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_START_SUCCEEDED
+        = fromString("AzureFirewallPacketCaptureStartSucceeded");
+
+    /**
+     * Static value AzureFirewallPacketCaptureStartFailed for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_START_FAILED
+        = fromString("AzureFirewallPacketCaptureStartFailed");
+
+    /**
+     * Static value AzureFirewallPacketCaptureStartFailedToUpload for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_START_FAILED_TO_UPLOAD
+        = fromString("AzureFirewallPacketCaptureStartFailedToUpload");
+
+    /**
+     * Static value AzureFirewallPacketCaptureStartFailure for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_START_FAILURE
+        = fromString("AzureFirewallPacketCaptureStartFailure");
+
+    /**
+     * Static value AzureFirewallPacketCaptureInProgress for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_IN_PROGRESS
+        = fromString("AzureFirewallPacketCaptureInProgress");
+
+    /**
+     * Static value AzureFirewallPacketCaptureNotInProgress for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_NOT_IN_PROGRESS
+        = fromString("AzureFirewallPacketCaptureNotInProgress");
+
+    /**
+     * Static value AzureFirewallPacketCaptureStopSucceeded for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_STOP_SUCCEEDED
+        = fromString("AzureFirewallPacketCaptureStopSucceeded");
+
+    /**
+     * Static value AzureFirewallPacketCaptureFailed for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_FAILED
+        = fromString("AzureFirewallPacketCaptureFailed");
+
+    /**
+     * Static value AzureFirewallPacketCaptureCompleted for AzureFirewallPacketCaptureResponseCode.
+     */
+    public static final AzureFirewallPacketCaptureResponseCode AZURE_FIREWALL_PACKET_CAPTURE_COMPLETED
+        = fromString("AzureFirewallPacketCaptureCompleted");
+
+    /**
+     * Creates a new instance of AzureFirewallPacketCaptureResponseCode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AzureFirewallPacketCaptureResponseCode() {
+    }
+
+    /**
+     * Creates or finds a AzureFirewallPacketCaptureResponseCode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AzureFirewallPacketCaptureResponseCode.
+     */
+    public static AzureFirewallPacketCaptureResponseCode fromString(String name) {
+        return fromString(name, AzureFirewallPacketCaptureResponseCode.class);
+    }
+
+    /**
+     * Gets known AzureFirewallPacketCaptureResponseCode values.
+     * 
+     * @return known AzureFirewallPacketCaptureResponseCode values.
+     */
+    public static Collection<AzureFirewallPacketCaptureResponseCode> values() {
+        return values(AzureFirewallPacketCaptureResponseCode.class);
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/FirewallPacketCaptureParameters.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/FirewallPacketCaptureParameters.java
index 652125659a4f..e9ad2cae152b 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/FirewallPacketCaptureParameters.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/FirewallPacketCaptureParameters.java
@@ -18,12 +18,12 @@
 @Fluent
 public final class FirewallPacketCaptureParameters implements JsonSerializable<FirewallPacketCaptureParameters> {
     /*
-     * Duration of packet capture in seconds.
+     * Duration of packet capture in seconds. If the field is not provided, the default value is 60.
      */
     private Integer durationInSeconds;
 
     /*
-     * Number of packets to be captured.
+     * Number of packets to be captured. If the field is not provided, the default value is 1000.
      */
     private Integer numberOfPacketsToCapture;
 
@@ -52,6 +52,11 @@ public final class FirewallPacketCaptureParameters implements JsonSerializable<F
      */
     private List<AzureFirewallPacketCaptureRule> filters;
 
+    /*
+     * The Azure Firewall packet capture operation to perform
+     */
+    private AzureFirewallPacketCaptureOperationType operation;
+
     /**
      * Creates an instance of FirewallPacketCaptureParameters class.
      */
@@ -59,7 +64,8 @@ public FirewallPacketCaptureParameters() {
     }
 
     /**
-     * Get the durationInSeconds property: Duration of packet capture in seconds.
+     * Get the durationInSeconds property: Duration of packet capture in seconds. If the field is not provided, the
+     * default value is 60.
      * 
      * @return the durationInSeconds value.
      */
@@ -68,7 +74,8 @@ public Integer durationInSeconds() {
     }
 
     /**
-     * Set the durationInSeconds property: Duration of packet capture in seconds.
+     * Set the durationInSeconds property: Duration of packet capture in seconds. If the field is not provided, the
+     * default value is 60.
      * 
      * @param durationInSeconds the durationInSeconds value to set.
      * @return the FirewallPacketCaptureParameters object itself.
@@ -79,7 +86,8 @@ public FirewallPacketCaptureParameters withDurationInSeconds(Integer durationInS
     }
 
     /**
-     * Get the numberOfPacketsToCapture property: Number of packets to be captured.
+     * Get the numberOfPacketsToCapture property: Number of packets to be captured. If the field is not provided, the
+     * default value is 1000.
      * 
      * @return the numberOfPacketsToCapture value.
      */
@@ -88,7 +96,8 @@ public Integer numberOfPacketsToCapture() {
     }
 
     /**
-     * Set the numberOfPacketsToCapture property: Number of packets to be captured.
+     * Set the numberOfPacketsToCapture property: Number of packets to be captured. If the field is not provided, the
+     * default value is 1000.
      * 
      * @param numberOfPacketsToCapture the numberOfPacketsToCapture value to set.
      * @return the FirewallPacketCaptureParameters object itself.
@@ -198,6 +207,26 @@ public FirewallPacketCaptureParameters withFilters(List<AzureFirewallPacketCaptu
         return this;
     }
 
+    /**
+     * Get the operation property: The Azure Firewall packet capture operation to perform.
+     * 
+     * @return the operation value.
+     */
+    public AzureFirewallPacketCaptureOperationType operation() {
+        return this.operation;
+    }
+
+    /**
+     * Set the operation property: The Azure Firewall packet capture operation to perform.
+     * 
+     * @param operation the operation value to set.
+     * @return the FirewallPacketCaptureParameters object itself.
+     */
+    public FirewallPacketCaptureParameters withOperation(AzureFirewallPacketCaptureOperationType operation) {
+        this.operation = operation;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -225,6 +254,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("protocol", this.protocol == null ? null : this.protocol.toString());
         jsonWriter.writeArrayField("flags", this.flags, (writer, element) -> writer.writeJson(element));
         jsonWriter.writeArrayField("filters", this.filters, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("operation", this.operation == null ? null : this.operation.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -265,6 +295,9 @@ public static FirewallPacketCaptureParameters fromJson(JsonReader jsonReader) th
                     List<AzureFirewallPacketCaptureRule> filters
                         = reader.readArray(reader1 -> AzureFirewallPacketCaptureRule.fromJson(reader1));
                     deserializedFirewallPacketCaptureParameters.filters = filters;
+                } else if ("operation".equals(fieldName)) {
+                    deserializedFirewallPacketCaptureParameters.operation
+                        = AzureFirewallPacketCaptureOperationType.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NicTypeInResponse.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NicTypeInResponse.java
index 5ed004235bd9..093b78115530 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NicTypeInResponse.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NicTypeInResponse.java
@@ -8,7 +8,8 @@
 import java.util.Collection;
 
 /**
- * NIC type - PublicNic, PrivateNic, or AdditionalNic.
+ * NIC type - PublicNic, PrivateNic, or AdditionalNic; AdditionalPrivateNic and AdditionalPublicNic are only supported
+ * for NVAs deployed in VNets.
  */
 public final class NicTypeInResponse extends ExpandableStringEnum<NicTypeInResponse> {
     /**
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NspServiceTagsListResult.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NspServiceTagsListResult.java
new file mode 100644
index 000000000000..ec7f4158d97e
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NspServiceTagsListResult.java
@@ -0,0 +1,128 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.network.fluent.models.NspServiceTagsResourceInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Result of the request to list NSP service tags.
+ */
+@Fluent
+public final class NspServiceTagsListResult implements JsonSerializable<NspServiceTagsListResult> {
+    /*
+     * Gets paged list of NSP service tags.
+     */
+    private List<NspServiceTagsResourceInner> value;
+
+    /*
+     * Gets the URL to get the next page of results.
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of NspServiceTagsListResult class.
+     */
+    public NspServiceTagsListResult() {
+    }
+
+    /**
+     * Get the value property: Gets paged list of NSP service tags.
+     * 
+     * @return the value value.
+     */
+    public List<NspServiceTagsResourceInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Set the value property: Gets paged list of NSP service tags.
+     * 
+     * @param value the value value to set.
+     * @return the NspServiceTagsListResult object itself.
+     */
+    public NspServiceTagsListResult withValue(List<NspServiceTagsResourceInner> value) {
+        this.value = value;
+        return this;
+    }
+
+    /**
+     * Get the nextLink property: Gets the URL to get the next page of results.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * Set the nextLink property: Gets the URL to get the next page of results.
+     * 
+     * @param nextLink the nextLink value to set.
+     * @return the NspServiceTagsListResult object itself.
+     */
+    public NspServiceTagsListResult withNextLink(String nextLink) {
+        this.nextLink = nextLink;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (value() != null) {
+            value().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NspServiceTagsListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NspServiceTagsListResult if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NspServiceTagsListResult.
+     */
+    public static NspServiceTagsListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NspServiceTagsListResult deserializedNspServiceTagsListResult = new NspServiceTagsListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<NspServiceTagsResourceInner> value
+                        = reader.readArray(reader1 -> NspServiceTagsResourceInner.fromJson(reader1));
+                    deserializedNspServiceTagsListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedNspServiceTagsListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNspServiceTagsListResult;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaInVnetSubnetReferenceProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaInVnetSubnetReferenceProperties.java
new file mode 100644
index 000000000000..a6df6063ea0e
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaInVnetSubnetReferenceProperties.java
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Subnet references where the NVA NICS will be deployed
+ * 
+ * The resource URI of the subnets where the NVA NICS will be deployed.
+ */
+@Fluent
+public final class NvaInVnetSubnetReferenceProperties implements JsonSerializable<NvaInVnetSubnetReferenceProperties> {
+    /*
+     * Resource Uri of Subnet
+     */
+    private String id;
+
+    /**
+     * Creates an instance of NvaInVnetSubnetReferenceProperties class.
+     */
+    public NvaInVnetSubnetReferenceProperties() {
+    }
+
+    /**
+     * Get the id property: Resource Uri of Subnet.
+     * 
+     * @return the id value.
+     */
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * Set the id property: Resource Uri of Subnet.
+     * 
+     * @param id the id value to set.
+     * @return the NvaInVnetSubnetReferenceProperties object itself.
+     */
+    public NvaInVnetSubnetReferenceProperties withId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("id", this.id);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NvaInVnetSubnetReferenceProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NvaInVnetSubnetReferenceProperties if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NvaInVnetSubnetReferenceProperties.
+     */
+    public static NvaInVnetSubnetReferenceProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NvaInVnetSubnetReferenceProperties deserializedNvaInVnetSubnetReferenceProperties
+                = new NvaInVnetSubnetReferenceProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedNvaInVnetSubnetReferenceProperties.id = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNvaInVnetSubnetReferenceProperties;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaInterfaceConfigurationsProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaInterfaceConfigurationsProperties.java
new file mode 100644
index 000000000000..4776866d0b86
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaInterfaceConfigurationsProperties.java
@@ -0,0 +1,166 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Specifies input parameters required NVA in VNet interface configuration.
+ */
+@Fluent
+public final class NvaInterfaceConfigurationsProperties
+    implements JsonSerializable<NvaInterfaceConfigurationsProperties> {
+    /*
+     * A subnet resource id where the NIC will be deployed. Each subnet resource uri should be unique.
+     */
+    private NvaInVnetSubnetReferenceProperties subnet;
+
+    /*
+     * Specifies the NIC types for the NVA interface configuration. Allowed values: PrivateNic, PublicNic,
+     * AdditionalPrivateNic, AdditionalPublicNic. Only the combination of PrivateNic and PublicNic is currently
+     * supported.
+     */
+    private List<NvaNicType> type;
+
+    /*
+     * Specifies the name of the interface. Maximum length is 70 characters.
+     */
+    private String name;
+
+    /**
+     * Creates an instance of NvaInterfaceConfigurationsProperties class.
+     */
+    public NvaInterfaceConfigurationsProperties() {
+    }
+
+    /**
+     * Get the subnet property: A subnet resource id where the NIC will be deployed. Each subnet resource uri should be
+     * unique.
+     * 
+     * @return the subnet value.
+     */
+    public NvaInVnetSubnetReferenceProperties subnet() {
+        return this.subnet;
+    }
+
+    /**
+     * Set the subnet property: A subnet resource id where the NIC will be deployed. Each subnet resource uri should be
+     * unique.
+     * 
+     * @param subnet the subnet value to set.
+     * @return the NvaInterfaceConfigurationsProperties object itself.
+     */
+    public NvaInterfaceConfigurationsProperties withSubnet(NvaInVnetSubnetReferenceProperties subnet) {
+        this.subnet = subnet;
+        return this;
+    }
+
+    /**
+     * Get the type property: Specifies the NIC types for the NVA interface configuration. Allowed values: PrivateNic,
+     * PublicNic, AdditionalPrivateNic, AdditionalPublicNic. Only the combination of PrivateNic and PublicNic is
+     * currently supported.
+     * 
+     * @return the type value.
+     */
+    public List<NvaNicType> type() {
+        return this.type;
+    }
+
+    /**
+     * Set the type property: Specifies the NIC types for the NVA interface configuration. Allowed values: PrivateNic,
+     * PublicNic, AdditionalPrivateNic, AdditionalPublicNic. Only the combination of PrivateNic and PublicNic is
+     * currently supported.
+     * 
+     * @param type the type value to set.
+     * @return the NvaInterfaceConfigurationsProperties object itself.
+     */
+    public NvaInterfaceConfigurationsProperties withType(List<NvaNicType> type) {
+        this.type = type;
+        return this;
+    }
+
+    /**
+     * Get the name property: Specifies the name of the interface. Maximum length is 70 characters.
+     * 
+     * @return the name value.
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the name property: Specifies the name of the interface. Maximum length is 70 characters.
+     * 
+     * @param name the name value to set.
+     * @return the NvaInterfaceConfigurationsProperties object itself.
+     */
+    public NvaInterfaceConfigurationsProperties withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (subnet() != null) {
+            subnet().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("subnet", this.subnet);
+        jsonWriter.writeArrayField("type", this.type,
+            (writer, element) -> writer.writeString(element == null ? null : element.toString()));
+        jsonWriter.writeStringField("name", this.name);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NvaInterfaceConfigurationsProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NvaInterfaceConfigurationsProperties if the JsonReader was pointing to an instance of it,
+     * or null if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NvaInterfaceConfigurationsProperties.
+     */
+    public static NvaInterfaceConfigurationsProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NvaInterfaceConfigurationsProperties deserializedNvaInterfaceConfigurationsProperties
+                = new NvaInterfaceConfigurationsProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("subnet".equals(fieldName)) {
+                    deserializedNvaInterfaceConfigurationsProperties.subnet
+                        = NvaInVnetSubnetReferenceProperties.fromJson(reader);
+                } else if ("type".equals(fieldName)) {
+                    List<NvaNicType> type = reader.readArray(reader1 -> NvaNicType.fromString(reader1.getString()));
+                    deserializedNvaInterfaceConfigurationsProperties.type = type;
+                } else if ("name".equals(fieldName)) {
+                    deserializedNvaInterfaceConfigurationsProperties.name = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNvaInterfaceConfigurationsProperties;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaNicType.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaNicType.java
new file mode 100644
index 000000000000..c895308e489f
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/NvaNicType.java
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Defines values for NvaNicType.
+ */
+public final class NvaNicType extends ExpandableStringEnum<NvaNicType> {
+    /**
+     * Static value PrivateNic for NvaNicType.
+     */
+    public static final NvaNicType PRIVATE_NIC = fromString("PrivateNic");
+
+    /**
+     * Static value PublicNic for NvaNicType.
+     */
+    public static final NvaNicType PUBLIC_NIC = fromString("PublicNic");
+
+    /**
+     * Static value AdditionalPrivateNic for NvaNicType.
+     */
+    public static final NvaNicType ADDITIONAL_PRIVATE_NIC = fromString("AdditionalPrivateNic");
+
+    /**
+     * Static value AdditionalPublicNic for NvaNicType.
+     */
+    public static final NvaNicType ADDITIONAL_PUBLIC_NIC = fromString("AdditionalPublicNic");
+
+    /**
+     * Creates a new instance of NvaNicType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public NvaNicType() {
+    }
+
+    /**
+     * Creates or finds a NvaNicType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding NvaNicType.
+     */
+    public static NvaNicType fromString(String name) {
+        return fromString(name, NvaNicType.class);
+    }
+
+    /**
+     * Gets known NvaNicType values.
+     * 
+     * @return known NvaNicType values.
+     */
+    public static Collection<NvaNicType> values() {
+        return values(NvaNicType.class);
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PartnerManagedResourceProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PartnerManagedResourceProperties.java
index 4c3e3f9396f4..7daf98f23b48 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PartnerManagedResourceProperties.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/PartnerManagedResourceProperties.java
@@ -12,7 +12,7 @@
 import java.io.IOException;
 
 /**
- * Properties of the partner managed resource.
+ * Properties of the partner managed resource. Only appliable for SaaS NVA.
  */
 @Immutable
 public final class PartnerManagedResourceProperties implements JsonSerializable<PartnerManagedResourceProperties> {
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusAuthServer.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusAuthServer.java
new file mode 100644
index 000000000000..2b44d629b389
--- /dev/null
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusAuthServer.java
@@ -0,0 +1,121 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Gateway or VpnServerConfiguration Radius server with radius secret details.
+ */
+@Fluent
+public final class RadiusAuthServer implements JsonSerializable<RadiusAuthServer> {
+    /*
+     * Radius server IPAddress
+     */
+    private String radiusServerAddress;
+
+    /*
+     * Radius server secret
+     */
+    private String radiusServerSecret;
+
+    /**
+     * Creates an instance of RadiusAuthServer class.
+     */
+    public RadiusAuthServer() {
+    }
+
+    /**
+     * Get the radiusServerAddress property: Radius server IPAddress.
+     * 
+     * @return the radiusServerAddress value.
+     */
+    public String radiusServerAddress() {
+        return this.radiusServerAddress;
+    }
+
+    /**
+     * Set the radiusServerAddress property: Radius server IPAddress.
+     * 
+     * @param radiusServerAddress the radiusServerAddress value to set.
+     * @return the RadiusAuthServer object itself.
+     */
+    public RadiusAuthServer withRadiusServerAddress(String radiusServerAddress) {
+        this.radiusServerAddress = radiusServerAddress;
+        return this;
+    }
+
+    /**
+     * Get the radiusServerSecret property: Radius server secret.
+     * 
+     * @return the radiusServerSecret value.
+     */
+    public String radiusServerSecret() {
+        return this.radiusServerSecret;
+    }
+
+    /**
+     * Set the radiusServerSecret property: Radius server secret.
+     * 
+     * @param radiusServerSecret the radiusServerSecret value to set.
+     * @return the RadiusAuthServer object itself.
+     */
+    public RadiusAuthServer withRadiusServerSecret(String radiusServerSecret) {
+        this.radiusServerSecret = radiusServerSecret;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("radiusServerAddress", this.radiusServerAddress);
+        jsonWriter.writeStringField("radiusServerSecret", this.radiusServerSecret);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of RadiusAuthServer from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of RadiusAuthServer if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the RadiusAuthServer.
+     */
+    public static RadiusAuthServer fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            RadiusAuthServer deserializedRadiusAuthServer = new RadiusAuthServer();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("radiusServerAddress".equals(fieldName)) {
+                    deserializedRadiusAuthServer.radiusServerAddress = reader.getString();
+                } else if ("radiusServerSecret".equals(fieldName)) {
+                    deserializedRadiusAuthServer.radiusServerSecret = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedRadiusAuthServer;
+        });
+    }
+}
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusServer.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusServer.java
index 9b0499c56f38..f9d0ca02b3eb 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusServer.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/RadiusServer.java
@@ -28,7 +28,9 @@ public final class RadiusServer implements JsonSerializable<RadiusServer> {
     private Long radiusServerScore;
 
     /*
-     * The secret used for this radius server.
+     * The secret used for this radius server. We will no longer return radiusServerSecret in VirtualNetworkGateway
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VirtualNetworkGateway ListRadiusSecrets API to fetch
+     * radius server secrets.
      */
     private String radiusServerSecret;
 
@@ -79,7 +81,9 @@ public RadiusServer withRadiusServerScore(Long radiusServerScore) {
     }
 
     /**
-     * Get the radiusServerSecret property: The secret used for this radius server.
+     * Get the radiusServerSecret property: The secret used for this radius server. We will no longer return
+     * radiusServerSecret in VirtualNetworkGateway Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGateway ListRadiusSecrets API to fetch radius server secrets.
      * 
      * @return the radiusServerSecret value.
      */
@@ -88,7 +92,9 @@ public String radiusServerSecret() {
     }
 
     /**
-     * Set the radiusServerSecret property: The secret used for this radius server.
+     * Set the radiusServerSecret property: The secret used for this radius server. We will no longer return
+     * radiusServerSecret in VirtualNetworkGateway Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGateway ListRadiusSecrets API to fetch radius server secrets.
      * 
      * @param radiusServerSecret the radiusServerSecret value to set.
      * @return the RadiusServer object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/TransportProtocol.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/TransportProtocol.java
index b4852440e9c2..50c6baaf5a51 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/TransportProtocol.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/TransportProtocol.java
@@ -26,6 +26,11 @@ public final class TransportProtocol extends ExpandableStringEnum<TransportProto
      */
     public static final TransportProtocol ALL = fromString("All");
 
+    /**
+     * Static value Quic for TransportProtocol.
+     */
+    public static final TransportProtocol QUIC = fromString("Quic");
+
     /**
      * Creates a new instance of TransportProtocol value.
      * 
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceIpConfiguration.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceIpConfiguration.java
index adf086f4bea7..6b5d01f918f4 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceIpConfiguration.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceIpConfiguration.java
@@ -17,7 +17,8 @@
 @Fluent
 public final class VirtualApplianceIpConfiguration implements JsonSerializable<VirtualApplianceIpConfiguration> {
     /*
-     * Name of the IP configuration.
+     * For hub NVAs, primary IP configs must be named 'privatenicipconfig' and 'publicnicipconfig', with non-primary
+     * configs using these prefixes; no naming restrictions apply for NVAs in VNets. Maximum 80 character are allowed.
      */
     private String name;
 
@@ -33,7 +34,9 @@ public VirtualApplianceIpConfiguration() {
     }
 
     /**
-     * Get the name property: Name of the IP configuration.
+     * Get the name property: For hub NVAs, primary IP configs must be named 'privatenicipconfig' and
+     * 'publicnicipconfig', with non-primary configs using these prefixes; no naming restrictions apply for NVAs in
+     * VNets. Maximum 80 character are allowed.
      * 
      * @return the name value.
      */
@@ -42,7 +45,9 @@ public String name() {
     }
 
     /**
-     * Set the name property: Name of the IP configuration.
+     * Set the name property: For hub NVAs, primary IP configs must be named 'privatenicipconfig' and
+     * 'publicnicipconfig', with non-primary configs using these prefixes; no naming restrictions apply for NVAs in
+     * VNets. Maximum 80 character are allowed.
      * 
      * @param name the name value to set.
      * @return the VirtualApplianceIpConfiguration object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceNicProperties.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceNicProperties.java
index 23a07ec46e9b..3de06bf181a7 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceNicProperties.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VirtualApplianceNicProperties.java
@@ -17,7 +17,8 @@
 @Immutable
 public final class VirtualApplianceNicProperties implements JsonSerializable<VirtualApplianceNicProperties> {
     /*
-     * NIC type - PublicNic, PrivateNic, or AdditionalNic.
+     * NIC type - PublicNic, PrivateNic, or AdditionalNic; AdditionalPrivateNic and AdditionalPublicNic are only
+     * supported for NVAs deployed in VNets.
      */
     private NicTypeInResponse nicType;
 
@@ -48,7 +49,8 @@ public VirtualApplianceNicProperties() {
     }
 
     /**
-     * Get the nicType property: NIC type - PublicNic, PrivateNic, or AdditionalNic.
+     * Get the nicType property: NIC type - PublicNic, PrivateNic, or AdditionalNic; AdditionalPrivateNic and
+     * AdditionalPublicNic are only supported for NVAs deployed in VNets.
      * 
      * @return the nicType value.
      */
diff --git a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VpnClientConfiguration.java b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VpnClientConfiguration.java
index 1d210309ea49..89ae32d9e990 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VpnClientConfiguration.java
+++ b/sdk/network/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/models/VpnClientConfiguration.java
@@ -53,7 +53,9 @@ public final class VpnClientConfiguration implements JsonSerializable<VpnClientC
     private String radiusServerAddress;
 
     /*
-     * The radius secret property of the VirtualNetworkGateway resource for vpn client connection.
+     * The radius secret property of the VirtualNetworkGateway resource for vpn client connection. We will no longer
+     * return radiusServerSecret in VirtualNetworkGateway Create/Update/Get/List/UpdateTags APIs response. Please use
+     * VirtualNetworkGateway ListRadiusSecrets API to fetch radius server secrets.
      */
     private String radiusServerSecret;
 
@@ -239,7 +241,9 @@ public VpnClientConfiguration withRadiusServerAddress(String radiusServerAddress
 
     /**
      * Get the radiusServerSecret property: The radius secret property of the VirtualNetworkGateway resource for vpn
-     * client connection.
+     * client connection. We will no longer return radiusServerSecret in VirtualNetworkGateway
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VirtualNetworkGateway ListRadiusSecrets API to fetch
+     * radius server secrets.
      * 
      * @return the radiusServerSecret value.
      */
@@ -249,7 +253,9 @@ public String radiusServerSecret() {
 
     /**
      * Set the radiusServerSecret property: The radius secret property of the VirtualNetworkGateway resource for vpn
-     * client connection.
+     * client connection. We will no longer return radiusServerSecret in VirtualNetworkGateway
+     * Create/Update/Get/List/UpdateTags APIs response. Please use VirtualNetworkGateway ListRadiusSecrets API to fetch
+     * radius server secrets.
      * 
      * @param radiusServerSecret the radiusServerSecret value to set.
      * @return the VpnClientConfiguration object itself.
diff --git a/sdk/network/azure-resourcemanager-network/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-network/proxy-config.json b/sdk/network/azure-resourcemanager-network/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-network/proxy-config.json
index d782a92dac22..ee0c711b2373 100644
--- a/sdk/network/azure-resourcemanager-network/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-network/proxy-config.json
+++ b/sdk/network/azure-resourcemanager-network/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-network/proxy-config.json
@@ -1 +1 @@
-[["com.azure.resourcemanager.network.implementation.AdminRuleCollectionsClientImpl$AdminRuleCollectionsService"],["com.azure.resourcemanager.network.implementation.AdminRulesClientImpl$AdminRulesService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayPrivateEndpointConnectionsClientImpl$ApplicationGatewayPrivateEndpointConnectionsService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayPrivateLinkResourcesClientImpl$ApplicationGatewayPrivateLinkResourcesService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayWafDynamicManifestsClientImpl$ApplicationGatewayWafDynamicManifestsService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayWafDynamicManifestsDefaultsClientImpl$ApplicationGatewayWafDynamicManifestsDefaultsService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewaysClientImpl$ApplicationGatewaysService"],["com.azure.resourcemanager.network.implementation.ApplicationSecurityGroupsClientImpl$ApplicationSecurityGroupsService"],["com.azure.resourcemanager.network.implementation.AvailableDelegationsClientImpl$AvailableDelegationsService"],["com.azure.resourcemanager.network.implementation.AvailableEndpointServicesClientImpl$AvailableEndpointServicesService"],["com.azure.resourcemanager.network.implementation.AvailablePrivateEndpointTypesClientImpl$AvailablePrivateEndpointTypesService"],["com.azure.resourcemanager.network.implementation.AvailableResourceGroupDelegationsClientImpl$AvailableResourceGroupDelegationsService"],["com.azure.resourcemanager.network.implementation.AvailableServiceAliasesClientImpl$AvailableServiceAliasesService"],["com.azure.resourcemanager.network.implementation.AzureFirewallFqdnTagsClientImpl$AzureFirewallFqdnTagsService"],["com.azure.resourcemanager.network.implementation.AzureFirewallsClientImpl$AzureFirewallsService"],["com.azure.resourcemanager.network.implementation.BastionHostsClientImpl$BastionHostsService"],["com.azure.resourcemanager.network.implementation.BgpServiceCommunitiesClientImpl$BgpServiceCommunitiesService"],["com.azure.resourcemanager.network.implementation.ConfigurationPolicyGroupsClientImpl$ConfigurationPolicyGroupsService"],["com.azure.resourcemanager.network.implementation.ConnectionMonitorsClientImpl$ConnectionMonitorsService"],["com.azure.resourcemanager.network.implementation.ConnectivityConfigurationsClientImpl$ConnectivityConfigurationsService"],["com.azure.resourcemanager.network.implementation.CustomIpPrefixesClientImpl$CustomIpPrefixesService"],["com.azure.resourcemanager.network.implementation.DdosCustomPoliciesClientImpl$DdosCustomPoliciesService"],["com.azure.resourcemanager.network.implementation.DdosProtectionPlansClientImpl$DdosProtectionPlansService"],["com.azure.resourcemanager.network.implementation.DefaultSecurityRulesClientImpl$DefaultSecurityRulesService"],["com.azure.resourcemanager.network.implementation.DscpConfigurationsClientImpl$DscpConfigurationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitAuthorizationsClientImpl$ExpressRouteCircuitAuthorizationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitConnectionsClientImpl$ExpressRouteCircuitConnectionsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitPeeringsClientImpl$ExpressRouteCircuitPeeringsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitsClientImpl$ExpressRouteCircuitsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteConnectionsClientImpl$ExpressRouteConnectionsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCrossConnectionPeeringsClientImpl$ExpressRouteCrossConnectionPeeringsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCrossConnectionsClientImpl$ExpressRouteCrossConnectionsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteGatewaysClientImpl$ExpressRouteGatewaysService"],["com.azure.resourcemanager.network.implementation.ExpressRouteLinksClientImpl$ExpressRouteLinksService"],["com.azure.resourcemanager.network.implementation.ExpressRoutePortAuthorizationsClientImpl$ExpressRoutePortAuthorizationsService"],["com.azure.resourcemanager.network.implementation.ExpressRoutePortsClientImpl$ExpressRoutePortsService"],["com.azure.resourcemanager.network.implementation.ExpressRoutePortsLocationsClientImpl$ExpressRoutePortsLocationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteProviderPortsLocationsClientImpl$ExpressRouteProviderPortsLocationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteServiceProvidersClientImpl$ExpressRouteServiceProvidersService"],["com.azure.resourcemanager.network.implementation.FirewallPoliciesClientImpl$FirewallPoliciesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyDeploymentsClientImpl$FirewallPolicyDeploymentsService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyDraftsClientImpl$FirewallPolicyDraftsService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyIdpsSignaturesClientImpl$FirewallPolicyIdpsSignaturesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyIdpsSignaturesFilterValuesClientImpl$FirewallPolicyIdpsSignaturesFilterValuesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyIdpsSignaturesOverridesClientImpl$FirewallPolicyIdpsSignaturesOverridesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyRuleCollectionGroupDraftsClientImpl$FirewallPolicyRuleCollectionGroupDraftsService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyRuleCollectionGroupsClientImpl$FirewallPolicyRuleCollectionGroupsService"],["com.azure.resourcemanager.network.implementation.FlowLogsClientImpl$FlowLogsService"],["com.azure.resourcemanager.network.implementation.HubRouteTablesClientImpl$HubRouteTablesService"],["com.azure.resourcemanager.network.implementation.HubVirtualNetworkConnectionsClientImpl$HubVirtualNetworkConnectionsService"],["com.azure.resourcemanager.network.implementation.InboundNatRulesClientImpl$InboundNatRulesService"],["com.azure.resourcemanager.network.implementation.InboundSecurityRuleOperationsClientImpl$InboundSecurityRuleOperationsService"],["com.azure.resourcemanager.network.implementation.IpAllocationsClientImpl$IpAllocationsService"],["com.azure.resourcemanager.network.implementation.IpGroupsClientImpl$IpGroupsService"],["com.azure.resourcemanager.network.implementation.IpamPoolsClientImpl$IpamPoolsService"],["com.azure.resourcemanager.network.implementation.LoadBalancerBackendAddressPoolsClientImpl$LoadBalancerBackendAddressPoolsService"],["com.azure.resourcemanager.network.implementation.LoadBalancerFrontendIpConfigurationsClientImpl$LoadBalancerFrontendIpConfigurationsService"],["com.azure.resourcemanager.network.implementation.LoadBalancerLoadBalancingRulesClientImpl$LoadBalancerLoadBalancingRulesService"],["com.azure.resourcemanager.network.implementation.LoadBalancerNetworkInterfacesClientImpl$LoadBalancerNetworkInterfacesService"],["com.azure.resourcemanager.network.implementation.LoadBalancerOutboundRulesClientImpl$LoadBalancerOutboundRulesService"],["com.azure.resourcemanager.network.implementation.LoadBalancerProbesClientImpl$LoadBalancerProbesService"],["com.azure.resourcemanager.network.implementation.LoadBalancersClientImpl$LoadBalancersService"],["com.azure.resourcemanager.network.implementation.LocalNetworkGatewaysClientImpl$LocalNetworkGatewaysService"],["com.azure.resourcemanager.network.implementation.ManagementGroupNetworkManagerConnectionsClientImpl$ManagementGroupNetworkManagerConnectionsService"],["com.azure.resourcemanager.network.implementation.NatGatewaysClientImpl$NatGatewaysService"],["com.azure.resourcemanager.network.implementation.NatRulesClientImpl$NatRulesService"],["com.azure.resourcemanager.network.implementation.NetworkGroupsClientImpl$NetworkGroupsService"],["com.azure.resourcemanager.network.implementation.NetworkInterfaceIpConfigurationsClientImpl$NetworkInterfaceIpConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkInterfaceLoadBalancersClientImpl$NetworkInterfaceLoadBalancersService"],["com.azure.resourcemanager.network.implementation.NetworkInterfaceTapConfigurationsClientImpl$NetworkInterfaceTapConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkInterfacesClientImpl$NetworkInterfacesService"],["com.azure.resourcemanager.network.implementation.NetworkManagementClientImpl$NetworkManagementClientService"],["com.azure.resourcemanager.network.implementation.NetworkManagerCommitsClientImpl$NetworkManagerCommitsService"],["com.azure.resourcemanager.network.implementation.NetworkManagerDeploymentStatusOperationsClientImpl$NetworkManagerDeploymentStatusOperationsService"],["com.azure.resourcemanager.network.implementation.NetworkManagerRoutingConfigurationsClientImpl$NetworkManagerRoutingConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkManagersClientImpl$NetworkManagersService"],["com.azure.resourcemanager.network.implementation.NetworkProfilesClientImpl$NetworkProfilesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityGroupsClientImpl$NetworkSecurityGroupsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterAccessRulesClientImpl$NetworkSecurityPerimeterAccessRulesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterAssociableResourceTypesClientImpl$NetworkSecurityPerimeterAssociableResourceTypesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterAssociationsClientImpl$NetworkSecurityPerimeterAssociationsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterLinkReferencesClientImpl$NetworkSecurityPerimeterLinkReferencesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterLinksClientImpl$NetworkSecurityPerimeterLinksService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterLoggingConfigurationsClientImpl$NetworkSecurityPerimeterLoggingConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterOperationStatusesClientImpl$NetworkSecurityPerimeterOperationStatusesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterProfilesClientImpl$NetworkSecurityPerimeterProfilesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimetersClientImpl$NetworkSecurityPerimetersService"],["com.azure.resourcemanager.network.implementation.NetworkVirtualApplianceConnectionsClientImpl$NetworkVirtualApplianceConnectionsService"],["com.azure.resourcemanager.network.implementation.NetworkVirtualAppliancesClientImpl$NetworkVirtualAppliancesService"],["com.azure.resourcemanager.network.implementation.NetworkWatchersClientImpl$NetworkWatchersService"],["com.azure.resourcemanager.network.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.network.implementation.P2SVpnGatewaysClientImpl$P2SVpnGatewaysService"],["com.azure.resourcemanager.network.implementation.PacketCapturesClientImpl$PacketCapturesService"],["com.azure.resourcemanager.network.implementation.PeerExpressRouteCircuitConnectionsClientImpl$PeerExpressRouteCircuitConnectionsService"],["com.azure.resourcemanager.network.implementation.PrivateDnsZoneGroupsClientImpl$PrivateDnsZoneGroupsService"],["com.azure.resourcemanager.network.implementation.PrivateEndpointsClientImpl$PrivateEndpointsService"],["com.azure.resourcemanager.network.implementation.PrivateLinkServicesClientImpl$PrivateLinkServicesService"],["com.azure.resourcemanager.network.implementation.PublicIpAddressesClientImpl$PublicIpAddressesService"],["com.azure.resourcemanager.network.implementation.PublicIpPrefixesClientImpl$PublicIpPrefixesService"],["com.azure.resourcemanager.network.implementation.ReachabilityAnalysisIntentsClientImpl$ReachabilityAnalysisIntentsService"],["com.azure.resourcemanager.network.implementation.ReachabilityAnalysisRunsClientImpl$ReachabilityAnalysisRunsService"],["com.azure.resourcemanager.network.implementation.ResourceNavigationLinksClientImpl$ResourceNavigationLinksService"],["com.azure.resourcemanager.network.implementation.RouteFilterRulesClientImpl$RouteFilterRulesService"],["com.azure.resourcemanager.network.implementation.RouteFiltersClientImpl$RouteFiltersService"],["com.azure.resourcemanager.network.implementation.RouteMapsClientImpl$RouteMapsService"],["com.azure.resourcemanager.network.implementation.RouteTablesClientImpl$RouteTablesService"],["com.azure.resourcemanager.network.implementation.RoutesClientImpl$RoutesService"],["com.azure.resourcemanager.network.implementation.RoutingIntentsClientImpl$RoutingIntentsService"],["com.azure.resourcemanager.network.implementation.RoutingRuleCollectionsClientImpl$RoutingRuleCollectionsService"],["com.azure.resourcemanager.network.implementation.RoutingRulesClientImpl$RoutingRulesService"],["com.azure.resourcemanager.network.implementation.ScopeConnectionsClientImpl$ScopeConnectionsService"],["com.azure.resourcemanager.network.implementation.SecurityAdminConfigurationsClientImpl$SecurityAdminConfigurationsService"],["com.azure.resourcemanager.network.implementation.SecurityPartnerProvidersClientImpl$SecurityPartnerProvidersService"],["com.azure.resourcemanager.network.implementation.SecurityRulesClientImpl$SecurityRulesService"],["com.azure.resourcemanager.network.implementation.SecurityUserConfigurationsClientImpl$SecurityUserConfigurationsService"],["com.azure.resourcemanager.network.implementation.SecurityUserRuleCollectionsClientImpl$SecurityUserRuleCollectionsService"],["com.azure.resourcemanager.network.implementation.SecurityUserRulesClientImpl$SecurityUserRulesService"],["com.azure.resourcemanager.network.implementation.ServiceAssociationLinksClientImpl$ServiceAssociationLinksService"],["com.azure.resourcemanager.network.implementation.ServiceEndpointPoliciesClientImpl$ServiceEndpointPoliciesService"],["com.azure.resourcemanager.network.implementation.ServiceEndpointPolicyDefinitionsClientImpl$ServiceEndpointPolicyDefinitionsService"],["com.azure.resourcemanager.network.implementation.ServiceTagInformationsClientImpl$ServiceTagInformationsService"],["com.azure.resourcemanager.network.implementation.ServiceTagsClientImpl$ServiceTagsService"],["com.azure.resourcemanager.network.implementation.StaticCidrsClientImpl$StaticCidrsService"],["com.azure.resourcemanager.network.implementation.StaticMembersClientImpl$StaticMembersService"],["com.azure.resourcemanager.network.implementation.SubnetsClientImpl$SubnetsService"],["com.azure.resourcemanager.network.implementation.SubscriptionNetworkManagerConnectionsClientImpl$SubscriptionNetworkManagerConnectionsService"],["com.azure.resourcemanager.network.implementation.UsagesClientImpl$UsagesService"],["com.azure.resourcemanager.network.implementation.VerifierWorkspacesClientImpl$VerifierWorkspacesService"],["com.azure.resourcemanager.network.implementation.VipSwapsClientImpl$VipSwapsService"],["com.azure.resourcemanager.network.implementation.VirtualApplianceSitesClientImpl$VirtualApplianceSitesService"],["com.azure.resourcemanager.network.implementation.VirtualApplianceSkusClientImpl$VirtualApplianceSkusService"],["com.azure.resourcemanager.network.implementation.VirtualHubBgpConnectionsClientImpl$VirtualHubBgpConnectionsService"],["com.azure.resourcemanager.network.implementation.VirtualHubIpConfigurationsClientImpl$VirtualHubIpConfigurationsService"],["com.azure.resourcemanager.network.implementation.VirtualHubRouteTableV2SClientImpl$VirtualHubRouteTableV2SService"],["com.azure.resourcemanager.network.implementation.VirtualHubsClientImpl$VirtualHubsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkGatewayConnectionsClientImpl$VirtualNetworkGatewayConnectionsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkGatewayNatRulesClientImpl$VirtualNetworkGatewayNatRulesService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkGatewaysClientImpl$VirtualNetworkGatewaysService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkPeeringsClientImpl$VirtualNetworkPeeringsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkTapsClientImpl$VirtualNetworkTapsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworksClientImpl$VirtualNetworksService"],["com.azure.resourcemanager.network.implementation.VirtualRouterPeeringsClientImpl$VirtualRouterPeeringsService"],["com.azure.resourcemanager.network.implementation.VirtualRoutersClientImpl$VirtualRoutersService"],["com.azure.resourcemanager.network.implementation.VirtualWansClientImpl$VirtualWansService"],["com.azure.resourcemanager.network.implementation.VpnConnectionsClientImpl$VpnConnectionsService"],["com.azure.resourcemanager.network.implementation.VpnGatewaysClientImpl$VpnGatewaysService"],["com.azure.resourcemanager.network.implementation.VpnLinkConnectionsClientImpl$VpnLinkConnectionsService"],["com.azure.resourcemanager.network.implementation.VpnServerConfigurationsAssociatedWithVirtualWansClientImpl$VpnServerConfigurationsAssociatedWithVirtualWansService"],["com.azure.resourcemanager.network.implementation.VpnServerConfigurationsClientImpl$VpnServerConfigurationsService"],["com.azure.resourcemanager.network.implementation.VpnSiteLinkConnectionsClientImpl$VpnSiteLinkConnectionsService"],["com.azure.resourcemanager.network.implementation.VpnSiteLinksClientImpl$VpnSiteLinksService"],["com.azure.resourcemanager.network.implementation.VpnSitesClientImpl$VpnSitesService"],["com.azure.resourcemanager.network.implementation.VpnSitesConfigurationsClientImpl$VpnSitesConfigurationsService"],["com.azure.resourcemanager.network.implementation.WebApplicationFirewallPoliciesClientImpl$WebApplicationFirewallPoliciesService"],["com.azure.resourcemanager.network.implementation.WebCategoriesClientImpl$WebCategoriesService"]]
\ No newline at end of file
+[["com.azure.resourcemanager.network.implementation.AdminRuleCollectionsClientImpl$AdminRuleCollectionsService"],["com.azure.resourcemanager.network.implementation.AdminRulesClientImpl$AdminRulesService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayPrivateEndpointConnectionsClientImpl$ApplicationGatewayPrivateEndpointConnectionsService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayPrivateLinkResourcesClientImpl$ApplicationGatewayPrivateLinkResourcesService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayWafDynamicManifestsClientImpl$ApplicationGatewayWafDynamicManifestsService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewayWafDynamicManifestsDefaultsClientImpl$ApplicationGatewayWafDynamicManifestsDefaultsService"],["com.azure.resourcemanager.network.implementation.ApplicationGatewaysClientImpl$ApplicationGatewaysService"],["com.azure.resourcemanager.network.implementation.ApplicationSecurityGroupsClientImpl$ApplicationSecurityGroupsService"],["com.azure.resourcemanager.network.implementation.AvailableDelegationsClientImpl$AvailableDelegationsService"],["com.azure.resourcemanager.network.implementation.AvailableEndpointServicesClientImpl$AvailableEndpointServicesService"],["com.azure.resourcemanager.network.implementation.AvailablePrivateEndpointTypesClientImpl$AvailablePrivateEndpointTypesService"],["com.azure.resourcemanager.network.implementation.AvailableResourceGroupDelegationsClientImpl$AvailableResourceGroupDelegationsService"],["com.azure.resourcemanager.network.implementation.AvailableServiceAliasesClientImpl$AvailableServiceAliasesService"],["com.azure.resourcemanager.network.implementation.AzureFirewallFqdnTagsClientImpl$AzureFirewallFqdnTagsService"],["com.azure.resourcemanager.network.implementation.AzureFirewallsClientImpl$AzureFirewallsService"],["com.azure.resourcemanager.network.implementation.BastionHostsClientImpl$BastionHostsService"],["com.azure.resourcemanager.network.implementation.BgpServiceCommunitiesClientImpl$BgpServiceCommunitiesService"],["com.azure.resourcemanager.network.implementation.ConfigurationPolicyGroupsClientImpl$ConfigurationPolicyGroupsService"],["com.azure.resourcemanager.network.implementation.ConnectionMonitorsClientImpl$ConnectionMonitorsService"],["com.azure.resourcemanager.network.implementation.ConnectivityConfigurationsClientImpl$ConnectivityConfigurationsService"],["com.azure.resourcemanager.network.implementation.CustomIpPrefixesClientImpl$CustomIpPrefixesService"],["com.azure.resourcemanager.network.implementation.DdosCustomPoliciesClientImpl$DdosCustomPoliciesService"],["com.azure.resourcemanager.network.implementation.DdosProtectionPlansClientImpl$DdosProtectionPlansService"],["com.azure.resourcemanager.network.implementation.DefaultSecurityRulesClientImpl$DefaultSecurityRulesService"],["com.azure.resourcemanager.network.implementation.DscpConfigurationsClientImpl$DscpConfigurationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitAuthorizationsClientImpl$ExpressRouteCircuitAuthorizationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitConnectionsClientImpl$ExpressRouteCircuitConnectionsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitPeeringsClientImpl$ExpressRouteCircuitPeeringsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCircuitsClientImpl$ExpressRouteCircuitsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteConnectionsClientImpl$ExpressRouteConnectionsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCrossConnectionPeeringsClientImpl$ExpressRouteCrossConnectionPeeringsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteCrossConnectionsClientImpl$ExpressRouteCrossConnectionsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteGatewaysClientImpl$ExpressRouteGatewaysService"],["com.azure.resourcemanager.network.implementation.ExpressRouteLinksClientImpl$ExpressRouteLinksService"],["com.azure.resourcemanager.network.implementation.ExpressRoutePortAuthorizationsClientImpl$ExpressRoutePortAuthorizationsService"],["com.azure.resourcemanager.network.implementation.ExpressRoutePortsClientImpl$ExpressRoutePortsService"],["com.azure.resourcemanager.network.implementation.ExpressRoutePortsLocationsClientImpl$ExpressRoutePortsLocationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteProviderPortsLocationsClientImpl$ExpressRouteProviderPortsLocationsService"],["com.azure.resourcemanager.network.implementation.ExpressRouteServiceProvidersClientImpl$ExpressRouteServiceProvidersService"],["com.azure.resourcemanager.network.implementation.FirewallPoliciesClientImpl$FirewallPoliciesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyDeploymentsClientImpl$FirewallPolicyDeploymentsService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyDraftsClientImpl$FirewallPolicyDraftsService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyIdpsSignaturesClientImpl$FirewallPolicyIdpsSignaturesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyIdpsSignaturesFilterValuesClientImpl$FirewallPolicyIdpsSignaturesFilterValuesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyIdpsSignaturesOverridesClientImpl$FirewallPolicyIdpsSignaturesOverridesService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyRuleCollectionGroupDraftsClientImpl$FirewallPolicyRuleCollectionGroupDraftsService"],["com.azure.resourcemanager.network.implementation.FirewallPolicyRuleCollectionGroupsClientImpl$FirewallPolicyRuleCollectionGroupsService"],["com.azure.resourcemanager.network.implementation.FlowLogsClientImpl$FlowLogsService"],["com.azure.resourcemanager.network.implementation.HubRouteTablesClientImpl$HubRouteTablesService"],["com.azure.resourcemanager.network.implementation.HubVirtualNetworkConnectionsClientImpl$HubVirtualNetworkConnectionsService"],["com.azure.resourcemanager.network.implementation.InboundNatRulesClientImpl$InboundNatRulesService"],["com.azure.resourcemanager.network.implementation.InboundSecurityRuleOperationsClientImpl$InboundSecurityRuleOperationsService"],["com.azure.resourcemanager.network.implementation.IpAllocationsClientImpl$IpAllocationsService"],["com.azure.resourcemanager.network.implementation.IpGroupsClientImpl$IpGroupsService"],["com.azure.resourcemanager.network.implementation.IpamPoolsClientImpl$IpamPoolsService"],["com.azure.resourcemanager.network.implementation.LoadBalancerBackendAddressPoolsClientImpl$LoadBalancerBackendAddressPoolsService"],["com.azure.resourcemanager.network.implementation.LoadBalancerFrontendIpConfigurationsClientImpl$LoadBalancerFrontendIpConfigurationsService"],["com.azure.resourcemanager.network.implementation.LoadBalancerLoadBalancingRulesClientImpl$LoadBalancerLoadBalancingRulesService"],["com.azure.resourcemanager.network.implementation.LoadBalancerNetworkInterfacesClientImpl$LoadBalancerNetworkInterfacesService"],["com.azure.resourcemanager.network.implementation.LoadBalancerOutboundRulesClientImpl$LoadBalancerOutboundRulesService"],["com.azure.resourcemanager.network.implementation.LoadBalancerProbesClientImpl$LoadBalancerProbesService"],["com.azure.resourcemanager.network.implementation.LoadBalancersClientImpl$LoadBalancersService"],["com.azure.resourcemanager.network.implementation.LocalNetworkGatewaysClientImpl$LocalNetworkGatewaysService"],["com.azure.resourcemanager.network.implementation.ManagementGroupNetworkManagerConnectionsClientImpl$ManagementGroupNetworkManagerConnectionsService"],["com.azure.resourcemanager.network.implementation.NatGatewaysClientImpl$NatGatewaysService"],["com.azure.resourcemanager.network.implementation.NatRulesClientImpl$NatRulesService"],["com.azure.resourcemanager.network.implementation.NetworkGroupsClientImpl$NetworkGroupsService"],["com.azure.resourcemanager.network.implementation.NetworkInterfaceIpConfigurationsClientImpl$NetworkInterfaceIpConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkInterfaceLoadBalancersClientImpl$NetworkInterfaceLoadBalancersService"],["com.azure.resourcemanager.network.implementation.NetworkInterfaceTapConfigurationsClientImpl$NetworkInterfaceTapConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkInterfacesClientImpl$NetworkInterfacesService"],["com.azure.resourcemanager.network.implementation.NetworkManagementClientImpl$NetworkManagementClientService"],["com.azure.resourcemanager.network.implementation.NetworkManagerCommitsClientImpl$NetworkManagerCommitsService"],["com.azure.resourcemanager.network.implementation.NetworkManagerDeploymentStatusOperationsClientImpl$NetworkManagerDeploymentStatusOperationsService"],["com.azure.resourcemanager.network.implementation.NetworkManagerRoutingConfigurationsClientImpl$NetworkManagerRoutingConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkManagersClientImpl$NetworkManagersService"],["com.azure.resourcemanager.network.implementation.NetworkProfilesClientImpl$NetworkProfilesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityGroupsClientImpl$NetworkSecurityGroupsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterAccessRulesClientImpl$NetworkSecurityPerimeterAccessRulesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterAssociableResourceTypesClientImpl$NetworkSecurityPerimeterAssociableResourceTypesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterAssociationsClientImpl$NetworkSecurityPerimeterAssociationsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterLinkReferencesClientImpl$NetworkSecurityPerimeterLinkReferencesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterLinksClientImpl$NetworkSecurityPerimeterLinksService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterLoggingConfigurationsClientImpl$NetworkSecurityPerimeterLoggingConfigurationsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterOperationStatusesClientImpl$NetworkSecurityPerimeterOperationStatusesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterProfilesClientImpl$NetworkSecurityPerimeterProfilesService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimeterServiceTagsClientImpl$NetworkSecurityPerimeterServiceTagsService"],["com.azure.resourcemanager.network.implementation.NetworkSecurityPerimetersClientImpl$NetworkSecurityPerimetersService"],["com.azure.resourcemanager.network.implementation.NetworkVirtualApplianceConnectionsClientImpl$NetworkVirtualApplianceConnectionsService"],["com.azure.resourcemanager.network.implementation.NetworkVirtualAppliancesClientImpl$NetworkVirtualAppliancesService"],["com.azure.resourcemanager.network.implementation.NetworkWatchersClientImpl$NetworkWatchersService"],["com.azure.resourcemanager.network.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.network.implementation.P2SVpnGatewaysClientImpl$P2SVpnGatewaysService"],["com.azure.resourcemanager.network.implementation.PacketCapturesClientImpl$PacketCapturesService"],["com.azure.resourcemanager.network.implementation.PeerExpressRouteCircuitConnectionsClientImpl$PeerExpressRouteCircuitConnectionsService"],["com.azure.resourcemanager.network.implementation.PrivateDnsZoneGroupsClientImpl$PrivateDnsZoneGroupsService"],["com.azure.resourcemanager.network.implementation.PrivateEndpointsClientImpl$PrivateEndpointsService"],["com.azure.resourcemanager.network.implementation.PrivateLinkServicesClientImpl$PrivateLinkServicesService"],["com.azure.resourcemanager.network.implementation.PublicIpAddressesClientImpl$PublicIpAddressesService"],["com.azure.resourcemanager.network.implementation.PublicIpPrefixesClientImpl$PublicIpPrefixesService"],["com.azure.resourcemanager.network.implementation.ReachabilityAnalysisIntentsClientImpl$ReachabilityAnalysisIntentsService"],["com.azure.resourcemanager.network.implementation.ReachabilityAnalysisRunsClientImpl$ReachabilityAnalysisRunsService"],["com.azure.resourcemanager.network.implementation.ResourceNavigationLinksClientImpl$ResourceNavigationLinksService"],["com.azure.resourcemanager.network.implementation.RouteFilterRulesClientImpl$RouteFilterRulesService"],["com.azure.resourcemanager.network.implementation.RouteFiltersClientImpl$RouteFiltersService"],["com.azure.resourcemanager.network.implementation.RouteMapsClientImpl$RouteMapsService"],["com.azure.resourcemanager.network.implementation.RouteTablesClientImpl$RouteTablesService"],["com.azure.resourcemanager.network.implementation.RoutesClientImpl$RoutesService"],["com.azure.resourcemanager.network.implementation.RoutingIntentsClientImpl$RoutingIntentsService"],["com.azure.resourcemanager.network.implementation.RoutingRuleCollectionsClientImpl$RoutingRuleCollectionsService"],["com.azure.resourcemanager.network.implementation.RoutingRulesClientImpl$RoutingRulesService"],["com.azure.resourcemanager.network.implementation.ScopeConnectionsClientImpl$ScopeConnectionsService"],["com.azure.resourcemanager.network.implementation.SecurityAdminConfigurationsClientImpl$SecurityAdminConfigurationsService"],["com.azure.resourcemanager.network.implementation.SecurityPartnerProvidersClientImpl$SecurityPartnerProvidersService"],["com.azure.resourcemanager.network.implementation.SecurityRulesClientImpl$SecurityRulesService"],["com.azure.resourcemanager.network.implementation.SecurityUserConfigurationsClientImpl$SecurityUserConfigurationsService"],["com.azure.resourcemanager.network.implementation.SecurityUserRuleCollectionsClientImpl$SecurityUserRuleCollectionsService"],["com.azure.resourcemanager.network.implementation.SecurityUserRulesClientImpl$SecurityUserRulesService"],["com.azure.resourcemanager.network.implementation.ServiceAssociationLinksClientImpl$ServiceAssociationLinksService"],["com.azure.resourcemanager.network.implementation.ServiceEndpointPoliciesClientImpl$ServiceEndpointPoliciesService"],["com.azure.resourcemanager.network.implementation.ServiceEndpointPolicyDefinitionsClientImpl$ServiceEndpointPolicyDefinitionsService"],["com.azure.resourcemanager.network.implementation.ServiceTagInformationsClientImpl$ServiceTagInformationsService"],["com.azure.resourcemanager.network.implementation.ServiceTagsClientImpl$ServiceTagsService"],["com.azure.resourcemanager.network.implementation.StaticCidrsClientImpl$StaticCidrsService"],["com.azure.resourcemanager.network.implementation.StaticMembersClientImpl$StaticMembersService"],["com.azure.resourcemanager.network.implementation.SubnetsClientImpl$SubnetsService"],["com.azure.resourcemanager.network.implementation.SubscriptionNetworkManagerConnectionsClientImpl$SubscriptionNetworkManagerConnectionsService"],["com.azure.resourcemanager.network.implementation.UsagesClientImpl$UsagesService"],["com.azure.resourcemanager.network.implementation.VerifierWorkspacesClientImpl$VerifierWorkspacesService"],["com.azure.resourcemanager.network.implementation.VipSwapsClientImpl$VipSwapsService"],["com.azure.resourcemanager.network.implementation.VirtualApplianceSitesClientImpl$VirtualApplianceSitesService"],["com.azure.resourcemanager.network.implementation.VirtualApplianceSkusClientImpl$VirtualApplianceSkusService"],["com.azure.resourcemanager.network.implementation.VirtualHubBgpConnectionsClientImpl$VirtualHubBgpConnectionsService"],["com.azure.resourcemanager.network.implementation.VirtualHubIpConfigurationsClientImpl$VirtualHubIpConfigurationsService"],["com.azure.resourcemanager.network.implementation.VirtualHubRouteTableV2SClientImpl$VirtualHubRouteTableV2SService"],["com.azure.resourcemanager.network.implementation.VirtualHubsClientImpl$VirtualHubsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkGatewayConnectionsClientImpl$VirtualNetworkGatewayConnectionsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkGatewayNatRulesClientImpl$VirtualNetworkGatewayNatRulesService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkGatewaysClientImpl$VirtualNetworkGatewaysService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkPeeringsClientImpl$VirtualNetworkPeeringsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworkTapsClientImpl$VirtualNetworkTapsService"],["com.azure.resourcemanager.network.implementation.VirtualNetworksClientImpl$VirtualNetworksService"],["com.azure.resourcemanager.network.implementation.VirtualRouterPeeringsClientImpl$VirtualRouterPeeringsService"],["com.azure.resourcemanager.network.implementation.VirtualRoutersClientImpl$VirtualRoutersService"],["com.azure.resourcemanager.network.implementation.VirtualWansClientImpl$VirtualWansService"],["com.azure.resourcemanager.network.implementation.VpnConnectionsClientImpl$VpnConnectionsService"],["com.azure.resourcemanager.network.implementation.VpnGatewaysClientImpl$VpnGatewaysService"],["com.azure.resourcemanager.network.implementation.VpnLinkConnectionsClientImpl$VpnLinkConnectionsService"],["com.azure.resourcemanager.network.implementation.VpnServerConfigurationsAssociatedWithVirtualWansClientImpl$VpnServerConfigurationsAssociatedWithVirtualWansService"],["com.azure.resourcemanager.network.implementation.VpnServerConfigurationsClientImpl$VpnServerConfigurationsService"],["com.azure.resourcemanager.network.implementation.VpnSiteLinkConnectionsClientImpl$VpnSiteLinkConnectionsService"],["com.azure.resourcemanager.network.implementation.VpnSiteLinksClientImpl$VpnSiteLinksService"],["com.azure.resourcemanager.network.implementation.VpnSitesClientImpl$VpnSitesService"],["com.azure.resourcemanager.network.implementation.VpnSitesConfigurationsClientImpl$VpnSitesConfigurationsService"],["com.azure.resourcemanager.network.implementation.WebApplicationFirewallPoliciesClientImpl$WebApplicationFirewallPoliciesService"],["com.azure.resourcemanager.network.implementation.WebCategoriesClientImpl$WebCategoriesService"]]
\ No newline at end of file
diff --git a/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationGatewayTests.java b/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationGatewayTests.java
index 9bf2286693b3..84d1dbc69303 100644
--- a/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationGatewayTests.java
+++ b/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/ApplicationGatewayTests.java
@@ -33,6 +33,7 @@
 import com.azure.resourcemanager.network.models.ResourceIdentityType;
 import com.azure.resourcemanager.network.models.WebApplicationFirewallMode;
 import com.azure.resourcemanager.network.models.WebApplicationFirewallPolicy;
+import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId;
 import com.azure.security.keyvault.certificates.CertificateClient;
 import com.azure.security.keyvault.certificates.CertificateClientBuilder;
 import com.azure.security.keyvault.certificates.models.CertificatePolicy;
@@ -47,8 +48,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class ApplicationGatewayTests extends NetworkManagementTest {
 
@@ -520,13 +523,13 @@ public void canSetSslPolicy() {
             .withExistingPublicIpAddress(pip)
             .withTier(ApplicationGatewayTier.WAF_V2)
             .withSize(ApplicationGatewaySkuName.WAF_V2)
-            .withPredefinedSslPolicy(ApplicationGatewaySslPolicyName.APP_GW_SSL_POLICY20150501)
+            .withPredefinedSslPolicy(ApplicationGatewaySslPolicyName.APP_GW_SSL_POLICY20170401S)
             .create();
 
         ApplicationGatewaySslPolicy sslPolicy = appGateway.sslPolicy();
         Assertions.assertNotNull(sslPolicy);
         Assertions.assertEquals(ApplicationGatewaySslPolicyType.PREDEFINED, sslPolicy.policyType());
-        Assertions.assertEquals(ApplicationGatewaySslPolicyName.APP_GW_SSL_POLICY20150501, sslPolicy.policyName());
+        Assertions.assertEquals(ApplicationGatewaySslPolicyName.APP_GW_SSL_POLICY20170401S, sslPolicy.policyName());
 
         // update with custom ssl policy
         appGateway.update()
@@ -634,6 +637,47 @@ public void canCRUDProbes() {
         Assertions.assertTrue(appGateway.probes().isEmpty());
     }
 
+    @Test
+    public void canListAvailabilityZones() {
+        String appGatewayName = generateRandomResourceName("agw", 15);
+
+        String appPublicIp = generateRandomResourceName("pip", 15);
+        PublicIpAddress pip = networkManager.publicIpAddresses()
+            .define(appPublicIp)
+            .withRegion(REGION)
+            .withNewResourceGroup(rgName)
+            .withSku(PublicIPSkuType.STANDARD)
+            .withStaticIP()
+            .withAvailabilityZone(AvailabilityZoneId.ZONE_1)
+            .withAvailabilityZone(AvailabilityZoneId.ZONE_2)
+            .create();
+
+        ApplicationGateway appGateway = networkManager.applicationGateways()
+            .define(appGatewayName)
+            .withRegion(REGION)
+            .withNewResourceGroup(rgName)
+            // Request routing rules
+            .defineRequestRoutingRule("rule1")
+            // BASIC still needs a public frontend. With private only, it'll report error:
+            // "Application Gateway does not support Application Gateway without Public IP for the selected SKU tier Basic.
+            // Supported SKU tiers are Standard,WAF."
+            .fromPublicFrontend()
+            .fromFrontendHttpPort(80)
+            .toBackendHttpPort(8080)
+            .toBackendIPAddress("11.1.1.1")
+            .attach()
+            .withExistingPublicIpAddress(pip)
+            .withAvailabilityZone(AvailabilityZoneId.ZONE_1)
+            .withAvailabilityZone(AvailabilityZoneId.ZONE_2)
+            .create();
+
+        Set<AvailabilityZoneId> expectedZones = new HashSet<>();
+        expectedZones.add(AvailabilityZoneId.ZONE_1);
+        expectedZones.add(AvailabilityZoneId.ZONE_2);
+
+        Assertions.assertEquals(expectedZones, appGateway.availabilityZones());
+    }
+
     private String createKeyVaultCertificate(String signedInUser, String identityPrincipal) {
         String vaultName = generateRandomResourceName("vlt", 10);
         String secretName = generateRandomResourceName("srt", 10);
diff --git a/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkSecurityGroupTests.java b/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkSecurityGroupTests.java
index 4e51b63c8b08..6583bc43b9d7 100644
--- a/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkSecurityGroupTests.java
+++ b/sdk/network/azure-resourcemanager-network/src/test/java/com/azure/resourcemanager/network/NetworkSecurityGroupTests.java
@@ -14,6 +14,8 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class NetworkSecurityGroupTests extends NetworkManagementTest {
 
@@ -87,12 +89,28 @@ public void canCRUDNetworkSecurityGroup() {
             .attach()
             .create();
 
-        Assertions.assertEquals(2, nsg.securityRules().get("rule2").sourceApplicationSecurityGroupIds().size());
-        Assertions.assertEquals(2, nsg.securityRules().get("rule3").destinationApplicationSecurityGroupIds().size());
-        Assertions.assertEquals(new HashSet<>(Arrays.asList(asg.id(), asg2.id())),
-            nsg.securityRules().get("rule2").sourceApplicationSecurityGroupIds());
-        Assertions.assertEquals(new HashSet<>(Arrays.asList(asg3.id(), asg4.id())),
-            nsg.securityRules().get("rule3").destinationApplicationSecurityGroupIds());
+        Set<String> sourceApplicationSecurityGroupIds = nsg.securityRules()
+            .get("rule2")
+            .sourceApplicationSecurityGroupIds()
+            .stream()
+            .map(id -> id.toLowerCase(Locale.ROOT))
+            .collect(Collectors.toSet());
+
+        Set<String> destinationApplicationSecurityGroupIds = nsg.securityRules()
+            .get("rule3")
+            .destinationApplicationSecurityGroupIds()
+            .stream()
+            .map(id -> id.toLowerCase(Locale.ROOT))
+            .collect(Collectors.toSet());
+
+        Assertions.assertEquals(2, sourceApplicationSecurityGroupIds.size());
+        Assertions.assertEquals(2, destinationApplicationSecurityGroupIds.size());
+        Assertions.assertEquals(
+            new HashSet<>(Arrays.asList(asg.id().toLowerCase(Locale.ROOT), asg2.id().toLowerCase(Locale.ROOT))),
+            sourceApplicationSecurityGroupIds);
+        Assertions.assertEquals(
+            new HashSet<>(Arrays.asList(asg3.id().toLowerCase(Locale.ROOT), asg4.id().toLowerCase(Locale.ROOT))),
+            destinationApplicationSecurityGroupIds);
 
         ApplicationSecurityGroup asg5 = networkManager.applicationSecurityGroups()
             .define(asgName5)
@@ -117,12 +135,28 @@ public void canCRUDNetworkSecurityGroup() {
             .parent()
             .apply();
 
-        Assertions.assertEquals(2, nsg.securityRules().get("rule2").sourceApplicationSecurityGroupIds().size());
-        Assertions.assertEquals(2, nsg.securityRules().get("rule3").destinationApplicationSecurityGroupIds().size());
-        Assertions.assertEquals(new HashSet<>(Arrays.asList(asg.id(), asg5.id())),
-            nsg.securityRules().get("rule2").sourceApplicationSecurityGroupIds());
-        Assertions.assertEquals(new HashSet<>(Arrays.asList(asg3.id(), asg6.id())),
-            nsg.securityRules().get("rule3").destinationApplicationSecurityGroupIds());
+        sourceApplicationSecurityGroupIds = nsg.securityRules()
+            .get("rule2")
+            .sourceApplicationSecurityGroupIds()
+            .stream()
+            .map(id -> id.toLowerCase(Locale.ROOT))
+            .collect(Collectors.toSet());
+
+        destinationApplicationSecurityGroupIds = nsg.securityRules()
+            .get("rule3")
+            .destinationApplicationSecurityGroupIds()
+            .stream()
+            .map(id -> id.toLowerCase(Locale.ROOT))
+            .collect(Collectors.toSet());
+
+        Assertions.assertEquals(2, sourceApplicationSecurityGroupIds.size());
+        Assertions.assertEquals(2, destinationApplicationSecurityGroupIds.size());
+        Assertions.assertEquals(
+            new HashSet<>(Arrays.asList(asg.id().toLowerCase(Locale.ROOT), asg5.id().toLowerCase(Locale.ROOT))),
+            sourceApplicationSecurityGroupIds);
+        Assertions.assertEquals(
+            new HashSet<>(Arrays.asList(asg3.id().toLowerCase(Locale.ROOT), asg6.id().toLowerCase(Locale.ROOT))),
+            destinationApplicationSecurityGroupIds);
 
         nsg.update()
             .updateRule("rule2")
diff --git a/sdk/networkanalytics/azure-resourcemanager-networkanalytics/pom.xml b/sdk/networkanalytics/azure-resourcemanager-networkanalytics/pom.xml
index a6bc73d4b452..191d2caac931 100644
--- a/sdk/networkanalytics/azure-resourcemanager-networkanalytics/pom.xml
+++ b/sdk/networkanalytics/azure-resourcemanager-networkanalytics/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/networkcloud/azure-resourcemanager-networkcloud/pom.xml b/sdk/networkcloud/azure-resourcemanager-networkcloud/pom.xml
index eea4e4f570c8..7920c334e034 100644
--- a/sdk/networkcloud/azure-resourcemanager-networkcloud/pom.xml
+++ b/sdk/networkcloud/azure-resourcemanager-networkcloud/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/networkfunction/azure-resourcemanager-networkfunction/pom.xml b/sdk/networkfunction/azure-resourcemanager-networkfunction/pom.xml
index 6acc9045a8aa..2046d2e6f6bd 100644
--- a/sdk/networkfunction/azure-resourcemanager-networkfunction/pom.xml
+++ b/sdk/networkfunction/azure-resourcemanager-networkfunction/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/newrelicobservability/azure-resourcemanager-newrelicobservability/pom.xml b/sdk/newrelicobservability/azure-resourcemanager-newrelicobservability/pom.xml
index 5be265d89ee6..639c2590f2ca 100644
--- a/sdk/newrelicobservability/azure-resourcemanager-newrelicobservability/pom.xml
+++ b/sdk/newrelicobservability/azure-resourcemanager-newrelicobservability/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/nginx/azure-resourcemanager-nginx/pom.xml b/sdk/nginx/azure-resourcemanager-nginx/pom.xml
index d1126ae17043..8841847eed47 100644
--- a/sdk/nginx/azure-resourcemanager-nginx/pom.xml
+++ b/sdk/nginx/azure-resourcemanager-nginx/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml b/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml
index 8d7f868de522..9d4b104e16ff 100644
--- a/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml
+++ b/sdk/notificationhubs/azure-resourcemanager-notificationhubs/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/oep/azure-resourcemanager-oep/pom.xml b/sdk/oep/azure-resourcemanager-oep/pom.xml
index 8abacc7fd27d..af7d4a98f92a 100644
--- a/sdk/oep/azure-resourcemanager-oep/pom.xml
+++ b/sdk/oep/azure-resourcemanager-oep/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/pom.xml b/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/pom.xml
index 2f8da3452be4..7d32edb21e18 100644
--- a/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/pom.xml
+++ b/sdk/onlineexperimentation/azure-analytics-onlineexperimentation/pom.xml
@@ -64,7 +64,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/pom.xml b/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/pom.xml
index 78c82c7bc993..0c7534473b58 100644
--- a/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/pom.xml
+++ b/sdk/onlineexperimentation/azure-resourcemanager-onlineexperimentation/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/openai/azure-ai-openai-assistants/pom.xml b/sdk/openai/azure-ai-openai-assistants/pom.xml
index d08ae6c900ac..f5e6d05d8218 100644
--- a/sdk/openai/azure-ai-openai-assistants/pom.xml
+++ b/sdk/openai/azure-ai-openai-assistants/pom.xml
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/openai/azure-ai-openai-realtime/pom.xml b/sdk/openai/azure-ai-openai-realtime/pom.xml
index a313e2c639fd..ca7910bc3405 100644
--- a/sdk/openai/azure-ai-openai-realtime/pom.xml
+++ b/sdk/openai/azure-ai-openai-realtime/pom.xml
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/openai/azure-ai-openai-stainless/pom.xml b/sdk/openai/azure-ai-openai-stainless/pom.xml
index d3ae28aa7cae..71e4c0cd366d 100644
--- a/sdk/openai/azure-ai-openai-stainless/pom.xml
+++ b/sdk/openai/azure-ai-openai-stainless/pom.xml
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/sdk/openai/azure-ai-openai/README.md b/sdk/openai/azure-ai-openai/README.md
index 7be1032aabb5..cc8d44788676 100644
--- a/sdk/openai/azure-ai-openai/README.md
+++ b/sdk/openai/azure-ai-openai/README.md
@@ -113,7 +113,7 @@ Authentication with Entra ID requires some initial setup:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/openai/azure-ai-openai/pom.xml b/sdk/openai/azure-ai-openai/pom.xml
index ca3548bc4f6e..83be61ed36ea 100644
--- a/sdk/openai/azure-ai-openai/pom.xml
+++ b/sdk/openai/azure-ai-openai/pom.xml
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml b/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml
index 38c30b316a00..91ec91c5e2bc 100644
--- a/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml
+++ b/sdk/operationsmanagement/azure-resourcemanager-operationsmanagement/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/CHANGELOG.md b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/CHANGELOG.md
index 04b91919a1d1..a242dda6e14e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/CHANGELOG.md
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 1.2.0-beta.1 (Unreleased)
+## 1.3.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,516 @@
 
 ### Other Changes
 
+## 1.2.0 (2025-09-24)
+
+- Azure Resource Manager Oracle Database client library for Java. This package contains Microsoft Azure SDK for Oracle Database Management SDK.  Package api-version 2025-09-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+
+### Breaking Changes
+
+#### `models.OracleSubscriptionUpdateProperties` was modified
+
+* `validate()` was removed
+
+#### `models.DefinedFileSystemConfiguration` was modified
+
+* `validate()` was removed
+
+#### `models.AllConnectionStringType` was modified
+
+* `validate()` was removed
+
+#### `models.ExadbVmClusterProperties` was modified
+
+* `validate()` was removed
+
+#### `models.DbNodeProperties` was modified
+
+* `validate()` was removed
+
+#### `models.CloudVmClusterProperties` was modified
+
+* `validate()` was removed
+
+#### `models.DbNodeDetails` was modified
+
+* `validate()` was removed
+
+#### `models.DayOfWeek` was modified
+
+* `validate()` was removed
+
+#### `models.Month` was modified
+
+* `validate()` was removed
+
+#### `models.DbServerProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ProfileType` was modified
+
+* `validate()` was removed
+
+#### `models.NsgCidr` was modified
+
+* `validate()` was removed
+
+#### `models.ExascaleDbStorageDetails` was modified
+
+* `validate()` was removed
+
+#### `models.AddRemoveDbNode` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseCrossRegionDisasterRecoveryProperties` was modified
+
+* `withScheduledOperations(models.ScheduledOperationsType)` was removed
+* `validate()` was removed
+
+#### `models.PlanUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.SystemVersionProperties` was modified
+
+* `validate()` was removed
+
+#### `models.RemoveVirtualMachineFromExadbVmClusterDetails` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseFromBackupTimestampProperties` was modified
+
+* `withScheduledOperations(models.ScheduledOperationsType)` was removed
+* `validate()` was removed
+
+#### `models.AzureSubscriptions` was modified
+
+* `validate()` was removed
+
+#### `models.ExadbVmClusterUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.DisasterRecoveryConfigurationDetails` was modified
+
+* `validate()` was removed
+
+#### `models.LongTermBackUpScheduleDetails` was modified
+
+* `validate()` was removed
+
+#### `models.PeerDbDetails` was modified
+
+* `validate()` was removed
+
+#### `models.DbSystemShapeProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ExadbVmClusterUpdateProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ApexDetailsType` was modified
+
+* `validate()` was removed
+
+#### `models.CloudExadataInfrastructureUpdateProperties` was modified
+
+* `validate()` was removed
+
+#### `models.GenerateAutonomousDatabaseWalletDetails` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseBackupUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.DbSystemShapes` was modified
+
+* `listByLocation(java.lang.String,java.lang.String,com.azure.core.util.Context)` was removed
+
+#### `models.VirtualNetworkAddressProperties` was modified
+
+* `validate()` was removed
+
+#### `models.CloudVmClusterUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.PortRange` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseCloneProperties` was modified
+
+* `validate()` was removed
+* `withScheduledOperations(models.ScheduledOperationsType)` was removed
+
+#### `models.OracleSubscriptionUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.FileSystemConfigurationDetails` was modified
+
+* `validate()` was removed
+
+#### `models.ExascaleDbNodeProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ExadataIormConfig` was modified
+
+* `validate()` was removed
+
+#### `models.FlexComponentProperties` was modified
+
+* `validate()` was removed
+
+#### `models.DnsPrivateZoneProperties` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseUpdateProperties` was modified
+
+* `withScheduledOperations(models.ScheduledOperationsTypeUpdate)` was removed
+* `scheduledOperations()` was removed
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseBackupUpdateProperties` was modified
+
+* `validate()` was removed
+
+#### `models.EstimatedPatchingTime` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.CloudExadataInfrastructureUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.GiVersions` was modified
+
+* `listByLocation(java.lang.String,models.SystemShapes,java.lang.String,com.azure.core.util.Context)` was removed
+
+#### `models.OperationDisplay` was modified
+
+* `validate()` was removed
+
+#### `models.ScheduledOperationsType` was modified
+
+* `validate()` was removed
+
+#### `models.GiMinorVersionProperties` was modified
+
+* `validate()` was removed
+
+#### `models.DbNodeAction` was modified
+
+* `validate()` was removed
+
+#### `models.OracleSubscriptionProperties` was modified
+
+* `validate()` was removed
+
+#### `models.CloudExadataInfrastructureProperties` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDbVersionProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ExadbVmClusterStorageDetails` was modified
+
+* `validate()` was removed
+
+#### `models.DayOfWeekUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.ExascaleDbStorageVaultProperties` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseCharacterSetProperties` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseNationalCharacterSetProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ExascaleDbStorageVaultTagsUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.Plan` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseBaseProperties` was modified
+
+* `validate()` was removed
+* `withScheduledOperations(models.ScheduledOperationsType)` was removed
+* `scheduledOperations()` was removed
+
+#### `models.DbIormConfig` was modified
+
+* `validate()` was removed
+
+#### `models.ConnectionUrlType` was modified
+
+* `validate()` was removed
+
+#### `models.DbServerPatchingDetails` was modified
+
+* `validate()` was removed
+
+#### `models.CustomerContact` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseProperties` was modified
+
+* `withScheduledOperations(models.ScheduledOperationsType)` was removed
+* `validate()` was removed
+
+#### `models.ExascaleDbStorageInputDetails` was modified
+
+* `validate()` was removed
+
+#### `models.DnsPrivateViewProperties` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseStandbySummary` was modified
+
+* `validate()` was removed
+
+#### `models.ConnectionStringType` was modified
+
+* `validate()` was removed
+
+#### `models.CloudVmClusterUpdateProperties` was modified
+
+* `validate()` was removed
+
+#### `models.PrivateIpAddressesFilter` was modified
+
+* `validate()` was removed
+
+#### `models.RestoreAutonomousDatabaseDetails` was modified
+
+* `validate()` was removed
+
+#### `models.DataCollectionOptions` was modified
+
+* `validate()` was removed
+
+#### `models.MaintenanceWindow` was modified
+
+* `validate()` was removed
+
+#### `models.AutonomousDatabaseBackupProperties` was modified
+
+* `validate()` was removed
+
+#### `models.ScheduledOperationsTypeUpdate` was modified
+
+* `validate()` was removed
+
+#### `models.GiVersionProperties` was modified
+
+* `validate()` was removed
+
+### Features Added
+
+* `models.ResourceAnchor$UpdateStages` was added
+
+* `models.DbSystem$DefinitionStages` was added
+
+* `models.NetworkAnchorProperties` was added
+
+* `models.ResourceAnchor` was added
+
+* `models.StorageManagementType` was added
+
+* `models.DbSystemSourceType` was added
+
+* `models.NetworkAnchor$Update` was added
+
+* `models.ResourceAnchors` was added
+
+* `models.DbSystemUpdateProperties` was added
+
+* `models.DbSystemBaseProperties` was added
+
+* `models.DbSystemOptions` was added
+
+* `models.ResourceAnchorUpdate` was added
+
+* `models.AutonomousDatabaseLifecycleAction` was added
+
+* `models.DbSystemProperties` was added
+
+* `models.DbVersions` was added
+
+* `models.DbSystemUpdate` was added
+
+* `models.ResourceAnchorProperties` was added
+
+* `models.ResourceAnchor$Update` was added
+
+* `models.ExadataVmClusterStorageManagementType` was added
+
+* `models.ConfigureExascaleCloudExadataInfrastructureDetails` was added
+
+* `models.DbVersionProperties` was added
+
+* `models.NetworkAnchorUpdateProperties` was added
+
+* `models.DiskRedundancyType` was added
+
+* `models.AutonomousDatabaseLifecycleActionEnum` was added
+
+* `models.DbSystem` was added
+
+* `models.NetworkAnchors` was added
+
+* `models.NetworkAnchor$UpdateStages` was added
+
+* `models.DbVersion` was added
+
+* `models.DbSystemDatabaseEditionType` was added
+
+* `models.NetworkAnchor` was added
+
+* `models.NetworkAnchor$Definition` was added
+
+* `models.ShapeFamilyType` was added
+
+* `models.NetworkAnchor$DefinitionStages` was added
+
+* `models.ExascaleConfigDetails` was added
+
+* `models.DbSystem$Update` was added
+
+* `models.DbSystem$UpdateStages` was added
+
+* `models.BaseDbSystemShapes` was added
+
+* `models.DbSystemLifecycleState` was added
+
+* `models.DbSystem$Definition` was added
+
+* `models.ShapeAttribute` was added
+
+* `models.NetworkAnchorUpdate` was added
+
+* `models.DnsForwardingRule` was added
+
+* `models.ResourceAnchor$DefinitionStages` was added
+
+* `models.ResourceAnchor$Definition` was added
+
+* `models.StorageVolumePerformanceMode` was added
+
+* `models.DbSystems` was added
+
+#### `models.ExadbVmClusterProperties` was modified
+
+* `shapeAttribute()` was added
+* `withShapeAttribute(models.ShapeAttribute)` was added
+
+#### `models.CloudVmClusterProperties` was modified
+
+* `exascaleDbStorageVaultId()` was added
+* `withExascaleDbStorageVaultId(java.lang.String)` was added
+* `storageManagementType()` was added
+
+#### `models.AutonomousDatabaseCrossRegionDisasterRecoveryProperties` was modified
+
+* `withScheduledOperationsList(java.util.List)` was added
+
+#### `models.AutonomousDatabaseFromBackupTimestampProperties` was modified
+
+* `withScheduledOperationsList(java.util.List)` was added
+
+#### `models.DbSystemShapeProperties` was modified
+
+* `shapeAttributes()` was added
+
+#### `models.AutonomousDatabase` was modified
+
+* `action(models.AutonomousDatabaseLifecycleAction,com.azure.core.util.Context)` was added
+* `action(models.AutonomousDatabaseLifecycleAction)` was added
+
+#### `models.DbSystemShapes` was modified
+
+* `listByLocation(java.lang.String,java.lang.String,java.lang.String,com.azure.core.util.Context)` was added
+
+#### `models.AutonomousDatabaseCloneProperties` was modified
+
+* `withScheduledOperationsList(java.util.List)` was added
+
+#### `models.AutonomousDatabaseUpdateProperties` was modified
+
+* `withScheduledOperationsList(java.util.List)` was added
+* `scheduledOperationsList()` was added
+
+#### `models.GiVersions` was modified
+
+* `listByLocation(java.lang.String,models.SystemShapes,java.lang.String,java.lang.String,com.azure.core.util.Context)` was added
+
+#### `OracleDatabaseManager` was modified
+
+* `dbVersions()` was added
+* `networkAnchors()` was added
+* `resourceAnchors()` was added
+* `dbSystems()` was added
+
+#### `models.CloudExadataInfrastructureProperties` was modified
+
+* `exascaleConfig()` was added
+
+#### `models.CloudExadataInfrastructure` was modified
+
+* `configureExascale(models.ConfigureExascaleCloudExadataInfrastructureDetails,com.azure.core.util.Context)` was added
+* `configureExascale(models.ConfigureExascaleCloudExadataInfrastructureDetails)` was added
+
+#### `models.AutonomousDatabases` was modified
+
+* `action(java.lang.String,java.lang.String,models.AutonomousDatabaseLifecycleAction,com.azure.core.util.Context)` was added
+* `action(java.lang.String,java.lang.String,models.AutonomousDatabaseLifecycleAction)` was added
+
+#### `models.ExascaleDbStorageVaultProperties` was modified
+
+* `withExadataInfrastructureId(java.lang.String)` was added
+* `attachedShapeAttributes()` was added
+* `exadataInfrastructureId()` was added
+
+#### `models.AutonomousDatabaseBaseProperties` was modified
+
+* `scheduledOperationsList()` was added
+* `withScheduledOperationsList(java.util.List)` was added
+
+#### `models.AutonomousDatabaseProperties` was modified
+
+* `withScheduledOperationsList(java.util.List)` was added
+
+#### `models.CloudExadataInfrastructures` was modified
+
+* `configureExascale(java.lang.String,java.lang.String,models.ConfigureExascaleCloudExadataInfrastructureDetails)` was added
+* `configureExascale(java.lang.String,java.lang.String,models.ConfigureExascaleCloudExadataInfrastructureDetails,com.azure.core.util.Context)` was added
+
 ## 1.1.0 (2025-06-04)
 
 - Azure Resource Manager Oracle Database client library for Java. This package contains Microsoft Azure SDK for Oracle Database Management SDK.  Package api-version 2025-03-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/README.md b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/README.md
index 5d13be7ec2f6..10d2f0f0e95f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/README.md
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager Oracle Database client library for Java.
 
-This package contains Microsoft Azure SDK for Oracle Database Management SDK.  Package api-version 2025-03-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for Oracle Database Management SDK.  Package api-version 2025-09-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-oracledatabase</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/SAMPLE.md b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/SAMPLE.md
index cc48a4f3e65b..f0c26cb7af91 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/SAMPLE.md
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/SAMPLE.md
@@ -8,17 +8,20 @@
 
 ## AutonomousDatabases
 
+- [Action](#autonomousdatabases_action)
 - [ChangeDisasterRecoveryConfiguration](#autonomousdatabases_changedisasterrecoveryconfiguration)
 - [Failover](#autonomousdatabases_failover)
 - [GenerateWallet](#autonomousdatabases_generatewallet)
 - [ListByResourceGroup](#autonomousdatabases_listbyresourcegroup)
 - [Restore](#autonomousdatabases_restore)
+- [Shrink](#autonomousdatabases_shrink)
 - [Switchover](#autonomousdatabases_switchover)
 - [Update](#autonomousdatabases_update)
 
 ## CloudExadataInfrastructures
 
 - [AddStorageCapacity](#cloudexadatainfrastructures_addstoragecapacity)
+- [ConfigureExascale](#cloudexadatainfrastructures_configureexascale)
 
 ## CloudVmClusters
 
@@ -39,6 +42,10 @@
 
 - [ListByLocation](#dbsystemshapes_listbylocation)
 
+## DbVersions
+
+- [ListByLocation](#dbversions_listbylocation)
+
 ## ExadbVmClusters
 
 - [RemoveVms](#exadbvmclusters_removevms)
@@ -94,7 +101,7 @@
  */
 public final class AutonomousDatabaseBackupsListByAutonomousDatabaseSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_listByParent.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_listByParent.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_ListByAutonomousDatabase.
@@ -113,13 +120,32 @@ public final class AutonomousDatabaseBackupsListByAutonomousDatabaseSamples {
 
 ```java
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackup;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupUpdateProperties;
 
 /**
  * Samples for AutonomousDatabaseBackups Update.
  */
 public final class AutonomousDatabaseBackupsUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_patch.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseBackups_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Autonomous Database Backup. - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchAutonomousDatabaseBackupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        AutonomousDatabaseBackup resource = manager.autonomousDatabaseBackups()
+            .getWithResponse("rgopenapi", "databasedb1", "1711644130", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withProperties(new AutonomousDatabaseBackupUpdateProperties().withRetentionPeriodInDays(90))
+            .apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_patch.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_Update.
@@ -136,18 +162,67 @@ public final class AutonomousDatabaseBackupsUpdateSamples {
 }
 ```
 
+### AutonomousDatabases_Action
+
+```java
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleActionEnum;
+
+/**
+ * Samples for AutonomousDatabases Action.
+ */
+public final class AutonomousDatabasesActionSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Action_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: AutonomousDatabases_Action_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        autonomousDatabasesActionMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .action("rgopenapi", "databasedb1",
+                new AutonomousDatabaseLifecycleAction().withAction(AutonomousDatabaseLifecycleActionEnum.START),
+                com.azure.core.util.Context.NONE);
+    }
+}
+```
+
 ### AutonomousDatabases_ChangeDisasterRecoveryConfiguration
 
 ```java
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails;
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryType;
+import java.time.OffsetDateTime;
 
 /**
  * Samples for AutonomousDatabases ChangeDisasterRecoveryConfiguration.
  */
 public final class AutonomousDatabasesChangeDisasterRecoveryConfigurationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_changeDisasterRecoveryConfiguration.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ChangeDisasterRecoveryConfiguration_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform ChangeDisasterRecoveryConfiguration action on Autonomous Database - generated by
+     * [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performChangeDisasterRecoveryConfigurationActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .changeDisasterRecoveryConfiguration("rgopenapi", "databasedb1",
+                new DisasterRecoveryConfigurationDetails().withDisasterRecoveryType(DisasterRecoveryType.ADG)
+                    .withTimeSnapshotStandbyEnabledTill(OffsetDateTime.parse("2025-08-01T04:32:58.725Z"))
+                    .withIsSnapshotStandby(true)
+                    .withIsReplicateAutomaticBackups(true),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_changeDisasterRecoveryConfiguration.json
      */
     /**
      * Sample code: AutonomousDatabases_ChangeDisasterRecoveryConfiguration.
@@ -175,7 +250,7 @@ import com.azure.resourcemanager.oracledatabase.models.PeerDbDetails;
  */
 public final class AutonomousDatabasesFailoverSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_failover.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_failover.json
      */
     /**
      * Sample code: AutonomousDatabases_Failover.
@@ -188,6 +263,24 @@ public final class AutonomousDatabasesFailoverSamples {
             .failover("rg000", "databasedb1", new PeerDbDetails().withPeerDbId("peerDbId"),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Failover_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform failover action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performFailoverActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .failover("rgopenapi", "databasedb1*",
+                new PeerDbDetails().withPeerDbId("peerDbId")
+                    .withPeerDbOcid("yozpqyefqhirkybmzwgoidyl")
+                    .withPeerDbLocation("cxlzbzbfzi"),
+                com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -202,7 +295,25 @@ import com.azure.resourcemanager.oracledatabase.models.GenerateType;
  */
 public final class AutonomousDatabasesGenerateWalletSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_generateWallet.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_GenerateWallet_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Generate wallet action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void generateWalletActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .generateWalletWithResponse("rgopenapi", "databasedb1",
+                new GenerateAutonomousDatabaseWalletDetails().withGenerateType(GenerateType.SINGLE)
+                    .withIsRegional(true)
+                    .withPassword("fakeTokenPlaceholder"),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_generateWallet.json
      */
     /**
      * Sample code: AutonomousDatabases_generateWallet.
@@ -229,7 +340,7 @@ public final class AutonomousDatabasesGenerateWalletSamples {
  */
 public final class AutonomousDatabasesListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_listByResourceGroup.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_listByResourceGroup.json
      */
     /**
      * Sample code: AutonomousDatabases_listByResourceGroup.
@@ -240,6 +351,32 @@ public final class AutonomousDatabasesListByResourceGroupSamples {
         autonomousDatabasesListByResourceGroup(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabases().listByResourceGroup("rg000", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Autonomous Database by resource group - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDatabaseByResourceGroupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Autonomous Database by resource group - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDatabaseByResourceGroupGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -254,7 +391,7 @@ import java.time.OffsetDateTime;
  */
 public final class AutonomousDatabasesRestoreSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_restore.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_restore.json
      */
     /**
      * Sample code: AutonomousDatabases_Restore.
@@ -268,6 +405,44 @@ public final class AutonomousDatabasesRestoreSamples {
                 new RestoreAutonomousDatabaseDetails().withTimestamp(OffsetDateTime.parse("2024-04-23T00:00:00.000Z")),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Restore_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform restore action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performRestoreActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .restore("rgopenapi", "database1",
+                new RestoreAutonomousDatabaseDetails().withTimestamp(OffsetDateTime.parse("2024-04-23T00:00:00.000Z")),
+                com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### AutonomousDatabases_Shrink
+
+```java
+/**
+ * Samples for AutonomousDatabases Shrink.
+ */
+public final class AutonomousDatabasesShrinkSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Shrink_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform shrink action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performShrinkActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().shrink("rgopenapi", "database1", com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -281,7 +456,25 @@ import com.azure.resourcemanager.oracledatabase.models.PeerDbDetails;
  */
 public final class AutonomousDatabasesSwitchoverSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_switchover.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Switchover_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform switchover action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performSwitchoverActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .switchover("rgopenapi", "databasedb1",
+                new PeerDbDetails().withPeerDbId("peerDbId")
+                    .withPeerDbOcid("yozpqyefqhirkybmzwgoidyl")
+                    .withPeerDbLocation("cxlzbzbfzi"),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_switchover.json
      */
     /**
      * Sample code: AutonomousDatabases_Switchover.
@@ -301,13 +494,30 @@ public final class AutonomousDatabasesSwitchoverSamples {
 
 ```java
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabase;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousMaintenanceScheduleType;
+import com.azure.resourcemanager.oracledatabase.models.CustomerContact;
+import com.azure.resourcemanager.oracledatabase.models.DatabaseEditionType;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekName;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekUpdate;
+import com.azure.resourcemanager.oracledatabase.models.LicenseModel;
+import com.azure.resourcemanager.oracledatabase.models.LongTermBackUpScheduleDetails;
+import com.azure.resourcemanager.oracledatabase.models.OpenModeType;
+import com.azure.resourcemanager.oracledatabase.models.PermissionLevelType;
+import com.azure.resourcemanager.oracledatabase.models.RepeatCadenceType;
+import com.azure.resourcemanager.oracledatabase.models.RoleType;
+import com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsTypeUpdate;
+import java.time.OffsetDateTime;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Samples for AutonomousDatabases Update.
  */
 public final class AutonomousDatabasesUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_patch.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_patch.json
      */
     /**
      * Sample code: AutonomousDatabases_update.
@@ -321,6 +531,67 @@ public final class AutonomousDatabasesUpdateSamples {
             .getValue();
         resource.update().apply();
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        AutonomousDatabase resource = manager.autonomousDatabases()
+            .getByResourceGroupWithResponse("rgopenapi", "databasedb1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("key9827", "fakeTokenPlaceholder"))
+            .withProperties(new AutonomousDatabaseUpdateProperties().withAdminPassword("fakeTokenPlaceholder")
+                .withAutonomousMaintenanceScheduleType(AutonomousMaintenanceScheduleType.EARLY)
+                .withComputeCount(56.1D)
+                .withCpuCoreCount(45)
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("dummyemail@microsoft.com")))
+                .withDataStorageSizeInTbs(133)
+                .withDataStorageSizeInGbs(175271)
+                .withDisplayName("lrdrjpyyvufnxdzpwvlkmfukpstrjftdxcejcxtnqhxqbhvtzeiokllnspotsqeggddxkjjtf")
+                .withIsAutoScalingEnabled(true)
+                .withIsAutoScalingForStorageEnabled(true)
+                .withPeerDbId("qmpfwtvpfvbgmulethqznsyyjlpxmyfqfanrymzqsgraavtmlqqbexpzguyqybngoupbshlzpxv")
+                .withIsLocalDataGuardEnabled(true)
+                .withIsMtlsConnectionRequired(true)
+                .withLicenseModel(LicenseModel.LICENSE_INCLUDED)
+                .withScheduledOperationsList(Arrays.asList(new ScheduledOperationsTypeUpdate()
+                    .withDayOfWeek(new DayOfWeekUpdate().withName(DayOfWeekName.MONDAY))
+                    .withScheduledStartTime("lwwvkazgmfremfwhckfb")
+                    .withScheduledStopTime("hjwagzxijpiaogulmnmbuqakpqxhkjvaypjqnvbvtjddc")))
+                .withDatabaseEdition(DatabaseEditionType.STANDARD_EDITION)
+                .withLongTermBackupSchedule(
+                    new LongTermBackUpScheduleDetails().withRepeatCadence(RepeatCadenceType.ONE_TIME)
+                        .withTimeOfBackup(OffsetDateTime.parse("2025-08-01T04:32:58.715Z"))
+                        .withRetentionPeriodInDays(188)
+                        .withIsDisabled(true))
+                .withLocalAdgAutoFailoverMaxDataLossLimit(212)
+                .withOpenMode(OpenModeType.READ_ONLY)
+                .withPermissionLevel(PermissionLevelType.RESTRICTED)
+                .withRole(RoleType.PRIMARY)
+                .withBackupRetentionPeriodInDays(12)
+                .withWhitelistedIps(Arrays.asList(
+                    "kfierlppwurtqrhfxwgfgrnqtmvraignzwsddwmpdijeveuevuoejfmbjvpnlrmmdflilxcwkkzvdofctsdjfxrrrwctihhnchtrouauesqbmlcqhzwnppnhrtitecenlfyshassvajukbwxudhlwixkvkgsessvshcwmleoqujeemwenhwlsccbcjnnviugzgylsxkssalqoicatcvkahogdvweymhdxboyqwhaxuzlmrdbvgbnnetobkbwygcsflzanwknlybvvzgjzjirpfrksbxwgllgfxwdflcisvxpkjecpgdaxccqkzxofedkrawvhzeabmunpykwd")))
+            .apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
 }
 ```
 
@@ -332,7 +603,37 @@ public final class AutonomousDatabasesUpdateSamples {
  */
 public final class CloudExadataInfrastructuresAddStorageCapacitySamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_addStorageCapacity.json
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_AddStorageCapacity_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform add storage capacity on exadata infra - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performAddStorageCapacityOnExadataInfraGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .addStorageCapacity("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_AddStorageCapacity_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform add storage capacity on exadata infra - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performAddStorageCapacityOnExadataInfraGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .addStorageCapacity("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/exaInfra_addStorageCapacity.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_addStorageCapacity.
@@ -346,6 +647,49 @@ public final class CloudExadataInfrastructuresAddStorageCapacitySamples {
 }
 ```
 
+### CloudExadataInfrastructures_ConfigureExascale
+
+```java
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
+
+/**
+ * Samples for CloudExadataInfrastructures ConfigureExascale.
+ */
+public final class CloudExadataInfrastructuresConfigureExascaleSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ConfigureExascale_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: CloudExadataInfrastructures_ConfigureExascale_MaximumSet_Gen - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void cloudExadataInfrastructuresConfigureExascaleMaximumSetGenGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .configureExascale("rgopenapi", "Replace this value with a string matching RegExp .*",
+                new ConfigureExascaleCloudExadataInfrastructureDetails().withTotalStorageInGbs(19),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ConfigureExascale_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: CloudExadataInfrastructures_ConfigureExascale_MaximumSet_Gen - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void cloudExadataInfrastructuresConfigureExascaleMaximumSetGenGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .configureExascale("rgopenapi", "Replace this value with a string matching RegExp .*",
+                new ConfigureExascaleCloudExadataInfrastructureDetails().withTotalStorageInGbs(19),
+                com.azure.core.util.Context.NONE);
+    }
+}
+```
+
 ### CloudVmClusters_AddVms
 
 ```java
@@ -357,7 +701,23 @@ import java.util.Arrays;
  */
 public final class CloudVmClustersAddVmsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_addVms.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_AddVms_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Add VMs to VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addVMsToVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .addVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_addVms.json
      */
     /**
      * Sample code: CloudVmClusters_addVms.
@@ -370,6 +730,22 @@ public final class CloudVmClustersAddVmsSamples {
                 new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_AddVms_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Add VMs to VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addVMsToVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .addVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -383,7 +759,7 @@ import com.azure.resourcemanager.oracledatabase.models.PrivateIpAddressesFilter;
  */
 public final class CloudVmClustersListPrivateIpAddressesSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_listPrivateIpAddresses.json
+     * x-ms-original-file: 2025-09-01/vmClusters_listPrivateIpAddresses.json
      */
     /**
      * Sample code: CloudVmClusters_listPrivateIpAddresses.
@@ -397,6 +773,38 @@ public final class CloudVmClustersListPrivateIpAddressesSamples {
                 new PrivateIpAddressesFilter().withSubnetId("ocid1..aaaaaa").withVnicId("ocid1..aaaaa"),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListPrivateIpAddresses_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Private IP Addresses for VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listPrivateIPAddressesForVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .listPrivateIpAddressesWithResponse("rgopenapi", "cloudvmcluster1",
+                new PrivateIpAddressesFilter().withSubnetId("ocid1..aaaaaa").withVnicId("ocid1..aaaaa"),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListPrivateIpAddresses_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Private IP Addresses for VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listPrivateIPAddressesForVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .listPrivateIpAddressesWithResponse("rgopenapi", "cloudvmcluster1",
+                new PrivateIpAddressesFilter().withSubnetId("ocid1..aaaaaa").withVnicId("ocid1..aaaaa"),
+                com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -411,7 +819,39 @@ import java.util.Arrays;
  */
 public final class CloudVmClustersRemoveVmsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_removeVms.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_RemoveVms_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Remove VMs from VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void removeVMsFromVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .removeVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_RemoveVms_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Remove VMs from VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void removeVMsFromVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .removeVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_removeVms.json
      */
     /**
      * Sample code: CloudVmClusters_removeVms.
@@ -438,7 +878,22 @@ import com.azure.resourcemanager.oracledatabase.models.DbNodeActionEnum;
  */
 public final class DbNodesActionSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbNodes_action.json
+     * x-ms-original-file: 2025-09-01/DbNodes_Action_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: VM actions on DbNodes of VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void vmActionsOnDbNodesOfVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbNodes()
+            .action("rgopenapi", "cloudvmcluster1", "adfedefeewwevkieviect",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbNodes_action.json
      */
     /**
      * Sample code: DbNodes_Action.
@@ -450,6 +905,21 @@ public final class DbNodesActionSamples {
             .action("rg000", "cluster1", "ocid1....aaaaaa", new DbNodeAction().withAction(DbNodeActionEnum.START),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbNodes_Action_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: VM actions on DbNodes of VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void vmActionsOnDbNodesOfVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbNodes()
+            .action("rgopenapi", "cloudvmcluster1", "abciderewdidsereq",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -461,7 +931,7 @@ public final class DbNodesActionSamples {
  */
 public final class DbNodesListByCloudVmClusterSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbNodes_listByParent.json
+     * x-ms-original-file: 2025-09-01/dbNodes_listByParent.json
      */
     /**
      * Sample code: DbNodes_listByCloudVmCluster.
@@ -483,7 +953,7 @@ public final class DbNodesListByCloudVmClusterSamples {
  */
 public final class DbServersListByCloudExadataInfrastructureSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbServers_listByParent.json
+     * x-ms-original-file: 2025-09-01/dbServers_listByParent.json
      */
     /**
      * Sample code: DbServers_listByCloudExadataInfrastructure.
@@ -497,24 +967,80 @@ public final class DbServersListByCloudExadataInfrastructureSamples {
 }
 ```
 
-### DbSystemShapes_ListByLocation
+### DbSystemShapes_ListByLocation
+
+```java
+/**
+ * Samples for DbSystemShapes ListByLocation.
+ */
+public final class DbSystemShapesListByLocationSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystemShapes_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List DbSystemShapes by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDbSystemShapesByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes().listByLocation("eastus", null, null, com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystemShapes_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List DbSystemShapes by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDbSystemShapesByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes().listByLocation("eastus", "ymedsvqavemtixp", null, com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbSystemShapes_listByLocation.json
+     */
+    /**
+     * Sample code: DbSystemShapes_listByLocation.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemShapesListByLocation(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes().listByLocation("eastus", null, null, com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### DbVersions_ListByLocation
 
 ```java
+import com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+
 /**
- * Samples for DbSystemShapes ListByLocation.
+ * Samples for DbVersions ListByLocation.
  */
-public final class DbSystemShapesListByLocationSamples {
+public final class DbVersionsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbSystemShapes_listByLocation.json
+     * x-ms-original-file: 2025-09-01/DbVersions_ListByLocation_MaximumSet_Gen.json
      */
     /**
-     * Sample code: DbSystemShapes_listByLocation.
+     * Sample code: DbVersions_ListByLocation_MaximumSet.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
     public static void
-        dbSystemShapesListByLocation(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.dbSystemShapes().listByLocation("eastus", null, com.azure.core.util.Context.NONE);
+        dbVersionsListByLocationMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbVersions()
+            .listByLocation("eastus", BaseDbSystemShapes.VMSTANDARD_X86,
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Oracle.Database/dbSystems/dbsystem1",
+                StorageManagementType.LVM, true, true, ShapeFamilyType.VIRTUAL_MACHINE,
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -531,7 +1057,7 @@ import java.util.Arrays;
  */
 public final class ExadbVmClustersRemoveVmsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_RemoveVms_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_RemoveVms_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_RemoveVms_MaximumSet.
@@ -541,7 +1067,24 @@ public final class ExadbVmClustersRemoveVmsSamples {
     public static void
         exadbVmClustersRemoveVmsMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exadbVmClusters()
-            .removeVms("rgopenapi", "vmClusterName", new RemoveVirtualMachineFromExadbVmClusterDetails()
+            .removeVms("rgopenapi", "exadbVmClusterName1", new RemoveVirtualMachineFromExadbVmClusterDetails()
+                .withDbNodes(Arrays.asList(new DbNodeDetails().withDbNodeId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Oracle.Database/exadbVmClusters/vmCluster/dbNodes/dbNodeName"))),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_RemoveVms_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_RemoveVms_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersRemoveVmsMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters()
+            .removeVms("rgopenapi", "vmCluster1", new RemoveVirtualMachineFromExadbVmClusterDetails()
                 .withDbNodes(Arrays.asList(new DbNodeDetails().withDbNodeId(
                     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Oracle.Database/exadbVmClusters/vmCluster/dbNodes/dbNodeName"))),
                 com.azure.core.util.Context.NONE);
@@ -560,7 +1103,7 @@ import com.azure.resourcemanager.oracledatabase.models.DbNodeActionEnum;
  */
 public final class ExascaleDbNodesActionSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbNodes_Action_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_Action_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbNodes_Action_MaximumSet.
@@ -570,8 +1113,23 @@ public final class ExascaleDbNodesActionSamples {
     public static void
         exascaleDbNodesActionMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbNodes()
-            .action("rgopenapi", "vmClusterName", "dbNodeName", new DbNodeAction().withAction(DbNodeActionEnum.START),
-                com.azure.core.util.Context.NONE);
+            .action("rgopenapi", "exadbvmcluster1", "exascaledbnode1",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_Action_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbNodes_Action_MinimumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        exascaleDbNodesActionMinimumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbNodes()
+            .action("rgopenapi", "exadbvmcluster1", "exascaledbnode1",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -584,7 +1142,7 @@ public final class ExascaleDbNodesActionSamples {
  */
 public final class ExascaleDbNodesListByParentSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbNodes_ListByParent_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_ListByParent_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbNodes_ListByParent_MaximumSet.
@@ -593,7 +1151,20 @@ public final class ExascaleDbNodesListByParentSamples {
      */
     public static void
         exascaleDbNodesListByParentMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.exascaleDbNodes().listByParent("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+        manager.exascaleDbNodes().listByParent("rgopenapi", "vmcluster", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_ListByParent_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbNodes_ListByParent_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbNodesListByParentMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbNodes().listByParent("rgopenapi", "vmcluster", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -612,7 +1183,24 @@ import java.util.Map;
  */
 public final class ExascaleDbStorageVaultsCreateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Create_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Create_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Create_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsCreateMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults()
+            .define("storagevault1")
+            .withRegion("odxgtv")
+            .withExistingResourceGroup("rgopenapi")
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Create_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Create_MaximumSet.
@@ -622,18 +1210,17 @@ public final class ExascaleDbStorageVaultsCreateSamples {
     public static void exascaleDbStorageVaultsCreateMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbStorageVaults()
-            .define("vmClusterName")
-            .withRegion("ltguhzffucaytqg")
+            .define("storagevault1")
+            .withRegion("zuoudqbvlxerpjtlfooyqlb")
             .withExistingResourceGroup("rgopenapi")
-            .withTags(mapOf("key7827", "fakeTokenPlaceholder"))
+            .withTags(mapOf("key4521", "fakeTokenPlaceholder"))
             .withProperties(new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(0)
-                .withDescription("dmnvnnduldfmrmkkvvsdtuvmsmruxzzpsfdydgytlckutfozephjygjetrauvbdfcwmti")
-                .withDisplayName(
-                    "hbsybtelyvhpalemszcvartlhwvskrnpiveqfblvkdihoytqaotdgsgauvgivzaftfgeiwlyeqzssicwrrnlxtsmeakbcsxabjlt")
-                .withHighCapacityDatabaseStorageInput(new ExascaleDbStorageInputDetails().withTotalSizeInGbs(21))
-                .withTimeZone(
-                    "ltrbozwxjunncicrtzjrpqnqrcjgghohztrdlbfjrbkpenopyldwolslwgrgumjfkyovvkzcuxjujuxtjjzubvqvnhrswnbdgcbslopeofmtepbrrlymqwwszvsglmyuvlcuejshtpokirwklnwpcykhyinjmlqvxtyixlthtdishhmtipbygsayvgqzfrprgppylydlcskbmvwctxifdltippfvsxiughqbojqpqrekxsotnqsk"))
-            .withZones(Arrays.asList("qk"))
+                .withDescription(
+                    "kgqvxvtegzwyppegpvqxnlslvetbjlgveofcpjddenhbpocyzwtswaeaetqkipcxyhedsymuljalirryldlbviuvidhssyiwodacajjnbpkbvbvzwzsjctsidchalyjkievnivikwnnypaojcvhmokddstxwiqxmbfmbvglfimseguwyvibwzllggjtwejdfgezoeuvjjbsyfozswihydzuscjrqnklewongumiljeordhqlsclwlmftzdoey")
+                .withDisplayName("storagevault1")
+                .withHighCapacityDatabaseStorageInput(new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1))
+                .withTimeZone("hyjcftlal"))
+            .withZones(Arrays.asList("npqjhyekyumfybqas"))
             .create();
     }
 
@@ -659,7 +1246,7 @@ public final class ExascaleDbStorageVaultsCreateSamples {
  */
 public final class ExascaleDbStorageVaultsDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Delete_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Delete_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Delete_MaximumSet.
@@ -668,7 +1255,20 @@ public final class ExascaleDbStorageVaultsDeleteSamples {
      */
     public static void exascaleDbStorageVaultsDeleteMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.exascaleDbStorageVaults().delete("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+        manager.exascaleDbStorageVaults().delete("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Delete_MinimumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsDeleteMinimumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults().delete("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -681,7 +1281,7 @@ public final class ExascaleDbStorageVaultsDeleteSamples {
  */
 public final class ExascaleDbStorageVaultsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Get_MaximumSet.
@@ -691,7 +1291,21 @@ public final class ExascaleDbStorageVaultsGetByResourceGroupSamples {
     public static void
         exascaleDbStorageVaultsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbStorageVaults()
-            .getByResourceGroupWithResponse("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Get_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsGetMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults()
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -704,7 +1318,20 @@ public final class ExascaleDbStorageVaultsGetByResourceGroupSamples {
  */
 public final class ExascaleDbStorageVaultsListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_ListBySubscription_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_ListBySubscription_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsListBySubscriptionMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListBySubscription_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_ListBySubscription_MaximumSet.
@@ -726,7 +1353,7 @@ public final class ExascaleDbStorageVaultsListSamples {
  */
 public final class ExascaleDbStorageVaultsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet.
@@ -737,6 +1364,19 @@ public final class ExascaleDbStorageVaultsListByResourceGroupSamples {
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbStorageVaults().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsListByResourceGroupMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -752,7 +1392,7 @@ import java.util.Map;
  */
 public final class ExascaleDbStorageVaultsUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Update_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Update_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Update_MaximumSet.
@@ -762,9 +1402,25 @@ public final class ExascaleDbStorageVaultsUpdateSamples {
     public static void exascaleDbStorageVaultsUpdateMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         ExascaleDbStorageVault resource = manager.exascaleDbStorageVaults()
-            .getByResourceGroupWithResponse("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE)
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().withTags(mapOf("key6486", "fakeTokenPlaceholder")).apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Update_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsUpdateMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        ExascaleDbStorageVault resource = manager.exascaleDbStorageVaults()
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE)
             .getValue();
-        resource.update().withTags(mapOf("key6179", "fakeTokenPlaceholder")).apply();
+        resource.update().apply();
     }
 
     // Use "Map.of" if available
@@ -789,7 +1445,7 @@ public final class ExascaleDbStorageVaultsUpdateSamples {
  */
 public final class FlexComponentsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/FlexComponents_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/FlexComponents_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: FlexComponents_Get_MaximumSet.
@@ -798,7 +1454,7 @@ public final class FlexComponentsGetSamples {
      */
     public static void
         flexComponentsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.flexComponents().getWithResponse("eastus", "flexComponent", com.azure.core.util.Context.NONE);
+        manager.flexComponents().getWithResponse("eastus", "flexname1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -813,7 +1469,7 @@ import com.azure.resourcemanager.oracledatabase.models.SystemShapes;
  */
 public final class FlexComponentsListByParentSamples {
     /*
-     * x-ms-original-file: 2025-03-01/FlexComponents_ListByParent_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/FlexComponents_ListByParent_MaximumSet_Gen.json
      */
     /**
      * Sample code: FlexComponents_ListByParent_MaximumSet.
@@ -822,7 +1478,20 @@ public final class FlexComponentsListByParentSamples {
      */
     public static void
         flexComponentsListByParentMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.flexComponents().listByParent("eastus", SystemShapes.EXADATA_X11M, com.azure.core.util.Context.NONE);
+        manager.flexComponents().listByParent("eastus", SystemShapes.EXADATA_X9M, com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/FlexComponents_ListByParent_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: FlexComponents_ListByParent_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void flexComponentsListByParentMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.flexComponents().listByParent("eastus", null, com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -835,7 +1504,7 @@ public final class FlexComponentsListByParentSamples {
  */
 public final class GiMinorVersionsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiMinorVersions_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiMinorVersions_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: GiMinorVersions_Get_MaximumSet.
@@ -845,7 +1514,7 @@ public final class GiMinorVersionsGetSamples {
     public static void
         giMinorVersionsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.giMinorVersions()
-            .getWithResponse("eastus", "giVersionName", "giMinorVersionName", com.azure.core.util.Context.NONE);
+            .getWithResponse("eastus", "19.0.0.0", "minorversion", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -860,7 +1529,7 @@ import com.azure.resourcemanager.oracledatabase.models.ShapeFamily;
  */
 public final class GiMinorVersionsListByParentSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiMinorVersions_ListByParent_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiMinorVersions_ListByParent_MaximumSet_Gen.json
      */
     /**
      * Sample code: GiMinorVersions_ListByParent_MaximumSet.
@@ -870,8 +1539,21 @@ public final class GiMinorVersionsListByParentSamples {
     public static void
         giMinorVersionsListByParentMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.giMinorVersions()
-            .listByParent("eastus", "giVersionName", ShapeFamily.fromString("rtfcosvtlpeeqoicsjqggtgc"), null,
-                com.azure.core.util.Context.NONE);
+            .listByParent("eastus", "name1", ShapeFamily.EXADATA, "zone1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/GiMinorVersions_ListByParent_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: GiMinorVersions_ListByParent_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void giMinorVersionsListByParentMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.giMinorVersions()
+            .listByParent("eastus", "giMinorVersionName", null, null, com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -886,32 +1568,30 @@ import com.azure.resourcemanager.oracledatabase.models.SystemShapes;
  */
 public final class GiVersionsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiVersions_ListByLocation_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiVersions_ListByLocation_MinimumSet_Gen.json
      */
     /**
-     * Sample code: List GiVersions by location - generated by [MaximumSet] rule.
+     * Sample code: GiVersions_ListByLocation_MinimumSet.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
-    public static void listGiVersionsByLocationGeneratedByMaximumSetRule(
-        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.giVersions()
-            .listByLocation("eastus", SystemShapes.fromString(
-                "osixsklyaauhoqnkxvnvsqeqenhzogntqnpubldrrfvqncwetdtwqwjjcvspwhgecbimdlulwcubikebrdzmidrucgtsuqvytkqutmbyrvvyioxpocpmuwiivyanjzucaegihztluuvpznzaoakfsselumhhsvrtrbzwpjhcihsvyouonlxdluwhqfxoqvgthkaxppbydtqjntscgzbivfdcaobbkthrbdjwpejirqmbly"),
-                null, com.azure.core.util.Context.NONE);
+    public static void
+        giVersionsListByLocationMinimumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.giVersions().listByLocation("eastus", null, null, null, com.azure.core.util.Context.NONE);
     }
 
     /*
-     * x-ms-original-file: 2025-03-01/GiVersions_ListByLocation_MinimumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiVersions_ListByLocation_MaximumSet_Gen.json
      */
     /**
-     * Sample code: List GiVersions by location - generated by [MinimumSet] rule.
+     * Sample code: GiVersions_ListByLocation_MaximumSet.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
-    public static void listGiVersionsByLocationGeneratedByMinimumSetRule(
-        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.giVersions().listByLocation("eastus", null, null, com.azure.core.util.Context.NONE);
+    public static void
+        giVersionsListByLocationMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.giVersions()
+            .listByLocation("eastus", SystemShapes.EXADATA_X9M, "hpzuyaemum", null, com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -924,7 +1604,20 @@ public final class GiVersionsListByLocationSamples {
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/operations_list.json
+     * x-ms-original-file: 2025-09-01/Operations_List_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Operations - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listOperationsGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.operations().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/operations_list.json
      */
     /**
      * Sample code: Operations_list.
@@ -934,6 +1627,19 @@ public final class OperationsListSamples {
     public static void operationsList(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.operations().list(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/Operations_List_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Operations - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listOperationsGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.operations().list(com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -948,7 +1654,7 @@ import java.util.Arrays;
  */
 public final class OracleSubscriptionsAddAzureSubscriptionsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_addAzureSubscriptions.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_addAzureSubscriptions.json
      */
     /**
      * Sample code: OracleSubscriptions_addAzureSubscriptions.
@@ -961,6 +1667,36 @@ public final class OracleSubscriptionsAddAzureSubscriptionsSamples {
             .addAzureSubscriptions(new AzureSubscriptions().withAzureSubscriptionIds(
                 Arrays.asList("00000000-0000-0000-0000-000000000001")), com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_AddAzureSubscriptions_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Add Azure Subscriptions to the OracleSubscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addAzureSubscriptionsToTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .addAzureSubscriptions(new AzureSubscriptions().withAzureSubscriptionIds(
+                Arrays.asList("00000000-0000-0000-0000-000000000001")), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_AddAzureSubscriptions_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Add Azure Subscriptions to the OracleSubscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addAzureSubscriptionsToTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .addAzureSubscriptions(new AzureSubscriptions().withAzureSubscriptionIds(
+                Arrays.asList("00000000-0000-0000-0000-000000000001")), com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -972,7 +1708,33 @@ public final class OracleSubscriptionsAddAzureSubscriptionsSamples {
  */
 public final class OracleSubscriptionsListActivationLinksSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listActivationLinks.json
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListActivationLinks_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Activation Links for the Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listActivationLinksForTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listActivationLinks(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListActivationLinks_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Activation Links for the Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listActivationLinksForTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listActivationLinks(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listActivationLinks.json
      */
     /**
      * Sample code: OracleSubscriptions_listActivationLinks.
@@ -994,7 +1756,7 @@ public final class OracleSubscriptionsListActivationLinksSamples {
  */
 public final class OracleSubscriptionsListCloudAccountDetailsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listCloudAccountDetails.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listCloudAccountDetails.json
      */
     /**
      * Sample code: OracleSubscriptions_listCloudAccountDetails.
@@ -1005,6 +1767,32 @@ public final class OracleSubscriptionsListCloudAccountDetailsSamples {
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.oracleSubscriptions().listCloudAccountDetails(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListCloudAccountDetails_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Cloud Account details for the Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listCloudAccountDetailsForTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listCloudAccountDetails(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListCloudAccountDetails_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Cloud Account details for the Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listCloudAccountDetailsForTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listCloudAccountDetails(com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -1016,7 +1804,7 @@ public final class OracleSubscriptionsListCloudAccountDetailsSamples {
  */
 public final class OracleSubscriptionsListSaasSubscriptionDetailsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listSaasSubscriptionDetails.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listSaasSubscriptionDetails.json
      */
     /**
      * Sample code: OracleSubscriptions_listSaasSubscriptionDetails.
@@ -1027,20 +1815,49 @@ public final class OracleSubscriptionsListSaasSubscriptionDetailsSamples {
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.oracleSubscriptions().listSaasSubscriptionDetails(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListSaasSubscriptionDetails_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Saas Subscription details for the Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listSaasSubscriptionDetailsForTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listSaasSubscriptionDetails(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListSaasSubscriptionDetails_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Saas Subscription details for the Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listSaasSubscriptionDetailsForTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listSaasSubscriptionDetails(com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
 ### OracleSubscriptions_Update
 
 ```java
+import com.azure.resourcemanager.oracledatabase.models.Intent;
 import com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdate;
+import com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.PlanUpdate;
 
 /**
  * Samples for OracleSubscriptions Update.
  */
 public final class OracleSubscriptionsUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_patch.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_patch.json
      */
     /**
      * Sample code: OracleSubscriptions_update.
@@ -1051,6 +1868,41 @@ public final class OracleSubscriptionsUpdateSamples {
         oracleSubscriptionsUpdate(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.oracleSubscriptions().update(new OracleSubscriptionUpdate(), com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().update(new OracleSubscriptionUpdate(), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .update(new OracleSubscriptionUpdate()
+                .withPlan(new PlanUpdate().withName("klnnbggrxhvvaiajvjx")
+                    .withPublisher("xvsarzadrjqergudsohjk")
+                    .withProduct("hivkczjyrimjilbmqj")
+                    .withPromotionCode("fakeTokenPlaceholder")
+                    .withVersion("ueudckjmuqpjvsmmenzyflgpa"))
+                .withProperties(new OracleSubscriptionUpdateProperties().withProductCode("fakeTokenPlaceholder")
+                    .withIntent(Intent.RETAIN)),
+                com.azure.core.util.Context.NONE);
+    }
 }
 ```
 
@@ -1062,7 +1914,7 @@ public final class OracleSubscriptionsUpdateSamples {
  */
 public final class VirtualNetworkAddressesListByCloudVmClusterSamples {
     /*
-     * x-ms-original-file: 2025-03-01/virtualNetworkAddresses_listByParent.json
+     * x-ms-original-file: 2025-09-01/virtualNetworkAddresses_listByParent.json
      */
     /**
      * Sample code: VirtualNetworkAddresses_listByCloudVmCluster.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/pom.xml b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/pom.xml
index 1e8d5f0d7ae3..8a2767efbbd2 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/pom.xml
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/pom.xml
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-oracledatabase</artifactId>
-  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-oracledatabase;current} -->
+  <version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-oracledatabase;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Oracle Database Management</name>
-  <description>This package contains Microsoft Azure SDK for Oracle Database Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt.  Package api-version 2025-03-01.</description>
+  <description>This package contains Microsoft Azure SDK for Oracle Database Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt.  Package api-version 2025-09-01.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/OracleDatabaseManager.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/OracleDatabaseManager.java
index 0692a8127a2d..31c6de17d35d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/OracleDatabaseManager.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/OracleDatabaseManager.java
@@ -35,6 +35,8 @@
 import com.azure.resourcemanager.oracledatabase.implementation.DbNodesImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.DbServersImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.DbSystemShapesImpl;
+import com.azure.resourcemanager.oracledatabase.implementation.DbSystemsImpl;
+import com.azure.resourcemanager.oracledatabase.implementation.DbVersionsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.DnsPrivateViewsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.DnsPrivateZonesImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.ExadbVmClustersImpl;
@@ -43,9 +45,11 @@
 import com.azure.resourcemanager.oracledatabase.implementation.FlexComponentsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.GiMinorVersionsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.GiVersionsImpl;
+import com.azure.resourcemanager.oracledatabase.implementation.NetworkAnchorsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.OperationsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.OracleDatabaseManagementClientBuilder;
 import com.azure.resourcemanager.oracledatabase.implementation.OracleSubscriptionsImpl;
+import com.azure.resourcemanager.oracledatabase.implementation.ResourceAnchorsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.SystemVersionsImpl;
 import com.azure.resourcemanager.oracledatabase.implementation.VirtualNetworkAddressesImpl;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackups;
@@ -58,6 +62,8 @@
 import com.azure.resourcemanager.oracledatabase.models.DbNodes;
 import com.azure.resourcemanager.oracledatabase.models.DbServers;
 import com.azure.resourcemanager.oracledatabase.models.DbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.DbSystems;
+import com.azure.resourcemanager.oracledatabase.models.DbVersions;
 import com.azure.resourcemanager.oracledatabase.models.DnsPrivateViews;
 import com.azure.resourcemanager.oracledatabase.models.DnsPrivateZones;
 import com.azure.resourcemanager.oracledatabase.models.ExadbVmClusters;
@@ -66,8 +72,10 @@
 import com.azure.resourcemanager.oracledatabase.models.FlexComponents;
 import com.azure.resourcemanager.oracledatabase.models.GiMinorVersions;
 import com.azure.resourcemanager.oracledatabase.models.GiVersions;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchors;
 import com.azure.resourcemanager.oracledatabase.models.Operations;
 import com.azure.resourcemanager.oracledatabase.models.OracleSubscriptions;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchors;
 import com.azure.resourcemanager.oracledatabase.models.SystemVersions;
 import com.azure.resourcemanager.oracledatabase.models.VirtualNetworkAddresses;
 import java.time.Duration;
@@ -126,6 +134,14 @@ public final class OracleDatabaseManager {
 
     private ExascaleDbStorageVaults exascaleDbStorageVaults;
 
+    private NetworkAnchors networkAnchors;
+
+    private ResourceAnchors resourceAnchors;
+
+    private DbSystems dbSystems;
+
+    private DbVersions dbVersions;
+
     private final OracleDatabaseManagementClient clientObject;
 
     private OracleDatabaseManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
@@ -612,6 +628,54 @@ public ExascaleDbStorageVaults exascaleDbStorageVaults() {
         return exascaleDbStorageVaults;
     }
 
+    /**
+     * Gets the resource collection API of NetworkAnchors. It manages NetworkAnchor.
+     * 
+     * @return Resource collection API of NetworkAnchors.
+     */
+    public NetworkAnchors networkAnchors() {
+        if (this.networkAnchors == null) {
+            this.networkAnchors = new NetworkAnchorsImpl(clientObject.getNetworkAnchors(), this);
+        }
+        return networkAnchors;
+    }
+
+    /**
+     * Gets the resource collection API of ResourceAnchors. It manages ResourceAnchor.
+     * 
+     * @return Resource collection API of ResourceAnchors.
+     */
+    public ResourceAnchors resourceAnchors() {
+        if (this.resourceAnchors == null) {
+            this.resourceAnchors = new ResourceAnchorsImpl(clientObject.getResourceAnchors(), this);
+        }
+        return resourceAnchors;
+    }
+
+    /**
+     * Gets the resource collection API of DbSystems. It manages DbSystem.
+     * 
+     * @return Resource collection API of DbSystems.
+     */
+    public DbSystems dbSystems() {
+        if (this.dbSystems == null) {
+            this.dbSystems = new DbSystemsImpl(clientObject.getDbSystems(), this);
+        }
+        return dbSystems;
+    }
+
+    /**
+     * Gets the resource collection API of DbVersions.
+     * 
+     * @return Resource collection API of DbVersions.
+     */
+    public DbVersions dbVersions() {
+        if (this.dbVersions == null) {
+            this.dbVersions = new DbVersionsImpl(clientObject.getDbVersions(), this);
+        }
+        return dbVersions;
+    }
+
     /**
      * Gets wrapped service client OracleDatabaseManagementClient providing direct access to the underlying
      * auto-generated API implementation, based on Azure REST API.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabasesClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabasesClient.java
index 5d4cafe76309..b40590ba8476 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabasesClient.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabasesClient.java
@@ -13,6 +13,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseInner;
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseWalletFileInner;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdate;
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails;
 import com.azure.resourcemanager.oracledatabase.models.GenerateAutonomousDatabaseWalletDetails;
@@ -608,4 +609,66 @@ AutonomousDatabaseInner changeDisasterRecoveryConfiguration(String resourceGroup
     @ServiceMethod(returns = ReturnType.SINGLE)
     AutonomousDatabaseInner changeDisasterRecoveryConfiguration(String resourceGroupName, String autonomousdatabasename,
         DisasterRecoveryConfigurationDetails body, Context context);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<AutonomousDatabaseInner>, AutonomousDatabaseInner> beginAction(String resourceGroupName,
+        String autonomousdatabasename, AutonomousDatabaseLifecycleAction body);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<AutonomousDatabaseInner>, AutonomousDatabaseInner> beginAction(String resourceGroupName,
+        String autonomousdatabasename, AutonomousDatabaseLifecycleAction body, Context context);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    AutonomousDatabaseInner action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    AutonomousDatabaseInner action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body, Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudExadataInfrastructuresClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudExadataInfrastructuresClient.java
index 6515bc1882cd..1d79ee1445e5 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudExadataInfrastructuresClient.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudExadataInfrastructuresClient.java
@@ -13,6 +13,7 @@
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.oracledatabase.fluent.models.CloudExadataInfrastructureInner;
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdate;
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
 
 /**
  * An instance of this class provides access to all the operations defined in CloudExadataInfrastructuresClient.
@@ -332,4 +333,68 @@ SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String
     @ServiceMethod(returns = ReturnType.SINGLE)
     CloudExadataInfrastructureInner addStorageCapacity(String resourceGroupName, String cloudexadatainfrastructurename,
         Context context);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<CloudExadataInfrastructureInner>, CloudExadataInfrastructureInner> beginConfigureExascale(
+        String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<CloudExadataInfrastructureInner>, CloudExadataInfrastructureInner> beginConfigureExascale(
+        String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body, Context context);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    CloudExadataInfrastructureInner configureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    CloudExadataInfrastructureInner configureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body, Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemShapesClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemShapesClient.java
index fef679a32b54..d4f9618be0c4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemShapesClient.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemShapesClient.java
@@ -59,6 +59,7 @@ public interface DbSystemShapesClient {
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
@@ -66,5 +67,6 @@ public interface DbSystemShapesClient {
      * @return the response of a DbSystemShape list operation as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<DbSystemShapeInner> listByLocation(String location, String zone, Context context);
+    PagedIterable<DbSystemShapeInner> listByLocation(String location, String zone, String shapeAttribute,
+        Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemsClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemsClient.java
new file mode 100644
index 000000000000..652883c14bcb
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemsClient.java
@@ -0,0 +1,268 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdate;
+
+/**
+ * An instance of this class provides access to all the operations defined in DbSystemsClient.
+ */
+public interface DbSystemsClient {
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<DbSystemInner> list();
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<DbSystemInner> list(Context context);
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginCreateOrUpdate(String resourceGroupName,
+        String dbSystemName, DbSystemInner resource);
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginCreateOrUpdate(String resourceGroupName,
+        String dbSystemName, DbSystemInner resource, Context context);
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    DbSystemInner createOrUpdate(String resourceGroupName, String dbSystemName, DbSystemInner resource);
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    DbSystemInner createOrUpdate(String resourceGroupName, String dbSystemName, DbSystemInner resource,
+        Context context);
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<DbSystemInner> getByResourceGroupWithResponse(String resourceGroupName, String dbSystemName,
+        Context context);
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    DbSystemInner getByResourceGroup(String resourceGroupName, String dbSystemName);
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginUpdate(String resourceGroupName, String dbSystemName,
+        DbSystemUpdate properties);
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginUpdate(String resourceGroupName, String dbSystemName,
+        DbSystemUpdate properties, Context context);
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    DbSystemInner update(String resourceGroupName, String dbSystemName, DbSystemUpdate properties);
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    DbSystemInner update(String resourceGroupName, String dbSystemName, DbSystemUpdate properties, Context context);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String dbSystemName);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String dbSystemName, Context context);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String dbSystemName);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String dbSystemName, Context context);
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<DbSystemInner> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<DbSystemInner> listByResourceGroup(String resourceGroupName, Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbVersionsClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbVersionsClient.java
new file mode 100644
index 000000000000..b58447329163
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbVersionsClient.java
@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+import com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+
+/**
+ * An instance of this class provides access to all the operations defined in DbVersionsClient.
+ */
+public interface DbVersionsClient {
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<DbVersionInner> getWithResponse(String location, String dbversionsname, Context context);
+
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    DbVersionInner get(String location, String dbversionsname);
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<DbVersionInner> listByLocation(String location);
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<DbVersionInner> listByLocation(String location, BaseDbSystemShapes dbSystemShape, String dbSystemId,
+        StorageManagementType storageManagement, Boolean isUpgradeSupported, Boolean isDatabaseSoftwareImageSupported,
+        ShapeFamilyType shapeFamily, Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiVersionsClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiVersionsClient.java
index eb1da495c8fa..acce8c46e81d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiVersionsClient.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiVersionsClient.java
@@ -61,6 +61,7 @@ public interface GiVersionsClient {
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
@@ -68,5 +69,6 @@ public interface GiVersionsClient {
      * @return the response of a GiVersion list operation as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    PagedIterable<GiVersionInner> listByLocation(String location, SystemShapes shape, String zone, Context context);
+    PagedIterable<GiVersionInner> listByLocation(String location, SystemShapes shape, String zone,
+        String shapeAttribute, Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/NetworkAnchorsClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/NetworkAnchorsClient.java
new file mode 100644
index 000000000000..15ce76886a51
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/NetworkAnchorsClient.java
@@ -0,0 +1,269 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdate;
+
+/**
+ * An instance of this class provides access to all the operations defined in NetworkAnchorsClient.
+ */
+public interface NetworkAnchorsClient {
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NetworkAnchorInner> list();
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NetworkAnchorInner> list(Context context);
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginCreateOrUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorInner resource);
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginCreateOrUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorInner resource, Context context);
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    NetworkAnchorInner createOrUpdate(String resourceGroupName, String networkAnchorName, NetworkAnchorInner resource);
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    NetworkAnchorInner createOrUpdate(String resourceGroupName, String networkAnchorName, NetworkAnchorInner resource,
+        Context context);
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<NetworkAnchorInner> getByResourceGroupWithResponse(String resourceGroupName, String networkAnchorName,
+        Context context);
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    NetworkAnchorInner getByResourceGroup(String resourceGroupName, String networkAnchorName);
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorUpdate properties);
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorUpdate properties, Context context);
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    NetworkAnchorInner update(String resourceGroupName, String networkAnchorName, NetworkAnchorUpdate properties);
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    NetworkAnchorInner update(String resourceGroupName, String networkAnchorName, NetworkAnchorUpdate properties,
+        Context context);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String networkAnchorName);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String networkAnchorName, Context context);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String networkAnchorName);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String networkAnchorName, Context context);
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NetworkAnchorInner> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<NetworkAnchorInner> listByResourceGroup(String resourceGroupName, Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleDatabaseManagementClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleDatabaseManagementClient.java
index a9639a16d442..985428f71492 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleDatabaseManagementClient.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleDatabaseManagementClient.java
@@ -199,4 +199,32 @@ public interface OracleDatabaseManagementClient {
      * @return the ExascaleDbStorageVaultsClient object.
      */
     ExascaleDbStorageVaultsClient getExascaleDbStorageVaults();
+
+    /**
+     * Gets the NetworkAnchorsClient object to access its operations.
+     * 
+     * @return the NetworkAnchorsClient object.
+     */
+    NetworkAnchorsClient getNetworkAnchors();
+
+    /**
+     * Gets the ResourceAnchorsClient object to access its operations.
+     * 
+     * @return the ResourceAnchorsClient object.
+     */
+    ResourceAnchorsClient getResourceAnchors();
+
+    /**
+     * Gets the DbSystemsClient object to access its operations.
+     * 
+     * @return the DbSystemsClient object.
+     */
+    DbSystemsClient getDbSystems();
+
+    /**
+     * Gets the DbVersionsClient object to access its operations.
+     * 
+     * @return the DbVersionsClient object.
+     */
+    DbVersionsClient getDbVersions();
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ResourceAnchorsClient.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ResourceAnchorsClient.java
new file mode 100644
index 000000000000..7366588cf43b
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ResourceAnchorsClient.java
@@ -0,0 +1,271 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent;
+
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.Context;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorUpdate;
+
+/**
+ * An instance of this class provides access to all the operations defined in ResourceAnchorsClient.
+ */
+public interface ResourceAnchorsClient {
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ResourceAnchorInner> list();
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ResourceAnchorInner> list(Context context);
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorInner resource);
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginCreateOrUpdate(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorInner resource, Context context);
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ResourceAnchorInner createOrUpdate(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource);
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ResourceAnchorInner createOrUpdate(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource, Context context);
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<ResourceAnchorInner> getByResourceGroupWithResponse(String resourceGroupName, String resourceAnchorName,
+        Context context);
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ResourceAnchorInner getByResourceGroup(String resourceGroupName, String resourceAnchorName);
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginUpdate(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorUpdate properties);
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginUpdate(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorUpdate properties, Context context);
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ResourceAnchorInner update(String resourceGroupName, String resourceAnchorName, ResourceAnchorUpdate properties);
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    ResourceAnchorInner update(String resourceGroupName, String resourceAnchorName, ResourceAnchorUpdate properties,
+        Context context);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceAnchorName);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceAnchorName,
+        Context context);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceAnchorName);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    void delete(String resourceGroupName, String resourceAnchorName, Context context);
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ResourceAnchorInner> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<ResourceAnchorInner> listByResourceGroup(String resourceGroupName, Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbSystemInner.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbSystemInner.java
new file mode 100644
index 000000000000..997afd24f54c
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbSystemInner.java
@@ -0,0 +1,211 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.Resource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemProperties;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * DbSystem resource definition.
+ */
+@Fluent
+public final class DbSystemInner extends Resource {
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private DbSystemProperties properties;
+
+    /*
+     * The availability zones.
+     */
+    private List<String> zones;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of DbSystemInner class.
+     */
+    public DbSystemInner() {
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public DbSystemProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The resource-specific properties for this resource.
+     * 
+     * @param properties the properties value to set.
+     * @return the DbSystemInner object itself.
+     */
+    public DbSystemInner withProperties(DbSystemProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the zones property: The availability zones.
+     * 
+     * @return the zones value.
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set the zones property: The availability zones.
+     * 
+     * @param zones the zones value to set.
+     * @return the DbSystemInner object itself.
+     */
+    public DbSystemInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemInner withLocation(String location) {
+        super.withLocation(location);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemInner withTags(Map<String, String> tags) {
+        super.withTags(tags);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("location", location());
+        jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.properties);
+        jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbSystemInner.
+     */
+    public static DbSystemInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemInner deserializedDbSystemInner = new DbSystemInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedDbSystemInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedDbSystemInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedDbSystemInner.type = reader.getString();
+                } else if ("location".equals(fieldName)) {
+                    deserializedDbSystemInner.withLocation(reader.getString());
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedDbSystemInner.withTags(tags);
+                } else if ("properties".equals(fieldName)) {
+                    deserializedDbSystemInner.properties = DbSystemProperties.fromJson(reader);
+                } else if ("zones".equals(fieldName)) {
+                    List<String> zones = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemInner.zones = zones;
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedDbSystemInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemInner;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbVersionInner.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbVersionInner.java
new file mode 100644
index 000000000000..6e91a871d3e9
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbVersionInner.java
@@ -0,0 +1,144 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.core.management.ProxyResource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.models.DbVersionProperties;
+import java.io.IOException;
+
+/**
+ * Oracle Database DbVersion resource definition.
+ */
+@Immutable
+public final class DbVersionInner extends ProxyResource {
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private DbVersionProperties properties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of DbVersionInner class.
+     */
+    private DbVersionInner() {
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public DbVersionProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbVersionInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbVersionInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbVersionInner.
+     */
+    public static DbVersionInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbVersionInner deserializedDbVersionInner = new DbVersionInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedDbVersionInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedDbVersionInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedDbVersionInner.type = reader.getString();
+                } else if ("properties".equals(fieldName)) {
+                    deserializedDbVersionInner.properties = DbVersionProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedDbVersionInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbVersionInner;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/NetworkAnchorInner.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/NetworkAnchorInner.java
new file mode 100644
index 000000000000..4916be8e57d5
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/NetworkAnchorInner.java
@@ -0,0 +1,211 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.Resource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Network Anchor resource model.
+ */
+@Fluent
+public final class NetworkAnchorInner extends Resource {
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private NetworkAnchorProperties properties;
+
+    /*
+     * The availability zones.
+     */
+    private List<String> zones;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of NetworkAnchorInner class.
+     */
+    public NetworkAnchorInner() {
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public NetworkAnchorProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The resource-specific properties for this resource.
+     * 
+     * @param properties the properties value to set.
+     * @return the NetworkAnchorInner object itself.
+     */
+    public NetworkAnchorInner withProperties(NetworkAnchorProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the zones property: The availability zones.
+     * 
+     * @return the zones value.
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set the zones property: The availability zones.
+     * 
+     * @param zones the zones value to set.
+     * @return the NetworkAnchorInner object itself.
+     */
+    public NetworkAnchorInner withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public NetworkAnchorInner withLocation(String location) {
+        super.withLocation(location);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public NetworkAnchorInner withTags(Map<String, String> tags) {
+        super.withTags(tags);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("location", location());
+        jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.properties);
+        jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkAnchorInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkAnchorInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the NetworkAnchorInner.
+     */
+    public static NetworkAnchorInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkAnchorInner deserializedNetworkAnchorInner = new NetworkAnchorInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedNetworkAnchorInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedNetworkAnchorInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedNetworkAnchorInner.type = reader.getString();
+                } else if ("location".equals(fieldName)) {
+                    deserializedNetworkAnchorInner.withLocation(reader.getString());
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedNetworkAnchorInner.withTags(tags);
+                } else if ("properties".equals(fieldName)) {
+                    deserializedNetworkAnchorInner.properties = NetworkAnchorProperties.fromJson(reader);
+                } else if ("zones".equals(fieldName)) {
+                    List<String> zones = reader.readArray(reader1 -> reader1.getString());
+                    deserializedNetworkAnchorInner.zones = zones;
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedNetworkAnchorInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkAnchorInner;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ResourceAnchorInner.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ResourceAnchorInner.java
new file mode 100644
index 000000000000..451a8f17ed61
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ResourceAnchorInner.java
@@ -0,0 +1,181 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.management.Resource;
+import com.azure.core.management.SystemData;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * Resource Anchor model.
+ */
+@Fluent
+public final class ResourceAnchorInner extends Resource {
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private ResourceAnchorProperties properties;
+
+    /*
+     * Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     */
+    private SystemData systemData;
+
+    /*
+     * The type of the resource.
+     */
+    private String type;
+
+    /*
+     * The name of the resource.
+     */
+    private String name;
+
+    /*
+     * Fully qualified resource Id for the resource.
+     */
+    private String id;
+
+    /**
+     * Creates an instance of ResourceAnchorInner class.
+     */
+    public ResourceAnchorInner() {
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public ResourceAnchorProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The resource-specific properties for this resource.
+     * 
+     * @param properties the properties value to set.
+     * @return the ResourceAnchorInner object itself.
+     */
+    public ResourceAnchorInner withProperties(ResourceAnchorProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * Get the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    public SystemData systemData() {
+        return this.systemData;
+    }
+
+    /**
+     * Get the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    @Override
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    @Override
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Get the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    @Override
+    public String id() {
+        return this.id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ResourceAnchorInner withLocation(String location) {
+        super.withLocation(location);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ResourceAnchorInner withTags(Map<String, String> tags) {
+        super.withTags(tags);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("location", location());
+        jsonWriter.writeMapField("tags", tags(), (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ResourceAnchorInner from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ResourceAnchorInner if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the ResourceAnchorInner.
+     */
+    public static ResourceAnchorInner fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ResourceAnchorInner deserializedResourceAnchorInner = new ResourceAnchorInner();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("id".equals(fieldName)) {
+                    deserializedResourceAnchorInner.id = reader.getString();
+                } else if ("name".equals(fieldName)) {
+                    deserializedResourceAnchorInner.name = reader.getString();
+                } else if ("type".equals(fieldName)) {
+                    deserializedResourceAnchorInner.type = reader.getString();
+                } else if ("location".equals(fieldName)) {
+                    deserializedResourceAnchorInner.withLocation(reader.getString());
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedResourceAnchorInner.withTags(tags);
+                } else if ("properties".equals(fieldName)) {
+                    deserializedResourceAnchorInner.properties = ResourceAnchorProperties.fromJson(reader);
+                } else if ("systemData".equals(fieldName)) {
+                    deserializedResourceAnchorInner.systemData = SystemData.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedResourceAnchorInner;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseImpl.java
index e8d8e75c492f..848655ca70d2 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseImpl.java
@@ -11,6 +11,7 @@
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseInner;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabase;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBaseProperties;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdate;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdateProperties;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseWalletFile;
@@ -209,6 +210,14 @@ public AutonomousDatabase changeDisasterRecoveryConfiguration(DisasterRecoveryCo
             .changeDisasterRecoveryConfiguration(resourceGroupName, autonomousdatabasename, body, context);
     }
 
+    public AutonomousDatabase action(AutonomousDatabaseLifecycleAction body) {
+        return serviceManager.autonomousDatabases().action(resourceGroupName, autonomousdatabasename, body);
+    }
+
+    public AutonomousDatabase action(AutonomousDatabaseLifecycleAction body, Context context) {
+        return serviceManager.autonomousDatabases().action(resourceGroupName, autonomousdatabasename, body, context);
+    }
+
     public AutonomousDatabaseImpl withRegion(Region location) {
         this.innerModel().withLocation(location.toString());
         return this;
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesClientImpl.java
index 8b034393414c..475c592bcb52 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesClientImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesClientImpl.java
@@ -38,6 +38,7 @@
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseInner;
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseWalletFileInner;
 import com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseListResult;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdate;
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails;
 import com.azure.resourcemanager.oracledatabase.models.GenerateAutonomousDatabaseWalletDetails;
@@ -311,6 +312,26 @@ Response<BinaryData> changeDisasterRecoveryConfigurationSync(@HostParam("endpoin
             @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") DisasterRecoveryConfigurationDetails body, Context context);
 
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/autonomousDatabases/{autonomousdatabasename}/action")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> action(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("autonomousdatabasename") String autonomousdatabasename,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") AutonomousDatabaseLifecycleAction body, Context context);
+
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/autonomousDatabases/{autonomousdatabasename}/action")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> actionSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("autonomousdatabasename") String autonomousdatabasename,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") AutonomousDatabaseLifecycleAction body, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -2088,6 +2109,186 @@ public AutonomousDatabaseInner changeDisasterRecoveryConfiguration(String resour
             .getFinalResult();
     }
 
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> actionWithResponseAsync(String resourceGroupName,
+        String autonomousdatabasename, AutonomousDatabaseLifecycleAction body) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.action(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, autonomousdatabasename, contentType, accept, body,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> actionWithResponse(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.actionSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, autonomousdatabasename, contentType, accept, body,
+            Context.NONE);
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> actionWithResponse(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.actionSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, autonomousdatabasename, contentType, accept, body,
+            context);
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<AutonomousDatabaseInner>, AutonomousDatabaseInner> beginActionAsync(
+        String resourceGroupName, String autonomousdatabasename, AutonomousDatabaseLifecycleAction body) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = actionWithResponseAsync(resourceGroupName, autonomousdatabasename, body);
+        return this.client.<AutonomousDatabaseInner, AutonomousDatabaseInner>getLroResult(mono,
+            this.client.getHttpPipeline(), AutonomousDatabaseInner.class, AutonomousDatabaseInner.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<AutonomousDatabaseInner>, AutonomousDatabaseInner>
+        beginAction(String resourceGroupName, String autonomousdatabasename, AutonomousDatabaseLifecycleAction body) {
+        Response<BinaryData> response = actionWithResponse(resourceGroupName, autonomousdatabasename, body);
+        return this.client.<AutonomousDatabaseInner, AutonomousDatabaseInner>getLroResult(response,
+            AutonomousDatabaseInner.class, AutonomousDatabaseInner.class, Context.NONE);
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<AutonomousDatabaseInner>, AutonomousDatabaseInner> beginAction(
+        String resourceGroupName, String autonomousdatabasename, AutonomousDatabaseLifecycleAction body,
+        Context context) {
+        Response<BinaryData> response = actionWithResponse(resourceGroupName, autonomousdatabasename, body, context);
+        return this.client.<AutonomousDatabaseInner, AutonomousDatabaseInner>getLroResult(response,
+            AutonomousDatabaseInner.class, AutonomousDatabaseInner.class, context);
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<AutonomousDatabaseInner> actionAsync(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body) {
+        return beginActionAsync(resourceGroupName, autonomousdatabasename, body).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public AutonomousDatabaseInner action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body) {
+        return beginAction(resourceGroupName, autonomousdatabasename, body).getFinalResult();
+    }
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public AutonomousDatabaseInner action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body, Context context) {
+        return beginAction(resourceGroupName, autonomousdatabasename, body, context).getFinalResult();
+    }
+
     /**
      * Get the next page of items.
      * 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesImpl.java
index 16146de100da..c04a002f7c6a 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesImpl.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseInner;
 import com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseWalletFileInner;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabase;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseWalletFile;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabases;
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails;
@@ -209,6 +210,27 @@ public AutonomousDatabase changeDisasterRecoveryConfiguration(String resourceGro
         }
     }
 
+    public AutonomousDatabase action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body) {
+        AutonomousDatabaseInner inner = this.serviceClient().action(resourceGroupName, autonomousdatabasename, body);
+        if (inner != null) {
+            return new AutonomousDatabaseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public AutonomousDatabase action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body, Context context) {
+        AutonomousDatabaseInner inner
+            = this.serviceClient().action(resourceGroupName, autonomousdatabasename, body, context);
+        if (inner != null) {
+            return new AutonomousDatabaseImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public AutonomousDatabase getById(String id) {
         String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructureImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructureImpl.java
index c9f659d226c4..1108f30fc635 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructureImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructureImpl.java
@@ -12,6 +12,7 @@
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureProperties;
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdate;
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -170,6 +171,17 @@ public CloudExadataInfrastructure addStorageCapacity(Context context) {
             .addStorageCapacity(resourceGroupName, cloudexadatainfrastructurename, context);
     }
 
+    public CloudExadataInfrastructure configureExascale(ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        return serviceManager.cloudExadataInfrastructures()
+            .configureExascale(resourceGroupName, cloudexadatainfrastructurename, body);
+    }
+
+    public CloudExadataInfrastructure configureExascale(ConfigureExascaleCloudExadataInfrastructureDetails body,
+        Context context) {
+        return serviceManager.cloudExadataInfrastructures()
+            .configureExascale(resourceGroupName, cloudexadatainfrastructurename, body, context);
+    }
+
     public CloudExadataInfrastructureImpl withRegion(Region location) {
         this.innerModel().withLocation(location.toString());
         return this;
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresClientImpl.java
index f3ab775e2932..4a18ad0d4e41 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresClientImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresClientImpl.java
@@ -38,6 +38,7 @@
 import com.azure.resourcemanager.oracledatabase.fluent.models.CloudExadataInfrastructureInner;
 import com.azure.resourcemanager.oracledatabase.implementation.models.CloudExadataInfrastructureListResult;
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdate;
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
 import java.nio.ByteBuffer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -206,6 +207,26 @@ Response<BinaryData> addStorageCapacitySync(@HostParam("endpoint") String endpoi
             @PathParam("cloudexadatainfrastructurename") String cloudexadatainfrastructurename,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/cloudExadataInfrastructures/{cloudexadatainfrastructurename}/configureExascale")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> configureExascale(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("cloudexadatainfrastructurename") String cloudexadatainfrastructurename,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") ConfigureExascaleCloudExadataInfrastructureDetails body, Context context);
+
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/cloudExadataInfrastructures/{cloudexadatainfrastructurename}/configureExascale")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> configureExascaleSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("cloudexadatainfrastructurename") String cloudexadatainfrastructurename,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") ConfigureExascaleCloudExadataInfrastructureDetails body, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1202,6 +1223,193 @@ public CloudExadataInfrastructureInner addStorageCapacity(String resourceGroupNa
         return beginAddStorageCapacity(resourceGroupName, cloudexadatainfrastructurename, context).getFinalResult();
     }
 
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> configureExascaleWithResponseAsync(String resourceGroupName,
+        String cloudexadatainfrastructurename, ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.configureExascale(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, cloudexadatainfrastructurename, contentType, accept,
+                body, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> configureExascaleWithResponse(String resourceGroupName,
+        String cloudexadatainfrastructurename, ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.configureExascaleSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, cloudexadatainfrastructurename, contentType, accept,
+            body, Context.NONE);
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> configureExascaleWithResponse(String resourceGroupName,
+        String cloudexadatainfrastructurename, ConfigureExascaleCloudExadataInfrastructureDetails body,
+        Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.configureExascaleSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, cloudexadatainfrastructurename, contentType, accept,
+            body, context);
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<CloudExadataInfrastructureInner>, CloudExadataInfrastructureInner>
+        beginConfigureExascaleAsync(String resourceGroupName, String cloudexadatainfrastructurename,
+            ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = configureExascaleWithResponseAsync(resourceGroupName, cloudexadatainfrastructurename, body);
+        return this.client.<CloudExadataInfrastructureInner, CloudExadataInfrastructureInner>getLroResult(mono,
+            this.client.getHttpPipeline(), CloudExadataInfrastructureInner.class, CloudExadataInfrastructureInner.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<CloudExadataInfrastructureInner>, CloudExadataInfrastructureInner>
+        beginConfigureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+            ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        Response<BinaryData> response
+            = configureExascaleWithResponse(resourceGroupName, cloudexadatainfrastructurename, body);
+        return this.client.<CloudExadataInfrastructureInner, CloudExadataInfrastructureInner>getLroResult(response,
+            CloudExadataInfrastructureInner.class, CloudExadataInfrastructureInner.class, Context.NONE);
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<CloudExadataInfrastructureInner>, CloudExadataInfrastructureInner>
+        beginConfigureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+            ConfigureExascaleCloudExadataInfrastructureDetails body, Context context) {
+        Response<BinaryData> response
+            = configureExascaleWithResponse(resourceGroupName, cloudexadatainfrastructurename, body, context);
+        return this.client.<CloudExadataInfrastructureInner, CloudExadataInfrastructureInner>getLroResult(response,
+            CloudExadataInfrastructureInner.class, CloudExadataInfrastructureInner.class, context);
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<CloudExadataInfrastructureInner> configureExascaleAsync(String resourceGroupName,
+        String cloudexadatainfrastructurename, ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        return beginConfigureExascaleAsync(resourceGroupName, cloudexadatainfrastructurename, body).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public CloudExadataInfrastructureInner configureExascale(String resourceGroupName,
+        String cloudexadatainfrastructurename, ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        return beginConfigureExascale(resourceGroupName, cloudexadatainfrastructurename, body).getFinalResult();
+    }
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public CloudExadataInfrastructureInner configureExascale(String resourceGroupName,
+        String cloudexadatainfrastructurename, ConfigureExascaleCloudExadataInfrastructureDetails body,
+        Context context) {
+        return beginConfigureExascale(resourceGroupName, cloudexadatainfrastructurename, body, context)
+            .getFinalResult();
+    }
+
     /**
      * Get the next page of items.
      * 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresImpl.java
index 15da4d12a9a2..fc5df0b9ab4f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresImpl.java
@@ -13,6 +13,7 @@
 import com.azure.resourcemanager.oracledatabase.fluent.models.CloudExadataInfrastructureInner;
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructure;
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructures;
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
 
 public final class CloudExadataInfrastructuresImpl implements CloudExadataInfrastructures {
     private static final ClientLogger LOGGER = new ClientLogger(CloudExadataInfrastructuresImpl.class);
@@ -106,6 +107,28 @@ public CloudExadataInfrastructure addStorageCapacity(String resourceGroupName,
         }
     }
 
+    public CloudExadataInfrastructure configureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body) {
+        CloudExadataInfrastructureInner inner
+            = this.serviceClient().configureExascale(resourceGroupName, cloudexadatainfrastructurename, body);
+        if (inner != null) {
+            return new CloudExadataInfrastructureImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public CloudExadataInfrastructure configureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body, Context context) {
+        CloudExadataInfrastructureInner inner
+            = this.serviceClient().configureExascale(resourceGroupName, cloudexadatainfrastructurename, body, context);
+        if (inner != null) {
+            return new CloudExadataInfrastructureImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
     public CloudExadataInfrastructure getById(String id) {
         String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
         if (resourceGroupName == null) {
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemImpl.java
new file mode 100644
index 000000000000..5878f598f326
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemImpl.java
@@ -0,0 +1,203 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.management.Region;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner;
+import com.azure.resourcemanager.oracledatabase.models.DbSystem;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemProperties;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdate;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdateProperties;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public final class DbSystemImpl implements DbSystem, DbSystem.Definition, DbSystem.Update {
+    private DbSystemInner innerObject;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public String id() {
+        return this.innerModel().id();
+    }
+
+    public String name() {
+        return this.innerModel().name();
+    }
+
+    public String type() {
+        return this.innerModel().type();
+    }
+
+    public String location() {
+        return this.innerModel().location();
+    }
+
+    public Map<String, String> tags() {
+        Map<String, String> inner = this.innerModel().tags();
+        if (inner != null) {
+            return Collections.unmodifiableMap(inner);
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
+    public DbSystemProperties properties() {
+        return this.innerModel().properties();
+    }
+
+    public List<String> zones() {
+        List<String> inner = this.innerModel().zones();
+        if (inner != null) {
+            return Collections.unmodifiableList(inner);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    public SystemData systemData() {
+        return this.innerModel().systemData();
+    }
+
+    public Region region() {
+        return Region.fromName(this.regionName());
+    }
+
+    public String regionName() {
+        return this.location();
+    }
+
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public DbSystemInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+
+    private String resourceGroupName;
+
+    private String dbSystemName;
+
+    private DbSystemUpdate updateProperties;
+
+    public DbSystemImpl withExistingResourceGroup(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    public DbSystem create() {
+        this.innerObject = serviceManager.serviceClient()
+            .getDbSystems()
+            .createOrUpdate(resourceGroupName, dbSystemName, this.innerModel(), Context.NONE);
+        return this;
+    }
+
+    public DbSystem create(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getDbSystems()
+            .createOrUpdate(resourceGroupName, dbSystemName, this.innerModel(), context);
+        return this;
+    }
+
+    DbSystemImpl(String name, com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = new DbSystemInner();
+        this.serviceManager = serviceManager;
+        this.dbSystemName = name;
+    }
+
+    public DbSystemImpl update() {
+        this.updateProperties = new DbSystemUpdate();
+        return this;
+    }
+
+    public DbSystem apply() {
+        this.innerObject = serviceManager.serviceClient()
+            .getDbSystems()
+            .update(resourceGroupName, dbSystemName, updateProperties, Context.NONE);
+        return this;
+    }
+
+    public DbSystem apply(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getDbSystems()
+            .update(resourceGroupName, dbSystemName, updateProperties, context);
+        return this;
+    }
+
+    DbSystemImpl(DbSystemInner innerObject,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+        this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
+        this.dbSystemName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "dbSystems");
+    }
+
+    public DbSystem refresh() {
+        this.innerObject = serviceManager.serviceClient()
+            .getDbSystems()
+            .getByResourceGroupWithResponse(resourceGroupName, dbSystemName, Context.NONE)
+            .getValue();
+        return this;
+    }
+
+    public DbSystem refresh(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getDbSystems()
+            .getByResourceGroupWithResponse(resourceGroupName, dbSystemName, context)
+            .getValue();
+        return this;
+    }
+
+    public DbSystemImpl withRegion(Region location) {
+        this.innerModel().withLocation(location.toString());
+        return this;
+    }
+
+    public DbSystemImpl withRegion(String location) {
+        this.innerModel().withLocation(location);
+        return this;
+    }
+
+    public DbSystemImpl withTags(Map<String, String> tags) {
+        if (isInCreateMode()) {
+            this.innerModel().withTags(tags);
+            return this;
+        } else {
+            this.updateProperties.withTags(tags);
+            return this;
+        }
+    }
+
+    public DbSystemImpl withProperties(DbSystemProperties properties) {
+        this.innerModel().withProperties(properties);
+        return this;
+    }
+
+    public DbSystemImpl withZones(List<String> zones) {
+        if (isInCreateMode()) {
+            this.innerModel().withZones(zones);
+            return this;
+        } else {
+            this.updateProperties.withZones(zones);
+            return this;
+        }
+    }
+
+    public DbSystemImpl withProperties(DbSystemUpdateProperties properties) {
+        this.updateProperties.withProperties(properties);
+        return this;
+    }
+
+    private boolean isInCreateMode() {
+        return this.innerModel() == null || this.innerModel().id() == null;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesClientImpl.java
index dc8b13fe2111..0e3fde45e0fd 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesClientImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesClientImpl.java
@@ -87,7 +87,7 @@ Response<DbSystemShapeInner> getSync(@HostParam("endpoint") String endpoint,
         Mono<Response<DbSystemShapeListResult>> listByLocation(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("location") String location, @QueryParam("zone") String zone,
-            @HeaderParam("Accept") String accept, Context context);
+            @QueryParam("shapeAttribute") String shapeAttribute, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/locations/{location}/dbSystemShapes")
@@ -96,7 +96,7 @@ Mono<Response<DbSystemShapeListResult>> listByLocation(@HostParam("endpoint") St
         Response<DbSystemShapeListResult> listByLocationSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("location") String location, @QueryParam("zone") String zone,
-            @HeaderParam("Accept") String accept, Context context);
+            @QueryParam("shapeAttribute") String shapeAttribute, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -187,6 +187,7 @@ public DbSystemShapeInner get(String location, String dbsystemshapename) {
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -194,11 +195,12 @@ public DbSystemShapeInner get(String location, String dbsystemshapename) {
      * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<DbSystemShapeInner>> listByLocationSinglePageAsync(String location, String zone) {
+    private Mono<PagedResponse<DbSystemShapeInner>> listByLocationSinglePageAsync(String location, String zone,
+        String shapeAttribute) {
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByLocation(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), location, zone, accept, context))
+                this.client.getSubscriptionId(), location, zone, shapeAttribute, accept, context))
             .<PagedResponse<DbSystemShapeInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
                 res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
@@ -209,14 +211,15 @@ private Mono<PagedResponse<DbSystemShapeInner>> listByLocationSinglePageAsync(St
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the response of a DbSystemShape list operation as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<DbSystemShapeInner> listByLocationAsync(String location, String zone) {
-        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, zone),
+    private PagedFlux<DbSystemShapeInner> listByLocationAsync(String location, String zone, String shapeAttribute) {
+        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, zone, shapeAttribute),
             nextLink -> listByLocationNextSinglePageAsync(nextLink));
     }
 
@@ -232,7 +235,8 @@ private PagedFlux<DbSystemShapeInner> listByLocationAsync(String location, Strin
     @ServiceMethod(returns = ReturnType.COLLECTION)
     private PagedFlux<DbSystemShapeInner> listByLocationAsync(String location) {
         final String zone = null;
-        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, zone),
+        final String shapeAttribute = null;
+        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, zone, shapeAttribute),
             nextLink -> listByLocationNextSinglePageAsync(nextLink));
     }
 
@@ -241,16 +245,19 @@ private PagedFlux<DbSystemShapeInner> listByLocationAsync(String location) {
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the response of a DbSystemShape list operation along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String location, String zone) {
+    private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String location, String zone,
+        String shapeAttribute) {
         final String accept = "application/json";
-        Response<DbSystemShapeListResult> res = service.listByLocationSync(this.client.getEndpoint(),
-            this.client.getApiVersion(), this.client.getSubscriptionId(), location, zone, accept, Context.NONE);
+        Response<DbSystemShapeListResult> res
+            = service.listByLocationSync(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), location, zone, shapeAttribute, accept, Context.NONE);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -260,6 +267,7 @@ private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String locati
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -267,10 +275,12 @@ private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String locati
      * @return the response of a DbSystemShape list operation along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String location, String zone, Context context) {
+    private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String location, String zone,
+        String shapeAttribute, Context context) {
         final String accept = "application/json";
-        Response<DbSystemShapeListResult> res = service.listByLocationSync(this.client.getEndpoint(),
-            this.client.getApiVersion(), this.client.getSubscriptionId(), location, zone, accept, context);
+        Response<DbSystemShapeListResult> res
+            = service.listByLocationSync(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), location, zone, shapeAttribute, accept, context);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -287,7 +297,8 @@ private PagedResponse<DbSystemShapeInner> listByLocationSinglePage(String locati
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<DbSystemShapeInner> listByLocation(String location) {
         final String zone = null;
-        return new PagedIterable<>(() -> listByLocationSinglePage(location, zone),
+        final String shapeAttribute = null;
+        return new PagedIterable<>(() -> listByLocationSinglePage(location, zone, shapeAttribute),
             nextLink -> listByLocationNextSinglePage(nextLink));
     }
 
@@ -296,6 +307,7 @@ public PagedIterable<DbSystemShapeInner> listByLocation(String location) {
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -303,8 +315,9 @@ public PagedIterable<DbSystemShapeInner> listByLocation(String location) {
      * @return the response of a DbSystemShape list operation as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<DbSystemShapeInner> listByLocation(String location, String zone, Context context) {
-        return new PagedIterable<>(() -> listByLocationSinglePage(location, zone, context),
+    public PagedIterable<DbSystemShapeInner> listByLocation(String location, String zone, String shapeAttribute,
+        Context context) {
+        return new PagedIterable<>(() -> listByLocationSinglePage(location, zone, shapeAttribute, context),
             nextLink -> listByLocationNextSinglePage(nextLink, context));
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesImpl.java
index 0ef002a51542..1fc4bd544c16 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesImpl.java
@@ -51,8 +51,10 @@ public PagedIterable<DbSystemShape> listByLocation(String location) {
         return ResourceManagerUtils.mapPage(inner, inner1 -> new DbSystemShapeImpl(inner1, this.manager()));
     }
 
-    public PagedIterable<DbSystemShape> listByLocation(String location, String zone, Context context) {
-        PagedIterable<DbSystemShapeInner> inner = this.serviceClient().listByLocation(location, zone, context);
+    public PagedIterable<DbSystemShape> listByLocation(String location, String zone, String shapeAttribute,
+        Context context) {
+        PagedIterable<DbSystemShapeInner> inner
+            = this.serviceClient().listByLocation(location, zone, shapeAttribute, context);
         return ResourceManagerUtils.mapPage(inner, inner1 -> new DbSystemShapeImpl(inner1, this.manager()));
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsClientImpl.java
new file mode 100644
index 000000000000..e0b3e1baa29a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsClientImpl.java
@@ -0,0 +1,1091 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.Patch;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner;
+import com.azure.resourcemanager.oracledatabase.implementation.models.DbSystemListResult;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdate;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in DbSystemsClient.
+ */
+public final class DbSystemsClientImpl implements DbSystemsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final DbSystemsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final OracleDatabaseManagementClientImpl client;
+
+    /**
+     * Initializes an instance of DbSystemsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    DbSystemsClientImpl(OracleDatabaseManagementClientImpl client) {
+        this.service
+            = RestProxy.create(DbSystemsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for OracleDatabaseManagementClientDbSystems to be used by the proxy
+     * service to perform REST calls.
+     */
+    @Host("{endpoint}")
+    @ServiceInterface(name = "OracleDatabaseManagementClientDbSystems")
+    public interface DbSystemsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/dbSystems")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbSystemListResult>> list(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/dbSystems")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbSystemListResult> listSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") DbSystemInner resource, Context context);
+
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createOrUpdateSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") DbSystemInner resource, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbSystemInner>> getByResourceGroup(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbSystemInner> getByResourceGroupSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") DbSystemUpdate properties, Context context);
+
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") DbSystemUpdate properties, Context context);
+
+        @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            Context context);
+
+        @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems/{dbSystemName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("dbSystemName") String dbSystemName,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbSystemListResult>> listByResourceGroup(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/dbSystems")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbSystemListResult> listByResourceGroupSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbSystemListResult>> listBySubscriptionNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbSystemListResult> listBySubscriptionNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbSystemListResult>> listByResourceGroupNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbSystemListResult> listByResourceGroupNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<DbSystemInner>> listSinglePageAsync() {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), accept, context))
+            .<PagedResponse<DbSystemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<DbSystemInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(),
+            nextLink -> listBySubscriptionNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listSinglePage() {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listSinglePage(Context context) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<DbSystemInner> list() {
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listBySubscriptionNextSinglePage(nextLink));
+    }
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<DbSystemInner> list(Context context) {
+        return new PagedIterable<>(() -> listSinglePage(context),
+            nextLink -> listBySubscriptionNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String dbSystemName, DbSystemInner resource) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, dbSystemName, contentType, accept, resource,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String dbSystemName,
+        DbSystemInner resource) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, contentType, accept, resource,
+            Context.NONE);
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String dbSystemName,
+        DbSystemInner resource, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, contentType, accept, resource, context);
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<DbSystemInner>, DbSystemInner> beginCreateOrUpdateAsync(String resourceGroupName,
+        String dbSystemName, DbSystemInner resource) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, dbSystemName, resource);
+        return this.client.<DbSystemInner, DbSystemInner>getLroResult(mono, this.client.getHttpPipeline(),
+            DbSystemInner.class, DbSystemInner.class, this.client.getContext());
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginCreateOrUpdate(String resourceGroupName,
+        String dbSystemName, DbSystemInner resource) {
+        Response<BinaryData> response = createOrUpdateWithResponse(resourceGroupName, dbSystemName, resource);
+        return this.client.<DbSystemInner, DbSystemInner>getLroResult(response, DbSystemInner.class,
+            DbSystemInner.class, Context.NONE);
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginCreateOrUpdate(String resourceGroupName,
+        String dbSystemName, DbSystemInner resource, Context context) {
+        Response<BinaryData> response = createOrUpdateWithResponse(resourceGroupName, dbSystemName, resource, context);
+        return this.client.<DbSystemInner, DbSystemInner>getLroResult(response, DbSystemInner.class,
+            DbSystemInner.class, context);
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<DbSystemInner> createOrUpdateAsync(String resourceGroupName, String dbSystemName,
+        DbSystemInner resource) {
+        return beginCreateOrUpdateAsync(resourceGroupName, dbSystemName, resource).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public DbSystemInner createOrUpdate(String resourceGroupName, String dbSystemName, DbSystemInner resource) {
+        return beginCreateOrUpdate(resourceGroupName, dbSystemName, resource).getFinalResult();
+    }
+
+    /**
+     * Create a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public DbSystemInner createOrUpdate(String resourceGroupName, String dbSystemName, DbSystemInner resource,
+        Context context) {
+        return beginCreateOrUpdate(resourceGroupName, dbSystemName, resource, context).getFinalResult();
+    }
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<DbSystemInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
+        String dbSystemName) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, dbSystemName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<DbSystemInner> getByResourceGroupAsync(String resourceGroupName, String dbSystemName) {
+        return getByResourceGroupWithResponseAsync(resourceGroupName, dbSystemName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<DbSystemInner> getByResourceGroupWithResponse(String resourceGroupName, String dbSystemName,
+        Context context) {
+        final String accept = "application/json";
+        return service.getByResourceGroupSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, accept, context);
+    }
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public DbSystemInner getByResourceGroup(String resourceGroupName, String dbSystemName) {
+        return getByResourceGroupWithResponse(resourceGroupName, dbSystemName, Context.NONE).getValue();
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName, String dbSystemName,
+        DbSystemUpdate properties) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil.withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, contentType, accept, properties, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String dbSystemName,
+        DbSystemUpdate properties) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, contentType, accept, properties,
+            Context.NONE);
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String dbSystemName,
+        DbSystemUpdate properties, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, contentType, accept, properties, context);
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<DbSystemInner>, DbSystemInner> beginUpdateAsync(String resourceGroupName,
+        String dbSystemName, DbSystemUpdate properties) {
+        Mono<Response<Flux<ByteBuffer>>> mono = updateWithResponseAsync(resourceGroupName, dbSystemName, properties);
+        return this.client.<DbSystemInner, DbSystemInner>getLroResult(mono, this.client.getHttpPipeline(),
+            DbSystemInner.class, DbSystemInner.class, this.client.getContext());
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginUpdate(String resourceGroupName,
+        String dbSystemName, DbSystemUpdate properties) {
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, dbSystemName, properties);
+        return this.client.<DbSystemInner, DbSystemInner>getLroResult(response, DbSystemInner.class,
+            DbSystemInner.class, Context.NONE);
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<DbSystemInner>, DbSystemInner> beginUpdate(String resourceGroupName,
+        String dbSystemName, DbSystemUpdate properties, Context context) {
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, dbSystemName, properties, context);
+        return this.client.<DbSystemInner, DbSystemInner>getLroResult(response, DbSystemInner.class,
+            DbSystemInner.class, context);
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<DbSystemInner> updateAsync(String resourceGroupName, String dbSystemName, DbSystemUpdate properties) {
+        return beginUpdateAsync(resourceGroupName, dbSystemName, properties).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public DbSystemInner update(String resourceGroupName, String dbSystemName, DbSystemUpdate properties) {
+        return beginUpdate(resourceGroupName, dbSystemName, properties).getFinalResult();
+    }
+
+    /**
+     * Update a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return dbSystem resource definition.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public DbSystemInner update(String resourceGroupName, String dbSystemName, DbSystemUpdate properties,
+        Context context) {
+        return beginUpdate(resourceGroupName, dbSystemName, properties, context).getFinalResult();
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String dbSystemName) {
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, dbSystemName, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String dbSystemName) {
+        return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, Context.NONE);
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String dbSystemName, Context context) {
+        return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, dbSystemName, context);
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String dbSystemName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, dbSystemName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String dbSystemName) {
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, dbSystemName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String dbSystemName,
+        Context context) {
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, dbSystemName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String dbSystemName) {
+        return beginDeleteAsync(resourceGroupName, dbSystemName).last().flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String dbSystemName) {
+        beginDelete(resourceGroupName, dbSystemName).getFinalResult();
+    }
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String dbSystemName, Context context) {
+        beginDelete(resourceGroupName, dbSystemName, context).getFinalResult();
+    }
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<DbSystemInner>> listByResourceGroupSinglePageAsync(String resourceGroupName) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, accept, context))
+            .<PagedResponse<DbSystemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<DbSystemInner> listByResourceGroupAsync(String resourceGroupName) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listByResourceGroupSinglePage(String resourceGroupName) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), resourceGroupName, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listByResourceGroupSinglePage(String resourceGroupName, Context context) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), resourceGroupName, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<DbSystemInner> listByResourceGroup(String resourceGroupName) {
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink));
+    }
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<DbSystemInner> listByResourceGroup(String resourceGroupName, Context context) {
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName, context),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<DbSystemInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listBySubscriptionNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<DbSystemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listBySubscriptionNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res
+            = service.listBySubscriptionNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listBySubscriptionNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res
+            = service.listBySubscriptionNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<DbSystemInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<DbSystemInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listByResourceGroupNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbSystemInner> listByResourceGroupNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<DbSystemListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsImpl.java
new file mode 100644
index 000000000000..a09b8ff2e0c7
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsImpl.java
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner;
+import com.azure.resourcemanager.oracledatabase.models.DbSystem;
+import com.azure.resourcemanager.oracledatabase.models.DbSystems;
+
+public final class DbSystemsImpl implements DbSystems {
+    private static final ClientLogger LOGGER = new ClientLogger(DbSystemsImpl.class);
+
+    private final DbSystemsClient innerClient;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public DbSystemsImpl(DbSystemsClient innerClient,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public PagedIterable<DbSystem> list() {
+        PagedIterable<DbSystemInner> inner = this.serviceClient().list();
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DbSystemImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<DbSystem> list(Context context) {
+        PagedIterable<DbSystemInner> inner = this.serviceClient().list(context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DbSystemImpl(inner1, this.manager()));
+    }
+
+    public Response<DbSystem> getByResourceGroupWithResponse(String resourceGroupName, String dbSystemName,
+        Context context) {
+        Response<DbSystemInner> inner
+            = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, dbSystemName, context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new DbSystemImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public DbSystem getByResourceGroup(String resourceGroupName, String dbSystemName) {
+        DbSystemInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, dbSystemName);
+        if (inner != null) {
+            return new DbSystemImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public void deleteByResourceGroup(String resourceGroupName, String dbSystemName) {
+        this.serviceClient().delete(resourceGroupName, dbSystemName);
+    }
+
+    public void delete(String resourceGroupName, String dbSystemName, Context context) {
+        this.serviceClient().delete(resourceGroupName, dbSystemName, context);
+    }
+
+    public PagedIterable<DbSystem> listByResourceGroup(String resourceGroupName) {
+        PagedIterable<DbSystemInner> inner = this.serviceClient().listByResourceGroup(resourceGroupName);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DbSystemImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<DbSystem> listByResourceGroup(String resourceGroupName, Context context) {
+        PagedIterable<DbSystemInner> inner = this.serviceClient().listByResourceGroup(resourceGroupName, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DbSystemImpl(inner1, this.manager()));
+    }
+
+    public DbSystem getById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String dbSystemName = ResourceManagerUtils.getValueFromIdByName(id, "dbSystems");
+        if (dbSystemName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'dbSystems'.", id)));
+        }
+        return this.getByResourceGroupWithResponse(resourceGroupName, dbSystemName, Context.NONE).getValue();
+    }
+
+    public Response<DbSystem> getByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String dbSystemName = ResourceManagerUtils.getValueFromIdByName(id, "dbSystems");
+        if (dbSystemName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'dbSystems'.", id)));
+        }
+        return this.getByResourceGroupWithResponse(resourceGroupName, dbSystemName, context);
+    }
+
+    public void deleteById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String dbSystemName = ResourceManagerUtils.getValueFromIdByName(id, "dbSystems");
+        if (dbSystemName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'dbSystems'.", id)));
+        }
+        this.delete(resourceGroupName, dbSystemName, Context.NONE);
+    }
+
+    public void deleteByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String dbSystemName = ResourceManagerUtils.getValueFromIdByName(id, "dbSystems");
+        if (dbSystemName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'dbSystems'.", id)));
+        }
+        this.delete(resourceGroupName, dbSystemName, context);
+    }
+
+    private DbSystemsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+
+    public DbSystemImpl define(String name) {
+        return new DbSystemImpl(name, this.manager());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionImpl.java
new file mode 100644
index 000000000000..467e47893fd8
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionImpl.java
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.management.SystemData;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+import com.azure.resourcemanager.oracledatabase.models.DbVersion;
+import com.azure.resourcemanager.oracledatabase.models.DbVersionProperties;
+
+public final class DbVersionImpl implements DbVersion {
+    private DbVersionInner innerObject;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    DbVersionImpl(DbVersionInner innerObject,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+    }
+
+    public String id() {
+        return this.innerModel().id();
+    }
+
+    public String name() {
+        return this.innerModel().name();
+    }
+
+    public String type() {
+        return this.innerModel().type();
+    }
+
+    public DbVersionProperties properties() {
+        return this.innerModel().properties();
+    }
+
+    public SystemData systemData() {
+        return this.innerModel().systemData();
+    }
+
+    public DbVersionInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsClientImpl.java
new file mode 100644
index 000000000000..1904a7071842
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsClientImpl.java
@@ -0,0 +1,465 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+import com.azure.resourcemanager.oracledatabase.implementation.models.DbVersionListResult;
+import com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in DbVersionsClient.
+ */
+public final class DbVersionsClientImpl implements DbVersionsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final DbVersionsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final OracleDatabaseManagementClientImpl client;
+
+    /**
+     * Initializes an instance of DbVersionsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    DbVersionsClientImpl(OracleDatabaseManagementClientImpl client) {
+        this.service
+            = RestProxy.create(DbVersionsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for OracleDatabaseManagementClientDbVersions to be used by the proxy
+     * service to perform REST calls.
+     */
+    @Host("{endpoint}")
+    @ServiceInterface(name = "OracleDatabaseManagementClientDbVersions")
+    public interface DbVersionsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/locations/{location}/dbSystemDbVersions/{dbversionsname}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbVersionInner>> get(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @PathParam("dbversionsname") String dbversionsname,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/locations/{location}/dbSystemDbVersions/{dbversionsname}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbVersionInner> getSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @PathParam("dbversionsname") String dbversionsname,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/locations/{location}/dbSystemDbVersions")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbVersionListResult>> listByLocation(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @QueryParam("dbSystemShape") BaseDbSystemShapes dbSystemShape,
+            @QueryParam("dbSystemId") String dbSystemId,
+            @QueryParam("storageManagement") StorageManagementType storageManagement,
+            @QueryParam("isUpgradeSupported") Boolean isUpgradeSupported,
+            @QueryParam("isDatabaseSoftwareImageSupported") Boolean isDatabaseSoftwareImageSupported,
+            @QueryParam("shapeFamily") ShapeFamilyType shapeFamily, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/locations/{location}/dbSystemDbVersions")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbVersionListResult> listByLocationSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("location") String location, @QueryParam("dbSystemShape") BaseDbSystemShapes dbSystemShape,
+            @QueryParam("dbSystemId") String dbSystemId,
+            @QueryParam("storageManagement") StorageManagementType storageManagement,
+            @QueryParam("isUpgradeSupported") Boolean isUpgradeSupported,
+            @QueryParam("isDatabaseSoftwareImageSupported") Boolean isDatabaseSoftwareImageSupported,
+            @QueryParam("shapeFamily") ShapeFamilyType shapeFamily, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<DbVersionListResult>> listByLocationNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DbVersionListResult> listByLocationNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<DbVersionInner>> getWithResponseAsync(String location, String dbversionsname) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.get(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), location, dbversionsname, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<DbVersionInner> getAsync(String location, String dbversionsname) {
+        return getWithResponseAsync(location, dbversionsname).flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<DbVersionInner> getWithResponse(String location, String dbversionsname, Context context) {
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
+            location, dbversionsname, accept, context);
+    }
+
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public DbVersionInner get(String location, String dbversionsname) {
+        return getWithResponse(location, dbversionsname, Context.NONE).getValue();
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<DbVersionInner>> listByLocationSinglePageAsync(String location,
+        BaseDbSystemShapes dbSystemShape, String dbSystemId, StorageManagementType storageManagement,
+        Boolean isUpgradeSupported, Boolean isDatabaseSoftwareImageSupported, ShapeFamilyType shapeFamily) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByLocation(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), location, dbSystemShape, dbSystemId, storageManagement,
+                isUpgradeSupported, isDatabaseSoftwareImageSupported, shapeFamily, accept, context))
+            .<PagedResponse<DbVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<DbVersionInner> listByLocationAsync(String location, BaseDbSystemShapes dbSystemShape,
+        String dbSystemId, StorageManagementType storageManagement, Boolean isUpgradeSupported,
+        Boolean isDatabaseSoftwareImageSupported, ShapeFamilyType shapeFamily) {
+        return new PagedFlux<>(
+            () -> listByLocationSinglePageAsync(location, dbSystemShape, dbSystemId, storageManagement,
+                isUpgradeSupported, isDatabaseSoftwareImageSupported, shapeFamily),
+            nextLink -> listByLocationNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<DbVersionInner> listByLocationAsync(String location) {
+        final BaseDbSystemShapes dbSystemShape = null;
+        final String dbSystemId = null;
+        final StorageManagementType storageManagement = null;
+        final Boolean isUpgradeSupported = null;
+        final Boolean isDatabaseSoftwareImageSupported = null;
+        final ShapeFamilyType shapeFamily = null;
+        return new PagedFlux<>(
+            () -> listByLocationSinglePageAsync(location, dbSystemShape, dbSystemId, storageManagement,
+                isUpgradeSupported, isDatabaseSoftwareImageSupported, shapeFamily),
+            nextLink -> listByLocationNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbVersionInner> listByLocationSinglePage(String location, BaseDbSystemShapes dbSystemShape,
+        String dbSystemId, StorageManagementType storageManagement, Boolean isUpgradeSupported,
+        Boolean isDatabaseSoftwareImageSupported, ShapeFamilyType shapeFamily) {
+        final String accept = "application/json";
+        Response<DbVersionListResult> res = service.listByLocationSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), location, dbSystemShape, dbSystemId,
+            storageManagement, isUpgradeSupported, isDatabaseSoftwareImageSupported, shapeFamily, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbVersionInner> listByLocationSinglePage(String location, BaseDbSystemShapes dbSystemShape,
+        String dbSystemId, StorageManagementType storageManagement, Boolean isUpgradeSupported,
+        Boolean isDatabaseSoftwareImageSupported, ShapeFamilyType shapeFamily, Context context) {
+        final String accept = "application/json";
+        Response<DbVersionListResult> res = service.listByLocationSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), location, dbSystemShape, dbSystemId,
+            storageManagement, isUpgradeSupported, isDatabaseSoftwareImageSupported, shapeFamily, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<DbVersionInner> listByLocation(String location) {
+        final BaseDbSystemShapes dbSystemShape = null;
+        final String dbSystemId = null;
+        final StorageManagementType storageManagement = null;
+        final Boolean isUpgradeSupported = null;
+        final Boolean isDatabaseSoftwareImageSupported = null;
+        final ShapeFamilyType shapeFamily = null;
+        return new PagedIterable<>(() -> listByLocationSinglePage(location, dbSystemShape, dbSystemId,
+            storageManagement, isUpgradeSupported, isDatabaseSoftwareImageSupported, shapeFamily),
+            nextLink -> listByLocationNextSinglePage(nextLink));
+    }
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<DbVersionInner> listByLocation(String location, BaseDbSystemShapes dbSystemShape,
+        String dbSystemId, StorageManagementType storageManagement, Boolean isUpgradeSupported,
+        Boolean isDatabaseSoftwareImageSupported, ShapeFamilyType shapeFamily, Context context) {
+        return new PagedIterable<>(
+            () -> listByLocationSinglePage(location, dbSystemShape, dbSystemId, storageManagement, isUpgradeSupported,
+                isDatabaseSoftwareImageSupported, shapeFamily, context),
+            nextLink -> listByLocationNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation along with {@link PagedResponse} on successful completion of
+     * {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<DbVersionInner>> listByLocationNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByLocationNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<DbVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
+                res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbVersionInner> listByLocationNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<DbVersionListResult> res
+            = service.listByLocationNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DbVersionInner> listByLocationNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<DbVersionListResult> res
+            = service.listByLocationNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsImpl.java
new file mode 100644
index 000000000000..cd7cd5020452
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsImpl.java
@@ -0,0 +1,73 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+import com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.DbVersion;
+import com.azure.resourcemanager.oracledatabase.models.DbVersions;
+import com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+
+public final class DbVersionsImpl implements DbVersions {
+    private static final ClientLogger LOGGER = new ClientLogger(DbVersionsImpl.class);
+
+    private final DbVersionsClient innerClient;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public DbVersionsImpl(DbVersionsClient innerClient,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public Response<DbVersion> getWithResponse(String location, String dbversionsname, Context context) {
+        Response<DbVersionInner> inner = this.serviceClient().getWithResponse(location, dbversionsname, context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new DbVersionImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public DbVersion get(String location, String dbversionsname) {
+        DbVersionInner inner = this.serviceClient().get(location, dbversionsname);
+        if (inner != null) {
+            return new DbVersionImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public PagedIterable<DbVersion> listByLocation(String location) {
+        PagedIterable<DbVersionInner> inner = this.serviceClient().listByLocation(location);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DbVersionImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<DbVersion> listByLocation(String location, BaseDbSystemShapes dbSystemShape, String dbSystemId,
+        StorageManagementType storageManagement, Boolean isUpgradeSupported, Boolean isDatabaseSoftwareImageSupported,
+        ShapeFamilyType shapeFamily, Context context) {
+        PagedIterable<DbVersionInner> inner = this.serviceClient()
+            .listByLocation(location, dbSystemShape, dbSystemId, storageManagement, isUpgradeSupported,
+                isDatabaseSoftwareImageSupported, shapeFamily, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new DbVersionImpl(inner1, this.manager()));
+    }
+
+    private DbVersionsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsClientImpl.java
index 9b54c17774c9..9270b2340d3f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsClientImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsClientImpl.java
@@ -88,7 +88,8 @@ Response<GiVersionInner> getSync(@HostParam("endpoint") String endpoint,
         Mono<Response<GiVersionListResult>> listByLocation(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("location") String location, @QueryParam("shape") SystemShapes shape,
-            @QueryParam("zone") String zone, @HeaderParam("Accept") String accept, Context context);
+            @QueryParam("zone") String zone, @QueryParam("shapeAttribute") String shapeAttribute,
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/locations/{location}/giVersions")
@@ -97,7 +98,8 @@ Mono<Response<GiVersionListResult>> listByLocation(@HostParam("endpoint") String
         Response<GiVersionListResult> listByLocationSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("location") String location, @QueryParam("shape") SystemShapes shape,
-            @QueryParam("zone") String zone, @HeaderParam("Accept") String accept, Context context);
+            @QueryParam("zone") String zone, @QueryParam("shapeAttribute") String shapeAttribute,
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -189,6 +191,7 @@ public GiVersionInner get(String location, String giversionname) {
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -197,11 +200,11 @@ public GiVersionInner get(String location, String giversionname) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<GiVersionInner>> listByLocationSinglePageAsync(String location, SystemShapes shape,
-        String zone) {
+        String zone, String shapeAttribute) {
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.listByLocation(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), location, shape, zone, accept, context))
+                this.client.getSubscriptionId(), location, shape, zone, shapeAttribute, accept, context))
             .<PagedResponse<GiVersionInner>>map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(),
                 res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
@@ -213,14 +216,16 @@ private Mono<PagedResponse<GiVersionInner>> listByLocationSinglePageAsync(String
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the response of a GiVersion list operation as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<GiVersionInner> listByLocationAsync(String location, SystemShapes shape, String zone) {
-        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, shape, zone),
+    private PagedFlux<GiVersionInner> listByLocationAsync(String location, SystemShapes shape, String zone,
+        String shapeAttribute) {
+        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, shape, zone, shapeAttribute),
             nextLink -> listByLocationNextSinglePageAsync(nextLink));
     }
 
@@ -237,7 +242,8 @@ private PagedFlux<GiVersionInner> listByLocationAsync(String location, SystemSha
     private PagedFlux<GiVersionInner> listByLocationAsync(String location) {
         final SystemShapes shape = null;
         final String zone = null;
-        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, shape, zone),
+        final String shapeAttribute = null;
+        return new PagedFlux<>(() -> listByLocationSinglePageAsync(location, shape, zone, shapeAttribute),
             nextLink -> listByLocationNextSinglePageAsync(nextLink));
     }
 
@@ -247,16 +253,19 @@ private PagedFlux<GiVersionInner> listByLocationAsync(String location) {
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the response of a GiVersion list operation along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private PagedResponse<GiVersionInner> listByLocationSinglePage(String location, SystemShapes shape, String zone) {
+    private PagedResponse<GiVersionInner> listByLocationSinglePage(String location, SystemShapes shape, String zone,
+        String shapeAttribute) {
         final String accept = "application/json";
-        Response<GiVersionListResult> res = service.listByLocationSync(this.client.getEndpoint(),
-            this.client.getApiVersion(), this.client.getSubscriptionId(), location, shape, zone, accept, Context.NONE);
+        Response<GiVersionListResult> res
+            = service.listByLocationSync(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), location, shape, zone, shapeAttribute, accept, Context.NONE);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -267,6 +276,7 @@ private PagedResponse<GiVersionInner> listByLocationSinglePage(String location,
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -275,10 +285,11 @@ private PagedResponse<GiVersionInner> listByLocationSinglePage(String location,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private PagedResponse<GiVersionInner> listByLocationSinglePage(String location, SystemShapes shape, String zone,
-        Context context) {
+        String shapeAttribute, Context context) {
         final String accept = "application/json";
-        Response<GiVersionListResult> res = service.listByLocationSync(this.client.getEndpoint(),
-            this.client.getApiVersion(), this.client.getSubscriptionId(), location, shape, zone, accept, context);
+        Response<GiVersionListResult> res
+            = service.listByLocationSync(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), location, shape, zone, shapeAttribute, accept, context);
         return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
             res.getValue().nextLink(), null);
     }
@@ -296,7 +307,8 @@ private PagedResponse<GiVersionInner> listByLocationSinglePage(String location,
     public PagedIterable<GiVersionInner> listByLocation(String location) {
         final SystemShapes shape = null;
         final String zone = null;
-        return new PagedIterable<>(() -> listByLocationSinglePage(location, shape, zone),
+        final String shapeAttribute = null;
+        return new PagedIterable<>(() -> listByLocationSinglePage(location, shape, zone, shapeAttribute),
             nextLink -> listByLocationNextSinglePage(nextLink));
     }
 
@@ -306,6 +318,7 @@ public PagedIterable<GiVersionInner> listByLocation(String location) {
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
@@ -314,8 +327,8 @@ public PagedIterable<GiVersionInner> listByLocation(String location) {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<GiVersionInner> listByLocation(String location, SystemShapes shape, String zone,
-        Context context) {
-        return new PagedIterable<>(() -> listByLocationSinglePage(location, shape, zone, context),
+        String shapeAttribute, Context context) {
+        return new PagedIterable<>(() -> listByLocationSinglePage(location, shape, zone, shapeAttribute, context),
             nextLink -> listByLocationNextSinglePage(nextLink, context));
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsImpl.java
index 6b1f5eb74dd4..db6dd64c3521 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsImpl.java
@@ -52,8 +52,10 @@ public PagedIterable<GiVersion> listByLocation(String location) {
         return ResourceManagerUtils.mapPage(inner, inner1 -> new GiVersionImpl(inner1, this.manager()));
     }
 
-    public PagedIterable<GiVersion> listByLocation(String location, SystemShapes shape, String zone, Context context) {
-        PagedIterable<GiVersionInner> inner = this.serviceClient().listByLocation(location, shape, zone, context);
+    public PagedIterable<GiVersion> listByLocation(String location, SystemShapes shape, String zone,
+        String shapeAttribute, Context context) {
+        PagedIterable<GiVersionInner> inner
+            = this.serviceClient().listByLocation(location, shape, zone, shapeAttribute, context);
         return ResourceManagerUtils.mapPage(inner, inner1 -> new GiVersionImpl(inner1, this.manager()));
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorImpl.java
new file mode 100644
index 000000000000..2918de5e5a17
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorImpl.java
@@ -0,0 +1,203 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.management.Region;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdate;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdateProperties;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public final class NetworkAnchorImpl implements NetworkAnchor, NetworkAnchor.Definition, NetworkAnchor.Update {
+    private NetworkAnchorInner innerObject;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public String id() {
+        return this.innerModel().id();
+    }
+
+    public String name() {
+        return this.innerModel().name();
+    }
+
+    public String type() {
+        return this.innerModel().type();
+    }
+
+    public String location() {
+        return this.innerModel().location();
+    }
+
+    public Map<String, String> tags() {
+        Map<String, String> inner = this.innerModel().tags();
+        if (inner != null) {
+            return Collections.unmodifiableMap(inner);
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
+    public NetworkAnchorProperties properties() {
+        return this.innerModel().properties();
+    }
+
+    public List<String> zones() {
+        List<String> inner = this.innerModel().zones();
+        if (inner != null) {
+            return Collections.unmodifiableList(inner);
+        } else {
+            return Collections.emptyList();
+        }
+    }
+
+    public SystemData systemData() {
+        return this.innerModel().systemData();
+    }
+
+    public Region region() {
+        return Region.fromName(this.regionName());
+    }
+
+    public String regionName() {
+        return this.location();
+    }
+
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public NetworkAnchorInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+
+    private String resourceGroupName;
+
+    private String networkAnchorName;
+
+    private NetworkAnchorUpdate updateProperties;
+
+    public NetworkAnchorImpl withExistingResourceGroup(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    public NetworkAnchor create() {
+        this.innerObject = serviceManager.serviceClient()
+            .getNetworkAnchors()
+            .createOrUpdate(resourceGroupName, networkAnchorName, this.innerModel(), Context.NONE);
+        return this;
+    }
+
+    public NetworkAnchor create(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getNetworkAnchors()
+            .createOrUpdate(resourceGroupName, networkAnchorName, this.innerModel(), context);
+        return this;
+    }
+
+    NetworkAnchorImpl(String name, com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = new NetworkAnchorInner();
+        this.serviceManager = serviceManager;
+        this.networkAnchorName = name;
+    }
+
+    public NetworkAnchorImpl update() {
+        this.updateProperties = new NetworkAnchorUpdate();
+        return this;
+    }
+
+    public NetworkAnchor apply() {
+        this.innerObject = serviceManager.serviceClient()
+            .getNetworkAnchors()
+            .update(resourceGroupName, networkAnchorName, updateProperties, Context.NONE);
+        return this;
+    }
+
+    public NetworkAnchor apply(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getNetworkAnchors()
+            .update(resourceGroupName, networkAnchorName, updateProperties, context);
+        return this;
+    }
+
+    NetworkAnchorImpl(NetworkAnchorInner innerObject,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+        this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
+        this.networkAnchorName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "networkAnchors");
+    }
+
+    public NetworkAnchor refresh() {
+        this.innerObject = serviceManager.serviceClient()
+            .getNetworkAnchors()
+            .getByResourceGroupWithResponse(resourceGroupName, networkAnchorName, Context.NONE)
+            .getValue();
+        return this;
+    }
+
+    public NetworkAnchor refresh(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getNetworkAnchors()
+            .getByResourceGroupWithResponse(resourceGroupName, networkAnchorName, context)
+            .getValue();
+        return this;
+    }
+
+    public NetworkAnchorImpl withRegion(Region location) {
+        this.innerModel().withLocation(location.toString());
+        return this;
+    }
+
+    public NetworkAnchorImpl withRegion(String location) {
+        this.innerModel().withLocation(location);
+        return this;
+    }
+
+    public NetworkAnchorImpl withTags(Map<String, String> tags) {
+        if (isInCreateMode()) {
+            this.innerModel().withTags(tags);
+            return this;
+        } else {
+            this.updateProperties.withTags(tags);
+            return this;
+        }
+    }
+
+    public NetworkAnchorImpl withProperties(NetworkAnchorProperties properties) {
+        this.innerModel().withProperties(properties);
+        return this;
+    }
+
+    public NetworkAnchorImpl withZones(List<String> zones) {
+        if (isInCreateMode()) {
+            this.innerModel().withZones(zones);
+            return this;
+        } else {
+            this.updateProperties.withZones(zones);
+            return this;
+        }
+    }
+
+    public NetworkAnchorImpl withProperties(NetworkAnchorUpdateProperties properties) {
+        this.updateProperties.withProperties(properties);
+        return this;
+    }
+
+    private boolean isInCreateMode() {
+        return this.innerModel() == null || this.innerModel().id() == null;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsClientImpl.java
new file mode 100644
index 000000000000..7bb5a5eafe93
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsClientImpl.java
@@ -0,0 +1,1109 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.Patch;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import com.azure.resourcemanager.oracledatabase.implementation.models.NetworkAnchorListResult;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdate;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in NetworkAnchorsClient.
+ */
+public final class NetworkAnchorsClientImpl implements NetworkAnchorsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final NetworkAnchorsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final OracleDatabaseManagementClientImpl client;
+
+    /**
+     * Initializes an instance of NetworkAnchorsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    NetworkAnchorsClientImpl(OracleDatabaseManagementClientImpl client) {
+        this.service
+            = RestProxy.create(NetworkAnchorsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for OracleDatabaseManagementClientNetworkAnchors to be used by the proxy
+     * service to perform REST calls.
+     */
+    @Host("{endpoint}")
+    @ServiceInterface(name = "OracleDatabaseManagementClientNetworkAnchors")
+    public interface NetworkAnchorsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/networkAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NetworkAnchorListResult>> list(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/networkAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<NetworkAnchorListResult> listSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") NetworkAnchorInner resource,
+            Context context);
+
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createOrUpdateSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") NetworkAnchorInner resource,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NetworkAnchorInner>> getByResourceGroup(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<NetworkAnchorInner> getByResourceGroupSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") NetworkAnchorUpdate properties,
+            Context context);
+
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") NetworkAnchorUpdate properties,
+            Context context);
+
+        @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, Context context);
+
+        @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors/{networkAnchorName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("networkAnchorName") String networkAnchorName, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NetworkAnchorListResult>> listByResourceGroup(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/networkAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<NetworkAnchorListResult> listByResourceGroupSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NetworkAnchorListResult>> listBySubscriptionNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<NetworkAnchorListResult> listBySubscriptionNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<NetworkAnchorListResult>> listByResourceGroupNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<NetworkAnchorListResult> listByResourceGroupNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NetworkAnchorInner>> listSinglePageAsync() {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), accept, context))
+            .<PagedResponse<NetworkAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<NetworkAnchorInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(),
+            nextLink -> listBySubscriptionNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listSinglePage() {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listSinglePage(Context context) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NetworkAnchorInner> list() {
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listBySubscriptionNextSinglePage(nextLink));
+    }
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NetworkAnchorInner> list(Context context) {
+        return new PagedIterable<>(() -> listSinglePage(context),
+            nextLink -> listBySubscriptionNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorInner resource) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, contentType, accept, resource,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorInner resource) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, contentType, accept, resource,
+            Context.NONE);
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorInner resource, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, contentType, accept, resource,
+            context);
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<NetworkAnchorInner>, NetworkAnchorInner>
+        beginCreateOrUpdateAsync(String resourceGroupName, String networkAnchorName, NetworkAnchorInner resource) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, networkAnchorName, resource);
+        return this.client.<NetworkAnchorInner, NetworkAnchorInner>getLroResult(mono, this.client.getHttpPipeline(),
+            NetworkAnchorInner.class, NetworkAnchorInner.class, this.client.getContext());
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginCreateOrUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorInner resource) {
+        Response<BinaryData> response = createOrUpdateWithResponse(resourceGroupName, networkAnchorName, resource);
+        return this.client.<NetworkAnchorInner, NetworkAnchorInner>getLroResult(response, NetworkAnchorInner.class,
+            NetworkAnchorInner.class, Context.NONE);
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginCreateOrUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorInner resource, Context context) {
+        Response<BinaryData> response
+            = createOrUpdateWithResponse(resourceGroupName, networkAnchorName, resource, context);
+        return this.client.<NetworkAnchorInner, NetworkAnchorInner>getLroResult(response, NetworkAnchorInner.class,
+            NetworkAnchorInner.class, context);
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<NetworkAnchorInner> createOrUpdateAsync(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorInner resource) {
+        return beginCreateOrUpdateAsync(resourceGroupName, networkAnchorName, resource).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public NetworkAnchorInner createOrUpdate(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorInner resource) {
+        return beginCreateOrUpdate(resourceGroupName, networkAnchorName, resource).getFinalResult();
+    }
+
+    /**
+     * Create a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public NetworkAnchorInner createOrUpdate(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorInner resource, Context context) {
+        return beginCreateOrUpdate(resourceGroupName, networkAnchorName, resource, context).getFinalResult();
+    }
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<NetworkAnchorInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
+        String networkAnchorName) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<NetworkAnchorInner> getByResourceGroupAsync(String resourceGroupName, String networkAnchorName) {
+        return getByResourceGroupWithResponseAsync(resourceGroupName, networkAnchorName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<NetworkAnchorInner> getByResourceGroupWithResponse(String resourceGroupName,
+        String networkAnchorName, Context context) {
+        final String accept = "application/json";
+        return service.getByResourceGroupSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, accept, context);
+    }
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public NetworkAnchorInner getByResourceGroup(String resourceGroupName, String networkAnchorName) {
+        return getByResourceGroupWithResponse(resourceGroupName, networkAnchorName, Context.NONE).getValue();
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorUpdate properties) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, contentType, accept, properties,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorUpdate properties) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, contentType, accept, properties,
+            Context.NONE);
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorUpdate properties, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, contentType, accept, properties,
+            context);
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginUpdateAsync(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorUpdate properties) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = updateWithResponseAsync(resourceGroupName, networkAnchorName, properties);
+        return this.client.<NetworkAnchorInner, NetworkAnchorInner>getLroResult(mono, this.client.getHttpPipeline(),
+            NetworkAnchorInner.class, NetworkAnchorInner.class, this.client.getContext());
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorUpdate properties) {
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, networkAnchorName, properties);
+        return this.client.<NetworkAnchorInner, NetworkAnchorInner>getLroResult(response, NetworkAnchorInner.class,
+            NetworkAnchorInner.class, Context.NONE);
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<NetworkAnchorInner>, NetworkAnchorInner> beginUpdate(String resourceGroupName,
+        String networkAnchorName, NetworkAnchorUpdate properties, Context context) {
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, networkAnchorName, properties, context);
+        return this.client.<NetworkAnchorInner, NetworkAnchorInner>getLroResult(response, NetworkAnchorInner.class,
+            NetworkAnchorInner.class, context);
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<NetworkAnchorInner> updateAsync(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorUpdate properties) {
+        return beginUpdateAsync(resourceGroupName, networkAnchorName, properties).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public NetworkAnchorInner update(String resourceGroupName, String networkAnchorName,
+        NetworkAnchorUpdate properties) {
+        return beginUpdate(resourceGroupName, networkAnchorName, properties).getFinalResult();
+    }
+
+    /**
+     * Update a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return network Anchor resource model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public NetworkAnchorInner update(String resourceGroupName, String networkAnchorName, NetworkAnchorUpdate properties,
+        Context context) {
+        return beginUpdate(resourceGroupName, networkAnchorName, properties, context).getFinalResult();
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName,
+        String networkAnchorName) {
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String networkAnchorName) {
+        return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, Context.NONE);
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String networkAnchorName,
+        Context context) {
+        return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, networkAnchorName, context);
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String networkAnchorName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, networkAnchorName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String networkAnchorName) {
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, networkAnchorName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String networkAnchorName,
+        Context context) {
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, networkAnchorName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String networkAnchorName) {
+        return beginDeleteAsync(resourceGroupName, networkAnchorName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String networkAnchorName) {
+        beginDelete(resourceGroupName, networkAnchorName).getFinalResult();
+    }
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String networkAnchorName, Context context) {
+        beginDelete(resourceGroupName, networkAnchorName, context).getFinalResult();
+    }
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NetworkAnchorInner>> listByResourceGroupSinglePageAsync(String resourceGroupName) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, accept, context))
+            .<PagedResponse<NetworkAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<NetworkAnchorInner> listByResourceGroupAsync(String resourceGroupName) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listByResourceGroupSinglePage(String resourceGroupName) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), resourceGroupName, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listByResourceGroupSinglePage(String resourceGroupName, Context context) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), resourceGroupName, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NetworkAnchorInner> listByResourceGroup(String resourceGroupName) {
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink));
+    }
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<NetworkAnchorInner> listByResourceGroup(String resourceGroupName, Context context) {
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName, context),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NetworkAnchorInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listBySubscriptionNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<NetworkAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listBySubscriptionNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res
+            = service.listBySubscriptionNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listBySubscriptionNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res
+            = service.listBySubscriptionNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<NetworkAnchorInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<NetworkAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listByResourceGroupNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<NetworkAnchorInner> listByResourceGroupNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<NetworkAnchorListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsImpl.java
new file mode 100644
index 000000000000..3b4360e90289
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsImpl.java
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchors;
+
+public final class NetworkAnchorsImpl implements NetworkAnchors {
+    private static final ClientLogger LOGGER = new ClientLogger(NetworkAnchorsImpl.class);
+
+    private final NetworkAnchorsClient innerClient;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public NetworkAnchorsImpl(NetworkAnchorsClient innerClient,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public PagedIterable<NetworkAnchor> list() {
+        PagedIterable<NetworkAnchorInner> inner = this.serviceClient().list();
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new NetworkAnchorImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<NetworkAnchor> list(Context context) {
+        PagedIterable<NetworkAnchorInner> inner = this.serviceClient().list(context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new NetworkAnchorImpl(inner1, this.manager()));
+    }
+
+    public Response<NetworkAnchor> getByResourceGroupWithResponse(String resourceGroupName, String networkAnchorName,
+        Context context) {
+        Response<NetworkAnchorInner> inner
+            = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, networkAnchorName, context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new NetworkAnchorImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public NetworkAnchor getByResourceGroup(String resourceGroupName, String networkAnchorName) {
+        NetworkAnchorInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, networkAnchorName);
+        if (inner != null) {
+            return new NetworkAnchorImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public void deleteByResourceGroup(String resourceGroupName, String networkAnchorName) {
+        this.serviceClient().delete(resourceGroupName, networkAnchorName);
+    }
+
+    public void delete(String resourceGroupName, String networkAnchorName, Context context) {
+        this.serviceClient().delete(resourceGroupName, networkAnchorName, context);
+    }
+
+    public PagedIterable<NetworkAnchor> listByResourceGroup(String resourceGroupName) {
+        PagedIterable<NetworkAnchorInner> inner = this.serviceClient().listByResourceGroup(resourceGroupName);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new NetworkAnchorImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<NetworkAnchor> listByResourceGroup(String resourceGroupName, Context context) {
+        PagedIterable<NetworkAnchorInner> inner = this.serviceClient().listByResourceGroup(resourceGroupName, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new NetworkAnchorImpl(inner1, this.manager()));
+    }
+
+    public NetworkAnchor getById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String networkAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "networkAnchors");
+        if (networkAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'networkAnchors'.", id)));
+        }
+        return this.getByResourceGroupWithResponse(resourceGroupName, networkAnchorName, Context.NONE).getValue();
+    }
+
+    public Response<NetworkAnchor> getByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String networkAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "networkAnchors");
+        if (networkAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'networkAnchors'.", id)));
+        }
+        return this.getByResourceGroupWithResponse(resourceGroupName, networkAnchorName, context);
+    }
+
+    public void deleteById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String networkAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "networkAnchors");
+        if (networkAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'networkAnchors'.", id)));
+        }
+        this.delete(resourceGroupName, networkAnchorName, Context.NONE);
+    }
+
+    public void deleteByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String networkAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "networkAnchors");
+        if (networkAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'networkAnchors'.", id)));
+        }
+        this.delete(resourceGroupName, networkAnchorName, context);
+    }
+
+    private NetworkAnchorsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+
+    public NetworkAnchorImpl define(String name) {
+        return new NetworkAnchorImpl(name, this.manager());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientImpl.java
index ac8d7fd42caa..e049d33ae7e7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientImpl.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientImpl.java
@@ -36,6 +36,8 @@
 import com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient;
 import com.azure.resourcemanager.oracledatabase.fluent.DbServersClient;
 import com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient;
+import com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient;
 import com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient;
@@ -44,9 +46,11 @@
 import com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.OperationsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.OracleDatabaseManagementClient;
 import com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient;
 import com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient;
 import java.io.IOException;
@@ -455,6 +459,62 @@ public ExascaleDbStorageVaultsClient getExascaleDbStorageVaults() {
         return this.exascaleDbStorageVaults;
     }
 
+    /**
+     * The NetworkAnchorsClient object to access its operations.
+     */
+    private final NetworkAnchorsClient networkAnchors;
+
+    /**
+     * Gets the NetworkAnchorsClient object to access its operations.
+     * 
+     * @return the NetworkAnchorsClient object.
+     */
+    public NetworkAnchorsClient getNetworkAnchors() {
+        return this.networkAnchors;
+    }
+
+    /**
+     * The ResourceAnchorsClient object to access its operations.
+     */
+    private final ResourceAnchorsClient resourceAnchors;
+
+    /**
+     * Gets the ResourceAnchorsClient object to access its operations.
+     * 
+     * @return the ResourceAnchorsClient object.
+     */
+    public ResourceAnchorsClient getResourceAnchors() {
+        return this.resourceAnchors;
+    }
+
+    /**
+     * The DbSystemsClient object to access its operations.
+     */
+    private final DbSystemsClient dbSystems;
+
+    /**
+     * Gets the DbSystemsClient object to access its operations.
+     * 
+     * @return the DbSystemsClient object.
+     */
+    public DbSystemsClient getDbSystems() {
+        return this.dbSystems;
+    }
+
+    /**
+     * The DbVersionsClient object to access its operations.
+     */
+    private final DbVersionsClient dbVersions;
+
+    /**
+     * Gets the DbVersionsClient object to access its operations.
+     * 
+     * @return the DbVersionsClient object.
+     */
+    public DbVersionsClient getDbVersions() {
+        return this.dbVersions;
+    }
+
     /**
      * Initializes an instance of OracleDatabaseManagementClient client.
      * 
@@ -472,7 +532,7 @@ public ExascaleDbStorageVaultsClient getExascaleDbStorageVaults() {
         this.defaultPollInterval = defaultPollInterval;
         this.endpoint = endpoint;
         this.subscriptionId = subscriptionId;
-        this.apiVersion = "2025-03-01";
+        this.apiVersion = "2025-09-01";
         this.operations = new OperationsClientImpl(this);
         this.cloudExadataInfrastructures = new CloudExadataInfrastructuresClientImpl(this);
         this.dbServers = new DbServersClientImpl(this);
@@ -495,6 +555,10 @@ public ExascaleDbStorageVaultsClient getExascaleDbStorageVaults() {
         this.exadbVmClusters = new ExadbVmClustersClientImpl(this);
         this.exascaleDbNodes = new ExascaleDbNodesClientImpl(this);
         this.exascaleDbStorageVaults = new ExascaleDbStorageVaultsClientImpl(this);
+        this.networkAnchors = new NetworkAnchorsClientImpl(this);
+        this.resourceAnchors = new ResourceAnchorsClientImpl(this);
+        this.dbSystems = new DbSystemsClientImpl(this);
+        this.dbVersions = new DbVersionsClientImpl(this);
     }
 
     /**
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorImpl.java
new file mode 100644
index 000000000000..1fd129524aa7
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorImpl.java
@@ -0,0 +1,177 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.management.Region;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorUpdate;
+import java.util.Collections;
+import java.util.Map;
+
+public final class ResourceAnchorImpl implements ResourceAnchor, ResourceAnchor.Definition, ResourceAnchor.Update {
+    private ResourceAnchorInner innerObject;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public String id() {
+        return this.innerModel().id();
+    }
+
+    public String name() {
+        return this.innerModel().name();
+    }
+
+    public String type() {
+        return this.innerModel().type();
+    }
+
+    public String location() {
+        return this.innerModel().location();
+    }
+
+    public Map<String, String> tags() {
+        Map<String, String> inner = this.innerModel().tags();
+        if (inner != null) {
+            return Collections.unmodifiableMap(inner);
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+
+    public ResourceAnchorProperties properties() {
+        return this.innerModel().properties();
+    }
+
+    public SystemData systemData() {
+        return this.innerModel().systemData();
+    }
+
+    public Region region() {
+        return Region.fromName(this.regionName());
+    }
+
+    public String regionName() {
+        return this.location();
+    }
+
+    public String resourceGroupName() {
+        return resourceGroupName;
+    }
+
+    public ResourceAnchorInner innerModel() {
+        return this.innerObject;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+
+    private String resourceGroupName;
+
+    private String resourceAnchorName;
+
+    private ResourceAnchorUpdate updateProperties;
+
+    public ResourceAnchorImpl withExistingResourceGroup(String resourceGroupName) {
+        this.resourceGroupName = resourceGroupName;
+        return this;
+    }
+
+    public ResourceAnchor create() {
+        this.innerObject = serviceManager.serviceClient()
+            .getResourceAnchors()
+            .createOrUpdate(resourceGroupName, resourceAnchorName, this.innerModel(), Context.NONE);
+        return this;
+    }
+
+    public ResourceAnchor create(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getResourceAnchors()
+            .createOrUpdate(resourceGroupName, resourceAnchorName, this.innerModel(), context);
+        return this;
+    }
+
+    ResourceAnchorImpl(String name, com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = new ResourceAnchorInner();
+        this.serviceManager = serviceManager;
+        this.resourceAnchorName = name;
+    }
+
+    public ResourceAnchorImpl update() {
+        this.updateProperties = new ResourceAnchorUpdate();
+        return this;
+    }
+
+    public ResourceAnchor apply() {
+        this.innerObject = serviceManager.serviceClient()
+            .getResourceAnchors()
+            .update(resourceGroupName, resourceAnchorName, updateProperties, Context.NONE);
+        return this;
+    }
+
+    public ResourceAnchor apply(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getResourceAnchors()
+            .update(resourceGroupName, resourceAnchorName, updateProperties, context);
+        return this;
+    }
+
+    ResourceAnchorImpl(ResourceAnchorInner innerObject,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerObject = innerObject;
+        this.serviceManager = serviceManager;
+        this.resourceGroupName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceGroups");
+        this.resourceAnchorName = ResourceManagerUtils.getValueFromIdByName(innerObject.id(), "resourceAnchors");
+    }
+
+    public ResourceAnchor refresh() {
+        this.innerObject = serviceManager.serviceClient()
+            .getResourceAnchors()
+            .getByResourceGroupWithResponse(resourceGroupName, resourceAnchorName, Context.NONE)
+            .getValue();
+        return this;
+    }
+
+    public ResourceAnchor refresh(Context context) {
+        this.innerObject = serviceManager.serviceClient()
+            .getResourceAnchors()
+            .getByResourceGroupWithResponse(resourceGroupName, resourceAnchorName, context)
+            .getValue();
+        return this;
+    }
+
+    public ResourceAnchorImpl withRegion(Region location) {
+        this.innerModel().withLocation(location.toString());
+        return this;
+    }
+
+    public ResourceAnchorImpl withRegion(String location) {
+        this.innerModel().withLocation(location);
+        return this;
+    }
+
+    public ResourceAnchorImpl withTags(Map<String, String> tags) {
+        if (isInCreateMode()) {
+            this.innerModel().withTags(tags);
+            return this;
+        } else {
+            this.updateProperties.withTags(tags);
+            return this;
+        }
+    }
+
+    public ResourceAnchorImpl withProperties(ResourceAnchorProperties properties) {
+        this.innerModel().withProperties(properties);
+        return this;
+    }
+
+    private boolean isInCreateMode() {
+        return this.innerModel() == null || this.innerModel().id() == null;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsClientImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsClientImpl.java
new file mode 100644
index 000000000000..69afa6f12f91
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsClientImpl.java
@@ -0,0 +1,1110 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.annotation.BodyParam;
+import com.azure.core.annotation.Delete;
+import com.azure.core.annotation.ExpectedResponses;
+import com.azure.core.annotation.Get;
+import com.azure.core.annotation.HeaderParam;
+import com.azure.core.annotation.Headers;
+import com.azure.core.annotation.Host;
+import com.azure.core.annotation.HostParam;
+import com.azure.core.annotation.Patch;
+import com.azure.core.annotation.PathParam;
+import com.azure.core.annotation.Put;
+import com.azure.core.annotation.QueryParam;
+import com.azure.core.annotation.ReturnType;
+import com.azure.core.annotation.ServiceInterface;
+import com.azure.core.annotation.ServiceMethod;
+import com.azure.core.annotation.UnexpectedResponseExceptionType;
+import com.azure.core.http.rest.PagedFlux;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.PagedResponse;
+import com.azure.core.http.rest.PagedResponseBase;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.RestProxy;
+import com.azure.core.management.exception.ManagementException;
+import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
+import com.azure.core.util.Context;
+import com.azure.core.util.FluxUtil;
+import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
+import com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import com.azure.resourcemanager.oracledatabase.implementation.models.ResourceAnchorListResult;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorUpdate;
+import java.nio.ByteBuffer;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * An instance of this class provides access to all the operations defined in ResourceAnchorsClient.
+ */
+public final class ResourceAnchorsClientImpl implements ResourceAnchorsClient {
+    /**
+     * The proxy service used to perform REST calls.
+     */
+    private final ResourceAnchorsService service;
+
+    /**
+     * The service client containing this operation class.
+     */
+    private final OracleDatabaseManagementClientImpl client;
+
+    /**
+     * Initializes an instance of ResourceAnchorsClientImpl.
+     * 
+     * @param client the instance of the service client containing this operation class.
+     */
+    ResourceAnchorsClientImpl(OracleDatabaseManagementClientImpl client) {
+        this.service
+            = RestProxy.create(ResourceAnchorsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
+        this.client = client;
+    }
+
+    /**
+     * The interface defining all the services for OracleDatabaseManagementClientResourceAnchors to be used by the proxy
+     * service to perform REST calls.
+     */
+    @Host("{endpoint}")
+    @ServiceInterface(name = "OracleDatabaseManagementClientResourceAnchors")
+    public interface ResourceAnchorsService {
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/resourceAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ResourceAnchorListResult>> list(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Oracle.Database/resourceAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ResourceAnchorListResult> listSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> createOrUpdate(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") ResourceAnchorInner resource,
+            Context context);
+
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createOrUpdateSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") ResourceAnchorInner resource,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ResourceAnchorInner>> getByResourceGroup(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ResourceAnchorInner> getByResourceGroupSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> update(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") ResourceAnchorUpdate properties,
+            Context context);
+
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") ResourceAnchorUpdate properties,
+            Context context);
+
+        @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, Context context);
+
+        @Headers({ "Accept: application/json;q=0.9", "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors/{resourceAnchorName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName,
+            @PathParam("resourceAnchorName") String resourceAnchorName, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ResourceAnchorListResult>> listByResourceGroup(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Oracle.Database/resourceAnchors")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ResourceAnchorListResult> listByResourceGroupSync(@HostParam("endpoint") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
+            Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ResourceAnchorListResult>> listBySubscriptionNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ResourceAnchorListResult> listBySubscriptionNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Mono<Response<ResourceAnchorListResult>> listByResourceGroupNext(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ResourceAnchorListResult> listByResourceGroupNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+    }
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ResourceAnchorInner>> listSinglePageAsync() {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.list(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), accept, context))
+            .<PagedResponse<ResourceAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ResourceAnchorInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(),
+            nextLink -> listBySubscriptionNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listSinglePage() {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res = service.listSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listSinglePage(Context context) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res = service.listSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ResourceAnchorInner> list() {
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listBySubscriptionNextSinglePage(nextLink));
+    }
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ResourceAnchorInner> list(Context context) {
+        return new PagedIterable<>(() -> listSinglePage(context),
+            nextLink -> listBySubscriptionNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorInner resource) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, contentType, accept, resource,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, contentType, accept, resource,
+            Context.NONE);
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createOrUpdateWithResponse(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, contentType, accept, resource,
+            context);
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<ResourceAnchorInner>, ResourceAnchorInner>
+        beginCreateOrUpdateAsync(String resourceGroupName, String resourceAnchorName, ResourceAnchorInner resource) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = createOrUpdateWithResponseAsync(resourceGroupName, resourceAnchorName, resource);
+        return this.client.<ResourceAnchorInner, ResourceAnchorInner>getLroResult(mono, this.client.getHttpPipeline(),
+            ResourceAnchorInner.class, ResourceAnchorInner.class, this.client.getContext());
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner>
+        beginCreateOrUpdate(String resourceGroupName, String resourceAnchorName, ResourceAnchorInner resource) {
+        Response<BinaryData> response = createOrUpdateWithResponse(resourceGroupName, resourceAnchorName, resource);
+        return this.client.<ResourceAnchorInner, ResourceAnchorInner>getLroResult(response, ResourceAnchorInner.class,
+            ResourceAnchorInner.class, Context.NONE);
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginCreateOrUpdate(
+        String resourceGroupName, String resourceAnchorName, ResourceAnchorInner resource, Context context) {
+        Response<BinaryData> response
+            = createOrUpdateWithResponse(resourceGroupName, resourceAnchorName, resource, context);
+        return this.client.<ResourceAnchorInner, ResourceAnchorInner>getLroResult(response, ResourceAnchorInner.class,
+            ResourceAnchorInner.class, context);
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<ResourceAnchorInner> createOrUpdateAsync(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource) {
+        return beginCreateOrUpdateAsync(resourceGroupName, resourceAnchorName, resource).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ResourceAnchorInner createOrUpdate(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource) {
+        return beginCreateOrUpdate(resourceGroupName, resourceAnchorName, resource).getFinalResult();
+    }
+
+    /**
+     * Create a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param resource Resource create parameters.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ResourceAnchorInner createOrUpdate(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorInner resource, Context context) {
+        return beginCreateOrUpdate(resourceGroupName, resourceAnchorName, resource, context).getFinalResult();
+    }
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<ResourceAnchorInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
+        String resourceAnchorName) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.getByResourceGroup(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<ResourceAnchorInner> getByResourceGroupAsync(String resourceGroupName, String resourceAnchorName) {
+        return getByResourceGroupWithResponseAsync(resourceGroupName, resourceAnchorName)
+            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
+    }
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public Response<ResourceAnchorInner> getByResourceGroupWithResponse(String resourceGroupName,
+        String resourceAnchorName, Context context) {
+        final String accept = "application/json";
+        return service.getByResourceGroupSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, accept, context);
+    }
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ResourceAnchorInner getByResourceGroup(String resourceGroupName, String resourceAnchorName) {
+        return getByResourceGroupWithResponse(resourceGroupName, resourceAnchorName, Context.NONE).getValue();
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorUpdate properties) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, contentType, accept, properties,
+                context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorUpdate properties) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, contentType, accept, properties,
+            Context.NONE);
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorUpdate properties, Context context) {
+        final String contentType = "application/json";
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, contentType, accept, properties,
+            context);
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginUpdateAsync(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorUpdate properties) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = updateWithResponseAsync(resourceGroupName, resourceAnchorName, properties);
+        return this.client.<ResourceAnchorInner, ResourceAnchorInner>getLroResult(mono, this.client.getHttpPipeline(),
+            ResourceAnchorInner.class, ResourceAnchorInner.class, this.client.getContext());
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginUpdate(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorUpdate properties) {
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, resourceAnchorName, properties);
+        return this.client.<ResourceAnchorInner, ResourceAnchorInner>getLroResult(response, ResourceAnchorInner.class,
+            ResourceAnchorInner.class, Context.NONE);
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<ResourceAnchorInner>, ResourceAnchorInner> beginUpdate(String resourceGroupName,
+        String resourceAnchorName, ResourceAnchorUpdate properties, Context context) {
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, resourceAnchorName, properties, context);
+        return this.client.<ResourceAnchorInner, ResourceAnchorInner>getLroResult(response, ResourceAnchorInner.class,
+            ResourceAnchorInner.class, context);
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<ResourceAnchorInner> updateAsync(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorUpdate properties) {
+        return beginUpdateAsync(resourceGroupName, resourceAnchorName, properties).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ResourceAnchorInner update(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorUpdate properties) {
+        return beginUpdate(resourceGroupName, resourceAnchorName, properties).getFinalResult();
+    }
+
+    /**
+     * Update a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param properties The resource properties to be updated.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return resource Anchor model.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public ResourceAnchorInner update(String resourceGroupName, String resourceAnchorName,
+        ResourceAnchorUpdate properties, Context context) {
+        return beginUpdate(resourceGroupName, resourceAnchorName, properties, context).getFinalResult();
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName,
+        String resourceAnchorName) {
+        return FluxUtil
+            .withContext(context -> service.delete(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String resourceAnchorName) {
+        return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, Context.NONE);
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String resourceAnchorName,
+        Context context) {
+        return service.deleteSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, resourceAnchorName, context);
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String resourceAnchorName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, resourceAnchorName);
+        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
+            this.client.getContext());
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceAnchorName) {
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, resourceAnchorName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of long-running operation.
+     */
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String resourceAnchorName,
+        Context context) {
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, resourceAnchorName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return A {@link Mono} that completes when a successful response is received.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<Void> deleteAsync(String resourceGroupName, String resourceAnchorName) {
+        return beginDeleteAsync(resourceGroupName, resourceAnchorName).last()
+            .flatMap(this.client::getLroFinalResultOrError);
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceAnchorName) {
+        beginDelete(resourceGroupName, resourceAnchorName).getFinalResult();
+    }
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String resourceAnchorName, Context context) {
+        beginDelete(resourceGroupName, resourceAnchorName, context).getFinalResult();
+    }
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ResourceAnchorInner>> listByResourceGroupSinglePageAsync(String resourceGroupName) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(context -> service.listByResourceGroup(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, accept, context))
+            .<PagedResponse<ResourceAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ResourceAnchorInner> listByResourceGroupAsync(String resourceGroupName) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
+    }
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listByResourceGroupSinglePage(String resourceGroupName) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), resourceGroupName, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listByResourceGroupSinglePage(String resourceGroupName,
+        Context context) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res = service.listByResourceGroupSync(this.client.getEndpoint(),
+            this.client.getApiVersion(), this.client.getSubscriptionId(), resourceGroupName, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ResourceAnchorInner> listByResourceGroup(String resourceGroupName) {
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink));
+    }
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    public PagedIterable<ResourceAnchorInner> listByResourceGroup(String resourceGroupName, Context context) {
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName, context),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink, context));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ResourceAnchorInner>> listBySubscriptionNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listBySubscriptionNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<ResourceAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listBySubscriptionNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res
+            = service.listBySubscriptionNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listBySubscriptionNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res
+            = service.listBySubscriptionNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse} on successful completion
+     * of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Mono<PagedResponse<ResourceAnchorInner>> listByResourceGroupNextSinglePageAsync(String nextLink) {
+        final String accept = "application/json";
+        return FluxUtil
+            .withContext(
+                context -> service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context))
+            .<PagedResponse<ResourceAnchorInner>>map(res -> new PagedResponseBase<>(res.getRequest(),
+                res.getStatusCode(), res.getHeaders(), res.getValue().value(), res.getValue().nextLink(), null))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listByResourceGroupNextSinglePage(String nextLink) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ResourceAnchorInner> listByResourceGroupNextSinglePage(String nextLink, Context context) {
+        final String accept = "application/json";
+        Response<ResourceAnchorListResult> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsImpl.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsImpl.java
new file mode 100644
index 000000000000..449769ab3b54
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsImpl.java
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.http.rest.SimpleResponse;
+import com.azure.core.util.Context;
+import com.azure.core.util.logging.ClientLogger;
+import com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchors;
+
+public final class ResourceAnchorsImpl implements ResourceAnchors {
+    private static final ClientLogger LOGGER = new ClientLogger(ResourceAnchorsImpl.class);
+
+    private final ResourceAnchorsClient innerClient;
+
+    private final com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager;
+
+    public ResourceAnchorsImpl(ResourceAnchorsClient innerClient,
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager serviceManager) {
+        this.innerClient = innerClient;
+        this.serviceManager = serviceManager;
+    }
+
+    public PagedIterable<ResourceAnchor> list() {
+        PagedIterable<ResourceAnchorInner> inner = this.serviceClient().list();
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new ResourceAnchorImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<ResourceAnchor> list(Context context) {
+        PagedIterable<ResourceAnchorInner> inner = this.serviceClient().list(context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new ResourceAnchorImpl(inner1, this.manager()));
+    }
+
+    public Response<ResourceAnchor> getByResourceGroupWithResponse(String resourceGroupName, String resourceAnchorName,
+        Context context) {
+        Response<ResourceAnchorInner> inner
+            = this.serviceClient().getByResourceGroupWithResponse(resourceGroupName, resourceAnchorName, context);
+        if (inner != null) {
+            return new SimpleResponse<>(inner.getRequest(), inner.getStatusCode(), inner.getHeaders(),
+                new ResourceAnchorImpl(inner.getValue(), this.manager()));
+        } else {
+            return null;
+        }
+    }
+
+    public ResourceAnchor getByResourceGroup(String resourceGroupName, String resourceAnchorName) {
+        ResourceAnchorInner inner = this.serviceClient().getByResourceGroup(resourceGroupName, resourceAnchorName);
+        if (inner != null) {
+            return new ResourceAnchorImpl(inner, this.manager());
+        } else {
+            return null;
+        }
+    }
+
+    public void deleteByResourceGroup(String resourceGroupName, String resourceAnchorName) {
+        this.serviceClient().delete(resourceGroupName, resourceAnchorName);
+    }
+
+    public void delete(String resourceGroupName, String resourceAnchorName, Context context) {
+        this.serviceClient().delete(resourceGroupName, resourceAnchorName, context);
+    }
+
+    public PagedIterable<ResourceAnchor> listByResourceGroup(String resourceGroupName) {
+        PagedIterable<ResourceAnchorInner> inner = this.serviceClient().listByResourceGroup(resourceGroupName);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new ResourceAnchorImpl(inner1, this.manager()));
+    }
+
+    public PagedIterable<ResourceAnchor> listByResourceGroup(String resourceGroupName, Context context) {
+        PagedIterable<ResourceAnchorInner> inner = this.serviceClient().listByResourceGroup(resourceGroupName, context);
+        return ResourceManagerUtils.mapPage(inner, inner1 -> new ResourceAnchorImpl(inner1, this.manager()));
+    }
+
+    public ResourceAnchor getById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String resourceAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "resourceAnchors");
+        if (resourceAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceAnchors'.", id)));
+        }
+        return this.getByResourceGroupWithResponse(resourceGroupName, resourceAnchorName, Context.NONE).getValue();
+    }
+
+    public Response<ResourceAnchor> getByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String resourceAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "resourceAnchors");
+        if (resourceAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceAnchors'.", id)));
+        }
+        return this.getByResourceGroupWithResponse(resourceGroupName, resourceAnchorName, context);
+    }
+
+    public void deleteById(String id) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String resourceAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "resourceAnchors");
+        if (resourceAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceAnchors'.", id)));
+        }
+        this.delete(resourceGroupName, resourceAnchorName, Context.NONE);
+    }
+
+    public void deleteByIdWithResponse(String id, Context context) {
+        String resourceGroupName = ResourceManagerUtils.getValueFromIdByName(id, "resourceGroups");
+        if (resourceGroupName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceGroups'.", id)));
+        }
+        String resourceAnchorName = ResourceManagerUtils.getValueFromIdByName(id, "resourceAnchors");
+        if (resourceAnchorName == null) {
+            throw LOGGER.logExceptionAsError(new IllegalArgumentException(
+                String.format("The resource ID '%s' is not valid. Missing path segment 'resourceAnchors'.", id)));
+        }
+        this.delete(resourceGroupName, resourceAnchorName, context);
+    }
+
+    private ResourceAnchorsClient serviceClient() {
+        return this.innerClient;
+    }
+
+    private com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager() {
+        return this.serviceManager;
+    }
+
+    public ResourceAnchorImpl define(String name) {
+        return new ResourceAnchorImpl(name, this.manager());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbSystemListResult.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbSystemListResult.java
new file mode 100644
index 000000000000..34bcd2e9cf0f
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbSystemListResult.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response of a DbSystem list operation.
+ */
+@Immutable
+public final class DbSystemListResult implements JsonSerializable<DbSystemListResult> {
+    /*
+     * The DbSystem items on this page
+     */
+    private List<DbSystemInner> value;
+
+    /*
+     * The link to the next page of items
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of DbSystemListResult class.
+     */
+    private DbSystemListResult() {
+    }
+
+    /**
+     * Get the value property: The DbSystem items on this page.
+     * 
+     * @return the value value.
+     */
+    public List<DbSystemInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Get the nextLink property: The link to the next page of items.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemListResult if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbSystemListResult.
+     */
+    public static DbSystemListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemListResult deserializedDbSystemListResult = new DbSystemListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<DbSystemInner> value = reader.readArray(reader1 -> DbSystemInner.fromJson(reader1));
+                    deserializedDbSystemListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedDbSystemListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemListResult;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbVersionListResult.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbVersionListResult.java
new file mode 100644
index 000000000000..7914a7b37d3a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbVersionListResult.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response of a DbVersion list operation.
+ */
+@Immutable
+public final class DbVersionListResult implements JsonSerializable<DbVersionListResult> {
+    /*
+     * The DbVersion items on this page
+     */
+    private List<DbVersionInner> value;
+
+    /*
+     * The link to the next page of items
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of DbVersionListResult class.
+     */
+    private DbVersionListResult() {
+    }
+
+    /**
+     * Get the value property: The DbVersion items on this page.
+     * 
+     * @return the value value.
+     */
+    public List<DbVersionInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Get the nextLink property: The link to the next page of items.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbVersionListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbVersionListResult if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbVersionListResult.
+     */
+    public static DbVersionListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbVersionListResult deserializedDbVersionListResult = new DbVersionListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<DbVersionInner> value = reader.readArray(reader1 -> DbVersionInner.fromJson(reader1));
+                    deserializedDbVersionListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedDbVersionListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbVersionListResult;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/NetworkAnchorListResult.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/NetworkAnchorListResult.java
new file mode 100644
index 000000000000..869f62379cbb
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/NetworkAnchorListResult.java
@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response of a NetworkAnchor list operation.
+ */
+@Immutable
+public final class NetworkAnchorListResult implements JsonSerializable<NetworkAnchorListResult> {
+    /*
+     * The NetworkAnchor items on this page
+     */
+    private List<NetworkAnchorInner> value;
+
+    /*
+     * The link to the next page of items
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of NetworkAnchorListResult class.
+     */
+    private NetworkAnchorListResult() {
+    }
+
+    /**
+     * Get the value property: The NetworkAnchor items on this page.
+     * 
+     * @return the value value.
+     */
+    public List<NetworkAnchorInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Get the nextLink property: The link to the next page of items.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkAnchorListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkAnchorListResult if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the NetworkAnchorListResult.
+     */
+    public static NetworkAnchorListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkAnchorListResult deserializedNetworkAnchorListResult = new NetworkAnchorListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<NetworkAnchorInner> value = reader.readArray(reader1 -> NetworkAnchorInner.fromJson(reader1));
+                    deserializedNetworkAnchorListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedNetworkAnchorListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkAnchorListResult;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ResourceAnchorListResult.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ResourceAnchorListResult.java
new file mode 100644
index 000000000000..0e7617d73bbb
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ResourceAnchorListResult.java
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.implementation.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * The response of a ResourceAnchor list operation.
+ */
+@Immutable
+public final class ResourceAnchorListResult implements JsonSerializable<ResourceAnchorListResult> {
+    /*
+     * The ResourceAnchor items on this page
+     */
+    private List<ResourceAnchorInner> value;
+
+    /*
+     * The link to the next page of items
+     */
+    private String nextLink;
+
+    /**
+     * Creates an instance of ResourceAnchorListResult class.
+     */
+    private ResourceAnchorListResult() {
+    }
+
+    /**
+     * Get the value property: The ResourceAnchor items on this page.
+     * 
+     * @return the value value.
+     */
+    public List<ResourceAnchorInner> value() {
+        return this.value;
+    }
+
+    /**
+     * Get the nextLink property: The link to the next page of items.
+     * 
+     * @return the nextLink value.
+     */
+    public String nextLink() {
+        return this.nextLink;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("value", this.value, (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("nextLink", this.nextLink);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ResourceAnchorListResult from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ResourceAnchorListResult if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the ResourceAnchorListResult.
+     */
+    public static ResourceAnchorListResult fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ResourceAnchorListResult deserializedResourceAnchorListResult = new ResourceAnchorListResult();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("value".equals(fieldName)) {
+                    List<ResourceAnchorInner> value
+                        = reader.readArray(reader1 -> ResourceAnchorInner.fromJson(reader1));
+                    deserializedResourceAnchorListResult.value = value;
+                } else if ("nextLink".equals(fieldName)) {
+                    deserializedResourceAnchorListResult.nextLink = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedResourceAnchorListResult;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabase.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabase.java
index 774258c0fb7a..b53a6639867b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabase.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabase.java
@@ -399,4 +399,27 @@ Response<AutonomousDatabaseWalletFile> generateWalletWithResponse(GenerateAutono
      * @return the response.
      */
     AutonomousDatabase changeDisasterRecoveryConfiguration(DisasterRecoveryConfigurationDetails body, Context context);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    AutonomousDatabase action(AutonomousDatabaseLifecycleAction body);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    AutonomousDatabase action(AutonomousDatabaseLifecycleAction body, Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBaseProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBaseProperties.java
index b6494b3da8bf..7a359df6054b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBaseProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBaseProperties.java
@@ -182,7 +182,7 @@ public class AutonomousDatabaseBaseProperties implements JsonSerializable<Autono
     /*
      * The list of scheduled operations.
      */
-    private ScheduledOperationsType scheduledOperations;
+    private List<ScheduledOperationsType> scheduledOperationsList;
 
     /*
      * The private endpoint Ip address for the resource.
@@ -1068,22 +1068,23 @@ AutonomousDatabaseBaseProperties withLifecycleState(AutonomousDatabaseLifecycleS
     }
 
     /**
-     * Get the scheduledOperations property: The list of scheduled operations.
+     * Get the scheduledOperationsList property: The list of scheduled operations.
      * 
-     * @return the scheduledOperations value.
+     * @return the scheduledOperationsList value.
      */
-    public ScheduledOperationsType scheduledOperations() {
-        return this.scheduledOperations;
+    public List<ScheduledOperationsType> scheduledOperationsList() {
+        return this.scheduledOperationsList;
     }
 
     /**
-     * Set the scheduledOperations property: The list of scheduled operations.
+     * Set the scheduledOperationsList property: The list of scheduled operations.
      * 
-     * @param scheduledOperations the scheduledOperations value to set.
+     * @param scheduledOperationsList the scheduledOperationsList value to set.
      * @return the AutonomousDatabaseBaseProperties object itself.
      */
-    public AutonomousDatabaseBaseProperties withScheduledOperations(ScheduledOperationsType scheduledOperations) {
-        this.scheduledOperations = scheduledOperations;
+    public AutonomousDatabaseBaseProperties
+        withScheduledOperationsList(List<ScheduledOperationsType> scheduledOperationsList) {
+        this.scheduledOperationsList = scheduledOperationsList;
         return this;
     }
 
@@ -2052,7 +2053,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             this.isPreviewVersionWithServiceTermsAccepted);
         jsonWriter.writeStringField("licenseModel", this.licenseModel == null ? null : this.licenseModel.toString());
         jsonWriter.writeStringField("ncharacterSet", this.ncharacterSet);
-        jsonWriter.writeJsonField("scheduledOperations", this.scheduledOperations);
+        jsonWriter.writeArrayField("scheduledOperationsList", this.scheduledOperationsList,
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("privateEndpointIp", this.privateEndpointIp);
         jsonWriter.writeStringField("privateEndpointLabel", this.privateEndpointLabel);
         jsonWriter.writeStringField("subnetId", this.subnetId);
@@ -2205,9 +2207,10 @@ static AutonomousDatabaseBaseProperties fromJsonKnownDiscriminator(JsonReader js
                 } else if ("lifecycleState".equals(fieldName)) {
                     deserializedAutonomousDatabaseBaseProperties.lifecycleState
                         = AutonomousDatabaseLifecycleState.fromString(reader.getString());
-                } else if ("scheduledOperations".equals(fieldName)) {
-                    deserializedAutonomousDatabaseBaseProperties.scheduledOperations
-                        = ScheduledOperationsType.fromJson(reader);
+                } else if ("scheduledOperationsList".equals(fieldName)) {
+                    List<ScheduledOperationsType> scheduledOperationsList
+                        = reader.readArray(reader1 -> ScheduledOperationsType.fromJson(reader1));
+                    deserializedAutonomousDatabaseBaseProperties.scheduledOperationsList = scheduledOperationsList;
                 } else if ("privateEndpointIp".equals(fieldName)) {
                     deserializedAutonomousDatabaseBaseProperties.privateEndpointIp = reader.getString();
                 } else if ("privateEndpointLabel".equals(fieldName)) {
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCloneProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCloneProperties.java
index 17f92e101dd8..85870db03e31 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCloneProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCloneProperties.java
@@ -398,8 +398,9 @@ public AutonomousDatabaseCloneProperties withNcharacterSet(String ncharacterSet)
      * {@inheritDoc}
      */
     @Override
-    public AutonomousDatabaseCloneProperties withScheduledOperations(ScheduledOperationsType scheduledOperations) {
-        super.withScheduledOperations(scheduledOperations);
+    public AutonomousDatabaseCloneProperties
+        withScheduledOperationsList(List<ScheduledOperationsType> scheduledOperationsList) {
+        super.withScheduledOperationsList(scheduledOperationsList);
         return this;
     }
 
@@ -551,7 +552,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             isPreviewVersionWithServiceTermsAccepted());
         jsonWriter.writeStringField("licenseModel", licenseModel() == null ? null : licenseModel().toString());
         jsonWriter.writeStringField("ncharacterSet", ncharacterSet());
-        jsonWriter.writeJsonField("scheduledOperations", scheduledOperations());
+        jsonWriter.writeArrayField("scheduledOperationsList", scheduledOperationsList(),
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("privateEndpointIp", privateEndpointIp());
         jsonWriter.writeStringField("privateEndpointLabel", privateEndpointLabel());
         jsonWriter.writeStringField("subnetId", subnetId());
@@ -677,9 +679,10 @@ public static AutonomousDatabaseCloneProperties fromJson(JsonReader jsonReader)
                 } else if ("lifecycleState".equals(fieldName)) {
                     deserializedAutonomousDatabaseCloneProperties
                         .withLifecycleState(AutonomousDatabaseLifecycleState.fromString(reader.getString()));
-                } else if ("scheduledOperations".equals(fieldName)) {
-                    deserializedAutonomousDatabaseCloneProperties
-                        .withScheduledOperations(ScheduledOperationsType.fromJson(reader));
+                } else if ("scheduledOperationsList".equals(fieldName)) {
+                    List<ScheduledOperationsType> scheduledOperationsList
+                        = reader.readArray(reader1 -> ScheduledOperationsType.fromJson(reader1));
+                    deserializedAutonomousDatabaseCloneProperties.withScheduledOperationsList(scheduledOperationsList);
                 } else if ("privateEndpointIp".equals(fieldName)) {
                     deserializedAutonomousDatabaseCloneProperties.withPrivateEndpointIp(reader.getString());
                 } else if ("privateEndpointLabel".equals(fieldName)) {
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCrossRegionDisasterRecoveryProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCrossRegionDisasterRecoveryProperties.java
index 93ab6ebb1eec..f21559565494 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCrossRegionDisasterRecoveryProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCrossRegionDisasterRecoveryProperties.java
@@ -390,8 +390,8 @@ public AutonomousDatabaseCrossRegionDisasterRecoveryProperties withNcharacterSet
      */
     @Override
     public AutonomousDatabaseCrossRegionDisasterRecoveryProperties
-        withScheduledOperations(ScheduledOperationsType scheduledOperations) {
-        super.withScheduledOperations(scheduledOperations);
+        withScheduledOperationsList(List<ScheduledOperationsType> scheduledOperationsList) {
+        super.withScheduledOperationsList(scheduledOperationsList);
         return this;
     }
 
@@ -548,7 +548,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             isPreviewVersionWithServiceTermsAccepted());
         jsonWriter.writeStringField("licenseModel", licenseModel() == null ? null : licenseModel().toString());
         jsonWriter.writeStringField("ncharacterSet", ncharacterSet());
-        jsonWriter.writeJsonField("scheduledOperations", scheduledOperations());
+        jsonWriter.writeArrayField("scheduledOperationsList", scheduledOperationsList(),
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("privateEndpointIp", privateEndpointIp());
         jsonWriter.writeStringField("privateEndpointLabel", privateEndpointLabel());
         jsonWriter.writeStringField("subnetId", subnetId());
@@ -686,9 +687,11 @@ public static AutonomousDatabaseCrossRegionDisasterRecoveryProperties fromJson(J
                 } else if ("lifecycleState".equals(fieldName)) {
                     deserializedAutonomousDatabaseCrossRegionDisasterRecoveryProperties
                         .withLifecycleState(AutonomousDatabaseLifecycleState.fromString(reader.getString()));
-                } else if ("scheduledOperations".equals(fieldName)) {
+                } else if ("scheduledOperationsList".equals(fieldName)) {
+                    List<ScheduledOperationsType> scheduledOperationsList
+                        = reader.readArray(reader1 -> ScheduledOperationsType.fromJson(reader1));
                     deserializedAutonomousDatabaseCrossRegionDisasterRecoveryProperties
-                        .withScheduledOperations(ScheduledOperationsType.fromJson(reader));
+                        .withScheduledOperationsList(scheduledOperationsList);
                 } else if ("privateEndpointIp".equals(fieldName)) {
                     deserializedAutonomousDatabaseCrossRegionDisasterRecoveryProperties
                         .withPrivateEndpointIp(reader.getString());
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseFromBackupTimestampProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseFromBackupTimestampProperties.java
index 8f77added0bc..e4623b141b35 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseFromBackupTimestampProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseFromBackupTimestampProperties.java
@@ -351,8 +351,8 @@ public AutonomousDatabaseFromBackupTimestampProperties withNcharacterSet(String
      */
     @Override
     public AutonomousDatabaseFromBackupTimestampProperties
-        withScheduledOperations(ScheduledOperationsType scheduledOperations) {
-        super.withScheduledOperations(scheduledOperations);
+        withScheduledOperationsList(List<ScheduledOperationsType> scheduledOperationsList) {
+        super.withScheduledOperationsList(scheduledOperationsList);
         return this;
     }
 
@@ -505,7 +505,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             isPreviewVersionWithServiceTermsAccepted());
         jsonWriter.writeStringField("licenseModel", licenseModel() == null ? null : licenseModel().toString());
         jsonWriter.writeStringField("ncharacterSet", ncharacterSet());
-        jsonWriter.writeJsonField("scheduledOperations", scheduledOperations());
+        jsonWriter.writeArrayField("scheduledOperationsList", scheduledOperationsList(),
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("privateEndpointIp", privateEndpointIp());
         jsonWriter.writeStringField("privateEndpointLabel", privateEndpointLabel());
         jsonWriter.writeStringField("subnetId", subnetId());
@@ -633,9 +634,11 @@ public static AutonomousDatabaseFromBackupTimestampProperties fromJson(JsonReade
                 } else if ("lifecycleState".equals(fieldName)) {
                     deserializedAutonomousDatabaseFromBackupTimestampProperties
                         .withLifecycleState(AutonomousDatabaseLifecycleState.fromString(reader.getString()));
-                } else if ("scheduledOperations".equals(fieldName)) {
+                } else if ("scheduledOperationsList".equals(fieldName)) {
+                    List<ScheduledOperationsType> scheduledOperationsList
+                        = reader.readArray(reader1 -> ScheduledOperationsType.fromJson(reader1));
                     deserializedAutonomousDatabaseFromBackupTimestampProperties
-                        .withScheduledOperations(ScheduledOperationsType.fromJson(reader));
+                        .withScheduledOperationsList(scheduledOperationsList);
                 } else if ("privateEndpointIp".equals(fieldName)) {
                     deserializedAutonomousDatabaseFromBackupTimestampProperties
                         .withPrivateEndpointIp(reader.getString());
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleAction.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleAction.java
new file mode 100644
index 000000000000..d359a48de616
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleAction.java
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Autonomous Database Action Object.
+ */
+@Fluent
+public final class AutonomousDatabaseLifecycleAction implements JsonSerializable<AutonomousDatabaseLifecycleAction> {
+    /*
+     * Autonomous Database lifecycle action
+     */
+    private AutonomousDatabaseLifecycleActionEnum action;
+
+    /**
+     * Creates an instance of AutonomousDatabaseLifecycleAction class.
+     */
+    public AutonomousDatabaseLifecycleAction() {
+    }
+
+    /**
+     * Get the action property: Autonomous Database lifecycle action.
+     * 
+     * @return the action value.
+     */
+    public AutonomousDatabaseLifecycleActionEnum action() {
+        return this.action;
+    }
+
+    /**
+     * Set the action property: Autonomous Database lifecycle action.
+     * 
+     * @param action the action value to set.
+     * @return the AutonomousDatabaseLifecycleAction object itself.
+     */
+    public AutonomousDatabaseLifecycleAction withAction(AutonomousDatabaseLifecycleActionEnum action) {
+        this.action = action;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("action", this.action == null ? null : this.action.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of AutonomousDatabaseLifecycleAction from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of AutonomousDatabaseLifecycleAction if the JsonReader was pointing to an instance of it, or
+     * null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the AutonomousDatabaseLifecycleAction.
+     */
+    public static AutonomousDatabaseLifecycleAction fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            AutonomousDatabaseLifecycleAction deserializedAutonomousDatabaseLifecycleAction
+                = new AutonomousDatabaseLifecycleAction();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("action".equals(fieldName)) {
+                    deserializedAutonomousDatabaseLifecycleAction.action
+                        = AutonomousDatabaseLifecycleActionEnum.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedAutonomousDatabaseLifecycleAction;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleActionEnum.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleActionEnum.java
new file mode 100644
index 000000000000..1e1db6cbd043
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleActionEnum.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Autonomous Database Action Enum.
+ */
+public final class AutonomousDatabaseLifecycleActionEnum
+    extends ExpandableStringEnum<AutonomousDatabaseLifecycleActionEnum> {
+    /**
+     * Start Autonomous Database.
+     */
+    public static final AutonomousDatabaseLifecycleActionEnum START = fromString("Start");
+
+    /**
+     * Stop Autonomous Database.
+     */
+    public static final AutonomousDatabaseLifecycleActionEnum STOP = fromString("Stop");
+
+    /**
+     * Restart Autonomous Database.
+     */
+    public static final AutonomousDatabaseLifecycleActionEnum RESTART = fromString("Restart");
+
+    /**
+     * Creates a new instance of AutonomousDatabaseLifecycleActionEnum value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public AutonomousDatabaseLifecycleActionEnum() {
+    }
+
+    /**
+     * Creates or finds a AutonomousDatabaseLifecycleActionEnum from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding AutonomousDatabaseLifecycleActionEnum.
+     */
+    public static AutonomousDatabaseLifecycleActionEnum fromString(String name) {
+        return fromString(name, AutonomousDatabaseLifecycleActionEnum.class);
+    }
+
+    /**
+     * Gets known AutonomousDatabaseLifecycleActionEnum values.
+     * 
+     * @return known AutonomousDatabaseLifecycleActionEnum values.
+     */
+    public static Collection<AutonomousDatabaseLifecycleActionEnum> values() {
+        return values(AutonomousDatabaseLifecycleActionEnum.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseProperties.java
index 70f6b9b325be..051c9a909c19 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseProperties.java
@@ -224,8 +224,9 @@ public AutonomousDatabaseProperties withNcharacterSet(String ncharacterSet) {
      * {@inheritDoc}
      */
     @Override
-    public AutonomousDatabaseProperties withScheduledOperations(ScheduledOperationsType scheduledOperations) {
-        super.withScheduledOperations(scheduledOperations);
+    public AutonomousDatabaseProperties
+        withScheduledOperationsList(List<ScheduledOperationsType> scheduledOperationsList) {
+        super.withScheduledOperationsList(scheduledOperationsList);
         return this;
     }
 
@@ -377,7 +378,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
             isPreviewVersionWithServiceTermsAccepted());
         jsonWriter.writeStringField("licenseModel", licenseModel() == null ? null : licenseModel().toString());
         jsonWriter.writeStringField("ncharacterSet", ncharacterSet());
-        jsonWriter.writeJsonField("scheduledOperations", scheduledOperations());
+        jsonWriter.writeArrayField("scheduledOperationsList", scheduledOperationsList(),
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("privateEndpointIp", privateEndpointIp());
         jsonWriter.writeStringField("privateEndpointLabel", privateEndpointLabel());
         jsonWriter.writeStringField("subnetId", subnetId());
@@ -494,9 +496,10 @@ public static AutonomousDatabaseProperties fromJson(JsonReader jsonReader) throw
                 } else if ("lifecycleState".equals(fieldName)) {
                     deserializedAutonomousDatabaseProperties
                         .withLifecycleState(AutonomousDatabaseLifecycleState.fromString(reader.getString()));
-                } else if ("scheduledOperations".equals(fieldName)) {
-                    deserializedAutonomousDatabaseProperties
-                        .withScheduledOperations(ScheduledOperationsType.fromJson(reader));
+                } else if ("scheduledOperationsList".equals(fieldName)) {
+                    List<ScheduledOperationsType> scheduledOperationsList
+                        = reader.readArray(reader1 -> ScheduledOperationsType.fromJson(reader1));
+                    deserializedAutonomousDatabaseProperties.withScheduledOperationsList(scheduledOperationsList);
                 } else if ("privateEndpointIp".equals(fieldName)) {
                     deserializedAutonomousDatabaseProperties.withPrivateEndpointIp(reader.getString());
                 } else if ("privateEndpointLabel".equals(fieldName)) {
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdateProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdateProperties.java
index eefb071c7a07..312e4d21d885 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdateProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdateProperties.java
@@ -91,7 +91,7 @@ public final class AutonomousDatabaseUpdateProperties implements JsonSerializabl
     /*
      * The list of scheduled operations.
      */
-    private ScheduledOperationsTypeUpdate scheduledOperations;
+    private List<ScheduledOperationsTypeUpdate> scheduledOperationsList;
 
     /*
      * The Oracle Database Edition that applies to the Autonomous databases.
@@ -439,23 +439,23 @@ public AutonomousDatabaseUpdateProperties withLicenseModel(LicenseModel licenseM
     }
 
     /**
-     * Get the scheduledOperations property: The list of scheduled operations.
+     * Get the scheduledOperationsList property: The list of scheduled operations.
      * 
-     * @return the scheduledOperations value.
+     * @return the scheduledOperationsList value.
      */
-    public ScheduledOperationsTypeUpdate scheduledOperations() {
-        return this.scheduledOperations;
+    public List<ScheduledOperationsTypeUpdate> scheduledOperationsList() {
+        return this.scheduledOperationsList;
     }
 
     /**
-     * Set the scheduledOperations property: The list of scheduled operations.
+     * Set the scheduledOperationsList property: The list of scheduled operations.
      * 
-     * @param scheduledOperations the scheduledOperations value to set.
+     * @param scheduledOperationsList the scheduledOperationsList value to set.
      * @return the AutonomousDatabaseUpdateProperties object itself.
      */
     public AutonomousDatabaseUpdateProperties
-        withScheduledOperations(ScheduledOperationsTypeUpdate scheduledOperations) {
-        this.scheduledOperations = scheduledOperations;
+        withScheduledOperationsList(List<ScheduledOperationsTypeUpdate> scheduledOperationsList) {
+        this.scheduledOperationsList = scheduledOperationsList;
         return this;
     }
 
@@ -653,7 +653,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeBooleanField("isLocalDataGuardEnabled", this.isLocalDataGuardEnabled);
         jsonWriter.writeBooleanField("isMtlsConnectionRequired", this.isMtlsConnectionRequired);
         jsonWriter.writeStringField("licenseModel", this.licenseModel == null ? null : this.licenseModel.toString());
-        jsonWriter.writeJsonField("scheduledOperations", this.scheduledOperations);
+        jsonWriter.writeArrayField("scheduledOperationsList", this.scheduledOperationsList,
+            (writer, element) -> writer.writeJson(element));
         jsonWriter.writeStringField("databaseEdition",
             this.databaseEdition == null ? null : this.databaseEdition.toString());
         jsonWriter.writeJsonField("longTermBackupSchedule", this.longTermBackupSchedule);
@@ -724,9 +725,10 @@ public static AutonomousDatabaseUpdateProperties fromJson(JsonReader jsonReader)
                 } else if ("licenseModel".equals(fieldName)) {
                     deserializedAutonomousDatabaseUpdateProperties.licenseModel
                         = LicenseModel.fromString(reader.getString());
-                } else if ("scheduledOperations".equals(fieldName)) {
-                    deserializedAutonomousDatabaseUpdateProperties.scheduledOperations
-                        = ScheduledOperationsTypeUpdate.fromJson(reader);
+                } else if ("scheduledOperationsList".equals(fieldName)) {
+                    List<ScheduledOperationsTypeUpdate> scheduledOperationsList
+                        = reader.readArray(reader1 -> ScheduledOperationsTypeUpdate.fromJson(reader1));
+                    deserializedAutonomousDatabaseUpdateProperties.scheduledOperationsList = scheduledOperationsList;
                 } else if ("databaseEdition".equals(fieldName)) {
                     deserializedAutonomousDatabaseUpdateProperties.databaseEdition
                         = DatabaseEditionType.fromString(reader.getString());
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabases.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabases.java
index 9bb0f49b7de1..f4c300001f1d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabases.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabases.java
@@ -272,6 +272,35 @@ AutonomousDatabase changeDisasterRecoveryConfiguration(String resourceGroupName,
     AutonomousDatabase changeDisasterRecoveryConfiguration(String resourceGroupName, String autonomousdatabasename,
         DisasterRecoveryConfigurationDetails body, Context context);
 
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    AutonomousDatabase action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body);
+
+    /**
+     * Perform Lifecycle Management Action on Autonomous Database.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param autonomousdatabasename The database name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    AutonomousDatabase action(String resourceGroupName, String autonomousdatabasename,
+        AutonomousDatabaseLifecycleAction body, Context context);
+
     /**
      * Get a AutonomousDatabase.
      * 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/BaseDbSystemShapes.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/BaseDbSystemShapes.java
new file mode 100644
index 000000000000..d6dd229d63dd
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/BaseDbSystemShapes.java
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Allowed values for BaseDb System Shapes.
+ */
+public final class BaseDbSystemShapes extends ExpandableStringEnum<BaseDbSystemShapes> {
+    /**
+     * Vm Standard X86.
+     */
+    public static final BaseDbSystemShapes VMSTANDARD_X86 = fromString("VM.Standard.x86");
+
+    /**
+     * Creates a new instance of BaseDbSystemShapes value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public BaseDbSystemShapes() {
+    }
+
+    /**
+     * Creates or finds a BaseDbSystemShapes from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding BaseDbSystemShapes.
+     */
+    public static BaseDbSystemShapes fromString(String name) {
+        return fromString(name, BaseDbSystemShapes.class);
+    }
+
+    /**
+     * Gets known BaseDbSystemShapes values.
+     * 
+     * @return known BaseDbSystemShapes values.
+     */
+    public static Collection<BaseDbSystemShapes> values() {
+        return values(BaseDbSystemShapes.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructure.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructure.java
index 8bc51f514805..f41860a50d86 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructure.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructure.java
@@ -316,4 +316,28 @@ interface WithProperties {
      * @return the response.
      */
     CloudExadataInfrastructure addStorageCapacity(Context context);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    CloudExadataInfrastructure configureExascale(ConfigureExascaleCloudExadataInfrastructureDetails body);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    CloudExadataInfrastructure configureExascale(ConfigureExascaleCloudExadataInfrastructureDetails body,
+        Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureProperties.java
index c836a01baec8..4075743d80d6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureProperties.java
@@ -197,6 +197,11 @@ public final class CloudExadataInfrastructureProperties
      */
     private ComputeModel computeModel;
 
+    /*
+     * The exascale config details for the cloud Exadata infrastructure
+     */
+    private ExascaleConfigDetails exascaleConfig;
+
     /**
      * Creates an instance of CloudExadataInfrastructureProperties class.
      */
@@ -621,6 +626,15 @@ public ComputeModel computeModel() {
         return this.computeModel;
     }
 
+    /**
+     * Get the exascaleConfig property: The exascale config details for the cloud Exadata infrastructure.
+     * 
+     * @return the exascaleConfig value.
+     */
+    public ExascaleConfigDetails exascaleConfig() {
+        return this.exascaleConfig;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -749,6 +763,9 @@ public static CloudExadataInfrastructureProperties fromJson(JsonReader jsonReade
                 } else if ("computeModel".equals(fieldName)) {
                     deserializedCloudExadataInfrastructureProperties.computeModel
                         = ComputeModel.fromString(reader.getString());
+                } else if ("exascaleConfig".equals(fieldName)) {
+                    deserializedCloudExadataInfrastructureProperties.exascaleConfig
+                        = ExascaleConfigDetails.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructures.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructures.java
index 716b2dc36d29..eb4a83411052 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructures.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructures.java
@@ -134,6 +134,35 @@ Response<CloudExadataInfrastructure> getByResourceGroupWithResponse(String resou
     CloudExadataInfrastructure addStorageCapacity(String resourceGroupName, String cloudexadatainfrastructurename,
         Context context);
 
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    CloudExadataInfrastructure configureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body);
+
+    /**
+     * Configures Exascale on Cloud exadata infrastructure resource.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param cloudexadatainfrastructurename CloudExadataInfrastructure name.
+     * @param body The content of the action request.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response.
+     */
+    CloudExadataInfrastructure configureExascale(String resourceGroupName, String cloudexadatainfrastructurename,
+        ConfigureExascaleCloudExadataInfrastructureDetails body, Context context);
+
     /**
      * Get a CloudExadataInfrastructure.
      * 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterProperties.java
index 65f830e7789a..11b924457297 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterProperties.java
@@ -285,6 +285,16 @@ public final class CloudVmClusterProperties implements JsonSerializable<CloudVmC
      */
     private ComputeModel computeModel;
 
+    /*
+     * Exadata Database Storage Vault ID
+     */
+    private String exascaleDbStorageVaultId;
+
+    /*
+     * Specifies whether the type of storage management for the VM cluster is ASM or Exascale.
+     */
+    private ExadataVmClusterStorageManagementType storageManagementType;
+
     /**
      * Creates an instance of CloudVmClusterProperties class.
      */
@@ -1112,6 +1122,36 @@ public ComputeModel computeModel() {
         return this.computeModel;
     }
 
+    /**
+     * Get the exascaleDbStorageVaultId property: Exadata Database Storage Vault ID.
+     * 
+     * @return the exascaleDbStorageVaultId value.
+     */
+    public String exascaleDbStorageVaultId() {
+        return this.exascaleDbStorageVaultId;
+    }
+
+    /**
+     * Set the exascaleDbStorageVaultId property: Exadata Database Storage Vault ID.
+     * 
+     * @param exascaleDbStorageVaultId the exascaleDbStorageVaultId value to set.
+     * @return the CloudVmClusterProperties object itself.
+     */
+    public CloudVmClusterProperties withExascaleDbStorageVaultId(String exascaleDbStorageVaultId) {
+        this.exascaleDbStorageVaultId = exascaleDbStorageVaultId;
+        return this;
+    }
+
+    /**
+     * Get the storageManagementType property: Specifies whether the type of storage management for the VM cluster is
+     * ASM or Exascale.
+     * 
+     * @return the storageManagementType value.
+     */
+    public ExadataVmClusterStorageManagementType storageManagementType() {
+        return this.storageManagementType;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -1150,6 +1190,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeJsonField("dataCollectionOptions", this.dataCollectionOptions);
         jsonWriter.writeArrayField("computeNodes", this.computeNodes, (writer, element) -> writer.writeString(element));
         jsonWriter.writeArrayField("dbServers", this.dbServers, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeStringField("exascaleDbStorageVaultId", this.exascaleDbStorageVaultId);
         return jsonWriter.writeEndObject();
     }
 
@@ -1286,6 +1327,11 @@ public static CloudVmClusterProperties fromJson(JsonReader jsonReader) throws IO
                     deserializedCloudVmClusterProperties.subnetOcid = reader.getString();
                 } else if ("computeModel".equals(fieldName)) {
                     deserializedCloudVmClusterProperties.computeModel = ComputeModel.fromString(reader.getString());
+                } else if ("exascaleDbStorageVaultId".equals(fieldName)) {
+                    deserializedCloudVmClusterProperties.exascaleDbStorageVaultId = reader.getString();
+                } else if ("storageManagementType".equals(fieldName)) {
+                    deserializedCloudVmClusterProperties.storageManagementType
+                        = ExadataVmClusterStorageManagementType.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ConfigureExascaleCloudExadataInfrastructureDetails.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ConfigureExascaleCloudExadataInfrastructureDetails.java
new file mode 100644
index 000000000000..acb283c80a62
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ConfigureExascaleCloudExadataInfrastructureDetails.java
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The exascale config request details for the Cloud Exadata infrastructure.
+ */
+@Fluent
+public final class ConfigureExascaleCloudExadataInfrastructureDetails
+    implements JsonSerializable<ConfigureExascaleCloudExadataInfrastructureDetails> {
+    /*
+     * Storage size needed for Exascale in GBs.
+     */
+    private int totalStorageInGbs;
+
+    /**
+     * Creates an instance of ConfigureExascaleCloudExadataInfrastructureDetails class.
+     */
+    public ConfigureExascaleCloudExadataInfrastructureDetails() {
+    }
+
+    /**
+     * Get the totalStorageInGbs property: Storage size needed for Exascale in GBs.
+     * 
+     * @return the totalStorageInGbs value.
+     */
+    public int totalStorageInGbs() {
+        return this.totalStorageInGbs;
+    }
+
+    /**
+     * Set the totalStorageInGbs property: Storage size needed for Exascale in GBs.
+     * 
+     * @param totalStorageInGbs the totalStorageInGbs value to set.
+     * @return the ConfigureExascaleCloudExadataInfrastructureDetails object itself.
+     */
+    public ConfigureExascaleCloudExadataInfrastructureDetails withTotalStorageInGbs(int totalStorageInGbs) {
+        this.totalStorageInGbs = totalStorageInGbs;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeIntField("totalStorageInGbs", this.totalStorageInGbs);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ConfigureExascaleCloudExadataInfrastructureDetails from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ConfigureExascaleCloudExadataInfrastructureDetails if the JsonReader was pointing to an
+     * instance of it, or null if it was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the ConfigureExascaleCloudExadataInfrastructureDetails.
+     */
+    public static ConfigureExascaleCloudExadataInfrastructureDetails fromJson(JsonReader jsonReader)
+        throws IOException {
+        return jsonReader.readObject(reader -> {
+            ConfigureExascaleCloudExadataInfrastructureDetails deserializedConfigureExascaleCloudExadataInfrastructureDetails
+                = new ConfigureExascaleCloudExadataInfrastructureDetails();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("totalStorageInGbs".equals(fieldName)) {
+                    deserializedConfigureExascaleCloudExadataInfrastructureDetails.totalStorageInGbs = reader.getInt();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedConfigureExascaleCloudExadataInfrastructureDetails;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystem.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystem.java
new file mode 100644
index 000000000000..174967b38071
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystem.java
@@ -0,0 +1,300 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.management.Region;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An immutable client-side representation of DbSystem.
+ */
+public interface DbSystem {
+    /**
+     * Gets the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * Gets the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * Gets the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * Gets the location property: The geo-location where the resource lives.
+     * 
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * Gets the tags property: Resource tags.
+     * 
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * Gets the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    DbSystemProperties properties();
+
+    /**
+     * Gets the zones property: The availability zones.
+     * 
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    SystemData systemData();
+
+    /**
+     * Gets the region of the resource.
+     * 
+     * @return the region of the resource.
+     */
+    Region region();
+
+    /**
+     * Gets the name of the resource region.
+     * 
+     * @return the name of the resource region.
+     */
+    String regionName();
+
+    /**
+     * Gets the name of the resource group.
+     * 
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner object.
+     * 
+     * @return the inner object.
+     */
+    DbSystemInner innerModel();
+
+    /**
+     * The entirety of the DbSystem definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation,
+        DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * The DbSystem definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of the DbSystem definition.
+         */
+        interface Blank extends WithLocation {
+        }
+
+        /**
+         * The stage of the DbSystem definition allowing to specify location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies the region for the resource.
+             * 
+             * @param location The geo-location where the resource lives.
+             * @return the next definition stage.
+             */
+            WithResourceGroup withRegion(Region location);
+
+            /**
+             * Specifies the region for the resource.
+             * 
+             * @param location The geo-location where the resource lives.
+             * @return the next definition stage.
+             */
+            WithResourceGroup withRegion(String location);
+        }
+
+        /**
+         * The stage of the DbSystem definition allowing to specify parent resource.
+         */
+        interface WithResourceGroup {
+            /**
+             * Specifies resourceGroupName.
+             * 
+             * @param resourceGroupName The name of the resource group. The name is case insensitive.
+             * @return the next definition stage.
+             */
+            WithCreate withExistingResourceGroup(String resourceGroupName);
+        }
+
+        /**
+         * The stage of the DbSystem definition which contains all the minimum required properties for the resource to
+         * be created, but also allows for any other optional properties to be specified.
+         */
+        interface WithCreate
+            extends DefinitionStages.WithTags, DefinitionStages.WithProperties, DefinitionStages.WithZones {
+            /**
+             * Executes the create request.
+             * 
+             * @return the created resource.
+             */
+            DbSystem create();
+
+            /**
+             * Executes the create request.
+             * 
+             * @param context The context to associate with this operation.
+             * @return the created resource.
+             */
+            DbSystem create(Context context);
+        }
+
+        /**
+         * The stage of the DbSystem definition allowing to specify tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies the tags property: Resource tags..
+             * 
+             * @param tags Resource tags.
+             * @return the next definition stage.
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the DbSystem definition allowing to specify properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies the properties property: The resource-specific properties for this resource..
+             * 
+             * @param properties The resource-specific properties for this resource.
+             * @return the next definition stage.
+             */
+            WithCreate withProperties(DbSystemProperties properties);
+        }
+
+        /**
+         * The stage of the DbSystem definition allowing to specify zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies the zones property: The availability zones..
+             * 
+             * @param zones The availability zones.
+             * @return the next definition stage.
+             */
+            WithCreate withZones(List<String> zones);
+        }
+    }
+
+    /**
+     * Begins update for the DbSystem resource.
+     * 
+     * @return the stage of resource update.
+     */
+    DbSystem.Update update();
+
+    /**
+     * The template for DbSystem update.
+     */
+    interface Update extends UpdateStages.WithTags, UpdateStages.WithZones, UpdateStages.WithProperties {
+        /**
+         * Executes the update request.
+         * 
+         * @return the updated resource.
+         */
+        DbSystem apply();
+
+        /**
+         * Executes the update request.
+         * 
+         * @param context The context to associate with this operation.
+         * @return the updated resource.
+         */
+        DbSystem apply(Context context);
+    }
+
+    /**
+     * The DbSystem update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the DbSystem update allowing to specify tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies the tags property: Resource tags..
+             * 
+             * @param tags Resource tags.
+             * @return the next definition stage.
+             */
+            Update withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the DbSystem update allowing to specify zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies the zones property: The availability zones..
+             * 
+             * @param zones The availability zones.
+             * @return the next definition stage.
+             */
+            Update withZones(List<String> zones);
+        }
+
+        /**
+         * The stage of the DbSystem update allowing to specify properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies the properties property: The resource-specific properties for this resource..
+             * 
+             * @param properties The resource-specific properties for this resource.
+             * @return the next definition stage.
+             */
+            Update withProperties(DbSystemUpdateProperties properties);
+        }
+    }
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @return the refreshed resource.
+     */
+    DbSystem refresh();
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @param context The context to associate with this operation.
+     * @return the refreshed resource.
+     */
+    DbSystem refresh(Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemBaseProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemBaseProperties.java
new file mode 100644
index 000000000000..4a535e0832fa
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemBaseProperties.java
@@ -0,0 +1,968 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * DbSystem resource base model.
+ */
+@Fluent
+public class DbSystemBaseProperties implements JsonSerializable<DbSystemBaseProperties> {
+    /*
+     * The source of the database: Use `None` for creating a new database. The default is `None`.
+     */
+    private DbSystemSourceType source = DbSystemSourceType.fromString("DbSystemBaseProperties");
+
+    /*
+     * dbSystem provisioning state
+     */
+    private AzureResourceProvisioningState provisioningState;
+
+    /*
+     * HTTPS link to OCI resources exposed to Azure Customer via Azure Interface.
+     */
+    private String ociUrl;
+
+    /*
+     * Azure Resource Anchor ID
+     */
+    private String resourceAnchorId;
+
+    /*
+     * Azure Network Anchor ID
+     */
+    private String networkAnchorId;
+
+    /*
+     * The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster name must begin with an
+     * alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The cluster name can be no
+     * longer than 11 characters and is not case sensitive.
+     */
+    private String clusterName;
+
+    /*
+     * The user-friendly name for the DB system. The name does not have to be unique.
+     */
+    private String displayName;
+
+    /*
+     * Size in GB of the initial data volume that will be created and attached to a virtual machine DB system. You can
+     * scale up storage after provisioning, as needed. Note that the total storage size attached will be more than the
+     * amount you specify to allow for REDO/RECO space and software volume.
+     */
+    private Integer initialDataStorageSizeInGb;
+
+    /*
+     * The data storage size, in gigabytes, that is currently available to the DB system. Applies only for virtual
+     * machine DB systems.
+     */
+    private Integer dataStorageSizeInGbs;
+
+    /*
+     * The DB system options.
+     */
+    private DbSystemOptions dbSystemOptions;
+
+    /*
+     * The type of redundancy configured for the DB system. NORMAL is 2-way redundancy. HIGH is 3-way redundancy.
+     */
+    private DiskRedundancyType diskRedundancy;
+
+    /*
+     * The domain name for the DB system.
+     */
+    private String domainV2;
+
+    /*
+     * The OCID of a grid infrastructure software image. This is a database software image of the type GRID_IMAGE.
+     */
+    private String gridImageOcid;
+
+    /*
+     * The hostname for the DB system.
+     */
+    private String hostname;
+
+    /*
+     * The OCID of the DB system.
+     */
+    private String ocid;
+
+    /*
+     * The Oracle license model that applies to all the databases on the DB system. The default is LicenseIncluded.
+     */
+    private LicenseModel licenseModelV2;
+
+    /*
+     * Additional information about the current lifecycle state.
+     */
+    private String lifecycleDetails;
+
+    /*
+     * The current state of the DB system.
+     */
+    private DbSystemLifecycleState lifecycleState;
+
+    /*
+     * The port number configured for the listener on the DB system.
+     */
+    private Integer listenerPort;
+
+    /*
+     * Memory allocated to the DB system, in gigabytes.
+     */
+    private Integer memorySizeInGbs;
+
+    /*
+     * The number of nodes in the DB system. For RAC DB systems, the value is greater than 1.
+     */
+    private Integer nodeCount;
+
+    /*
+     * The FQDN of the DNS record for the SCAN IP addresses that are associated with the DB system.
+     */
+    private String scanDnsName;
+
+    /*
+     * The list of Single Client Access Name (SCAN) IP addresses associated with the DB system. SCAN IP addresses are
+     * typically used for load balancing and are not assigned to any interface. Oracle Clusterware directs the requests
+     * to the appropriate nodes in the cluster. Note: For a single-node DB system, this list is empty.
+     */
+    private List<String> scanIps;
+
+    /*
+     * The shape of the DB system. The shape determines resources to allocate to the DB system. For virtual machine
+     * shapes, the number of CPU cores and memory. For bare metal and Exadata shapes, the number of CPU cores, storage,
+     * and memory.
+     */
+    private String shape;
+
+    /*
+     * The public key portion of one or more key pairs used for SSH access to the DB system.
+     */
+    private List<String> sshPublicKeys;
+
+    /*
+     * The block storage volume performance level. Valid values are Balanced and HighPerformance. See [Block Volume
+     * Performance](/Content/Block/Concepts/blockvolumeperformance.htm) for more information.
+     */
+    private StorageVolumePerformanceMode storageVolumePerformanceMode;
+
+    /*
+     * The time zone of the DB system, e.g., UTC, to set the timeZone as UTC.
+     */
+    private String timeZone;
+
+    /*
+     * The Oracle Database version of the DB system.
+     */
+    private String version;
+
+    /*
+     * The compute model for Base Database Service. This is required if using the `computeCount` parameter. If using
+     * `cpuCoreCount` then it is an error to specify `computeModel` to a non-null value. The ECPU compute model is the
+     * recommended model, and the OCPU compute model is legacy.
+     */
+    private ComputeModel computeModel;
+
+    /*
+     * The number of compute servers for the DB system.
+     */
+    private Integer computeCount;
+
+    /**
+     * Creates an instance of DbSystemBaseProperties class.
+     */
+    public DbSystemBaseProperties() {
+    }
+
+    /**
+     * Get the source property: The source of the database: Use `None` for creating a new database. The default is
+     * `None`.
+     * 
+     * @return the source value.
+     */
+    public DbSystemSourceType source() {
+        return this.source;
+    }
+
+    /**
+     * Get the provisioningState property: dbSystem provisioning state.
+     * 
+     * @return the provisioningState value.
+     */
+    public AzureResourceProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set the provisioningState property: dbSystem provisioning state.
+     * 
+     * @param provisioningState the provisioningState value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withProvisioningState(AzureResourceProvisioningState provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get the ociUrl property: HTTPS link to OCI resources exposed to Azure Customer via Azure Interface.
+     * 
+     * @return the ociUrl value.
+     */
+    public String ociUrl() {
+        return this.ociUrl;
+    }
+
+    /**
+     * Set the ociUrl property: HTTPS link to OCI resources exposed to Azure Customer via Azure Interface.
+     * 
+     * @param ociUrl the ociUrl value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withOciUrl(String ociUrl) {
+        this.ociUrl = ociUrl;
+        return this;
+    }
+
+    /**
+     * Get the resourceAnchorId property: Azure Resource Anchor ID.
+     * 
+     * @return the resourceAnchorId value.
+     */
+    public String resourceAnchorId() {
+        return this.resourceAnchorId;
+    }
+
+    /**
+     * Set the resourceAnchorId property: Azure Resource Anchor ID.
+     * 
+     * @param resourceAnchorId the resourceAnchorId value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withResourceAnchorId(String resourceAnchorId) {
+        this.resourceAnchorId = resourceAnchorId;
+        return this;
+    }
+
+    /**
+     * Get the networkAnchorId property: Azure Network Anchor ID.
+     * 
+     * @return the networkAnchorId value.
+     */
+    public String networkAnchorId() {
+        return this.networkAnchorId;
+    }
+
+    /**
+     * Set the networkAnchorId property: Azure Network Anchor ID.
+     * 
+     * @param networkAnchorId the networkAnchorId value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withNetworkAnchorId(String networkAnchorId) {
+        this.networkAnchorId = networkAnchorId;
+        return this;
+    }
+
+    /**
+     * Get the clusterName property: The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster
+     * name must begin with an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The
+     * cluster name can be no longer than 11 characters and is not case sensitive.
+     * 
+     * @return the clusterName value.
+     */
+    public String clusterName() {
+        return this.clusterName;
+    }
+
+    /**
+     * Set the clusterName property: The cluster name for Exadata and 2-node RAC virtual machine DB systems. The cluster
+     * name must begin with an alphabetic character, and may contain hyphens (-). Underscores (_) are not permitted. The
+     * cluster name can be no longer than 11 characters and is not case sensitive.
+     * 
+     * @param clusterName the clusterName value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withClusterName(String clusterName) {
+        this.clusterName = clusterName;
+        return this;
+    }
+
+    /**
+     * Get the displayName property: The user-friendly name for the DB system. The name does not have to be unique.
+     * 
+     * @return the displayName value.
+     */
+    public String displayName() {
+        return this.displayName;
+    }
+
+    /**
+     * Set the displayName property: The user-friendly name for the DB system. The name does not have to be unique.
+     * 
+     * @param displayName the displayName value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withDisplayName(String displayName) {
+        this.displayName = displayName;
+        return this;
+    }
+
+    /**
+     * Get the initialDataStorageSizeInGb property: Size in GB of the initial data volume that will be created and
+     * attached to a virtual machine DB system. You can scale up storage after provisioning, as needed. Note that the
+     * total storage size attached will be more than the amount you specify to allow for REDO/RECO space and software
+     * volume.
+     * 
+     * @return the initialDataStorageSizeInGb value.
+     */
+    public Integer initialDataStorageSizeInGb() {
+        return this.initialDataStorageSizeInGb;
+    }
+
+    /**
+     * Set the initialDataStorageSizeInGb property: Size in GB of the initial data volume that will be created and
+     * attached to a virtual machine DB system. You can scale up storage after provisioning, as needed. Note that the
+     * total storage size attached will be more than the amount you specify to allow for REDO/RECO space and software
+     * volume.
+     * 
+     * @param initialDataStorageSizeInGb the initialDataStorageSizeInGb value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withInitialDataStorageSizeInGb(Integer initialDataStorageSizeInGb) {
+        this.initialDataStorageSizeInGb = initialDataStorageSizeInGb;
+        return this;
+    }
+
+    /**
+     * Get the dataStorageSizeInGbs property: The data storage size, in gigabytes, that is currently available to the DB
+     * system. Applies only for virtual machine DB systems.
+     * 
+     * @return the dataStorageSizeInGbs value.
+     */
+    public Integer dataStorageSizeInGbs() {
+        return this.dataStorageSizeInGbs;
+    }
+
+    /**
+     * Set the dataStorageSizeInGbs property: The data storage size, in gigabytes, that is currently available to the DB
+     * system. Applies only for virtual machine DB systems.
+     * 
+     * @param dataStorageSizeInGbs the dataStorageSizeInGbs value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withDataStorageSizeInGbs(Integer dataStorageSizeInGbs) {
+        this.dataStorageSizeInGbs = dataStorageSizeInGbs;
+        return this;
+    }
+
+    /**
+     * Get the dbSystemOptions property: The DB system options.
+     * 
+     * @return the dbSystemOptions value.
+     */
+    public DbSystemOptions dbSystemOptions() {
+        return this.dbSystemOptions;
+    }
+
+    /**
+     * Set the dbSystemOptions property: The DB system options.
+     * 
+     * @param dbSystemOptions the dbSystemOptions value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withDbSystemOptions(DbSystemOptions dbSystemOptions) {
+        this.dbSystemOptions = dbSystemOptions;
+        return this;
+    }
+
+    /**
+     * Get the diskRedundancy property: The type of redundancy configured for the DB system. NORMAL is 2-way redundancy.
+     * HIGH is 3-way redundancy.
+     * 
+     * @return the diskRedundancy value.
+     */
+    public DiskRedundancyType diskRedundancy() {
+        return this.diskRedundancy;
+    }
+
+    /**
+     * Set the diskRedundancy property: The type of redundancy configured for the DB system. NORMAL is 2-way redundancy.
+     * HIGH is 3-way redundancy.
+     * 
+     * @param diskRedundancy the diskRedundancy value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withDiskRedundancy(DiskRedundancyType diskRedundancy) {
+        this.diskRedundancy = diskRedundancy;
+        return this;
+    }
+
+    /**
+     * Get the domainV2 property: The domain name for the DB system.
+     * 
+     * @return the domainV2 value.
+     */
+    public String domainV2() {
+        return this.domainV2;
+    }
+
+    /**
+     * Set the domainV2 property: The domain name for the DB system.
+     * 
+     * @param domainV2 the domainV2 value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withDomainV2(String domainV2) {
+        this.domainV2 = domainV2;
+        return this;
+    }
+
+    /**
+     * Get the gridImageOcid property: The OCID of a grid infrastructure software image. This is a database software
+     * image of the type GRID_IMAGE.
+     * 
+     * @return the gridImageOcid value.
+     */
+    public String gridImageOcid() {
+        return this.gridImageOcid;
+    }
+
+    /**
+     * Set the gridImageOcid property: The OCID of a grid infrastructure software image. This is a database software
+     * image of the type GRID_IMAGE.
+     * 
+     * @param gridImageOcid the gridImageOcid value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withGridImageOcid(String gridImageOcid) {
+        this.gridImageOcid = gridImageOcid;
+        return this;
+    }
+
+    /**
+     * Get the hostname property: The hostname for the DB system.
+     * 
+     * @return the hostname value.
+     */
+    public String hostname() {
+        return this.hostname;
+    }
+
+    /**
+     * Set the hostname property: The hostname for the DB system.
+     * 
+     * @param hostname the hostname value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withHostname(String hostname) {
+        this.hostname = hostname;
+        return this;
+    }
+
+    /**
+     * Get the ocid property: The OCID of the DB system.
+     * 
+     * @return the ocid value.
+     */
+    public String ocid() {
+        return this.ocid;
+    }
+
+    /**
+     * Set the ocid property: The OCID of the DB system.
+     * 
+     * @param ocid the ocid value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withOcid(String ocid) {
+        this.ocid = ocid;
+        return this;
+    }
+
+    /**
+     * Get the licenseModelV2 property: The Oracle license model that applies to all the databases on the DB system. The
+     * default is LicenseIncluded.
+     * 
+     * @return the licenseModelV2 value.
+     */
+    public LicenseModel licenseModelV2() {
+        return this.licenseModelV2;
+    }
+
+    /**
+     * Set the licenseModelV2 property: The Oracle license model that applies to all the databases on the DB system. The
+     * default is LicenseIncluded.
+     * 
+     * @param licenseModelV2 the licenseModelV2 value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withLicenseModelV2(LicenseModel licenseModelV2) {
+        this.licenseModelV2 = licenseModelV2;
+        return this;
+    }
+
+    /**
+     * Get the lifecycleDetails property: Additional information about the current lifecycle state.
+     * 
+     * @return the lifecycleDetails value.
+     */
+    public String lifecycleDetails() {
+        return this.lifecycleDetails;
+    }
+
+    /**
+     * Set the lifecycleDetails property: Additional information about the current lifecycle state.
+     * 
+     * @param lifecycleDetails the lifecycleDetails value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withLifecycleDetails(String lifecycleDetails) {
+        this.lifecycleDetails = lifecycleDetails;
+        return this;
+    }
+
+    /**
+     * Get the lifecycleState property: The current state of the DB system.
+     * 
+     * @return the lifecycleState value.
+     */
+    public DbSystemLifecycleState lifecycleState() {
+        return this.lifecycleState;
+    }
+
+    /**
+     * Set the lifecycleState property: The current state of the DB system.
+     * 
+     * @param lifecycleState the lifecycleState value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withLifecycleState(DbSystemLifecycleState lifecycleState) {
+        this.lifecycleState = lifecycleState;
+        return this;
+    }
+
+    /**
+     * Get the listenerPort property: The port number configured for the listener on the DB system.
+     * 
+     * @return the listenerPort value.
+     */
+    public Integer listenerPort() {
+        return this.listenerPort;
+    }
+
+    /**
+     * Set the listenerPort property: The port number configured for the listener on the DB system.
+     * 
+     * @param listenerPort the listenerPort value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withListenerPort(Integer listenerPort) {
+        this.listenerPort = listenerPort;
+        return this;
+    }
+
+    /**
+     * Get the memorySizeInGbs property: Memory allocated to the DB system, in gigabytes.
+     * 
+     * @return the memorySizeInGbs value.
+     */
+    public Integer memorySizeInGbs() {
+        return this.memorySizeInGbs;
+    }
+
+    /**
+     * Set the memorySizeInGbs property: Memory allocated to the DB system, in gigabytes.
+     * 
+     * @param memorySizeInGbs the memorySizeInGbs value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withMemorySizeInGbs(Integer memorySizeInGbs) {
+        this.memorySizeInGbs = memorySizeInGbs;
+        return this;
+    }
+
+    /**
+     * Get the nodeCount property: The number of nodes in the DB system. For RAC DB systems, the value is greater than
+     * 1.
+     * 
+     * @return the nodeCount value.
+     */
+    public Integer nodeCount() {
+        return this.nodeCount;
+    }
+
+    /**
+     * Set the nodeCount property: The number of nodes in the DB system. For RAC DB systems, the value is greater than
+     * 1.
+     * 
+     * @param nodeCount the nodeCount value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withNodeCount(Integer nodeCount) {
+        this.nodeCount = nodeCount;
+        return this;
+    }
+
+    /**
+     * Get the scanDnsName property: The FQDN of the DNS record for the SCAN IP addresses that are associated with the
+     * DB system.
+     * 
+     * @return the scanDnsName value.
+     */
+    public String scanDnsName() {
+        return this.scanDnsName;
+    }
+
+    /**
+     * Set the scanDnsName property: The FQDN of the DNS record for the SCAN IP addresses that are associated with the
+     * DB system.
+     * 
+     * @param scanDnsName the scanDnsName value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withScanDnsName(String scanDnsName) {
+        this.scanDnsName = scanDnsName;
+        return this;
+    }
+
+    /**
+     * Get the scanIps property: The list of Single Client Access Name (SCAN) IP addresses associated with the DB
+     * system. SCAN IP addresses are typically used for load balancing and are not assigned to any interface. Oracle
+     * Clusterware directs the requests to the appropriate nodes in the cluster. Note: For a single-node DB system, this
+     * list is empty.
+     * 
+     * @return the scanIps value.
+     */
+    public List<String> scanIps() {
+        return this.scanIps;
+    }
+
+    /**
+     * Set the scanIps property: The list of Single Client Access Name (SCAN) IP addresses associated with the DB
+     * system. SCAN IP addresses are typically used for load balancing and are not assigned to any interface. Oracle
+     * Clusterware directs the requests to the appropriate nodes in the cluster. Note: For a single-node DB system, this
+     * list is empty.
+     * 
+     * @param scanIps the scanIps value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withScanIps(List<String> scanIps) {
+        this.scanIps = scanIps;
+        return this;
+    }
+
+    /**
+     * Get the shape property: The shape of the DB system. The shape determines resources to allocate to the DB system.
+     * For virtual machine shapes, the number of CPU cores and memory. For bare metal and Exadata shapes, the number of
+     * CPU cores, storage, and memory.
+     * 
+     * @return the shape value.
+     */
+    public String shape() {
+        return this.shape;
+    }
+
+    /**
+     * Set the shape property: The shape of the DB system. The shape determines resources to allocate to the DB system.
+     * For virtual machine shapes, the number of CPU cores and memory. For bare metal and Exadata shapes, the number of
+     * CPU cores, storage, and memory.
+     * 
+     * @param shape the shape value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withShape(String shape) {
+        this.shape = shape;
+        return this;
+    }
+
+    /**
+     * Get the sshPublicKeys property: The public key portion of one or more key pairs used for SSH access to the DB
+     * system.
+     * 
+     * @return the sshPublicKeys value.
+     */
+    public List<String> sshPublicKeys() {
+        return this.sshPublicKeys;
+    }
+
+    /**
+     * Set the sshPublicKeys property: The public key portion of one or more key pairs used for SSH access to the DB
+     * system.
+     * 
+     * @param sshPublicKeys the sshPublicKeys value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withSshPublicKeys(List<String> sshPublicKeys) {
+        this.sshPublicKeys = sshPublicKeys;
+        return this;
+    }
+
+    /**
+     * Get the storageVolumePerformanceMode property: The block storage volume performance level. Valid values are
+     * Balanced and HighPerformance. See [Block Volume Performance](/Content/Block/Concepts/blockvolumeperformance.htm)
+     * for more information.
+     * 
+     * @return the storageVolumePerformanceMode value.
+     */
+    public StorageVolumePerformanceMode storageVolumePerformanceMode() {
+        return this.storageVolumePerformanceMode;
+    }
+
+    /**
+     * Set the storageVolumePerformanceMode property: The block storage volume performance level. Valid values are
+     * Balanced and HighPerformance. See [Block Volume Performance](/Content/Block/Concepts/blockvolumeperformance.htm)
+     * for more information.
+     * 
+     * @param storageVolumePerformanceMode the storageVolumePerformanceMode value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties
+        withStorageVolumePerformanceMode(StorageVolumePerformanceMode storageVolumePerformanceMode) {
+        this.storageVolumePerformanceMode = storageVolumePerformanceMode;
+        return this;
+    }
+
+    /**
+     * Get the timeZone property: The time zone of the DB system, e.g., UTC, to set the timeZone as UTC.
+     * 
+     * @return the timeZone value.
+     */
+    public String timeZone() {
+        return this.timeZone;
+    }
+
+    /**
+     * Set the timeZone property: The time zone of the DB system, e.g., UTC, to set the timeZone as UTC.
+     * 
+     * @param timeZone the timeZone value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withTimeZone(String timeZone) {
+        this.timeZone = timeZone;
+        return this;
+    }
+
+    /**
+     * Get the version property: The Oracle Database version of the DB system.
+     * 
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Set the version property: The Oracle Database version of the DB system.
+     * 
+     * @param version the version value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    DbSystemBaseProperties withVersion(String version) {
+        this.version = version;
+        return this;
+    }
+
+    /**
+     * Get the computeModel property: The compute model for Base Database Service. This is required if using the
+     * `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null
+     * value. The ECPU compute model is the recommended model, and the OCPU compute model is legacy.
+     * 
+     * @return the computeModel value.
+     */
+    public ComputeModel computeModel() {
+        return this.computeModel;
+    }
+
+    /**
+     * Set the computeModel property: The compute model for Base Database Service. This is required if using the
+     * `computeCount` parameter. If using `cpuCoreCount` then it is an error to specify `computeModel` to a non-null
+     * value. The ECPU compute model is the recommended model, and the OCPU compute model is legacy.
+     * 
+     * @param computeModel the computeModel value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withComputeModel(ComputeModel computeModel) {
+        this.computeModel = computeModel;
+        return this;
+    }
+
+    /**
+     * Get the computeCount property: The number of compute servers for the DB system.
+     * 
+     * @return the computeCount value.
+     */
+    public Integer computeCount() {
+        return this.computeCount;
+    }
+
+    /**
+     * Set the computeCount property: The number of compute servers for the DB system.
+     * 
+     * @param computeCount the computeCount value to set.
+     * @return the DbSystemBaseProperties object itself.
+     */
+    public DbSystemBaseProperties withComputeCount(Integer computeCount) {
+        this.computeCount = computeCount;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("resourceAnchorId", this.resourceAnchorId);
+        jsonWriter.writeStringField("networkAnchorId", this.networkAnchorId);
+        jsonWriter.writeStringField("hostname", this.hostname);
+        jsonWriter.writeStringField("shape", this.shape);
+        jsonWriter.writeArrayField("sshPublicKeys", this.sshPublicKeys,
+            (writer, element) -> writer.writeString(element));
+        jsonWriter.writeStringField("source", this.source == null ? null : this.source.toString());
+        jsonWriter.writeStringField("clusterName", this.clusterName);
+        jsonWriter.writeStringField("displayName", this.displayName);
+        jsonWriter.writeNumberField("initialDataStorageSizeInGb", this.initialDataStorageSizeInGb);
+        jsonWriter.writeJsonField("dbSystemOptions", this.dbSystemOptions);
+        jsonWriter.writeStringField("diskRedundancy",
+            this.diskRedundancy == null ? null : this.diskRedundancy.toString());
+        jsonWriter.writeStringField("domain", this.domainV2);
+        jsonWriter.writeStringField("licenseModel",
+            this.licenseModelV2 == null ? null : this.licenseModelV2.toString());
+        jsonWriter.writeNumberField("nodeCount", this.nodeCount);
+        jsonWriter.writeStringField("storageVolumePerformanceMode",
+            this.storageVolumePerformanceMode == null ? null : this.storageVolumePerformanceMode.toString());
+        jsonWriter.writeStringField("timeZone", this.timeZone);
+        jsonWriter.writeStringField("computeModel", this.computeModel == null ? null : this.computeModel.toString());
+        jsonWriter.writeNumberField("computeCount", this.computeCount);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemBaseProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemBaseProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbSystemBaseProperties.
+     */
+    public static DbSystemBaseProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            String discriminatorValue = null;
+            try (JsonReader readerToUse = reader.bufferObject()) {
+                readerToUse.nextToken(); // Prepare for reading
+                while (readerToUse.nextToken() != JsonToken.END_OBJECT) {
+                    String fieldName = readerToUse.getFieldName();
+                    readerToUse.nextToken();
+                    if ("source".equals(fieldName)) {
+                        discriminatorValue = readerToUse.getString();
+                        break;
+                    } else {
+                        readerToUse.skipChildren();
+                    }
+                }
+                // Use the discriminator value to determine which subtype should be deserialized.
+                if ("None".equals(discriminatorValue)) {
+                    return DbSystemProperties.fromJson(readerToUse.reset());
+                } else {
+                    return fromJsonKnownDiscriminator(readerToUse.reset());
+                }
+            }
+        });
+    }
+
+    static DbSystemBaseProperties fromJsonKnownDiscriminator(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemBaseProperties deserializedDbSystemBaseProperties = new DbSystemBaseProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("resourceAnchorId".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.resourceAnchorId = reader.getString();
+                } else if ("networkAnchorId".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.networkAnchorId = reader.getString();
+                } else if ("hostname".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.hostname = reader.getString();
+                } else if ("shape".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.shape = reader.getString();
+                } else if ("sshPublicKeys".equals(fieldName)) {
+                    List<String> sshPublicKeys = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemBaseProperties.sshPublicKeys = sshPublicKeys;
+                } else if ("source".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.source = DbSystemSourceType.fromString(reader.getString());
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.provisioningState
+                        = AzureResourceProvisioningState.fromString(reader.getString());
+                } else if ("ociUrl".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.ociUrl = reader.getString();
+                } else if ("clusterName".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.clusterName = reader.getString();
+                } else if ("displayName".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.displayName = reader.getString();
+                } else if ("initialDataStorageSizeInGb".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.initialDataStorageSizeInGb
+                        = reader.getNullable(JsonReader::getInt);
+                } else if ("dataStorageSizeInGbs".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.dataStorageSizeInGbs = reader.getNullable(JsonReader::getInt);
+                } else if ("dbSystemOptions".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.dbSystemOptions = DbSystemOptions.fromJson(reader);
+                } else if ("diskRedundancy".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.diskRedundancy
+                        = DiskRedundancyType.fromString(reader.getString());
+                } else if ("domain".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.domainV2 = reader.getString();
+                } else if ("gridImageOcid".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.gridImageOcid = reader.getString();
+                } else if ("ocid".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.ocid = reader.getString();
+                } else if ("licenseModel".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.licenseModelV2 = LicenseModel.fromString(reader.getString());
+                } else if ("lifecycleDetails".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.lifecycleDetails = reader.getString();
+                } else if ("lifecycleState".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.lifecycleState
+                        = DbSystemLifecycleState.fromString(reader.getString());
+                } else if ("listenerPort".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.listenerPort = reader.getNullable(JsonReader::getInt);
+                } else if ("memorySizeInGbs".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.memorySizeInGbs = reader.getNullable(JsonReader::getInt);
+                } else if ("nodeCount".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.nodeCount = reader.getNullable(JsonReader::getInt);
+                } else if ("scanDnsName".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.scanDnsName = reader.getString();
+                } else if ("scanIps".equals(fieldName)) {
+                    List<String> scanIps = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemBaseProperties.scanIps = scanIps;
+                } else if ("storageVolumePerformanceMode".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.storageVolumePerformanceMode
+                        = StorageVolumePerformanceMode.fromString(reader.getString());
+                } else if ("timeZone".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.timeZone = reader.getString();
+                } else if ("version".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.version = reader.getString();
+                } else if ("computeModel".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.computeModel = ComputeModel.fromString(reader.getString());
+                } else if ("computeCount".equals(fieldName)) {
+                    deserializedDbSystemBaseProperties.computeCount = reader.getNullable(JsonReader::getInt);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemBaseProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemDatabaseEditionType.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemDatabaseEditionType.java
new file mode 100644
index 000000000000..9d6c1cfe77a3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemDatabaseEditionType.java
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Database edition type enum.
+ */
+public final class DbSystemDatabaseEditionType extends ExpandableStringEnum<DbSystemDatabaseEditionType> {
+    /**
+     * Standard edition.
+     */
+    public static final DbSystemDatabaseEditionType STANDARD_EDITION = fromString("StandardEdition");
+
+    /**
+     * Enterprise edition.
+     */
+    public static final DbSystemDatabaseEditionType ENTERPRISE_EDITION = fromString("EnterpriseEdition");
+
+    /**
+     * Enterprise edition high performance.
+     */
+    public static final DbSystemDatabaseEditionType ENTERPRISE_EDITION_HIGH_PERFORMANCE
+        = fromString("EnterpriseEditionHighPerformance");
+
+    /**
+     * Enterprise edition extreme.
+     */
+    public static final DbSystemDatabaseEditionType ENTERPRISE_EDITION_EXTREME = fromString("EnterpriseEditionExtreme");
+
+    /**
+     * Enterprise edition developer.
+     */
+    public static final DbSystemDatabaseEditionType ENTERPRISE_EDITION_DEVELOPER
+        = fromString("EnterpriseEditionDeveloper");
+
+    /**
+     * Creates a new instance of DbSystemDatabaseEditionType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DbSystemDatabaseEditionType() {
+    }
+
+    /**
+     * Creates or finds a DbSystemDatabaseEditionType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DbSystemDatabaseEditionType.
+     */
+    public static DbSystemDatabaseEditionType fromString(String name) {
+        return fromString(name, DbSystemDatabaseEditionType.class);
+    }
+
+    /**
+     * Gets known DbSystemDatabaseEditionType values.
+     * 
+     * @return known DbSystemDatabaseEditionType values.
+     */
+    public static Collection<DbSystemDatabaseEditionType> values() {
+        return values(DbSystemDatabaseEditionType.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemLifecycleState.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemLifecycleState.java
new file mode 100644
index 000000000000..76a13acf35d2
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemLifecycleState.java
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * DB System lifecycle state enum.
+ */
+public final class DbSystemLifecycleState extends ExpandableStringEnum<DbSystemLifecycleState> {
+    /**
+     * Indicates that resource in Provisioning state.
+     */
+    public static final DbSystemLifecycleState PROVISIONING = fromString("Provisioning");
+
+    /**
+     * Indicates that resource in Available state.
+     */
+    public static final DbSystemLifecycleState AVAILABLE = fromString("Available");
+
+    /**
+     * Indicates that resource in Updating state.
+     */
+    public static final DbSystemLifecycleState UPDATING = fromString("Updating");
+
+    /**
+     * Indicates that resource in Terminating state.
+     */
+    public static final DbSystemLifecycleState TERMINATING = fromString("Terminating");
+
+    /**
+     * Indicates that resource in Terminated state.
+     */
+    public static final DbSystemLifecycleState TERMINATED = fromString("Terminated");
+
+    /**
+     * Indicates that resource in Failed state.
+     */
+    public static final DbSystemLifecycleState FAILED = fromString("Failed");
+
+    /**
+     * Indicates that resource is Migrated state.
+     */
+    public static final DbSystemLifecycleState MIGRATED = fromString("Migrated");
+
+    /**
+     * Indicates that resource maintenance in progress state.
+     */
+    public static final DbSystemLifecycleState MAINTENANCE_IN_PROGRESS = fromString("MaintenanceInProgress");
+
+    /**
+     * Indicates that resource needs attention state.
+     */
+    public static final DbSystemLifecycleState NEEDS_ATTENTION = fromString("NeedsAttention");
+
+    /**
+     * Indicates that resource in Upgrading state.
+     */
+    public static final DbSystemLifecycleState UPGRADING = fromString("Upgrading");
+
+    /**
+     * Creates a new instance of DbSystemLifecycleState value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DbSystemLifecycleState() {
+    }
+
+    /**
+     * Creates or finds a DbSystemLifecycleState from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DbSystemLifecycleState.
+     */
+    public static DbSystemLifecycleState fromString(String name) {
+        return fromString(name, DbSystemLifecycleState.class);
+    }
+
+    /**
+     * Gets known DbSystemLifecycleState values.
+     * 
+     * @return known DbSystemLifecycleState values.
+     */
+    public static Collection<DbSystemLifecycleState> values() {
+        return values(DbSystemLifecycleState.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemOptions.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemOptions.java
new file mode 100644
index 000000000000..56bc5d8c7dfb
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemOptions.java
@@ -0,0 +1,89 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * DbSystemOptions resource properties.
+ */
+@Fluent
+public final class DbSystemOptions implements JsonSerializable<DbSystemOptions> {
+    /*
+     * The storage option used in DB system. ASM - Automatic storage management, LVM - Logical Volume management.
+     */
+    private StorageManagementType storageManagement;
+
+    /**
+     * Creates an instance of DbSystemOptions class.
+     */
+    public DbSystemOptions() {
+    }
+
+    /**
+     * Get the storageManagement property: The storage option used in DB system. ASM - Automatic storage management, LVM
+     * - Logical Volume management.
+     * 
+     * @return the storageManagement value.
+     */
+    public StorageManagementType storageManagement() {
+        return this.storageManagement;
+    }
+
+    /**
+     * Set the storageManagement property: The storage option used in DB system. ASM - Automatic storage management, LVM
+     * - Logical Volume management.
+     * 
+     * @param storageManagement the storageManagement value to set.
+     * @return the DbSystemOptions object itself.
+     */
+    public DbSystemOptions withStorageManagement(StorageManagementType storageManagement) {
+        this.storageManagement = storageManagement;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("storageManagement",
+            this.storageManagement == null ? null : this.storageManagement.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemOptions from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemOptions if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the DbSystemOptions.
+     */
+    public static DbSystemOptions fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemOptions deserializedDbSystemOptions = new DbSystemOptions();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("storageManagement".equals(fieldName)) {
+                    deserializedDbSystemOptions.storageManagement
+                        = StorageManagementType.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemOptions;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemProperties.java
new file mode 100644
index 000000000000..d872ecd6d795
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemProperties.java
@@ -0,0 +1,445 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * DbSystem resource model.
+ */
+@Fluent
+public final class DbSystemProperties extends DbSystemBaseProperties {
+    /*
+     * The source of the database: Use `None` for creating a new database. The default is `None`.
+     */
+    private DbSystemSourceType source = DbSystemSourceType.NONE;
+
+    /*
+     * The Oracle Database Edition that applies to all the databases on the DB system. Exadata DB systems and 2-node RAC
+     * DB systems require EnterpriseEditionExtremePerformance.
+     */
+    private DbSystemDatabaseEditionType databaseEdition;
+
+    /*
+     * A strong password for SYS, SYSTEM, and PDB Admin. The password must be at least nine characters and contain at
+     * least two uppercase, two lowercase, two numbers, and two special characters. The special characters must be _, #,
+     * or -.
+     */
+    private String adminPassword;
+
+    /*
+     * A valid Oracle Database version. For a list of supported versions, use the ListDbVersions operation.
+     */
+    private String dbVersion;
+
+    /*
+     * The name of the pluggable database. The name must begin with an alphabetic character and can contain a maximum of
+     * thirty alphanumeric characters. Special characters are not permitted. Pluggable database should not be same as
+     * database name.
+     */
+    private String pdbName;
+
+    /**
+     * Creates an instance of DbSystemProperties class.
+     */
+    public DbSystemProperties() {
+    }
+
+    /**
+     * Get the source property: The source of the database: Use `None` for creating a new database. The default is
+     * `None`.
+     * 
+     * @return the source value.
+     */
+    @Override
+    public DbSystemSourceType source() {
+        return this.source;
+    }
+
+    /**
+     * Get the databaseEdition property: The Oracle Database Edition that applies to all the databases on the DB system.
+     * Exadata DB systems and 2-node RAC DB systems require EnterpriseEditionExtremePerformance.
+     * 
+     * @return the databaseEdition value.
+     */
+    public DbSystemDatabaseEditionType databaseEdition() {
+        return this.databaseEdition;
+    }
+
+    /**
+     * Set the databaseEdition property: The Oracle Database Edition that applies to all the databases on the DB system.
+     * Exadata DB systems and 2-node RAC DB systems require EnterpriseEditionExtremePerformance.
+     * 
+     * @param databaseEdition the databaseEdition value to set.
+     * @return the DbSystemProperties object itself.
+     */
+    public DbSystemProperties withDatabaseEdition(DbSystemDatabaseEditionType databaseEdition) {
+        this.databaseEdition = databaseEdition;
+        return this;
+    }
+
+    /**
+     * Get the adminPassword property: A strong password for SYS, SYSTEM, and PDB Admin. The password must be at least
+     * nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The
+     * special characters must be _, #, or -.
+     * 
+     * @return the adminPassword value.
+     */
+    public String adminPassword() {
+        return this.adminPassword;
+    }
+
+    /**
+     * Set the adminPassword property: A strong password for SYS, SYSTEM, and PDB Admin. The password must be at least
+     * nine characters and contain at least two uppercase, two lowercase, two numbers, and two special characters. The
+     * special characters must be _, #, or -.
+     * 
+     * @param adminPassword the adminPassword value to set.
+     * @return the DbSystemProperties object itself.
+     */
+    public DbSystemProperties withAdminPassword(String adminPassword) {
+        this.adminPassword = adminPassword;
+        return this;
+    }
+
+    /**
+     * Get the dbVersion property: A valid Oracle Database version. For a list of supported versions, use the
+     * ListDbVersions operation.
+     * 
+     * @return the dbVersion value.
+     */
+    public String dbVersion() {
+        return this.dbVersion;
+    }
+
+    /**
+     * Set the dbVersion property: A valid Oracle Database version. For a list of supported versions, use the
+     * ListDbVersions operation.
+     * 
+     * @param dbVersion the dbVersion value to set.
+     * @return the DbSystemProperties object itself.
+     */
+    public DbSystemProperties withDbVersion(String dbVersion) {
+        this.dbVersion = dbVersion;
+        return this;
+    }
+
+    /**
+     * Get the pdbName property: The name of the pluggable database. The name must begin with an alphabetic character
+     * and can contain a maximum of thirty alphanumeric characters. Special characters are not permitted. Pluggable
+     * database should not be same as database name.
+     * 
+     * @return the pdbName value.
+     */
+    public String pdbName() {
+        return this.pdbName;
+    }
+
+    /**
+     * Set the pdbName property: The name of the pluggable database. The name must begin with an alphabetic character
+     * and can contain a maximum of thirty alphanumeric characters. Special characters are not permitted. Pluggable
+     * database should not be same as database name.
+     * 
+     * @param pdbName the pdbName value to set.
+     * @return the DbSystemProperties object itself.
+     */
+    public DbSystemProperties withPdbName(String pdbName) {
+        this.pdbName = pdbName;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withResourceAnchorId(String resourceAnchorId) {
+        super.withResourceAnchorId(resourceAnchorId);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withNetworkAnchorId(String networkAnchorId) {
+        super.withNetworkAnchorId(networkAnchorId);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withClusterName(String clusterName) {
+        super.withClusterName(clusterName);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withDisplayName(String displayName) {
+        super.withDisplayName(displayName);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withInitialDataStorageSizeInGb(Integer initialDataStorageSizeInGb) {
+        super.withInitialDataStorageSizeInGb(initialDataStorageSizeInGb);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withDbSystemOptions(DbSystemOptions dbSystemOptions) {
+        super.withDbSystemOptions(dbSystemOptions);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withDiskRedundancy(DiskRedundancyType diskRedundancy) {
+        super.withDiskRedundancy(diskRedundancy);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withDomainV2(String domainV2) {
+        super.withDomainV2(domainV2);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withHostname(String hostname) {
+        super.withHostname(hostname);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withLicenseModelV2(LicenseModel licenseModelV2) {
+        super.withLicenseModelV2(licenseModelV2);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withNodeCount(Integer nodeCount) {
+        super.withNodeCount(nodeCount);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withShape(String shape) {
+        super.withShape(shape);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withSshPublicKeys(List<String> sshPublicKeys) {
+        super.withSshPublicKeys(sshPublicKeys);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties
+        withStorageVolumePerformanceMode(StorageVolumePerformanceMode storageVolumePerformanceMode) {
+        super.withStorageVolumePerformanceMode(storageVolumePerformanceMode);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withTimeZone(String timeZone) {
+        super.withTimeZone(timeZone);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withComputeModel(ComputeModel computeModel) {
+        super.withComputeModel(computeModel);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DbSystemProperties withComputeCount(Integer computeCount) {
+        super.withComputeCount(computeCount);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("resourceAnchorId", resourceAnchorId());
+        jsonWriter.writeStringField("networkAnchorId", networkAnchorId());
+        jsonWriter.writeStringField("hostname", hostname());
+        jsonWriter.writeStringField("shape", shape());
+        jsonWriter.writeArrayField("sshPublicKeys", sshPublicKeys(), (writer, element) -> writer.writeString(element));
+        jsonWriter.writeStringField("clusterName", clusterName());
+        jsonWriter.writeStringField("displayName", displayName());
+        jsonWriter.writeNumberField("initialDataStorageSizeInGb", initialDataStorageSizeInGb());
+        jsonWriter.writeJsonField("dbSystemOptions", dbSystemOptions());
+        jsonWriter.writeStringField("diskRedundancy", diskRedundancy() == null ? null : diskRedundancy().toString());
+        jsonWriter.writeStringField("domain", domainV2());
+        jsonWriter.writeStringField("licenseModel", licenseModelV2() == null ? null : licenseModelV2().toString());
+        jsonWriter.writeNumberField("nodeCount", nodeCount());
+        jsonWriter.writeStringField("storageVolumePerformanceMode",
+            storageVolumePerformanceMode() == null ? null : storageVolumePerformanceMode().toString());
+        jsonWriter.writeStringField("timeZone", timeZone());
+        jsonWriter.writeStringField("computeModel", computeModel() == null ? null : computeModel().toString());
+        jsonWriter.writeNumberField("computeCount", computeCount());
+        jsonWriter.writeStringField("databaseEdition",
+            this.databaseEdition == null ? null : this.databaseEdition.toString());
+        jsonWriter.writeStringField("dbVersion", this.dbVersion);
+        jsonWriter.writeStringField("source", this.source == null ? null : this.source.toString());
+        jsonWriter.writeStringField("adminPassword", this.adminPassword);
+        jsonWriter.writeStringField("pdbName", this.pdbName);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemProperties if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbSystemProperties.
+     */
+    public static DbSystemProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemProperties deserializedDbSystemProperties = new DbSystemProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("resourceAnchorId".equals(fieldName)) {
+                    deserializedDbSystemProperties.withResourceAnchorId(reader.getString());
+                } else if ("networkAnchorId".equals(fieldName)) {
+                    deserializedDbSystemProperties.withNetworkAnchorId(reader.getString());
+                } else if ("hostname".equals(fieldName)) {
+                    deserializedDbSystemProperties.withHostname(reader.getString());
+                } else if ("shape".equals(fieldName)) {
+                    deserializedDbSystemProperties.withShape(reader.getString());
+                } else if ("sshPublicKeys".equals(fieldName)) {
+                    List<String> sshPublicKeys = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemProperties.withSshPublicKeys(sshPublicKeys);
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedDbSystemProperties
+                        .withProvisioningState(AzureResourceProvisioningState.fromString(reader.getString()));
+                } else if ("ociUrl".equals(fieldName)) {
+                    deserializedDbSystemProperties.withOciUrl(reader.getString());
+                } else if ("clusterName".equals(fieldName)) {
+                    deserializedDbSystemProperties.withClusterName(reader.getString());
+                } else if ("displayName".equals(fieldName)) {
+                    deserializedDbSystemProperties.withDisplayName(reader.getString());
+                } else if ("initialDataStorageSizeInGb".equals(fieldName)) {
+                    deserializedDbSystemProperties
+                        .withInitialDataStorageSizeInGb(reader.getNullable(JsonReader::getInt));
+                } else if ("dataStorageSizeInGbs".equals(fieldName)) {
+                    deserializedDbSystemProperties.withDataStorageSizeInGbs(reader.getNullable(JsonReader::getInt));
+                } else if ("dbSystemOptions".equals(fieldName)) {
+                    deserializedDbSystemProperties.withDbSystemOptions(DbSystemOptions.fromJson(reader));
+                } else if ("diskRedundancy".equals(fieldName)) {
+                    deserializedDbSystemProperties
+                        .withDiskRedundancy(DiskRedundancyType.fromString(reader.getString()));
+                } else if ("domain".equals(fieldName)) {
+                    deserializedDbSystemProperties.withDomainV2(reader.getString());
+                } else if ("gridImageOcid".equals(fieldName)) {
+                    deserializedDbSystemProperties.withGridImageOcid(reader.getString());
+                } else if ("ocid".equals(fieldName)) {
+                    deserializedDbSystemProperties.withOcid(reader.getString());
+                } else if ("licenseModel".equals(fieldName)) {
+                    deserializedDbSystemProperties.withLicenseModelV2(LicenseModel.fromString(reader.getString()));
+                } else if ("lifecycleDetails".equals(fieldName)) {
+                    deserializedDbSystemProperties.withLifecycleDetails(reader.getString());
+                } else if ("lifecycleState".equals(fieldName)) {
+                    deserializedDbSystemProperties
+                        .withLifecycleState(DbSystemLifecycleState.fromString(reader.getString()));
+                } else if ("listenerPort".equals(fieldName)) {
+                    deserializedDbSystemProperties.withListenerPort(reader.getNullable(JsonReader::getInt));
+                } else if ("memorySizeInGbs".equals(fieldName)) {
+                    deserializedDbSystemProperties.withMemorySizeInGbs(reader.getNullable(JsonReader::getInt));
+                } else if ("nodeCount".equals(fieldName)) {
+                    deserializedDbSystemProperties.withNodeCount(reader.getNullable(JsonReader::getInt));
+                } else if ("scanDnsName".equals(fieldName)) {
+                    deserializedDbSystemProperties.withScanDnsName(reader.getString());
+                } else if ("scanIps".equals(fieldName)) {
+                    List<String> scanIps = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemProperties.withScanIps(scanIps);
+                } else if ("storageVolumePerformanceMode".equals(fieldName)) {
+                    deserializedDbSystemProperties
+                        .withStorageVolumePerformanceMode(StorageVolumePerformanceMode.fromString(reader.getString()));
+                } else if ("timeZone".equals(fieldName)) {
+                    deserializedDbSystemProperties.withTimeZone(reader.getString());
+                } else if ("version".equals(fieldName)) {
+                    deserializedDbSystemProperties.withVersion(reader.getString());
+                } else if ("computeModel".equals(fieldName)) {
+                    deserializedDbSystemProperties.withComputeModel(ComputeModel.fromString(reader.getString()));
+                } else if ("computeCount".equals(fieldName)) {
+                    deserializedDbSystemProperties.withComputeCount(reader.getNullable(JsonReader::getInt));
+                } else if ("databaseEdition".equals(fieldName)) {
+                    deserializedDbSystemProperties.databaseEdition
+                        = DbSystemDatabaseEditionType.fromString(reader.getString());
+                } else if ("dbVersion".equals(fieldName)) {
+                    deserializedDbSystemProperties.dbVersion = reader.getString();
+                } else if ("source".equals(fieldName)) {
+                    deserializedDbSystemProperties.source = DbSystemSourceType.fromString(reader.getString());
+                } else if ("adminPassword".equals(fieldName)) {
+                    deserializedDbSystemProperties.adminPassword = reader.getString();
+                } else if ("pdbName".equals(fieldName)) {
+                    deserializedDbSystemProperties.pdbName = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapeProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapeProperties.java
index 133b93e79e74..0685e3ca8108 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapeProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapeProperties.java
@@ -10,6 +10,7 @@
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * DbSystemShape resource model.
@@ -137,6 +138,11 @@ public final class DbSystemShapeProperties implements JsonSerializable<DbSystemS
      */
     private String displayName;
 
+    /*
+     * The shapeAttributes of the DB system shape..
+     */
+    private List<String> shapeAttributes;
+
     /**
      * Creates an instance of DbSystemShapeProperties class.
      */
@@ -371,6 +377,15 @@ public String displayName() {
         return this.displayName;
     }
 
+    /**
+     * Get the shapeAttributes property: The shapeAttributes of the DB system shape..
+     * 
+     * @return the shapeAttributes value.
+     */
+    public List<String> shapeAttributes() {
+        return this.shapeAttributes;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -401,6 +416,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("computeModel", this.computeModel == null ? null : this.computeModel.toString());
         jsonWriter.writeBooleanField("areServerTypesSupported", this.areServerTypesSupported);
         jsonWriter.writeStringField("displayName", this.displayName);
+        jsonWriter.writeArrayField("shapeAttributes", this.shapeAttributes,
+            (writer, element) -> writer.writeString(element));
         return jsonWriter.writeEndObject();
     }
 
@@ -477,6 +494,9 @@ public static DbSystemShapeProperties fromJson(JsonReader jsonReader) throws IOE
                         = reader.getNullable(JsonReader::getBoolean);
                 } else if ("displayName".equals(fieldName)) {
                     deserializedDbSystemShapeProperties.displayName = reader.getString();
+                } else if ("shapeAttributes".equals(fieldName)) {
+                    List<String> shapeAttributes = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemShapeProperties.shapeAttributes = shapeAttributes;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapes.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapes.java
index 81b56fbb314b..9eaa2bc654e0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapes.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapes.java
@@ -53,11 +53,12 @@ public interface DbSystemShapes {
      * 
      * @param location The name of the Azure region.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the response of a DbSystemShape list operation as paginated response with {@link PagedIterable}.
      */
-    PagedIterable<DbSystemShape> listByLocation(String location, String zone, Context context);
+    PagedIterable<DbSystemShape> listByLocation(String location, String zone, String shapeAttribute, Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemSourceType.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemSourceType.java
new file mode 100644
index 000000000000..0d48b2e815e9
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemSourceType.java
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The DbSystem source type of the database.
+ */
+public final class DbSystemSourceType extends ExpandableStringEnum<DbSystemSourceType> {
+    /**
+     * for creating a new database.
+     */
+    public static final DbSystemSourceType NONE = fromString("None");
+
+    /**
+     * Creates a new instance of DbSystemSourceType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DbSystemSourceType() {
+    }
+
+    /**
+     * Creates or finds a DbSystemSourceType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DbSystemSourceType.
+     */
+    public static DbSystemSourceType fromString(String name) {
+        return fromString(name, DbSystemSourceType.class);
+    }
+
+    /**
+     * Gets known DbSystemSourceType values.
+     * 
+     * @return known DbSystemSourceType values.
+     */
+    public static Collection<DbSystemSourceType> values() {
+        return values(DbSystemSourceType.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdate.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdate.java
new file mode 100644
index 000000000000..5a9d0104e610
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdate.java
@@ -0,0 +1,145 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The type used for update operations of the DbSystem.
+ */
+@Fluent
+public final class DbSystemUpdate implements JsonSerializable<DbSystemUpdate> {
+    /*
+     * The availability zones.
+     */
+    private List<String> zones;
+
+    /*
+     * Resource tags.
+     */
+    private Map<String, String> tags;
+
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private DbSystemUpdateProperties properties;
+
+    /**
+     * Creates an instance of DbSystemUpdate class.
+     */
+    public DbSystemUpdate() {
+    }
+
+    /**
+     * Get the zones property: The availability zones.
+     * 
+     * @return the zones value.
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set the zones property: The availability zones.
+     * 
+     * @param zones the zones value to set.
+     * @return the DbSystemUpdate object itself.
+     */
+    public DbSystemUpdate withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get the tags property: Resource tags.
+     * 
+     * @return the tags value.
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: Resource tags.
+     * 
+     * @param tags the tags value to set.
+     * @return the DbSystemUpdate object itself.
+     */
+    public DbSystemUpdate withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public DbSystemUpdateProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The resource-specific properties for this resource.
+     * 
+     * @param properties the properties value to set.
+     * @return the DbSystemUpdate object itself.
+     */
+    public DbSystemUpdate withProperties(DbSystemUpdateProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemUpdate from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemUpdate if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the DbSystemUpdate.
+     */
+    public static DbSystemUpdate fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemUpdate deserializedDbSystemUpdate = new DbSystemUpdate();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("zones".equals(fieldName)) {
+                    List<String> zones = reader.readArray(reader1 -> reader1.getString());
+                    deserializedDbSystemUpdate.zones = zones;
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedDbSystemUpdate.tags = tags;
+                } else if ("properties".equals(fieldName)) {
+                    deserializedDbSystemUpdate.properties = DbSystemUpdateProperties.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemUpdate;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdateProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdateProperties.java
new file mode 100644
index 000000000000..33b6954648d3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdateProperties.java
@@ -0,0 +1,85 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The updatable properties of the DbSystem.
+ */
+@Fluent
+public final class DbSystemUpdateProperties implements JsonSerializable<DbSystemUpdateProperties> {
+    /*
+     * The source of the database for creating a new database.
+     */
+    private DbSystemSourceType source;
+
+    /**
+     * Creates an instance of DbSystemUpdateProperties class.
+     */
+    public DbSystemUpdateProperties() {
+    }
+
+    /**
+     * Get the source property: The source of the database for creating a new database.
+     * 
+     * @return the source value.
+     */
+    public DbSystemSourceType source() {
+        return this.source;
+    }
+
+    /**
+     * Set the source property: The source of the database for creating a new database.
+     * 
+     * @param source the source value to set.
+     * @return the DbSystemUpdateProperties object itself.
+     */
+    public DbSystemUpdateProperties withSource(DbSystemSourceType source) {
+        this.source = source;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("source", this.source == null ? null : this.source.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbSystemUpdateProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbSystemUpdateProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the DbSystemUpdateProperties.
+     */
+    public static DbSystemUpdateProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbSystemUpdateProperties deserializedDbSystemUpdateProperties = new DbSystemUpdateProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("source".equals(fieldName)) {
+                    deserializedDbSystemUpdateProperties.source = DbSystemSourceType.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbSystemUpdateProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystems.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystems.java
new file mode 100644
index 000000000000..21b1e372b437
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystems.java
@@ -0,0 +1,157 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/**
+ * Resource collection API of DbSystems.
+ */
+public interface DbSystems {
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<DbSystem> list();
+
+    /**
+     * List DbSystem resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<DbSystem> list(Context context);
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem along with {@link Response}.
+     */
+    Response<DbSystem> getByResourceGroupWithResponse(String resourceGroupName, String dbSystemName, Context context);
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem.
+     */
+    DbSystem getByResourceGroup(String resourceGroupName, String dbSystemName);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByResourceGroup(String resourceGroupName, String dbSystemName);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param dbSystemName The name of the DbSystem.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String dbSystemName, Context context);
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<DbSystem> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * List DbSystem resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbSystem list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<DbSystem> listByResourceGroup(String resourceGroupName, Context context);
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem along with {@link Response}.
+     */
+    DbSystem getById(String id);
+
+    /**
+     * Get a DbSystem.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbSystem along with {@link Response}.
+     */
+    Response<DbSystem> getByIdWithResponse(String id, Context context);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteById(String id);
+
+    /**
+     * Delete a DbSystem.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByIdWithResponse(String id, Context context);
+
+    /**
+     * Begins definition for a new DbSystem resource.
+     * 
+     * @param name resource name.
+     * @return the first stage of the new DbSystem definition.
+     */
+    DbSystem.DefinitionStages.Blank define(String name);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersion.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersion.java
new file mode 100644
index 000000000000..5e24e6e1851f
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersion.java
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.management.SystemData;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+
+/**
+ * An immutable client-side representation of DbVersion.
+ */
+public interface DbVersion {
+    /**
+     * Gets the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * Gets the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * Gets the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * Gets the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    DbVersionProperties properties();
+
+    /**
+     * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    SystemData systemData();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner object.
+     * 
+     * @return the inner object.
+     */
+    DbVersionInner innerModel();
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersionProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersionProperties.java
new file mode 100644
index 000000000000..4adce8042a5f
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersionProperties.java
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * DbVersion resource model.
+ */
+@Immutable
+public final class DbVersionProperties implements JsonSerializable<DbVersionProperties> {
+    /*
+     * A valid Oracle Database version.
+     */
+    private String version;
+
+    /*
+     * True if this version of the Oracle Database software is the latest version for a release.
+     */
+    private Boolean isLatestForMajorVersion;
+
+    /*
+     * True if this version of the Oracle Database software is the preview version.
+     */
+    private Boolean isPreviewDbVersion;
+
+    /*
+     * True if this version of the Oracle Database software is supported for Upgrade.
+     */
+    private Boolean isUpgradeSupported;
+
+    /*
+     * True if this version of the Oracle Database software supports pluggable databases.
+     */
+    private Boolean supportsPdb;
+
+    /**
+     * Creates an instance of DbVersionProperties class.
+     */
+    private DbVersionProperties() {
+    }
+
+    /**
+     * Get the version property: A valid Oracle Database version.
+     * 
+     * @return the version value.
+     */
+    public String version() {
+        return this.version;
+    }
+
+    /**
+     * Get the isLatestForMajorVersion property: True if this version of the Oracle Database software is the latest
+     * version for a release.
+     * 
+     * @return the isLatestForMajorVersion value.
+     */
+    public Boolean isLatestForMajorVersion() {
+        return this.isLatestForMajorVersion;
+    }
+
+    /**
+     * Get the isPreviewDbVersion property: True if this version of the Oracle Database software is the preview version.
+     * 
+     * @return the isPreviewDbVersion value.
+     */
+    public Boolean isPreviewDbVersion() {
+        return this.isPreviewDbVersion;
+    }
+
+    /**
+     * Get the isUpgradeSupported property: True if this version of the Oracle Database software is supported for
+     * Upgrade.
+     * 
+     * @return the isUpgradeSupported value.
+     */
+    public Boolean isUpgradeSupported() {
+        return this.isUpgradeSupported;
+    }
+
+    /**
+     * Get the supportsPdb property: True if this version of the Oracle Database software supports pluggable databases.
+     * 
+     * @return the supportsPdb value.
+     */
+    public Boolean supportsPdb() {
+        return this.supportsPdb;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("version", this.version);
+        jsonWriter.writeBooleanField("isLatestForMajorVersion", this.isLatestForMajorVersion);
+        jsonWriter.writeBooleanField("isPreviewDbVersion", this.isPreviewDbVersion);
+        jsonWriter.writeBooleanField("isUpgradeSupported", this.isUpgradeSupported);
+        jsonWriter.writeBooleanField("supportsPdb", this.supportsPdb);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DbVersionProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DbVersionProperties if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DbVersionProperties.
+     */
+    public static DbVersionProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DbVersionProperties deserializedDbVersionProperties = new DbVersionProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("version".equals(fieldName)) {
+                    deserializedDbVersionProperties.version = reader.getString();
+                } else if ("isLatestForMajorVersion".equals(fieldName)) {
+                    deserializedDbVersionProperties.isLatestForMajorVersion
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isPreviewDbVersion".equals(fieldName)) {
+                    deserializedDbVersionProperties.isPreviewDbVersion = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isUpgradeSupported".equals(fieldName)) {
+                    deserializedDbVersionProperties.isUpgradeSupported = reader.getNullable(JsonReader::getBoolean);
+                } else if ("supportsPdb".equals(fieldName)) {
+                    deserializedDbVersionProperties.supportsPdb = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDbVersionProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersions.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersions.java
new file mode 100644
index 000000000000..e0eda8b649f6
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersions.java
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/**
+ * Resource collection API of DbVersions.
+ */
+public interface DbVersions {
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion along with {@link Response}.
+     */
+    Response<DbVersion> getWithResponse(String location, String dbversionsname, Context context);
+
+    /**
+     * Get a DbVersion.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbversionsname DbVersion name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a DbVersion.
+     */
+    DbVersion get(String location, String dbversionsname);
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<DbVersion> listByLocation(String location);
+
+    /**
+     * List DbVersion resources by SubscriptionLocationResource.
+     * 
+     * @param location The name of the Azure region.
+     * @param dbSystemShape If provided, filters the results to the set of database versions which are supported for the
+     * given shape. e.g., VM.Standard.E5.Flex.
+     * @param dbSystemId The DB system AzureId. If provided, filters the results to the set of database versions which
+     * are supported for the DB system.
+     * @param storageManagement The DB system storage management option. Used to list database versions available for
+     * that storage manager. Valid values are ASM and LVM.
+     * @param isUpgradeSupported If true, filters the results to the set of database versions which are supported for
+     * Upgrade.
+     * @param isDatabaseSoftwareImageSupported If true, filters the results to the set of Oracle Database versions that
+     * are supported for the database software images.
+     * @param shapeFamily If provided, filters the results to the set of database versions which are supported for the
+     * given shape family.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a DbVersion list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<DbVersion> listByLocation(String location, BaseDbSystemShapes dbSystemShape, String dbSystemId,
+        StorageManagementType storageManagement, Boolean isUpgradeSupported, Boolean isDatabaseSoftwareImageSupported,
+        ShapeFamilyType shapeFamily, Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DiskRedundancyType.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DiskRedundancyType.java
new file mode 100644
index 000000000000..fa4c1ce45b9a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DiskRedundancyType.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Disk redundancy type enum.
+ */
+public final class DiskRedundancyType extends ExpandableStringEnum<DiskRedundancyType> {
+    /**
+     * 3-way redundancy.
+     */
+    public static final DiskRedundancyType HIGH = fromString("High");
+
+    /**
+     * 2-way redundancy.
+     */
+    public static final DiskRedundancyType NORMAL = fromString("Normal");
+
+    /**
+     * Creates a new instance of DiskRedundancyType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public DiskRedundancyType() {
+    }
+
+    /**
+     * Creates or finds a DiskRedundancyType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding DiskRedundancyType.
+     */
+    public static DiskRedundancyType fromString(String name) {
+        return fromString(name, DiskRedundancyType.class);
+    }
+
+    /**
+     * Gets known DiskRedundancyType values.
+     * 
+     * @return known DiskRedundancyType values.
+     */
+    public static Collection<DiskRedundancyType> values() {
+        return values(DiskRedundancyType.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsForwardingRule.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsForwardingRule.java
new file mode 100644
index 000000000000..765fc3da2df0
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsForwardingRule.java
@@ -0,0 +1,114 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * DNS forwarding rule properties.
+ */
+@Fluent
+public final class DnsForwardingRule implements JsonSerializable<DnsForwardingRule> {
+    /*
+     * Comma-separated domain names
+     */
+    private String domainNames;
+
+    /*
+     * Forwarding ip address
+     */
+    private String forwardingIpAddress;
+
+    /**
+     * Creates an instance of DnsForwardingRule class.
+     */
+    public DnsForwardingRule() {
+    }
+
+    /**
+     * Get the domainNames property: Comma-separated domain names.
+     * 
+     * @return the domainNames value.
+     */
+    public String domainNames() {
+        return this.domainNames;
+    }
+
+    /**
+     * Set the domainNames property: Comma-separated domain names.
+     * 
+     * @param domainNames the domainNames value to set.
+     * @return the DnsForwardingRule object itself.
+     */
+    public DnsForwardingRule withDomainNames(String domainNames) {
+        this.domainNames = domainNames;
+        return this;
+    }
+
+    /**
+     * Get the forwardingIpAddress property: Forwarding ip address.
+     * 
+     * @return the forwardingIpAddress value.
+     */
+    public String forwardingIpAddress() {
+        return this.forwardingIpAddress;
+    }
+
+    /**
+     * Set the forwardingIpAddress property: Forwarding ip address.
+     * 
+     * @param forwardingIpAddress the forwardingIpAddress value to set.
+     * @return the DnsForwardingRule object itself.
+     */
+    public DnsForwardingRule withForwardingIpAddress(String forwardingIpAddress) {
+        this.forwardingIpAddress = forwardingIpAddress;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("domainNames", this.domainNames);
+        jsonWriter.writeStringField("forwardingIpAddress", this.forwardingIpAddress);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DnsForwardingRule from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DnsForwardingRule if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the DnsForwardingRule.
+     */
+    public static DnsForwardingRule fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DnsForwardingRule deserializedDnsForwardingRule = new DnsForwardingRule();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("domainNames".equals(fieldName)) {
+                    deserializedDnsForwardingRule.domainNames = reader.getString();
+                } else if ("forwardingIpAddress".equals(fieldName)) {
+                    deserializedDnsForwardingRule.forwardingIpAddress = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDnsForwardingRule;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadataVmClusterStorageManagementType.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadataVmClusterStorageManagementType.java
new file mode 100644
index 000000000000..e8bd51b040b6
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadataVmClusterStorageManagementType.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Specifies the type of storage management for the Cloud VM Cluster if its ASM or Exascale.
+ */
+public final class ExadataVmClusterStorageManagementType
+    extends ExpandableStringEnum<ExadataVmClusterStorageManagementType> {
+    /**
+     * Indicates that storage management for the Cloud VM Cluster is ASM.
+     */
+    public static final ExadataVmClusterStorageManagementType ASM = fromString("ASM");
+
+    /**
+     * Indicates that storage management for the Cloud VM Cluster is Exascale.
+     */
+    public static final ExadataVmClusterStorageManagementType EXASCALE = fromString("Exascale");
+
+    /**
+     * Creates a new instance of ExadataVmClusterStorageManagementType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ExadataVmClusterStorageManagementType() {
+    }
+
+    /**
+     * Creates or finds a ExadataVmClusterStorageManagementType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ExadataVmClusterStorageManagementType.
+     */
+    public static ExadataVmClusterStorageManagementType fromString(String name) {
+        return fromString(name, ExadataVmClusterStorageManagementType.class);
+    }
+
+    /**
+     * Gets known ExadataVmClusterStorageManagementType values.
+     * 
+     * @return known ExadataVmClusterStorageManagementType values.
+     */
+    public static Collection<ExadataVmClusterStorageManagementType> values() {
+        return values(ExadataVmClusterStorageManagementType.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterProperties.java
index e4c0654ab598..25505421f45e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterProperties.java
@@ -247,6 +247,11 @@ public final class ExadbVmClusterProperties implements JsonSerializable<ExadbVmC
      */
     private String subnetOcid;
 
+    /*
+     * The type of Exascale storage used for Exadata VM cluster.
+     */
+    private ShapeAttribute shapeAttribute;
+
     /**
      * Creates an instance of ExadbVmClusterProperties class.
      */
@@ -927,6 +932,26 @@ public String subnetOcid() {
         return this.subnetOcid;
     }
 
+    /**
+     * Get the shapeAttribute property: The type of Exascale storage used for Exadata VM cluster.
+     * 
+     * @return the shapeAttribute value.
+     */
+    public ShapeAttribute shapeAttribute() {
+        return this.shapeAttribute;
+    }
+
+    /**
+     * Set the shapeAttribute property: The type of Exascale storage used for Exadata VM cluster.
+     * 
+     * @param shapeAttribute the shapeAttribute value to set.
+     * @return the ExadbVmClusterProperties object itself.
+     */
+    public ExadbVmClusterProperties withShapeAttribute(ShapeAttribute shapeAttribute) {
+        this.shapeAttribute = shapeAttribute;
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -957,6 +982,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeNumberField("scanListenerPortTcpSsl", this.scanListenerPortTcpSsl);
         jsonWriter.writeStringField("systemVersion", this.systemVersion);
         jsonWriter.writeStringField("timeZone", this.timeZone);
+        jsonWriter.writeStringField("shapeAttribute",
+            this.shapeAttribute == null ? null : this.shapeAttribute.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -1072,6 +1099,8 @@ public static ExadbVmClusterProperties fromJson(JsonReader jsonReader) throws IO
                     deserializedExadbVmClusterProperties.backupSubnetOcid = reader.getString();
                 } else if ("subnetOcid".equals(fieldName)) {
                     deserializedExadbVmClusterProperties.subnetOcid = reader.getString();
+                } else if ("shapeAttribute".equals(fieldName)) {
+                    deserializedExadbVmClusterProperties.shapeAttribute = ShapeAttribute.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleConfigDetails.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleConfigDetails.java
new file mode 100644
index 000000000000..2459af14c88d
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleConfigDetails.java
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The exascale config response details for the cloud Exadata infrastructure.
+ */
+@Immutable
+public final class ExascaleConfigDetails implements JsonSerializable<ExascaleConfigDetails> {
+    /*
+     * Storage size needed for Exascale in GBs.
+     */
+    private int totalStorageInGbs;
+
+    /*
+     * Available storage size for Exascale in GBs.
+     */
+    private Integer availableStorageInGbs;
+
+    /**
+     * Creates an instance of ExascaleConfigDetails class.
+     */
+    private ExascaleConfigDetails() {
+    }
+
+    /**
+     * Get the totalStorageInGbs property: Storage size needed for Exascale in GBs.
+     * 
+     * @return the totalStorageInGbs value.
+     */
+    public int totalStorageInGbs() {
+        return this.totalStorageInGbs;
+    }
+
+    /**
+     * Get the availableStorageInGbs property: Available storage size for Exascale in GBs.
+     * 
+     * @return the availableStorageInGbs value.
+     */
+    public Integer availableStorageInGbs() {
+        return this.availableStorageInGbs;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeIntField("totalStorageInGbs", this.totalStorageInGbs);
+        jsonWriter.writeNumberField("availableStorageInGbs", this.availableStorageInGbs);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ExascaleConfigDetails from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ExascaleConfigDetails if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the ExascaleConfigDetails.
+     */
+    public static ExascaleConfigDetails fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ExascaleConfigDetails deserializedExascaleConfigDetails = new ExascaleConfigDetails();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("totalStorageInGbs".equals(fieldName)) {
+                    deserializedExascaleConfigDetails.totalStorageInGbs = reader.getInt();
+                } else if ("availableStorageInGbs".equals(fieldName)) {
+                    deserializedExascaleConfigDetails.availableStorageInGbs = reader.getNullable(JsonReader::getInt);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedExascaleConfigDetails;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultProperties.java
index c12e31ac845f..a41f25c4393f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultProperties.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultProperties.java
@@ -10,6 +10,7 @@
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
 import java.io.IOException;
+import java.util.List;
 
 /**
  * ExascaleDbStorageVault resource model.
@@ -76,6 +77,16 @@ public final class ExascaleDbStorageVaultProperties implements JsonSerializable<
      */
     private String ociUrl;
 
+    /*
+     * Cloud Exadata infrastructure ID
+     */
+    private String exadataInfrastructureId;
+
+    /*
+     * The shapeAttribute of the Exadata VM cluster(s) associated with the Exadata Database Storage Vault.
+     */
+    private List<ShapeAttribute> attachedShapeAttributes;
+
     /**
      * Creates an instance of ExascaleDbStorageVaultProperties class.
      */
@@ -250,6 +261,36 @@ public String ociUrl() {
         return this.ociUrl;
     }
 
+    /**
+     * Get the exadataInfrastructureId property: Cloud Exadata infrastructure ID.
+     * 
+     * @return the exadataInfrastructureId value.
+     */
+    public String exadataInfrastructureId() {
+        return this.exadataInfrastructureId;
+    }
+
+    /**
+     * Set the exadataInfrastructureId property: Cloud Exadata infrastructure ID.
+     * 
+     * @param exadataInfrastructureId the exadataInfrastructureId value to set.
+     * @return the ExascaleDbStorageVaultProperties object itself.
+     */
+    public ExascaleDbStorageVaultProperties withExadataInfrastructureId(String exadataInfrastructureId) {
+        this.exadataInfrastructureId = exadataInfrastructureId;
+        return this;
+    }
+
+    /**
+     * Get the attachedShapeAttributes property: The shapeAttribute of the Exadata VM cluster(s) associated with the
+     * Exadata Database Storage Vault.
+     * 
+     * @return the attachedShapeAttributes value.
+     */
+    public List<ShapeAttribute> attachedShapeAttributes() {
+        return this.attachedShapeAttributes;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -261,6 +302,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeNumberField("additionalFlashCacheInPercent", this.additionalFlashCacheInPercent);
         jsonWriter.writeStringField("description", this.description);
         jsonWriter.writeStringField("timeZone", this.timeZone);
+        jsonWriter.writeStringField("exadataInfrastructureId", this.exadataInfrastructureId);
         return jsonWriter.writeEndObject();
     }
 
@@ -311,6 +353,12 @@ public static ExascaleDbStorageVaultProperties fromJson(JsonReader jsonReader) t
                     deserializedExascaleDbStorageVaultProperties.ocid = reader.getString();
                 } else if ("ociUrl".equals(fieldName)) {
                     deserializedExascaleDbStorageVaultProperties.ociUrl = reader.getString();
+                } else if ("exadataInfrastructureId".equals(fieldName)) {
+                    deserializedExascaleDbStorageVaultProperties.exadataInfrastructureId = reader.getString();
+                } else if ("attachedShapeAttributes".equals(fieldName)) {
+                    List<ShapeAttribute> attachedShapeAttributes
+                        = reader.readArray(reader1 -> ShapeAttribute.fromString(reader1.getString()));
+                    deserializedExascaleDbStorageVaultProperties.attachedShapeAttributes = attachedShapeAttributes;
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersions.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersions.java
index e152261bd1c2..82383d33f896 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersions.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersions.java
@@ -54,11 +54,13 @@ public interface GiVersions {
      * @param location The name of the Azure region.
      * @param shape If provided, filters the results for the given shape.
      * @param zone Filters the result for the given Azure Availability Zone.
+     * @param shapeAttribute Filters the result for the given Shape Attribute, such as BLOCK_STORAGE or SMART_STORAGE.
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the response of a GiVersion list operation as paginated response with {@link PagedIterable}.
      */
-    PagedIterable<GiVersion> listByLocation(String location, SystemShapes shape, String zone, Context context);
+    PagedIterable<GiVersion> listByLocation(String location, SystemShapes shape, String zone, String shapeAttribute,
+        Context context);
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchor.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchor.java
new file mode 100644
index 000000000000..8d42f29b91be
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchor.java
@@ -0,0 +1,300 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.management.Region;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An immutable client-side representation of NetworkAnchor.
+ */
+public interface NetworkAnchor {
+    /**
+     * Gets the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * Gets the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * Gets the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * Gets the location property: The geo-location where the resource lives.
+     * 
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * Gets the tags property: Resource tags.
+     * 
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * Gets the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    NetworkAnchorProperties properties();
+
+    /**
+     * Gets the zones property: The availability zones.
+     * 
+     * @return the zones value.
+     */
+    List<String> zones();
+
+    /**
+     * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    SystemData systemData();
+
+    /**
+     * Gets the region of the resource.
+     * 
+     * @return the region of the resource.
+     */
+    Region region();
+
+    /**
+     * Gets the name of the resource region.
+     * 
+     * @return the name of the resource region.
+     */
+    String regionName();
+
+    /**
+     * Gets the name of the resource group.
+     * 
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner object.
+     * 
+     * @return the inner object.
+     */
+    NetworkAnchorInner innerModel();
+
+    /**
+     * The entirety of the NetworkAnchor definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation,
+        DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * The NetworkAnchor definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of the NetworkAnchor definition.
+         */
+        interface Blank extends WithLocation {
+        }
+
+        /**
+         * The stage of the NetworkAnchor definition allowing to specify location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies the region for the resource.
+             * 
+             * @param location The geo-location where the resource lives.
+             * @return the next definition stage.
+             */
+            WithResourceGroup withRegion(Region location);
+
+            /**
+             * Specifies the region for the resource.
+             * 
+             * @param location The geo-location where the resource lives.
+             * @return the next definition stage.
+             */
+            WithResourceGroup withRegion(String location);
+        }
+
+        /**
+         * The stage of the NetworkAnchor definition allowing to specify parent resource.
+         */
+        interface WithResourceGroup {
+            /**
+             * Specifies resourceGroupName.
+             * 
+             * @param resourceGroupName The name of the resource group. The name is case insensitive.
+             * @return the next definition stage.
+             */
+            WithCreate withExistingResourceGroup(String resourceGroupName);
+        }
+
+        /**
+         * The stage of the NetworkAnchor definition which contains all the minimum required properties for the resource
+         * to be created, but also allows for any other optional properties to be specified.
+         */
+        interface WithCreate
+            extends DefinitionStages.WithTags, DefinitionStages.WithProperties, DefinitionStages.WithZones {
+            /**
+             * Executes the create request.
+             * 
+             * @return the created resource.
+             */
+            NetworkAnchor create();
+
+            /**
+             * Executes the create request.
+             * 
+             * @param context The context to associate with this operation.
+             * @return the created resource.
+             */
+            NetworkAnchor create(Context context);
+        }
+
+        /**
+         * The stage of the NetworkAnchor definition allowing to specify tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies the tags property: Resource tags..
+             * 
+             * @param tags Resource tags.
+             * @return the next definition stage.
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the NetworkAnchor definition allowing to specify properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies the properties property: The resource-specific properties for this resource..
+             * 
+             * @param properties The resource-specific properties for this resource.
+             * @return the next definition stage.
+             */
+            WithCreate withProperties(NetworkAnchorProperties properties);
+        }
+
+        /**
+         * The stage of the NetworkAnchor definition allowing to specify zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies the zones property: The availability zones..
+             * 
+             * @param zones The availability zones.
+             * @return the next definition stage.
+             */
+            WithCreate withZones(List<String> zones);
+        }
+    }
+
+    /**
+     * Begins update for the NetworkAnchor resource.
+     * 
+     * @return the stage of resource update.
+     */
+    NetworkAnchor.Update update();
+
+    /**
+     * The template for NetworkAnchor update.
+     */
+    interface Update extends UpdateStages.WithTags, UpdateStages.WithZones, UpdateStages.WithProperties {
+        /**
+         * Executes the update request.
+         * 
+         * @return the updated resource.
+         */
+        NetworkAnchor apply();
+
+        /**
+         * Executes the update request.
+         * 
+         * @param context The context to associate with this operation.
+         * @return the updated resource.
+         */
+        NetworkAnchor apply(Context context);
+    }
+
+    /**
+     * The NetworkAnchor update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the NetworkAnchor update allowing to specify tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies the tags property: Resource tags..
+             * 
+             * @param tags Resource tags.
+             * @return the next definition stage.
+             */
+            Update withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the NetworkAnchor update allowing to specify zones.
+         */
+        interface WithZones {
+            /**
+             * Specifies the zones property: The availability zones..
+             * 
+             * @param zones The availability zones.
+             * @return the next definition stage.
+             */
+            Update withZones(List<String> zones);
+        }
+
+        /**
+         * The stage of the NetworkAnchor update allowing to specify properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies the properties property: The resource-specific properties for this resource..
+             * 
+             * @param properties The resource-specific properties for this resource.
+             * @return the next definition stage.
+             */
+            Update withProperties(NetworkAnchorUpdateProperties properties);
+        }
+    }
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @return the refreshed resource.
+     */
+    NetworkAnchor refresh();
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @param context The context to associate with this operation.
+     * @return the refreshed resource.
+     */
+    NetworkAnchor refresh(Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorProperties.java
new file mode 100644
index 000000000000..e615de85cc66
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorProperties.java
@@ -0,0 +1,486 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Network Anchor properties.
+ */
+@Fluent
+public final class NetworkAnchorProperties implements JsonSerializable<NetworkAnchorProperties> {
+    /*
+     * Corresponding resource anchor Azure ID
+     */
+    private String resourceAnchorId;
+
+    /*
+     * NetworkAnchor provisioning state
+     */
+    private AzureResourceProvisioningState provisioningState;
+
+    /*
+     * VNET for network connectivity
+     */
+    private String vnetId;
+
+    /*
+     * Client subnet
+     */
+    private String subnetId;
+
+    /*
+     * Delegated Azure subnet cidr block.
+     */
+    private String cidrBlock;
+
+    /*
+     * Oracle Cloud Infrastructure VCN OCID
+     */
+    private String ociVcnId;
+
+    /*
+     * OCI DNS label. This is optional if DNS config is provided.
+     */
+    private String ociVcnDnsLabel;
+
+    /*
+     * Oracle Cloud Infrastructure subnet OCID
+     */
+    private String ociSubnetId;
+
+    /*
+     * OCI backup subnet cidr block.
+     */
+    private String ociBackupCidrBlock;
+
+    /*
+     * Indicates whether DNS zone sync from OCI to Azure is enabled
+     */
+    private Boolean isOracleToAzureDnsZoneSyncEnabled;
+
+    /*
+     * Indicates whether the Oracle DNS listening endpoint is enabled
+     */
+    private Boolean isOracleDnsListeningEndpointEnabled;
+
+    /*
+     * Indicates whether the Oracle DNS forwarding endpoint is enabled
+     */
+    private Boolean isOracleDnsForwardingEndpointEnabled;
+
+    /*
+     * DNS forwarding rules
+     */
+    private List<DnsForwardingRule> dnsForwardingRules;
+
+    /*
+     * Comma-separated list of CIDRs that are allowed to send requests to the DNS listening endpoint
+     */
+    private String dnsListeningEndpointAllowedCidrs;
+
+    /*
+     * DNS listening endpoint IP address
+     */
+    private String dnsListeningEndpointIpAddress;
+
+    /*
+     * DNS forwarding endpoint IP address
+     */
+    private String dnsForwardingEndpointIpAddress;
+
+    /*
+     * Deep link to OCI console DNS Forwarding rules page
+     */
+    private String dnsForwardingRulesUrl;
+
+    /*
+     * Deep link to OCI console DNS Listening endpoint NSG rules
+     */
+    private String dnsListeningEndpointNsgRulesUrl;
+
+    /*
+     * Deep link to OCI console DNS Forwarding endpoint NSG rules
+     */
+    private String dnsForwardingEndpointNsgRulesUrl;
+
+    /**
+     * Creates an instance of NetworkAnchorProperties class.
+     */
+    public NetworkAnchorProperties() {
+    }
+
+    /**
+     * Get the resourceAnchorId property: Corresponding resource anchor Azure ID.
+     * 
+     * @return the resourceAnchorId value.
+     */
+    public String resourceAnchorId() {
+        return this.resourceAnchorId;
+    }
+
+    /**
+     * Set the resourceAnchorId property: Corresponding resource anchor Azure ID.
+     * 
+     * @param resourceAnchorId the resourceAnchorId value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withResourceAnchorId(String resourceAnchorId) {
+        this.resourceAnchorId = resourceAnchorId;
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: NetworkAnchor provisioning state.
+     * 
+     * @return the provisioningState value.
+     */
+    public AzureResourceProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the vnetId property: VNET for network connectivity.
+     * 
+     * @return the vnetId value.
+     */
+    public String vnetId() {
+        return this.vnetId;
+    }
+
+    /**
+     * Get the subnetId property: Client subnet.
+     * 
+     * @return the subnetId value.
+     */
+    public String subnetId() {
+        return this.subnetId;
+    }
+
+    /**
+     * Set the subnetId property: Client subnet.
+     * 
+     * @param subnetId the subnetId value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withSubnetId(String subnetId) {
+        this.subnetId = subnetId;
+        return this;
+    }
+
+    /**
+     * Get the cidrBlock property: Delegated Azure subnet cidr block.
+     * 
+     * @return the cidrBlock value.
+     */
+    public String cidrBlock() {
+        return this.cidrBlock;
+    }
+
+    /**
+     * Get the ociVcnId property: Oracle Cloud Infrastructure VCN OCID.
+     * 
+     * @return the ociVcnId value.
+     */
+    public String ociVcnId() {
+        return this.ociVcnId;
+    }
+
+    /**
+     * Get the ociVcnDnsLabel property: OCI DNS label. This is optional if DNS config is provided.
+     * 
+     * @return the ociVcnDnsLabel value.
+     */
+    public String ociVcnDnsLabel() {
+        return this.ociVcnDnsLabel;
+    }
+
+    /**
+     * Set the ociVcnDnsLabel property: OCI DNS label. This is optional if DNS config is provided.
+     * 
+     * @param ociVcnDnsLabel the ociVcnDnsLabel value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withOciVcnDnsLabel(String ociVcnDnsLabel) {
+        this.ociVcnDnsLabel = ociVcnDnsLabel;
+        return this;
+    }
+
+    /**
+     * Get the ociSubnetId property: Oracle Cloud Infrastructure subnet OCID.
+     * 
+     * @return the ociSubnetId value.
+     */
+    public String ociSubnetId() {
+        return this.ociSubnetId;
+    }
+
+    /**
+     * Get the ociBackupCidrBlock property: OCI backup subnet cidr block.
+     * 
+     * @return the ociBackupCidrBlock value.
+     */
+    public String ociBackupCidrBlock() {
+        return this.ociBackupCidrBlock;
+    }
+
+    /**
+     * Set the ociBackupCidrBlock property: OCI backup subnet cidr block.
+     * 
+     * @param ociBackupCidrBlock the ociBackupCidrBlock value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withOciBackupCidrBlock(String ociBackupCidrBlock) {
+        this.ociBackupCidrBlock = ociBackupCidrBlock;
+        return this;
+    }
+
+    /**
+     * Get the isOracleToAzureDnsZoneSyncEnabled property: Indicates whether DNS zone sync from OCI to Azure is enabled.
+     * 
+     * @return the isOracleToAzureDnsZoneSyncEnabled value.
+     */
+    public Boolean isOracleToAzureDnsZoneSyncEnabled() {
+        return this.isOracleToAzureDnsZoneSyncEnabled;
+    }
+
+    /**
+     * Set the isOracleToAzureDnsZoneSyncEnabled property: Indicates whether DNS zone sync from OCI to Azure is enabled.
+     * 
+     * @param isOracleToAzureDnsZoneSyncEnabled the isOracleToAzureDnsZoneSyncEnabled value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withIsOracleToAzureDnsZoneSyncEnabled(Boolean isOracleToAzureDnsZoneSyncEnabled) {
+        this.isOracleToAzureDnsZoneSyncEnabled = isOracleToAzureDnsZoneSyncEnabled;
+        return this;
+    }
+
+    /**
+     * Get the isOracleDnsListeningEndpointEnabled property: Indicates whether the Oracle DNS listening endpoint is
+     * enabled.
+     * 
+     * @return the isOracleDnsListeningEndpointEnabled value.
+     */
+    public Boolean isOracleDnsListeningEndpointEnabled() {
+        return this.isOracleDnsListeningEndpointEnabled;
+    }
+
+    /**
+     * Set the isOracleDnsListeningEndpointEnabled property: Indicates whether the Oracle DNS listening endpoint is
+     * enabled.
+     * 
+     * @param isOracleDnsListeningEndpointEnabled the isOracleDnsListeningEndpointEnabled value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties
+        withIsOracleDnsListeningEndpointEnabled(Boolean isOracleDnsListeningEndpointEnabled) {
+        this.isOracleDnsListeningEndpointEnabled = isOracleDnsListeningEndpointEnabled;
+        return this;
+    }
+
+    /**
+     * Get the isOracleDnsForwardingEndpointEnabled property: Indicates whether the Oracle DNS forwarding endpoint is
+     * enabled.
+     * 
+     * @return the isOracleDnsForwardingEndpointEnabled value.
+     */
+    public Boolean isOracleDnsForwardingEndpointEnabled() {
+        return this.isOracleDnsForwardingEndpointEnabled;
+    }
+
+    /**
+     * Set the isOracleDnsForwardingEndpointEnabled property: Indicates whether the Oracle DNS forwarding endpoint is
+     * enabled.
+     * 
+     * @param isOracleDnsForwardingEndpointEnabled the isOracleDnsForwardingEndpointEnabled value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties
+        withIsOracleDnsForwardingEndpointEnabled(Boolean isOracleDnsForwardingEndpointEnabled) {
+        this.isOracleDnsForwardingEndpointEnabled = isOracleDnsForwardingEndpointEnabled;
+        return this;
+    }
+
+    /**
+     * Get the dnsForwardingRules property: DNS forwarding rules.
+     * 
+     * @return the dnsForwardingRules value.
+     */
+    public List<DnsForwardingRule> dnsForwardingRules() {
+        return this.dnsForwardingRules;
+    }
+
+    /**
+     * Set the dnsForwardingRules property: DNS forwarding rules.
+     * 
+     * @param dnsForwardingRules the dnsForwardingRules value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withDnsForwardingRules(List<DnsForwardingRule> dnsForwardingRules) {
+        this.dnsForwardingRules = dnsForwardingRules;
+        return this;
+    }
+
+    /**
+     * Get the dnsListeningEndpointAllowedCidrs property: Comma-separated list of CIDRs that are allowed to send
+     * requests to the DNS listening endpoint.
+     * 
+     * @return the dnsListeningEndpointAllowedCidrs value.
+     */
+    public String dnsListeningEndpointAllowedCidrs() {
+        return this.dnsListeningEndpointAllowedCidrs;
+    }
+
+    /**
+     * Set the dnsListeningEndpointAllowedCidrs property: Comma-separated list of CIDRs that are allowed to send
+     * requests to the DNS listening endpoint.
+     * 
+     * @param dnsListeningEndpointAllowedCidrs the dnsListeningEndpointAllowedCidrs value to set.
+     * @return the NetworkAnchorProperties object itself.
+     */
+    public NetworkAnchorProperties withDnsListeningEndpointAllowedCidrs(String dnsListeningEndpointAllowedCidrs) {
+        this.dnsListeningEndpointAllowedCidrs = dnsListeningEndpointAllowedCidrs;
+        return this;
+    }
+
+    /**
+     * Get the dnsListeningEndpointIpAddress property: DNS listening endpoint IP address.
+     * 
+     * @return the dnsListeningEndpointIpAddress value.
+     */
+    public String dnsListeningEndpointIpAddress() {
+        return this.dnsListeningEndpointIpAddress;
+    }
+
+    /**
+     * Get the dnsForwardingEndpointIpAddress property: DNS forwarding endpoint IP address.
+     * 
+     * @return the dnsForwardingEndpointIpAddress value.
+     */
+    public String dnsForwardingEndpointIpAddress() {
+        return this.dnsForwardingEndpointIpAddress;
+    }
+
+    /**
+     * Get the dnsForwardingRulesUrl property: Deep link to OCI console DNS Forwarding rules page.
+     * 
+     * @return the dnsForwardingRulesUrl value.
+     */
+    public String dnsForwardingRulesUrl() {
+        return this.dnsForwardingRulesUrl;
+    }
+
+    /**
+     * Get the dnsListeningEndpointNsgRulesUrl property: Deep link to OCI console DNS Listening endpoint NSG rules.
+     * 
+     * @return the dnsListeningEndpointNsgRulesUrl value.
+     */
+    public String dnsListeningEndpointNsgRulesUrl() {
+        return this.dnsListeningEndpointNsgRulesUrl;
+    }
+
+    /**
+     * Get the dnsForwardingEndpointNsgRulesUrl property: Deep link to OCI console DNS Forwarding endpoint NSG rules.
+     * 
+     * @return the dnsForwardingEndpointNsgRulesUrl value.
+     */
+    public String dnsForwardingEndpointNsgRulesUrl() {
+        return this.dnsForwardingEndpointNsgRulesUrl;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("resourceAnchorId", this.resourceAnchorId);
+        jsonWriter.writeStringField("subnetId", this.subnetId);
+        jsonWriter.writeStringField("ociVcnDnsLabel", this.ociVcnDnsLabel);
+        jsonWriter.writeStringField("ociBackupCidrBlock", this.ociBackupCidrBlock);
+        jsonWriter.writeBooleanField("isOracleToAzureDnsZoneSyncEnabled", this.isOracleToAzureDnsZoneSyncEnabled);
+        jsonWriter.writeBooleanField("isOracleDnsListeningEndpointEnabled", this.isOracleDnsListeningEndpointEnabled);
+        jsonWriter.writeBooleanField("isOracleDnsForwardingEndpointEnabled", this.isOracleDnsForwardingEndpointEnabled);
+        jsonWriter.writeArrayField("dnsForwardingRules", this.dnsForwardingRules,
+            (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeStringField("dnsListeningEndpointAllowedCidrs", this.dnsListeningEndpointAllowedCidrs);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkAnchorProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkAnchorProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
+     * @throws IOException If an error occurs while reading the NetworkAnchorProperties.
+     */
+    public static NetworkAnchorProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkAnchorProperties deserializedNetworkAnchorProperties = new NetworkAnchorProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("resourceAnchorId".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.resourceAnchorId = reader.getString();
+                } else if ("subnetId".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.subnetId = reader.getString();
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.provisioningState
+                        = AzureResourceProvisioningState.fromString(reader.getString());
+                } else if ("vnetId".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.vnetId = reader.getString();
+                } else if ("cidrBlock".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.cidrBlock = reader.getString();
+                } else if ("ociVcnId".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.ociVcnId = reader.getString();
+                } else if ("ociVcnDnsLabel".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.ociVcnDnsLabel = reader.getString();
+                } else if ("ociSubnetId".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.ociSubnetId = reader.getString();
+                } else if ("ociBackupCidrBlock".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.ociBackupCidrBlock = reader.getString();
+                } else if ("isOracleToAzureDnsZoneSyncEnabled".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.isOracleToAzureDnsZoneSyncEnabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isOracleDnsListeningEndpointEnabled".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.isOracleDnsListeningEndpointEnabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isOracleDnsForwardingEndpointEnabled".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.isOracleDnsForwardingEndpointEnabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("dnsForwardingRules".equals(fieldName)) {
+                    List<DnsForwardingRule> dnsForwardingRules
+                        = reader.readArray(reader1 -> DnsForwardingRule.fromJson(reader1));
+                    deserializedNetworkAnchorProperties.dnsForwardingRules = dnsForwardingRules;
+                } else if ("dnsListeningEndpointAllowedCidrs".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.dnsListeningEndpointAllowedCidrs = reader.getString();
+                } else if ("dnsListeningEndpointIpAddress".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.dnsListeningEndpointIpAddress = reader.getString();
+                } else if ("dnsForwardingEndpointIpAddress".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.dnsForwardingEndpointIpAddress = reader.getString();
+                } else if ("dnsForwardingRulesUrl".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.dnsForwardingRulesUrl = reader.getString();
+                } else if ("dnsListeningEndpointNsgRulesUrl".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.dnsListeningEndpointNsgRulesUrl = reader.getString();
+                } else if ("dnsForwardingEndpointNsgRulesUrl".equals(fieldName)) {
+                    deserializedNetworkAnchorProperties.dnsForwardingEndpointNsgRulesUrl = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkAnchorProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdate.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdate.java
new file mode 100644
index 000000000000..52b9da71932a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdate.java
@@ -0,0 +1,145 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The type used for update operations of the NetworkAnchor.
+ */
+@Fluent
+public final class NetworkAnchorUpdate implements JsonSerializable<NetworkAnchorUpdate> {
+    /*
+     * The availability zones.
+     */
+    private List<String> zones;
+
+    /*
+     * Resource tags.
+     */
+    private Map<String, String> tags;
+
+    /*
+     * The resource-specific properties for this resource.
+     */
+    private NetworkAnchorUpdateProperties properties;
+
+    /**
+     * Creates an instance of NetworkAnchorUpdate class.
+     */
+    public NetworkAnchorUpdate() {
+    }
+
+    /**
+     * Get the zones property: The availability zones.
+     * 
+     * @return the zones value.
+     */
+    public List<String> zones() {
+        return this.zones;
+    }
+
+    /**
+     * Set the zones property: The availability zones.
+     * 
+     * @param zones the zones value to set.
+     * @return the NetworkAnchorUpdate object itself.
+     */
+    public NetworkAnchorUpdate withZones(List<String> zones) {
+        this.zones = zones;
+        return this;
+    }
+
+    /**
+     * Get the tags property: Resource tags.
+     * 
+     * @return the tags value.
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: Resource tags.
+     * 
+     * @param tags the tags value to set.
+     * @return the NetworkAnchorUpdate object itself.
+     */
+    public NetworkAnchorUpdate withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * Get the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    public NetworkAnchorUpdateProperties properties() {
+        return this.properties;
+    }
+
+    /**
+     * Set the properties property: The resource-specific properties for this resource.
+     * 
+     * @param properties the properties value to set.
+     * @return the NetworkAnchorUpdate object itself.
+     */
+    public NetworkAnchorUpdate withProperties(NetworkAnchorUpdateProperties properties) {
+        this.properties = properties;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeArrayField("zones", this.zones, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
+        jsonWriter.writeJsonField("properties", this.properties);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkAnchorUpdate from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkAnchorUpdate if the JsonReader was pointing to an instance of it, or null if it was
+     * pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NetworkAnchorUpdate.
+     */
+    public static NetworkAnchorUpdate fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkAnchorUpdate deserializedNetworkAnchorUpdate = new NetworkAnchorUpdate();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("zones".equals(fieldName)) {
+                    List<String> zones = reader.readArray(reader1 -> reader1.getString());
+                    deserializedNetworkAnchorUpdate.zones = zones;
+                } else if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedNetworkAnchorUpdate.tags = tags;
+                } else if ("properties".equals(fieldName)) {
+                    deserializedNetworkAnchorUpdate.properties = NetworkAnchorUpdateProperties.fromJson(reader);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkAnchorUpdate;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdateProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdateProperties.java
new file mode 100644
index 000000000000..07fc2e041983
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdateProperties.java
@@ -0,0 +1,180 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * The updatable properties of the NetworkAnchor.
+ */
+@Fluent
+public final class NetworkAnchorUpdateProperties implements JsonSerializable<NetworkAnchorUpdateProperties> {
+    /*
+     * OCI backup subnet cidr block.
+     */
+    private String ociBackupCidrBlock;
+
+    /*
+     * Indicates whether DNS zone sync from OCI to Azure is enabled
+     */
+    private Boolean isOracleToAzureDnsZoneSyncEnabled;
+
+    /*
+     * Indicates whether the Oracle DNS listening endpoint is enabled
+     */
+    private Boolean isOracleDnsListeningEndpointEnabled;
+
+    /*
+     * Indicates whether the Oracle DNS forwarding endpoint is enabled
+     */
+    private Boolean isOracleDnsForwardingEndpointEnabled;
+
+    /**
+     * Creates an instance of NetworkAnchorUpdateProperties class.
+     */
+    public NetworkAnchorUpdateProperties() {
+    }
+
+    /**
+     * Get the ociBackupCidrBlock property: OCI backup subnet cidr block.
+     * 
+     * @return the ociBackupCidrBlock value.
+     */
+    public String ociBackupCidrBlock() {
+        return this.ociBackupCidrBlock;
+    }
+
+    /**
+     * Set the ociBackupCidrBlock property: OCI backup subnet cidr block.
+     * 
+     * @param ociBackupCidrBlock the ociBackupCidrBlock value to set.
+     * @return the NetworkAnchorUpdateProperties object itself.
+     */
+    public NetworkAnchorUpdateProperties withOciBackupCidrBlock(String ociBackupCidrBlock) {
+        this.ociBackupCidrBlock = ociBackupCidrBlock;
+        return this;
+    }
+
+    /**
+     * Get the isOracleToAzureDnsZoneSyncEnabled property: Indicates whether DNS zone sync from OCI to Azure is enabled.
+     * 
+     * @return the isOracleToAzureDnsZoneSyncEnabled value.
+     */
+    public Boolean isOracleToAzureDnsZoneSyncEnabled() {
+        return this.isOracleToAzureDnsZoneSyncEnabled;
+    }
+
+    /**
+     * Set the isOracleToAzureDnsZoneSyncEnabled property: Indicates whether DNS zone sync from OCI to Azure is enabled.
+     * 
+     * @param isOracleToAzureDnsZoneSyncEnabled the isOracleToAzureDnsZoneSyncEnabled value to set.
+     * @return the NetworkAnchorUpdateProperties object itself.
+     */
+    public NetworkAnchorUpdateProperties
+        withIsOracleToAzureDnsZoneSyncEnabled(Boolean isOracleToAzureDnsZoneSyncEnabled) {
+        this.isOracleToAzureDnsZoneSyncEnabled = isOracleToAzureDnsZoneSyncEnabled;
+        return this;
+    }
+
+    /**
+     * Get the isOracleDnsListeningEndpointEnabled property: Indicates whether the Oracle DNS listening endpoint is
+     * enabled.
+     * 
+     * @return the isOracleDnsListeningEndpointEnabled value.
+     */
+    public Boolean isOracleDnsListeningEndpointEnabled() {
+        return this.isOracleDnsListeningEndpointEnabled;
+    }
+
+    /**
+     * Set the isOracleDnsListeningEndpointEnabled property: Indicates whether the Oracle DNS listening endpoint is
+     * enabled.
+     * 
+     * @param isOracleDnsListeningEndpointEnabled the isOracleDnsListeningEndpointEnabled value to set.
+     * @return the NetworkAnchorUpdateProperties object itself.
+     */
+    public NetworkAnchorUpdateProperties
+        withIsOracleDnsListeningEndpointEnabled(Boolean isOracleDnsListeningEndpointEnabled) {
+        this.isOracleDnsListeningEndpointEnabled = isOracleDnsListeningEndpointEnabled;
+        return this;
+    }
+
+    /**
+     * Get the isOracleDnsForwardingEndpointEnabled property: Indicates whether the Oracle DNS forwarding endpoint is
+     * enabled.
+     * 
+     * @return the isOracleDnsForwardingEndpointEnabled value.
+     */
+    public Boolean isOracleDnsForwardingEndpointEnabled() {
+        return this.isOracleDnsForwardingEndpointEnabled;
+    }
+
+    /**
+     * Set the isOracleDnsForwardingEndpointEnabled property: Indicates whether the Oracle DNS forwarding endpoint is
+     * enabled.
+     * 
+     * @param isOracleDnsForwardingEndpointEnabled the isOracleDnsForwardingEndpointEnabled value to set.
+     * @return the NetworkAnchorUpdateProperties object itself.
+     */
+    public NetworkAnchorUpdateProperties
+        withIsOracleDnsForwardingEndpointEnabled(Boolean isOracleDnsForwardingEndpointEnabled) {
+        this.isOracleDnsForwardingEndpointEnabled = isOracleDnsForwardingEndpointEnabled;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("ociBackupCidrBlock", this.ociBackupCidrBlock);
+        jsonWriter.writeBooleanField("isOracleToAzureDnsZoneSyncEnabled", this.isOracleToAzureDnsZoneSyncEnabled);
+        jsonWriter.writeBooleanField("isOracleDnsListeningEndpointEnabled", this.isOracleDnsListeningEndpointEnabled);
+        jsonWriter.writeBooleanField("isOracleDnsForwardingEndpointEnabled", this.isOracleDnsForwardingEndpointEnabled);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of NetworkAnchorUpdateProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of NetworkAnchorUpdateProperties if the JsonReader was pointing to an instance of it, or null
+     * if it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the NetworkAnchorUpdateProperties.
+     */
+    public static NetworkAnchorUpdateProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            NetworkAnchorUpdateProperties deserializedNetworkAnchorUpdateProperties
+                = new NetworkAnchorUpdateProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("ociBackupCidrBlock".equals(fieldName)) {
+                    deserializedNetworkAnchorUpdateProperties.ociBackupCidrBlock = reader.getString();
+                } else if ("isOracleToAzureDnsZoneSyncEnabled".equals(fieldName)) {
+                    deserializedNetworkAnchorUpdateProperties.isOracleToAzureDnsZoneSyncEnabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isOracleDnsListeningEndpointEnabled".equals(fieldName)) {
+                    deserializedNetworkAnchorUpdateProperties.isOracleDnsListeningEndpointEnabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else if ("isOracleDnsForwardingEndpointEnabled".equals(fieldName)) {
+                    deserializedNetworkAnchorUpdateProperties.isOracleDnsForwardingEndpointEnabled
+                        = reader.getNullable(JsonReader::getBoolean);
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedNetworkAnchorUpdateProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchors.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchors.java
new file mode 100644
index 000000000000..57d62b0e28e2
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchors.java
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/**
+ * Resource collection API of NetworkAnchors.
+ */
+public interface NetworkAnchors {
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<NetworkAnchor> list();
+
+    /**
+     * List NetworkAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<NetworkAnchor> list(Context context);
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor along with {@link Response}.
+     */
+    Response<NetworkAnchor> getByResourceGroupWithResponse(String resourceGroupName, String networkAnchorName,
+        Context context);
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor.
+     */
+    NetworkAnchor getByResourceGroup(String resourceGroupName, String networkAnchorName);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByResourceGroup(String resourceGroupName, String networkAnchorName);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param networkAnchorName The name of the NetworkAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String networkAnchorName, Context context);
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<NetworkAnchor> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * List NetworkAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a NetworkAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<NetworkAnchor> listByResourceGroup(String resourceGroupName, Context context);
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor along with {@link Response}.
+     */
+    NetworkAnchor getById(String id);
+
+    /**
+     * Get a NetworkAnchor.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a NetworkAnchor along with {@link Response}.
+     */
+    Response<NetworkAnchor> getByIdWithResponse(String id, Context context);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteById(String id);
+
+    /**
+     * Delete a NetworkAnchor.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByIdWithResponse(String id, Context context);
+
+    /**
+     * Begins definition for a new NetworkAnchor resource.
+     * 
+     * @param name resource name.
+     * @return the first stage of the new NetworkAnchor definition.
+     */
+    NetworkAnchor.DefinitionStages.Blank define(String name);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchor.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchor.java
new file mode 100644
index 000000000000..96cee30fa668
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchor.java
@@ -0,0 +1,252 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.management.Region;
+import com.azure.core.management.SystemData;
+import com.azure.core.util.Context;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import java.util.Map;
+
+/**
+ * An immutable client-side representation of ResourceAnchor.
+ */
+public interface ResourceAnchor {
+    /**
+     * Gets the id property: Fully qualified resource Id for the resource.
+     * 
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * Gets the name property: The name of the resource.
+     * 
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * Gets the type property: The type of the resource.
+     * 
+     * @return the type value.
+     */
+    String type();
+
+    /**
+     * Gets the location property: The geo-location where the resource lives.
+     * 
+     * @return the location value.
+     */
+    String location();
+
+    /**
+     * Gets the tags property: Resource tags.
+     * 
+     * @return the tags value.
+     */
+    Map<String, String> tags();
+
+    /**
+     * Gets the properties property: The resource-specific properties for this resource.
+     * 
+     * @return the properties value.
+     */
+    ResourceAnchorProperties properties();
+
+    /**
+     * Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
+     * 
+     * @return the systemData value.
+     */
+    SystemData systemData();
+
+    /**
+     * Gets the region of the resource.
+     * 
+     * @return the region of the resource.
+     */
+    Region region();
+
+    /**
+     * Gets the name of the resource region.
+     * 
+     * @return the name of the resource region.
+     */
+    String regionName();
+
+    /**
+     * Gets the name of the resource group.
+     * 
+     * @return the name of the resource group.
+     */
+    String resourceGroupName();
+
+    /**
+     * Gets the inner com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner object.
+     * 
+     * @return the inner object.
+     */
+    ResourceAnchorInner innerModel();
+
+    /**
+     * The entirety of the ResourceAnchor definition.
+     */
+    interface Definition extends DefinitionStages.Blank, DefinitionStages.WithLocation,
+        DefinitionStages.WithResourceGroup, DefinitionStages.WithCreate {
+    }
+
+    /**
+     * The ResourceAnchor definition stages.
+     */
+    interface DefinitionStages {
+        /**
+         * The first stage of the ResourceAnchor definition.
+         */
+        interface Blank extends WithLocation {
+        }
+
+        /**
+         * The stage of the ResourceAnchor definition allowing to specify location.
+         */
+        interface WithLocation {
+            /**
+             * Specifies the region for the resource.
+             * 
+             * @param location The geo-location where the resource lives.
+             * @return the next definition stage.
+             */
+            WithResourceGroup withRegion(Region location);
+
+            /**
+             * Specifies the region for the resource.
+             * 
+             * @param location The geo-location where the resource lives.
+             * @return the next definition stage.
+             */
+            WithResourceGroup withRegion(String location);
+        }
+
+        /**
+         * The stage of the ResourceAnchor definition allowing to specify parent resource.
+         */
+        interface WithResourceGroup {
+            /**
+             * Specifies resourceGroupName.
+             * 
+             * @param resourceGroupName The name of the resource group. The name is case insensitive.
+             * @return the next definition stage.
+             */
+            WithCreate withExistingResourceGroup(String resourceGroupName);
+        }
+
+        /**
+         * The stage of the ResourceAnchor definition which contains all the minimum required properties for the
+         * resource to be created, but also allows for any other optional properties to be specified.
+         */
+        interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithProperties {
+            /**
+             * Executes the create request.
+             * 
+             * @return the created resource.
+             */
+            ResourceAnchor create();
+
+            /**
+             * Executes the create request.
+             * 
+             * @param context The context to associate with this operation.
+             * @return the created resource.
+             */
+            ResourceAnchor create(Context context);
+        }
+
+        /**
+         * The stage of the ResourceAnchor definition allowing to specify tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies the tags property: Resource tags..
+             * 
+             * @param tags Resource tags.
+             * @return the next definition stage.
+             */
+            WithCreate withTags(Map<String, String> tags);
+        }
+
+        /**
+         * The stage of the ResourceAnchor definition allowing to specify properties.
+         */
+        interface WithProperties {
+            /**
+             * Specifies the properties property: The resource-specific properties for this resource..
+             * 
+             * @param properties The resource-specific properties for this resource.
+             * @return the next definition stage.
+             */
+            WithCreate withProperties(ResourceAnchorProperties properties);
+        }
+    }
+
+    /**
+     * Begins update for the ResourceAnchor resource.
+     * 
+     * @return the stage of resource update.
+     */
+    ResourceAnchor.Update update();
+
+    /**
+     * The template for ResourceAnchor update.
+     */
+    interface Update extends UpdateStages.WithTags {
+        /**
+         * Executes the update request.
+         * 
+         * @return the updated resource.
+         */
+        ResourceAnchor apply();
+
+        /**
+         * Executes the update request.
+         * 
+         * @param context The context to associate with this operation.
+         * @return the updated resource.
+         */
+        ResourceAnchor apply(Context context);
+    }
+
+    /**
+     * The ResourceAnchor update stages.
+     */
+    interface UpdateStages {
+        /**
+         * The stage of the ResourceAnchor update allowing to specify tags.
+         */
+        interface WithTags {
+            /**
+             * Specifies the tags property: Resource tags..
+             * 
+             * @param tags Resource tags.
+             * @return the next definition stage.
+             */
+            Update withTags(Map<String, String> tags);
+        }
+    }
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @return the refreshed resource.
+     */
+    ResourceAnchor refresh();
+
+    /**
+     * Refreshes the resource to sync with Azure.
+     * 
+     * @param context The context to associate with this operation.
+     * @return the refreshed resource.
+     */
+    ResourceAnchor refresh(Context context);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorProperties.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorProperties.java
new file mode 100644
index 000000000000..4148e558ec51
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorProperties.java
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Immutable;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+
+/**
+ * Resource Anchor properties.
+ */
+@Immutable
+public final class ResourceAnchorProperties implements JsonSerializable<ResourceAnchorProperties> {
+    /*
+     * ResourceAnchor provisioning state
+     */
+    private AzureResourceProvisioningState provisioningState;
+
+    /*
+     * Oracle Cloud Infrastructure compartment Id (ocid) which was created or linked by customer with resource anchor.
+     * This compartmentId is different from where resource Anchor lives
+     */
+    private String linkedCompartmentId;
+
+    /**
+     * Creates an instance of ResourceAnchorProperties class.
+     */
+    public ResourceAnchorProperties() {
+    }
+
+    /**
+     * Get the provisioningState property: ResourceAnchor provisioning state.
+     * 
+     * @return the provisioningState value.
+     */
+    public AzureResourceProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the linkedCompartmentId property: Oracle Cloud Infrastructure compartment Id (ocid) which was created or
+     * linked by customer with resource anchor. This compartmentId is different from where resource Anchor lives.
+     * 
+     * @return the linkedCompartmentId value.
+     */
+    public String linkedCompartmentId() {
+        return this.linkedCompartmentId;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ResourceAnchorProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ResourceAnchorProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ResourceAnchorProperties.
+     */
+    public static ResourceAnchorProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ResourceAnchorProperties deserializedResourceAnchorProperties = new ResourceAnchorProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("provisioningState".equals(fieldName)) {
+                    deserializedResourceAnchorProperties.provisioningState
+                        = AzureResourceProvisioningState.fromString(reader.getString());
+                } else if ("linkedCompartmentId".equals(fieldName)) {
+                    deserializedResourceAnchorProperties.linkedCompartmentId = reader.getString();
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedResourceAnchorProperties;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorUpdate.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorUpdate.java
new file mode 100644
index 000000000000..257b91c51787
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorUpdate.java
@@ -0,0 +1,87 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import java.io.IOException;
+import java.util.Map;
+
+/**
+ * The type used for update operations of the ResourceAnchor.
+ */
+@Fluent
+public final class ResourceAnchorUpdate implements JsonSerializable<ResourceAnchorUpdate> {
+    /*
+     * Resource tags.
+     */
+    private Map<String, String> tags;
+
+    /**
+     * Creates an instance of ResourceAnchorUpdate class.
+     */
+    public ResourceAnchorUpdate() {
+    }
+
+    /**
+     * Get the tags property: Resource tags.
+     * 
+     * @return the tags value.
+     */
+    public Map<String, String> tags() {
+        return this.tags;
+    }
+
+    /**
+     * Set the tags property: Resource tags.
+     * 
+     * @param tags the tags value to set.
+     * @return the ResourceAnchorUpdate object itself.
+     */
+    public ResourceAnchorUpdate withTags(Map<String, String> tags) {
+        this.tags = tags;
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeMapField("tags", this.tags, (writer, element) -> writer.writeString(element));
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ResourceAnchorUpdate from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ResourceAnchorUpdate if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ResourceAnchorUpdate.
+     */
+    public static ResourceAnchorUpdate fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ResourceAnchorUpdate deserializedResourceAnchorUpdate = new ResourceAnchorUpdate();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("tags".equals(fieldName)) {
+                    Map<String, String> tags = reader.readMap(reader1 -> reader1.getString());
+                    deserializedResourceAnchorUpdate.tags = tags;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedResourceAnchorUpdate;
+        });
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchors.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchors.java
new file mode 100644
index 000000000000..b6e6f3f7da09
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchors.java
@@ -0,0 +1,158 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.http.rest.Response;
+import com.azure.core.util.Context;
+
+/**
+ * Resource collection API of ResourceAnchors.
+ */
+public interface ResourceAnchors {
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<ResourceAnchor> list();
+
+    /**
+     * List ResourceAnchor resources by subscription ID.
+     * 
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<ResourceAnchor> list(Context context);
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor along with {@link Response}.
+     */
+    Response<ResourceAnchor> getByResourceGroupWithResponse(String resourceGroupName, String resourceAnchorName,
+        Context context);
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor.
+     */
+    ResourceAnchor getByResourceGroup(String resourceGroupName, String resourceAnchorName);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByResourceGroup(String resourceGroupName, String resourceAnchorName);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceAnchorName The name of the ResourceAnchor.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void delete(String resourceGroupName, String resourceAnchorName, Context context);
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<ResourceAnchor> listByResourceGroup(String resourceGroupName);
+
+    /**
+     * List ResourceAnchor resources by resource group.
+     * 
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a ResourceAnchor list operation as paginated response with {@link PagedIterable}.
+     */
+    PagedIterable<ResourceAnchor> listByResourceGroup(String resourceGroupName, Context context);
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor along with {@link Response}.
+     */
+    ResourceAnchor getById(String id);
+
+    /**
+     * Get a ResourceAnchor.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a ResourceAnchor along with {@link Response}.
+     */
+    Response<ResourceAnchor> getByIdWithResponse(String id, Context context);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param id the resource ID.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteById(String id);
+
+    /**
+     * Delete a ResourceAnchor.
+     * 
+     * @param id the resource ID.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    void deleteByIdWithResponse(String id, Context context);
+
+    /**
+     * Begins definition for a new ResourceAnchor resource.
+     * 
+     * @param name resource name.
+     * @return the first stage of the new ResourceAnchor definition.
+     */
+    ResourceAnchor.DefinitionStages.Blank define(String name);
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeAttribute.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeAttribute.java
new file mode 100644
index 000000000000..fc2222fb4512
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeAttribute.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * The type of Exascale storage used for Exadata VM cluster. The default is SMART_STORAGE which supports Oracle Database
+ * 23ai and later.
+ */
+public final class ShapeAttribute extends ExpandableStringEnum<ShapeAttribute> {
+    /**
+     * Smart storage.
+     */
+    public static final ShapeAttribute SMART_STORAGE = fromString("SMART_STORAGE");
+
+    /**
+     * block storage.
+     */
+    public static final ShapeAttribute BLOCK_STORAGE = fromString("BLOCK_STORAGE");
+
+    /**
+     * Creates a new instance of ShapeAttribute value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ShapeAttribute() {
+    }
+
+    /**
+     * Creates or finds a ShapeAttribute from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ShapeAttribute.
+     */
+    public static ShapeAttribute fromString(String name) {
+        return fromString(name, ShapeAttribute.class);
+    }
+
+    /**
+     * Gets known ShapeAttribute values.
+     * 
+     * @return known ShapeAttribute values.
+     */
+    public static Collection<ShapeAttribute> values() {
+        return values(ShapeAttribute.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeFamilyType.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeFamilyType.java
new file mode 100644
index 000000000000..c327d999b049
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeFamilyType.java
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Allowed values for shape family.
+ */
+public final class ShapeFamilyType extends ExpandableStringEnum<ShapeFamilyType> {
+    /**
+     * Family value for Exadata Shape.
+     */
+    public static final ShapeFamilyType EXADATA = fromString("EXADATA");
+
+    /**
+     * Family value for Exadb XS Shape.
+     */
+    public static final ShapeFamilyType EXADB_XS = fromString("EXADB_XS");
+
+    /**
+     * Family value for Single Node Shape.
+     */
+    public static final ShapeFamilyType SINGLE_NODE = fromString("SINGLENODE");
+
+    /**
+     * Family value for Virtual Machine Shape.
+     */
+    public static final ShapeFamilyType VIRTUAL_MACHINE = fromString("VIRTUALMACHINE");
+
+    /**
+     * Creates a new instance of ShapeFamilyType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public ShapeFamilyType() {
+    }
+
+    /**
+     * Creates or finds a ShapeFamilyType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding ShapeFamilyType.
+     */
+    public static ShapeFamilyType fromString(String name) {
+        return fromString(name, ShapeFamilyType.class);
+    }
+
+    /**
+     * Gets known ShapeFamilyType values.
+     * 
+     * @return known ShapeFamilyType values.
+     */
+    public static Collection<ShapeFamilyType> values() {
+        return values(ShapeFamilyType.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageManagementType.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageManagementType.java
new file mode 100644
index 000000000000..0c4ce768982a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageManagementType.java
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Storage Management type enum.
+ */
+public final class StorageManagementType extends ExpandableStringEnum<StorageManagementType> {
+    /**
+     * Logical Volume management.
+     */
+    public static final StorageManagementType LVM = fromString("LVM");
+
+    /**
+     * Creates a new instance of StorageManagementType value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public StorageManagementType() {
+    }
+
+    /**
+     * Creates or finds a StorageManagementType from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding StorageManagementType.
+     */
+    public static StorageManagementType fromString(String name) {
+        return fromString(name, StorageManagementType.class);
+    }
+
+    /**
+     * Gets known StorageManagementType values.
+     * 
+     * @return known StorageManagementType values.
+     */
+    public static Collection<StorageManagementType> values() {
+        return values(StorageManagementType.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageVolumePerformanceMode.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageVolumePerformanceMode.java
new file mode 100644
index 000000000000..78e6f8a4b841
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageVolumePerformanceMode.java
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Storage volume performance mode.
+ */
+public final class StorageVolumePerformanceMode extends ExpandableStringEnum<StorageVolumePerformanceMode> {
+    /**
+     * With this option, you are purchasing 10 VPUs per GB/month. For more information, including specific throughput
+     * and IOPS performance numbers for various volume sizes.
+     */
+    public static final StorageVolumePerformanceMode BALANCED = fromString("Balanced");
+
+    /**
+     * With this option, you are purchasing 20 VPUs per GB/month. For more information, including specific throughput
+     * and IOPS performance numbers for various volume sizes.
+     */
+    public static final StorageVolumePerformanceMode HIGH_PERFORMANCE = fromString("HighPerformance");
+
+    /**
+     * Creates a new instance of StorageVolumePerformanceMode value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public StorageVolumePerformanceMode() {
+    }
+
+    /**
+     * Creates or finds a StorageVolumePerformanceMode from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding StorageVolumePerformanceMode.
+     */
+    public static StorageVolumePerformanceMode fromString(String name) {
+        return fromString(name, StorageVolumePerformanceMode.class);
+    }
+
+    /**
+     * Gets known StorageVolumePerformanceMode values.
+     * 
+     * @return known StorageVolumePerformanceMode values.
+     */
+    public static Collection<StorageVolumePerformanceMode> values() {
+        return values(StorageVolumePerformanceMode.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_apiview_properties.json b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_apiview_properties.json
index 9b5f7105f9e2..ab36f434bc3c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_apiview_properties.json
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_apiview_properties.json
@@ -24,6 +24,8 @@
     "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.getWithResponse": "Oracle.Database.AutonomousDatabaseVersions.get",
     "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.listByLocation": "Oracle.Database.AutonomousDatabaseVersions.listByLocation",
     "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient": "Oracle.Database.AutonomousDatabases",
+    "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.action": "Oracle.Database.AutonomousDatabases.action",
+    "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginAction": "Oracle.Database.AutonomousDatabases.action",
     "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginChangeDisasterRecoveryConfiguration": "Oracle.Database.AutonomousDatabases.changeDisasterRecoveryConfiguration",
     "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginCreateOrUpdate": "Azure.ResourceManager.AutonomousDatabases.createOrUpdate",
     "com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginDelete": "Azure.ResourceManager.AutonomousDatabases.delete",
@@ -49,9 +51,11 @@
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient": "Oracle.Database.CloudExadataInfrastructures",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.addStorageCapacity": "Oracle.Database.CloudExadataInfrastructures.addStorageCapacity",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginAddStorageCapacity": "Oracle.Database.CloudExadataInfrastructures.addStorageCapacity",
+    "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginConfigureExascale": "Oracle.Database.CloudExadataInfrastructures.configureExascale",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginCreateOrUpdate": "Azure.ResourceManager.CloudExadataInfrastructures.createOrUpdate",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginDelete": "Azure.ResourceManager.CloudExadataInfrastructures.delete",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginUpdate": "Azure.ResourceManager.CloudExadataInfrastructures.update",
+    "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.configureExascale": "Oracle.Database.CloudExadataInfrastructures.configureExascale",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.createOrUpdate": "Azure.ResourceManager.CloudExadataInfrastructures.createOrUpdate",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.delete": "Azure.ResourceManager.CloudExadataInfrastructures.delete",
     "com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.getByResourceGroup": "Azure.ResourceManager.CloudExadataInfrastructures.get",
@@ -90,6 +94,21 @@
     "com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.get": "Oracle.Database.DbSystemShapes.get",
     "com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.getWithResponse": "Oracle.Database.DbSystemShapes.get",
     "com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.listByLocation": "Oracle.Database.DbSystemShapes.listByLocation",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient": "Oracle.Database.DbSystems",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.beginCreateOrUpdate": "Azure.ResourceManager.DbSystems.createOrUpdate",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.beginDelete": "Azure.ResourceManager.DbSystems.delete",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.beginUpdate": "Azure.ResourceManager.DbSystems.update",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.createOrUpdate": "Azure.ResourceManager.DbSystems.createOrUpdate",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.delete": "Azure.ResourceManager.DbSystems.delete",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.getByResourceGroup": "Azure.ResourceManager.DbSystems.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.DbSystems.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.list": "Azure.ResourceManager.DbSystems.listBySubscription",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.listByResourceGroup": "Oracle.Database.DbSystems.listByResourceGroup",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.update": "Azure.ResourceManager.DbSystems.update",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient": "Oracle.Database.DbVersions",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient.get": "Oracle.Database.DbVersions.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient.getWithResponse": "Oracle.Database.DbVersions.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient.listByLocation": "Oracle.Database.DbVersions.listByLocation",
     "com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient": "Oracle.Database.DnsPrivateViews",
     "com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.get": "Oracle.Database.DnsPrivateViews.get",
     "com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.getWithResponse": "Oracle.Database.DnsPrivateViews.get",
@@ -140,6 +159,17 @@
     "com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.get": "Oracle.Database.GiVersions.get",
     "com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.getWithResponse": "Oracle.Database.GiVersions.get",
     "com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.listByLocation": "Oracle.Database.GiVersions.listByLocation",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient": "Oracle.Database.NetworkAnchors",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.beginCreateOrUpdate": "Azure.ResourceManager.NetworkAnchors.createOrUpdate",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.beginDelete": "Azure.ResourceManager.NetworkAnchors.delete",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.beginUpdate": "Azure.ResourceManager.NetworkAnchors.update",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.createOrUpdate": "Azure.ResourceManager.NetworkAnchors.createOrUpdate",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.delete": "Azure.ResourceManager.NetworkAnchors.delete",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.getByResourceGroup": "Azure.ResourceManager.NetworkAnchors.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.NetworkAnchors.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.list": "Azure.ResourceManager.NetworkAnchors.listBySubscription",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.listByResourceGroup": "Oracle.Database.NetworkAnchors.listByResourceGroup",
+    "com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.update": "Azure.ResourceManager.NetworkAnchors.update",
     "com.azure.resourcemanager.oracledatabase.fluent.OperationsClient": "Oracle.Database.Operations",
     "com.azure.resourcemanager.oracledatabase.fluent.OperationsClient.list": "Azure.ResourceManager.Operations.list",
     "com.azure.resourcemanager.oracledatabase.fluent.OracleDatabaseManagementClient": "Oracle.Database",
@@ -161,6 +191,17 @@
     "com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listCloudAccountDetails": "Oracle.Database.OracleSubscriptions.listCloudAccountDetails",
     "com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listSaasSubscriptionDetails": "Oracle.Database.OracleSubscriptions.listSaasSubscriptionDetails",
     "com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.update": "Oracle.Database.OracleSubscriptions.update",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient": "Oracle.Database.ResourceAnchors",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.beginCreateOrUpdate": "Azure.ResourceManager.ResourceAnchors.createOrUpdate",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.beginDelete": "Azure.ResourceManager.ResourceAnchors.delete",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.beginUpdate": "Azure.ResourceManager.ResourceAnchors.update",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.createOrUpdate": "Azure.ResourceManager.ResourceAnchors.createOrUpdate",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.delete": "Azure.ResourceManager.ResourceAnchors.delete",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.getByResourceGroup": "Azure.ResourceManager.ResourceAnchors.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.getByResourceGroupWithResponse": "Azure.ResourceManager.ResourceAnchors.get",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.list": "Azure.ResourceManager.ResourceAnchors.listBySubscription",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.listByResourceGroup": "Oracle.Database.ResourceAnchors.listByResourceGroup",
+    "com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.update": "Azure.ResourceManager.ResourceAnchors.update",
     "com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient": "Oracle.Database.SystemVersions",
     "com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.get": "Oracle.Database.SystemVersions.get",
     "com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.getWithResponse": "Oracle.Database.SystemVersions.get",
@@ -186,7 +227,9 @@
     "com.azure.resourcemanager.oracledatabase.fluent.models.DbActionResponseInner": "Oracle.Database.DbActionResponse",
     "com.azure.resourcemanager.oracledatabase.fluent.models.DbNodeInner": "Oracle.Database.DbNode",
     "com.azure.resourcemanager.oracledatabase.fluent.models.DbServerInner": "Oracle.Database.DbServer",
+    "com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner": "Oracle.Database.DbSystem",
     "com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemShapeInner": "Oracle.Database.DbSystemShape",
+    "com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner": "Oracle.Database.DbVersion",
     "com.azure.resourcemanager.oracledatabase.fluent.models.DnsPrivateViewInner": "Oracle.Database.DnsPrivateView",
     "com.azure.resourcemanager.oracledatabase.fluent.models.DnsPrivateZoneInner": "Oracle.Database.DnsPrivateZone",
     "com.azure.resourcemanager.oracledatabase.fluent.models.ExadbVmClusterInner": "Oracle.Database.ExadbVmCluster",
@@ -195,9 +238,11 @@
     "com.azure.resourcemanager.oracledatabase.fluent.models.FlexComponentInner": "Oracle.Database.FlexComponent",
     "com.azure.resourcemanager.oracledatabase.fluent.models.GiMinorVersionInner": "Oracle.Database.GiMinorVersion",
     "com.azure.resourcemanager.oracledatabase.fluent.models.GiVersionInner": "Oracle.Database.GiVersion",
+    "com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner": "Oracle.Database.NetworkAnchor",
     "com.azure.resourcemanager.oracledatabase.fluent.models.OperationInner": "Azure.ResourceManager.CommonTypes.Operation",
     "com.azure.resourcemanager.oracledatabase.fluent.models.OracleSubscriptionInner": "Oracle.Database.OracleSubscription",
     "com.azure.resourcemanager.oracledatabase.fluent.models.PrivateIpAddressPropertiesInner": "Oracle.Database.PrivateIpAddressProperties",
+    "com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner": "Oracle.Database.ResourceAnchor",
     "com.azure.resourcemanager.oracledatabase.fluent.models.SaasSubscriptionDetailsInner": "Oracle.Database.SaasSubscriptionDetails",
     "com.azure.resourcemanager.oracledatabase.fluent.models.SystemVersionInner": "Oracle.Database.SystemVersion",
     "com.azure.resourcemanager.oracledatabase.fluent.models.VirtualNetworkAddressInner": "Oracle.Database.VirtualNetworkAddress",
@@ -211,7 +256,9 @@
     "com.azure.resourcemanager.oracledatabase.implementation.models.CloudVmClusterListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.DbNodeListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.DbServerListResult": "Azure.ResourceManager.ResourceListResult",
+    "com.azure.resourcemanager.oracledatabase.implementation.models.DbSystemListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.DbSystemShapeListResult": "Azure.ResourceManager.ResourceListResult",
+    "com.azure.resourcemanager.oracledatabase.implementation.models.DbVersionListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.DnsPrivateViewListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.DnsPrivateZoneListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.ExadbVmClusterListResult": "Azure.ResourceManager.ResourceListResult",
@@ -220,8 +267,10 @@
     "com.azure.resourcemanager.oracledatabase.implementation.models.FlexComponentListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.GiMinorVersionListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.GiVersionListResult": "Azure.ResourceManager.ResourceListResult",
+    "com.azure.resourcemanager.oracledatabase.implementation.models.NetworkAnchorListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.OperationListResult": "Azure.ResourceManager.CommonTypes.OperationListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.OracleSubscriptionListResult": "Azure.ResourceManager.ResourceListResult",
+    "com.azure.resourcemanager.oracledatabase.implementation.models.ResourceAnchorListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.SystemVersionListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.implementation.models.VirtualNetworkAddressListResult": "Azure.ResourceManager.ResourceListResult",
     "com.azure.resourcemanager.oracledatabase.models.ActionType": "Azure.ResourceManager.CommonTypes.ActionType",
@@ -239,6 +288,8 @@
     "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCloneProperties": "Oracle.Database.AutonomousDatabaseCloneProperties",
     "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCrossRegionDisasterRecoveryProperties": "Oracle.Database.AutonomousDatabaseCrossRegionDisasterRecoveryProperties",
     "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseFromBackupTimestampProperties": "Oracle.Database.AutonomousDatabaseFromBackupTimestampProperties",
+    "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction": "Oracle.Database.AutonomousDatabaseLifecycleAction",
+    "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleActionEnum": "Oracle.Database.AutonomousDatabaseLifecycleActionEnum",
     "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleState": "Oracle.Database.AutonomousDatabaseLifecycleState",
     "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseNationalCharacterSetProperties": "Oracle.Database.AutonomousDatabaseNationalCharacterSetProperties",
     "com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseProperties": "Oracle.Database.AutonomousDatabaseProperties",
@@ -249,6 +300,7 @@
     "com.azure.resourcemanager.oracledatabase.models.AutonomousMaintenanceScheduleType": "Oracle.Database.AutonomousMaintenanceScheduleType",
     "com.azure.resourcemanager.oracledatabase.models.AzureResourceProvisioningState": "Oracle.Database.AzureResourceProvisioningState",
     "com.azure.resourcemanager.oracledatabase.models.AzureSubscriptions": "Oracle.Database.AzureSubscriptions",
+    "com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes": "Oracle.Database.BaseDbSystemShapes",
     "com.azure.resourcemanager.oracledatabase.models.CloneType": "Oracle.Database.CloneType",
     "com.azure.resourcemanager.oracledatabase.models.CloudAccountProvisioningState": "Oracle.Database.CloudAccountProvisioningState",
     "com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureLifecycleState": "Oracle.Database.CloudExadataInfrastructureLifecycleState",
@@ -260,6 +312,7 @@
     "com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel",
     "com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdateProperties": "Azure.ResourceManager.Foundations.ResourceUpdateModelProperties",
     "com.azure.resourcemanager.oracledatabase.models.ComputeModel": "Oracle.Database.ComputeModel",
+    "com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails": "Oracle.Database.ConfigureExascaleCloudExadataInfrastructureDetails",
     "com.azure.resourcemanager.oracledatabase.models.ConnectionStringType": "Oracle.Database.ConnectionStringType",
     "com.azure.resourcemanager.oracledatabase.models.ConnectionUrlType": "Oracle.Database.ConnectionUrlType",
     "com.azure.resourcemanager.oracledatabase.models.ConsumerGroup": "Oracle.Database.ConsumerGroup",
@@ -282,22 +335,35 @@
     "com.azure.resourcemanager.oracledatabase.models.DbServerPatchingStatus": "Oracle.Database.DbServerPatchingStatus",
     "com.azure.resourcemanager.oracledatabase.models.DbServerProperties": "Oracle.Database.DbServerProperties",
     "com.azure.resourcemanager.oracledatabase.models.DbServerProvisioningState": "Oracle.Database.DbServerProvisioningState",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemBaseProperties": "Oracle.Database.DbSystemBaseProperties",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemDatabaseEditionType": "Oracle.Database.DbSystemDatabaseEditionType",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemLifecycleState": "Oracle.Database.DbSystemLifecycleState",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemOptions": "Oracle.Database.DbSystemOptions",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemProperties": "Oracle.Database.DbSystemProperties",
     "com.azure.resourcemanager.oracledatabase.models.DbSystemShapeProperties": "Oracle.Database.DbSystemShapeProperties",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemSourceType": "Oracle.Database.DbSystemSourceType",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel",
+    "com.azure.resourcemanager.oracledatabase.models.DbSystemUpdateProperties": "Azure.ResourceManager.Foundations.ResourceUpdateModelProperties",
+    "com.azure.resourcemanager.oracledatabase.models.DbVersionProperties": "Oracle.Database.DbVersionProperties",
     "com.azure.resourcemanager.oracledatabase.models.DefinedFileSystemConfiguration": "Oracle.Database.DefinedFileSystemConfiguration",
     "com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails": "Oracle.Database.DisasterRecoveryConfigurationDetails",
     "com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryType": "Oracle.Database.DisasterRecoveryType",
     "com.azure.resourcemanager.oracledatabase.models.DiskRedundancy": "Oracle.Database.DiskRedundancy",
+    "com.azure.resourcemanager.oracledatabase.models.DiskRedundancyType": "Oracle.Database.DiskRedundancyType",
+    "com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule": "Oracle.Database.DnsForwardingRule",
     "com.azure.resourcemanager.oracledatabase.models.DnsPrivateViewProperties": "Oracle.Database.DnsPrivateViewProperties",
     "com.azure.resourcemanager.oracledatabase.models.DnsPrivateViewsLifecycleState": "Oracle.Database.DnsPrivateViewsLifecycleState",
     "com.azure.resourcemanager.oracledatabase.models.DnsPrivateZoneProperties": "Oracle.Database.DnsPrivateZoneProperties",
     "com.azure.resourcemanager.oracledatabase.models.DnsPrivateZonesLifecycleState": "Oracle.Database.DnsPrivateZonesLifecycleState",
     "com.azure.resourcemanager.oracledatabase.models.EstimatedPatchingTime": "Oracle.Database.EstimatedPatchingTime",
     "com.azure.resourcemanager.oracledatabase.models.ExadataIormConfig": "Oracle.Database.ExadataIormConfig",
+    "com.azure.resourcemanager.oracledatabase.models.ExadataVmClusterStorageManagementType": "Oracle.Database.ExadataVmClusterStorageManagementType",
     "com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterLifecycleState": "Oracle.Database.ExadbVmClusterLifecycleState",
     "com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterProperties": "Oracle.Database.ExadbVmClusterProperties",
     "com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterStorageDetails": "Oracle.Database.ExadbVmClusterStorageDetails",
     "com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel",
     "com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterUpdateProperties": "Azure.ResourceManager.Foundations.ResourceUpdateModelProperties",
+    "com.azure.resourcemanager.oracledatabase.models.ExascaleConfigDetails": "Oracle.Database.ExascaleConfigDetails",
     "com.azure.resourcemanager.oracledatabase.models.ExascaleDbNodeProperties": "Oracle.Database.ExascaleDbNodeProperties",
     "com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageDetails": "Oracle.Database.ExascaleDbStorageDetails",
     "com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageInputDetails": "Oracle.Database.ExascaleDbStorageInputDetails",
@@ -320,6 +386,9 @@
     "com.azure.resourcemanager.oracledatabase.models.MaintenanceWindow": "Oracle.Database.MaintenanceWindow",
     "com.azure.resourcemanager.oracledatabase.models.Month": "Oracle.Database.Month",
     "com.azure.resourcemanager.oracledatabase.models.MonthName": "Oracle.Database.MonthName",
+    "com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties": "Oracle.Database.NetworkAnchorProperties",
+    "com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel",
+    "com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdateProperties": "Azure.ResourceManager.Foundations.ResourceUpdateModelProperties",
     "com.azure.resourcemanager.oracledatabase.models.NsgCidr": "Oracle.Database.NsgCidr",
     "com.azure.resourcemanager.oracledatabase.models.Objective": "Oracle.Database.Objective",
     "com.azure.resourcemanager.oracledatabase.models.OpenModeType": "Oracle.Database.OpenModeType",
@@ -344,14 +413,20 @@
     "com.azure.resourcemanager.oracledatabase.models.RefreshableStatusType": "Oracle.Database.RefreshableStatusType",
     "com.azure.resourcemanager.oracledatabase.models.RemoveVirtualMachineFromExadbVmClusterDetails": "Oracle.Database.RemoveVirtualMachineFromExadbVmClusterDetails",
     "com.azure.resourcemanager.oracledatabase.models.RepeatCadenceType": "Oracle.Database.RepeatCadenceType",
+    "com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties": "Oracle.Database.ResourceAnchorProperties",
+    "com.azure.resourcemanager.oracledatabase.models.ResourceAnchorUpdate": "Azure.ResourceManager.Foundations.ResourceUpdateModel",
     "com.azure.resourcemanager.oracledatabase.models.ResourceProvisioningState": "Azure.ResourceManager.ResourceProvisioningState",
     "com.azure.resourcemanager.oracledatabase.models.RestoreAutonomousDatabaseDetails": "Oracle.Database.RestoreAutonomousDatabaseDetails",
     "com.azure.resourcemanager.oracledatabase.models.RoleType": "Oracle.Database.RoleType",
     "com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsType": "Oracle.Database.ScheduledOperationsType",
     "com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsTypeUpdate": "Oracle.Database.ScheduledOperationsTypeUpdate",
     "com.azure.resourcemanager.oracledatabase.models.SessionModeType": "Oracle.Database.SessionModeType",
+    "com.azure.resourcemanager.oracledatabase.models.ShapeAttribute": "Oracle.Database.ShapeAttribute",
     "com.azure.resourcemanager.oracledatabase.models.ShapeFamily": "Oracle.Database.ShapeFamily",
+    "com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType": "Oracle.Database.ShapeFamilyType",
     "com.azure.resourcemanager.oracledatabase.models.SourceType": "Oracle.Database.SourceType",
+    "com.azure.resourcemanager.oracledatabase.models.StorageManagementType": "Oracle.Database.StorageManagementType",
+    "com.azure.resourcemanager.oracledatabase.models.StorageVolumePerformanceMode": "Oracle.Database.StorageVolumePerformanceMode",
     "com.azure.resourcemanager.oracledatabase.models.SyntaxFormatType": "Oracle.Database.SyntaxFormatType",
     "com.azure.resourcemanager.oracledatabase.models.SystemShapes": "Oracle.Database.SystemShapes",
     "com.azure.resourcemanager.oracledatabase.models.SystemVersionProperties": "Oracle.Database.SystemVersionProperties",
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_metadata.json b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_metadata.json
index ae57b1ffb820..7349ddc69d3e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_metadata.json
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/azure-resourcemanager-oracledatabase_metadata.json
@@ -1 +1 @@
-{"flavor":"azure","apiVersion":"2025-03-01","crossLanguageDefinitions":{"com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient":"Oracle.Database.AutonomousDatabaseBackups","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.beginCreateOrUpdate":"Azure.ResourceManager.AutonomousDatabaseBackups.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.beginDelete":"Azure.ResourceManager.AutonomousDatabaseBackups.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.beginUpdate":"Oracle.Database.AutonomousDatabaseBackups.update","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.createOrUpdate":"Azure.ResourceManager.AutonomousDatabaseBackups.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.delete":"Azure.ResourceManager.AutonomousDatabaseBackups.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.get":"Azure.ResourceManager.AutonomousDatabaseBackups.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.getWithResponse":"Azure.ResourceManager.AutonomousDatabaseBackups.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.listByAutonomousDatabase":"Oracle.Database.AutonomousDatabaseBackups.listByParent","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.update":"Oracle.Database.AutonomousDatabaseBackups.update","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient":"Oracle.Database.AutonomousDatabaseCharacterSets","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient.get":"Oracle.Database.AutonomousDatabaseCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient.getWithResponse":"Oracle.Database.AutonomousDatabaseCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient.listByLocation":"Oracle.Database.AutonomousDatabaseCharacterSets.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient":"Oracle.Database.AutonomousDatabaseNationalCharacterSets","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient.get":"Oracle.Database.AutonomousDatabaseNationalCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient.getWithResponse":"Oracle.Database.AutonomousDatabaseNationalCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient.listByLocation":"Oracle.Database.AutonomousDatabaseNationalCharacterSets.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient":"Oracle.Database.AutonomousDatabaseVersions","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.get":"Oracle.Database.AutonomousDatabaseVersions.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.getWithResponse":"Oracle.Database.AutonomousDatabaseVersions.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.listByLocation":"Oracle.Database.AutonomousDatabaseVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient":"Oracle.Database.AutonomousDatabases","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginChangeDisasterRecoveryConfiguration":"Oracle.Database.AutonomousDatabases.changeDisasterRecoveryConfiguration","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginCreateOrUpdate":"Azure.ResourceManager.AutonomousDatabases.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginDelete":"Azure.ResourceManager.AutonomousDatabases.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginFailover":"Oracle.Database.AutonomousDatabases.failover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginRestore":"Oracle.Database.AutonomousDatabases.restore","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginShrink":"Oracle.Database.AutonomousDatabases.shrink","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginSwitchover":"Oracle.Database.AutonomousDatabases.switchover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginUpdate":"Oracle.Database.AutonomousDatabases.update","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.changeDisasterRecoveryConfiguration":"Oracle.Database.AutonomousDatabases.changeDisasterRecoveryConfiguration","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.createOrUpdate":"Azure.ResourceManager.AutonomousDatabases.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.delete":"Azure.ResourceManager.AutonomousDatabases.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.failover":"Oracle.Database.AutonomousDatabases.failover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.generateWallet":"Oracle.Database.AutonomousDatabases.generateWallet","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.generateWalletWithResponse":"Oracle.Database.AutonomousDatabases.generateWallet","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.getByResourceGroup":"Azure.ResourceManager.AutonomousDatabases.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.AutonomousDatabases.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.list":"Azure.ResourceManager.AutonomousDatabases.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.listByResourceGroup":"Oracle.Database.AutonomousDatabases.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.restore":"Oracle.Database.AutonomousDatabases.restore","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.shrink":"Oracle.Database.AutonomousDatabases.shrink","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.switchover":"Oracle.Database.AutonomousDatabases.switchover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.update":"Oracle.Database.AutonomousDatabases.update","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient":"Oracle.Database.CloudExadataInfrastructures","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.addStorageCapacity":"Oracle.Database.CloudExadataInfrastructures.addStorageCapacity","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginAddStorageCapacity":"Oracle.Database.CloudExadataInfrastructures.addStorageCapacity","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginCreateOrUpdate":"Azure.ResourceManager.CloudExadataInfrastructures.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginDelete":"Azure.ResourceManager.CloudExadataInfrastructures.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginUpdate":"Azure.ResourceManager.CloudExadataInfrastructures.update","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.createOrUpdate":"Azure.ResourceManager.CloudExadataInfrastructures.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.delete":"Azure.ResourceManager.CloudExadataInfrastructures.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.getByResourceGroup":"Azure.ResourceManager.CloudExadataInfrastructures.get","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CloudExadataInfrastructures.get","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.list":"Azure.ResourceManager.CloudExadataInfrastructures.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.listByResourceGroup":"Oracle.Database.CloudExadataInfrastructures.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.update":"Azure.ResourceManager.CloudExadataInfrastructures.update","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient":"Oracle.Database.CloudVmClusters","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.addVms":"Oracle.Database.CloudVmClusters.addVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginAddVms":"Oracle.Database.CloudVmClusters.addVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginCreateOrUpdate":"Azure.ResourceManager.CloudVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginDelete":"Azure.ResourceManager.CloudVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginRemoveVms":"Oracle.Database.CloudVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginUpdate":"Azure.ResourceManager.CloudVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.createOrUpdate":"Azure.ResourceManager.CloudVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.delete":"Azure.ResourceManager.CloudVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.getByResourceGroup":"Azure.ResourceManager.CloudVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CloudVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.list":"Azure.ResourceManager.CloudVmClusters.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.listByResourceGroup":"Oracle.Database.CloudVmClusters.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.listPrivateIpAddresses":"Oracle.Database.CloudVmClusters.listPrivateIpAddresses","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.listPrivateIpAddressesWithResponse":"Oracle.Database.CloudVmClusters.listPrivateIpAddresses","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.removeVms":"Oracle.Database.CloudVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.update":"Azure.ResourceManager.CloudVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient":"Oracle.Database.DbNodes","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.action":"Oracle.Database.DbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.beginAction":"Oracle.Database.DbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.get":"Oracle.Database.DbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.getWithResponse":"Oracle.Database.DbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.listByCloudVmCluster":"Oracle.Database.DbNodes.listByParent","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient":"Oracle.Database.DbServers","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient.get":"Oracle.Database.DbServers.get","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient.getWithResponse":"Oracle.Database.DbServers.get","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient.listByCloudExadataInfrastructure":"Oracle.Database.DbServers.listByParent","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient":"Oracle.Database.DbSystemShapes","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.get":"Oracle.Database.DbSystemShapes.get","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.getWithResponse":"Oracle.Database.DbSystemShapes.get","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.listByLocation":"Oracle.Database.DbSystemShapes.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient":"Oracle.Database.DnsPrivateViews","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.get":"Oracle.Database.DnsPrivateViews.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.getWithResponse":"Oracle.Database.DnsPrivateViews.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.listByLocation":"Oracle.Database.DnsPrivateViews.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient":"Oracle.Database.DnsPrivateZones","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient.get":"Oracle.Database.DnsPrivateZones.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient.getWithResponse":"Oracle.Database.DnsPrivateZones.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient.listByLocation":"Oracle.Database.DnsPrivateZones.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient":"Oracle.Database.ExadbVmClusters","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginCreateOrUpdate":"Azure.ResourceManager.ExadbVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginDelete":"Azure.ResourceManager.ExadbVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginRemoveVms":"Oracle.Database.ExadbVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginUpdate":"Azure.ResourceManager.ExadbVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.createOrUpdate":"Azure.ResourceManager.ExadbVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.delete":"Azure.ResourceManager.ExadbVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.getByResourceGroup":"Azure.ResourceManager.ExadbVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.getByResourceGroupWithResponse":"Azure.ResourceManager.ExadbVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.list":"Azure.ResourceManager.ExadbVmClusters.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.listByResourceGroup":"Oracle.Database.ExadbVmClusters.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.removeVms":"Oracle.Database.ExadbVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.update":"Azure.ResourceManager.ExadbVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient":"Oracle.Database.ExascaleDbNodes","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.action":"Oracle.Database.ExascaleDbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.beginAction":"Oracle.Database.ExascaleDbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.get":"Oracle.Database.ExascaleDbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.getWithResponse":"Oracle.Database.ExascaleDbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.listByParent":"Oracle.Database.ExascaleDbNodes.listByParent","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient":"Oracle.Database.ExascaleDbStorageVaults","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.beginCreate":"Oracle.Database.ExascaleDbStorageVaults.create","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.beginDelete":"Oracle.Database.ExascaleDbStorageVaults.delete","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.beginUpdate":"Oracle.Database.ExascaleDbStorageVaults.update","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.create":"Oracle.Database.ExascaleDbStorageVaults.create","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.delete":"Oracle.Database.ExascaleDbStorageVaults.delete","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.getByResourceGroup":"Oracle.Database.ExascaleDbStorageVaults.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.getByResourceGroupWithResponse":"Oracle.Database.ExascaleDbStorageVaults.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.list":"Oracle.Database.ExascaleDbStorageVaults.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.listByResourceGroup":"Oracle.Database.ExascaleDbStorageVaults.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.update":"Oracle.Database.ExascaleDbStorageVaults.update","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient":"Oracle.Database.FlexComponents","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient.get":"Oracle.Database.FlexComponents.get","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient.getWithResponse":"Oracle.Database.FlexComponents.get","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient.listByParent":"Oracle.Database.FlexComponents.listByParent","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient":"Oracle.Database.GiMinorVersions","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient.get":"Oracle.Database.GiMinorVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient.getWithResponse":"Oracle.Database.GiMinorVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient.listByParent":"Oracle.Database.GiMinorVersions.listByParent","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient":"Oracle.Database.GiVersions","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.get":"Oracle.Database.GiVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.getWithResponse":"Oracle.Database.GiVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.listByLocation":"Oracle.Database.GiVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.OperationsClient":"Oracle.Database.Operations","com.azure.resourcemanager.oracledatabase.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","com.azure.resourcemanager.oracledatabase.fluent.OracleDatabaseManagementClient":"Oracle.Database","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient":"Oracle.Database.OracleSubscriptions","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.addAzureSubscriptions":"Oracle.Database.OracleSubscriptions.addAzureSubscriptions","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginAddAzureSubscriptions":"Oracle.Database.OracleSubscriptions.addAzureSubscriptions","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginCreateOrUpdate":"Azure.ResourceManager.OracleSubscriptions.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginDelete":"Azure.ResourceManager.OracleSubscriptions.delete","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginListActivationLinks":"Oracle.Database.OracleSubscriptions.listActivationLinks","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginListCloudAccountDetails":"Oracle.Database.OracleSubscriptions.listCloudAccountDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginListSaasSubscriptionDetails":"Oracle.Database.OracleSubscriptions.listSaasSubscriptionDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginUpdate":"Oracle.Database.OracleSubscriptions.update","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.createOrUpdate":"Azure.ResourceManager.OracleSubscriptions.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.delete":"Azure.ResourceManager.OracleSubscriptions.delete","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.get":"Azure.ResourceManager.OracleSubscriptions.get","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.getWithResponse":"Azure.ResourceManager.OracleSubscriptions.get","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.list":"Azure.ResourceManager.OracleSubscriptions.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listActivationLinks":"Oracle.Database.OracleSubscriptions.listActivationLinks","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listCloudAccountDetails":"Oracle.Database.OracleSubscriptions.listCloudAccountDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listSaasSubscriptionDetails":"Oracle.Database.OracleSubscriptions.listSaasSubscriptionDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.update":"Oracle.Database.OracleSubscriptions.update","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient":"Oracle.Database.SystemVersions","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.get":"Oracle.Database.SystemVersions.get","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.getWithResponse":"Oracle.Database.SystemVersions.get","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.listByLocation":"Oracle.Database.SystemVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient":"Oracle.Database.VirtualNetworkAddresses","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.beginCreateOrUpdate":"Azure.ResourceManager.VirtualNetworkAddresses.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.beginDelete":"Azure.ResourceManager.VirtualNetworkAddresses.delete","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.createOrUpdate":"Azure.ResourceManager.VirtualNetworkAddresses.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.delete":"Azure.ResourceManager.VirtualNetworkAddresses.delete","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.get":"Azure.ResourceManager.VirtualNetworkAddresses.get","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.getWithResponse":"Azure.ResourceManager.VirtualNetworkAddresses.get","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.listByCloudVmCluster":"Oracle.Database.VirtualNetworkAddresses.listByParent","com.azure.resourcemanager.oracledatabase.fluent.models.ActivationLinksInner":"Oracle.Database.ActivationLinks","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseBackupInner":"Oracle.Database.AutonomousDatabaseBackup","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseCharacterSetInner":"Oracle.Database.AutonomousDatabaseCharacterSet","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseInner":"Oracle.Database.AutonomousDatabase","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseNationalCharacterSetInner":"Oracle.Database.AutonomousDatabaseNationalCharacterSet","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseWalletFileInner":"Oracle.Database.AutonomousDatabaseWalletFile","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDbVersionInner":"Oracle.Database.AutonomousDbVersion","com.azure.resourcemanager.oracledatabase.fluent.models.CloudAccountDetailsInner":"Oracle.Database.CloudAccountDetails","com.azure.resourcemanager.oracledatabase.fluent.models.CloudExadataInfrastructureInner":"Oracle.Database.CloudExadataInfrastructure","com.azure.resourcemanager.oracledatabase.fluent.models.CloudVmClusterInner":"Oracle.Database.CloudVmCluster","com.azure.resourcemanager.oracledatabase.fluent.models.DbActionResponseInner":"Oracle.Database.DbActionResponse","com.azure.resourcemanager.oracledatabase.fluent.models.DbNodeInner":"Oracle.Database.DbNode","com.azure.resourcemanager.oracledatabase.fluent.models.DbServerInner":"Oracle.Database.DbServer","com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemShapeInner":"Oracle.Database.DbSystemShape","com.azure.resourcemanager.oracledatabase.fluent.models.DnsPrivateViewInner":"Oracle.Database.DnsPrivateView","com.azure.resourcemanager.oracledatabase.fluent.models.DnsPrivateZoneInner":"Oracle.Database.DnsPrivateZone","com.azure.resourcemanager.oracledatabase.fluent.models.ExadbVmClusterInner":"Oracle.Database.ExadbVmCluster","com.azure.resourcemanager.oracledatabase.fluent.models.ExascaleDbNodeInner":"Oracle.Database.ExascaleDbNode","com.azure.resourcemanager.oracledatabase.fluent.models.ExascaleDbStorageVaultInner":"Oracle.Database.ExascaleDbStorageVault","com.azure.resourcemanager.oracledatabase.fluent.models.FlexComponentInner":"Oracle.Database.FlexComponent","com.azure.resourcemanager.oracledatabase.fluent.models.GiMinorVersionInner":"Oracle.Database.GiMinorVersion","com.azure.resourcemanager.oracledatabase.fluent.models.GiVersionInner":"Oracle.Database.GiVersion","com.azure.resourcemanager.oracledatabase.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","com.azure.resourcemanager.oracledatabase.fluent.models.OracleSubscriptionInner":"Oracle.Database.OracleSubscription","com.azure.resourcemanager.oracledatabase.fluent.models.PrivateIpAddressPropertiesInner":"Oracle.Database.PrivateIpAddressProperties","com.azure.resourcemanager.oracledatabase.fluent.models.SaasSubscriptionDetailsInner":"Oracle.Database.SaasSubscriptionDetails","com.azure.resourcemanager.oracledatabase.fluent.models.SystemVersionInner":"Oracle.Database.SystemVersion","com.azure.resourcemanager.oracledatabase.fluent.models.VirtualNetworkAddressInner":"Oracle.Database.VirtualNetworkAddress","com.azure.resourcemanager.oracledatabase.implementation.OracleDatabaseManagementClientBuilder":"Oracle.Database","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseBackupListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseCharacterSetListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseNationalCharacterSetListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDbVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.CloudExadataInfrastructureListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.CloudVmClusterListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbNodeListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbServerListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbSystemShapeListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DnsPrivateViewListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DnsPrivateZoneListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ExadbVmClusterListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ExascaleDbNodeListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ExascaleDbStorageVaultListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.FlexComponentListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.GiMinorVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.GiVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","com.azure.resourcemanager.oracledatabase.implementation.models.OracleSubscriptionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.SystemVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.VirtualNetworkAddressListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","com.azure.resourcemanager.oracledatabase.models.AddRemoveDbNode":"Oracle.Database.AddRemoveDbNode","com.azure.resourcemanager.oracledatabase.models.AddSubscriptionOperationState":"Oracle.Database.AddSubscriptionOperationState","com.azure.resourcemanager.oracledatabase.models.AllConnectionStringType":"Oracle.Database.AllConnectionStringType","com.azure.resourcemanager.oracledatabase.models.ApexDetailsType":"Oracle.Database.ApexDetailsType","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupLifecycleState":"Oracle.Database.AutonomousDatabaseBackupLifecycleState","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupProperties":"Oracle.Database.AutonomousDatabaseBackupProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupType":"Oracle.Database.AutonomousDatabaseBackupType","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBaseProperties":"Oracle.Database.AutonomousDatabaseBaseProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCharacterSetProperties":"Oracle.Database.AutonomousDatabaseCharacterSetProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCloneProperties":"Oracle.Database.AutonomousDatabaseCloneProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCrossRegionDisasterRecoveryProperties":"Oracle.Database.AutonomousDatabaseCrossRegionDisasterRecoveryProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseFromBackupTimestampProperties":"Oracle.Database.AutonomousDatabaseFromBackupTimestampProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleState":"Oracle.Database.AutonomousDatabaseLifecycleState","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseNationalCharacterSetProperties":"Oracle.Database.AutonomousDatabaseNationalCharacterSetProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseProperties":"Oracle.Database.AutonomousDatabaseProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseStandbySummary":"Oracle.Database.AutonomousDatabaseStandbySummary","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdate":"Oracle.Database.AutonomousDatabaseUpdate","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdateProperties":"Oracle.Database.AutonomousDatabaseUpdateProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDbVersionProperties":"Oracle.Database.AutonomousDbVersionProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousMaintenanceScheduleType":"Oracle.Database.AutonomousMaintenanceScheduleType","com.azure.resourcemanager.oracledatabase.models.AzureResourceProvisioningState":"Oracle.Database.AzureResourceProvisioningState","com.azure.resourcemanager.oracledatabase.models.AzureSubscriptions":"Oracle.Database.AzureSubscriptions","com.azure.resourcemanager.oracledatabase.models.CloneType":"Oracle.Database.CloneType","com.azure.resourcemanager.oracledatabase.models.CloudAccountProvisioningState":"Oracle.Database.CloudAccountProvisioningState","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureLifecycleState":"Oracle.Database.CloudExadataInfrastructureLifecycleState","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureProperties":"Oracle.Database.CloudExadataInfrastructureProperties","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterLifecycleState":"Oracle.Database.CloudVmClusterLifecycleState","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterProperties":"Oracle.Database.CloudVmClusterProperties","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.ComputeModel":"Oracle.Database.ComputeModel","com.azure.resourcemanager.oracledatabase.models.ConnectionStringType":"Oracle.Database.ConnectionStringType","com.azure.resourcemanager.oracledatabase.models.ConnectionUrlType":"Oracle.Database.ConnectionUrlType","com.azure.resourcemanager.oracledatabase.models.ConsumerGroup":"Oracle.Database.ConsumerGroup","com.azure.resourcemanager.oracledatabase.models.CustomerContact":"Oracle.Database.CustomerContact","com.azure.resourcemanager.oracledatabase.models.DataBaseType":"Oracle.Database.DataBaseType","com.azure.resourcemanager.oracledatabase.models.DataCollectionOptions":"Oracle.Database.DataCollectionOptions","com.azure.resourcemanager.oracledatabase.models.DataSafeStatusType":"Oracle.Database.DataSafeStatusType","com.azure.resourcemanager.oracledatabase.models.DatabaseEditionType":"Oracle.Database.DatabaseEditionType","com.azure.resourcemanager.oracledatabase.models.DayOfWeek":"Oracle.Database.DayOfWeek","com.azure.resourcemanager.oracledatabase.models.DayOfWeekName":"Oracle.Database.DayOfWeekName","com.azure.resourcemanager.oracledatabase.models.DayOfWeekUpdate":"Oracle.Database.DayOfWeekUpdate","com.azure.resourcemanager.oracledatabase.models.DbIormConfig":"Oracle.Database.DbIormConfig","com.azure.resourcemanager.oracledatabase.models.DbNodeAction":"Oracle.Database.DbNodeAction","com.azure.resourcemanager.oracledatabase.models.DbNodeActionEnum":"Oracle.Database.DbNodeActionEnum","com.azure.resourcemanager.oracledatabase.models.DbNodeDetails":"Oracle.Database.DbNodeDetails","com.azure.resourcemanager.oracledatabase.models.DbNodeMaintenanceType":"Oracle.Database.DbNodeMaintenanceType","com.azure.resourcemanager.oracledatabase.models.DbNodeProperties":"Oracle.Database.DbNodeProperties","com.azure.resourcemanager.oracledatabase.models.DbNodeProvisioningState":"Oracle.Database.DbNodeProvisioningState","com.azure.resourcemanager.oracledatabase.models.DbServerPatchingDetails":"Oracle.Database.DbServerPatchingDetails","com.azure.resourcemanager.oracledatabase.models.DbServerPatchingStatus":"Oracle.Database.DbServerPatchingStatus","com.azure.resourcemanager.oracledatabase.models.DbServerProperties":"Oracle.Database.DbServerProperties","com.azure.resourcemanager.oracledatabase.models.DbServerProvisioningState":"Oracle.Database.DbServerProvisioningState","com.azure.resourcemanager.oracledatabase.models.DbSystemShapeProperties":"Oracle.Database.DbSystemShapeProperties","com.azure.resourcemanager.oracledatabase.models.DefinedFileSystemConfiguration":"Oracle.Database.DefinedFileSystemConfiguration","com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails":"Oracle.Database.DisasterRecoveryConfigurationDetails","com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryType":"Oracle.Database.DisasterRecoveryType","com.azure.resourcemanager.oracledatabase.models.DiskRedundancy":"Oracle.Database.DiskRedundancy","com.azure.resourcemanager.oracledatabase.models.DnsPrivateViewProperties":"Oracle.Database.DnsPrivateViewProperties","com.azure.resourcemanager.oracledatabase.models.DnsPrivateViewsLifecycleState":"Oracle.Database.DnsPrivateViewsLifecycleState","com.azure.resourcemanager.oracledatabase.models.DnsPrivateZoneProperties":"Oracle.Database.DnsPrivateZoneProperties","com.azure.resourcemanager.oracledatabase.models.DnsPrivateZonesLifecycleState":"Oracle.Database.DnsPrivateZonesLifecycleState","com.azure.resourcemanager.oracledatabase.models.EstimatedPatchingTime":"Oracle.Database.EstimatedPatchingTime","com.azure.resourcemanager.oracledatabase.models.ExadataIormConfig":"Oracle.Database.ExadataIormConfig","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterLifecycleState":"Oracle.Database.ExadbVmClusterLifecycleState","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterProperties":"Oracle.Database.ExadbVmClusterProperties","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterStorageDetails":"Oracle.Database.ExadbVmClusterStorageDetails","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.ExascaleDbNodeProperties":"Oracle.Database.ExascaleDbNodeProperties","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageDetails":"Oracle.Database.ExascaleDbStorageDetails","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageInputDetails":"Oracle.Database.ExascaleDbStorageInputDetails","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageVaultLifecycleState":"Oracle.Database.ExascaleDbStorageVaultLifecycleState","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageVaultProperties":"Oracle.Database.ExascaleDbStorageVaultProperties","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageVaultTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel","com.azure.resourcemanager.oracledatabase.models.FileSystemConfigurationDetails":"Oracle.Database.FileSystemConfigurationDetails","com.azure.resourcemanager.oracledatabase.models.FlexComponentProperties":"Oracle.Database.FlexComponentProperties","com.azure.resourcemanager.oracledatabase.models.GenerateAutonomousDatabaseWalletDetails":"Oracle.Database.GenerateAutonomousDatabaseWalletDetails","com.azure.resourcemanager.oracledatabase.models.GenerateType":"Oracle.Database.GenerateType","com.azure.resourcemanager.oracledatabase.models.GiMinorVersionProperties":"Oracle.Database.GiMinorVersionProperties","com.azure.resourcemanager.oracledatabase.models.GiVersionProperties":"Oracle.Database.GiVersionProperties","com.azure.resourcemanager.oracledatabase.models.GridImageType":"Oracle.Database.GridImageType","com.azure.resourcemanager.oracledatabase.models.HardwareType":"Oracle.Database.HardwareType","com.azure.resourcemanager.oracledatabase.models.HostFormatType":"Oracle.Database.HostFormatType","com.azure.resourcemanager.oracledatabase.models.Intent":"Oracle.Database.Intent","com.azure.resourcemanager.oracledatabase.models.IormLifecycleState":"Oracle.Database.IormLifecycleState","com.azure.resourcemanager.oracledatabase.models.LicenseModel":"Oracle.Database.LicenseModel","com.azure.resourcemanager.oracledatabase.models.LongTermBackUpScheduleDetails":"Oracle.Database.LongTermBackUpScheduleDetails","com.azure.resourcemanager.oracledatabase.models.MaintenanceWindow":"Oracle.Database.MaintenanceWindow","com.azure.resourcemanager.oracledatabase.models.Month":"Oracle.Database.Month","com.azure.resourcemanager.oracledatabase.models.MonthName":"Oracle.Database.MonthName","com.azure.resourcemanager.oracledatabase.models.NsgCidr":"Oracle.Database.NsgCidr","com.azure.resourcemanager.oracledatabase.models.Objective":"Oracle.Database.Objective","com.azure.resourcemanager.oracledatabase.models.OpenModeType":"Oracle.Database.OpenModeType","com.azure.resourcemanager.oracledatabase.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","com.azure.resourcemanager.oracledatabase.models.OperationsInsightsStatusType":"Oracle.Database.OperationsInsightsStatusType","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionProperties":"Oracle.Database.OracleSubscriptionProperties","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionProvisioningState":"Oracle.Database.OracleSubscriptionProvisioningState","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","com.azure.resourcemanager.oracledatabase.models.PatchingMode":"Oracle.Database.PatchingMode","com.azure.resourcemanager.oracledatabase.models.PeerDbDetails":"Oracle.Database.PeerDbDetails","com.azure.resourcemanager.oracledatabase.models.PermissionLevelType":"Oracle.Database.PermissionLevelType","com.azure.resourcemanager.oracledatabase.models.Plan":"Azure.ResourceManager.CommonTypes.Plan","com.azure.resourcemanager.oracledatabase.models.PlanUpdate":"Oracle.Database.PlanUpdate","com.azure.resourcemanager.oracledatabase.models.PortRange":"Oracle.Database.PortRange","com.azure.resourcemanager.oracledatabase.models.Preference":"Oracle.Database.Preference","com.azure.resourcemanager.oracledatabase.models.PrivateIpAddressesFilter":"Oracle.Database.PrivateIpAddressesFilter","com.azure.resourcemanager.oracledatabase.models.ProfileType":"Oracle.Database.ProfileType","com.azure.resourcemanager.oracledatabase.models.ProtocolType":"Oracle.Database.ProtocolType","com.azure.resourcemanager.oracledatabase.models.RefreshableModelType":"Oracle.Database.RefreshableModelType","com.azure.resourcemanager.oracledatabase.models.RefreshableStatusType":"Oracle.Database.RefreshableStatusType","com.azure.resourcemanager.oracledatabase.models.RemoveVirtualMachineFromExadbVmClusterDetails":"Oracle.Database.RemoveVirtualMachineFromExadbVmClusterDetails","com.azure.resourcemanager.oracledatabase.models.RepeatCadenceType":"Oracle.Database.RepeatCadenceType","com.azure.resourcemanager.oracledatabase.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","com.azure.resourcemanager.oracledatabase.models.RestoreAutonomousDatabaseDetails":"Oracle.Database.RestoreAutonomousDatabaseDetails","com.azure.resourcemanager.oracledatabase.models.RoleType":"Oracle.Database.RoleType","com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsType":"Oracle.Database.ScheduledOperationsType","com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsTypeUpdate":"Oracle.Database.ScheduledOperationsTypeUpdate","com.azure.resourcemanager.oracledatabase.models.SessionModeType":"Oracle.Database.SessionModeType","com.azure.resourcemanager.oracledatabase.models.ShapeFamily":"Oracle.Database.ShapeFamily","com.azure.resourcemanager.oracledatabase.models.SourceType":"Oracle.Database.SourceType","com.azure.resourcemanager.oracledatabase.models.SyntaxFormatType":"Oracle.Database.SyntaxFormatType","com.azure.resourcemanager.oracledatabase.models.SystemShapes":"Oracle.Database.SystemShapes","com.azure.resourcemanager.oracledatabase.models.SystemVersionProperties":"Oracle.Database.SystemVersionProperties","com.azure.resourcemanager.oracledatabase.models.TlsAuthenticationType":"Oracle.Database.TlsAuthenticationType","com.azure.resourcemanager.oracledatabase.models.VirtualNetworkAddressLifecycleState":"Oracle.Database.VirtualNetworkAddressLifecycleState","com.azure.resourcemanager.oracledatabase.models.VirtualNetworkAddressProperties":"Oracle.Database.VirtualNetworkAddressProperties","com.azure.resourcemanager.oracledatabase.models.WorkloadType":"Oracle.Database.WorkloadType","com.azure.resourcemanager.oracledatabase.models.ZoneType":"Oracle.Database.ZoneType"},"generatedFiles":["src/main/java/com/azure/resourcemanager/oracledatabase/OracleDatabaseManager.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseBackupsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseCharacterSetsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseNationalCharacterSetsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabasesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudExadataInfrastructuresClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudVmClustersClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbNodesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbServersClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemShapesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DnsPrivateViewsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DnsPrivateZonesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ExadbVmClustersClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ExascaleDbNodesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ExascaleDbStorageVaultsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/FlexComponentsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiMinorVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OperationsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleDatabaseManagementClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleSubscriptionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/SystemVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/VirtualNetworkAddressesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ActivationLinksInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseBackupInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseCharacterSetInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseNationalCharacterSetInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseWalletFileInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDbVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/CloudAccountDetailsInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/CloudExadataInfrastructureInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/CloudVmClusterInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbActionResponseInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbNodeInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbServerInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbSystemShapeInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DnsPrivateViewInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DnsPrivateZoneInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ExadbVmClusterInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ExascaleDbNodeInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ExascaleDbStorageVaultInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/FlexComponentInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/GiMinorVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/GiVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/OperationInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/OracleSubscriptionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/PrivateIpAddressPropertiesInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/SaasSubscriptionDetailsInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/SystemVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/VirtualNetworkAddressInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ActivationLinksImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseBackupImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseBackupsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseBackupsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseCharacterSetImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseCharacterSetsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseCharacterSetsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseNationalCharacterSetImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseNationalCharacterSetsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseNationalCharacterSetsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseWalletFileImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDbVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudAccountDetailsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructureImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudVmClusterImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudVmClustersClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudVmClustersImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbActionResponseImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbNodeImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbNodesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbNodesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbServerImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbServersClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbServersImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapeImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateViewImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateViewsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateViewsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateZoneImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateZonesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateZonesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExadbVmClusterImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExadbVmClustersClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExadbVmClustersImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbNodeImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbNodesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbNodesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbStorageVaultImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbStorageVaultsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbStorageVaultsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/FlexComponentImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/FlexComponentsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/FlexComponentsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiMinorVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiMinorVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiMinorVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OperationImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OperationsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OperationsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientBuilder.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleSubscriptionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleSubscriptionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleSubscriptionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/PrivateIpAddressPropertiesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceManagerUtils.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SaasSubscriptionDetailsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SystemVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SystemVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SystemVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/VirtualNetworkAddressImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/VirtualNetworkAddressesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/VirtualNetworkAddressesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseBackupListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseCharacterSetListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseNationalCharacterSetListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDbVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/CloudExadataInfrastructureListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/CloudVmClusterListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbNodeListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbServerListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbSystemShapeListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DnsPrivateViewListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DnsPrivateZoneListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ExadbVmClusterListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ExascaleDbNodeListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ExascaleDbStorageVaultListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/FlexComponentListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/GiMinorVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/GiVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/OperationListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/OracleSubscriptionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/SystemVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/VirtualNetworkAddressListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ActionType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ActivationLinks.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AddRemoveDbNode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AddSubscriptionOperationState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AllConnectionStringType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ApexDetailsType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabase.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackup.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackups.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBaseProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCharacterSet.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCharacterSetProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCharacterSets.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCloneProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCrossRegionDisasterRecoveryProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseFromBackupTimestampProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseNationalCharacterSet.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseNationalCharacterSetProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseNationalCharacterSets.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseStandbySummary.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseWalletFile.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabases.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDbVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDbVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousMaintenanceScheduleType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AzureResourceProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AzureSubscriptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloneType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudAccountDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudAccountProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructure.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructures.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmCluster.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusters.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ComputeModel.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConnectionStringType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConnectionUrlType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConsumerGroup.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CustomerContact.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DataBaseType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DataCollectionOptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DataSafeStatusType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DatabaseEditionType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DayOfWeek.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DayOfWeekName.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DayOfWeekUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbActionResponse.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbIormConfig.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeAction.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeActionEnum.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeMaintenanceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServer.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerPatchingDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerPatchingStatus.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServers.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShape.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapeProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DefinedFileSystemConfiguration.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DisasterRecoveryConfigurationDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DisasterRecoveryType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DiskRedundancy.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateView.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateViewProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateViews.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateViewsLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZone.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZoneProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZones.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZonesLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/EstimatedPatchingTime.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadataIormConfig.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmCluster.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterStorageDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusters.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbNode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbNodeProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbNodes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageInputDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVault.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultTagsUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaults.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FileSystemConfigurationDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FlexComponent.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FlexComponentProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FlexComponents.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GenerateAutonomousDatabaseWalletDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GenerateType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiMinorVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiMinorVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiMinorVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GridImageType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/HardwareType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/HostFormatType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Intent.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/IormLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/LicenseModel.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/LongTermBackUpScheduleDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/MaintenanceWindow.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Month.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/MonthName.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NsgCidr.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Objective.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OpenModeType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Operation.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OperationDisplay.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Operations.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OperationsInsightsStatusType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscription.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Origin.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PatchingMode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PeerDbDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PermissionLevelType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Plan.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PlanUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PortRange.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Preference.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PrivateIpAddressProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PrivateIpAddressesFilter.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ProfileType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ProtocolType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RefreshableModelType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RefreshableStatusType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RemoveVirtualMachineFromExadbVmClusterDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RepeatCadenceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RestoreAutonomousDatabaseDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RoleType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SaasSubscriptionDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ScheduledOperationsType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ScheduledOperationsTypeUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SessionModeType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeFamily.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SourceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SyntaxFormatType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemShapes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/TlsAuthenticationType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddress.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddressLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddressProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddresses.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/WorkloadType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ZoneType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/package-info.java","src/main/java/module-info.java"]}
\ No newline at end of file
+{"flavor":"azure","apiVersion":"2025-09-01","crossLanguageDefinitions":{"com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient":"Oracle.Database.AutonomousDatabaseBackups","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.beginCreateOrUpdate":"Azure.ResourceManager.AutonomousDatabaseBackups.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.beginDelete":"Azure.ResourceManager.AutonomousDatabaseBackups.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.beginUpdate":"Oracle.Database.AutonomousDatabaseBackups.update","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.createOrUpdate":"Azure.ResourceManager.AutonomousDatabaseBackups.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.delete":"Azure.ResourceManager.AutonomousDatabaseBackups.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.get":"Azure.ResourceManager.AutonomousDatabaseBackups.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.getWithResponse":"Azure.ResourceManager.AutonomousDatabaseBackups.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.listByAutonomousDatabase":"Oracle.Database.AutonomousDatabaseBackups.listByParent","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseBackupsClient.update":"Oracle.Database.AutonomousDatabaseBackups.update","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient":"Oracle.Database.AutonomousDatabaseCharacterSets","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient.get":"Oracle.Database.AutonomousDatabaseCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient.getWithResponse":"Oracle.Database.AutonomousDatabaseCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseCharacterSetsClient.listByLocation":"Oracle.Database.AutonomousDatabaseCharacterSets.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient":"Oracle.Database.AutonomousDatabaseNationalCharacterSets","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient.get":"Oracle.Database.AutonomousDatabaseNationalCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient.getWithResponse":"Oracle.Database.AutonomousDatabaseNationalCharacterSets.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseNationalCharacterSetsClient.listByLocation":"Oracle.Database.AutonomousDatabaseNationalCharacterSets.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient":"Oracle.Database.AutonomousDatabaseVersions","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.get":"Oracle.Database.AutonomousDatabaseVersions.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.getWithResponse":"Oracle.Database.AutonomousDatabaseVersions.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabaseVersionsClient.listByLocation":"Oracle.Database.AutonomousDatabaseVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient":"Oracle.Database.AutonomousDatabases","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.action":"Oracle.Database.AutonomousDatabases.action","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginAction":"Oracle.Database.AutonomousDatabases.action","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginChangeDisasterRecoveryConfiguration":"Oracle.Database.AutonomousDatabases.changeDisasterRecoveryConfiguration","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginCreateOrUpdate":"Azure.ResourceManager.AutonomousDatabases.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginDelete":"Azure.ResourceManager.AutonomousDatabases.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginFailover":"Oracle.Database.AutonomousDatabases.failover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginRestore":"Oracle.Database.AutonomousDatabases.restore","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginShrink":"Oracle.Database.AutonomousDatabases.shrink","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginSwitchover":"Oracle.Database.AutonomousDatabases.switchover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.beginUpdate":"Oracle.Database.AutonomousDatabases.update","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.changeDisasterRecoveryConfiguration":"Oracle.Database.AutonomousDatabases.changeDisasterRecoveryConfiguration","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.createOrUpdate":"Azure.ResourceManager.AutonomousDatabases.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.delete":"Azure.ResourceManager.AutonomousDatabases.delete","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.failover":"Oracle.Database.AutonomousDatabases.failover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.generateWallet":"Oracle.Database.AutonomousDatabases.generateWallet","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.generateWalletWithResponse":"Oracle.Database.AutonomousDatabases.generateWallet","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.getByResourceGroup":"Azure.ResourceManager.AutonomousDatabases.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.getByResourceGroupWithResponse":"Azure.ResourceManager.AutonomousDatabases.get","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.list":"Azure.ResourceManager.AutonomousDatabases.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.listByResourceGroup":"Oracle.Database.AutonomousDatabases.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.restore":"Oracle.Database.AutonomousDatabases.restore","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.shrink":"Oracle.Database.AutonomousDatabases.shrink","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.switchover":"Oracle.Database.AutonomousDatabases.switchover","com.azure.resourcemanager.oracledatabase.fluent.AutonomousDatabasesClient.update":"Oracle.Database.AutonomousDatabases.update","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient":"Oracle.Database.CloudExadataInfrastructures","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.addStorageCapacity":"Oracle.Database.CloudExadataInfrastructures.addStorageCapacity","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginAddStorageCapacity":"Oracle.Database.CloudExadataInfrastructures.addStorageCapacity","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginConfigureExascale":"Oracle.Database.CloudExadataInfrastructures.configureExascale","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginCreateOrUpdate":"Azure.ResourceManager.CloudExadataInfrastructures.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginDelete":"Azure.ResourceManager.CloudExadataInfrastructures.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.beginUpdate":"Azure.ResourceManager.CloudExadataInfrastructures.update","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.configureExascale":"Oracle.Database.CloudExadataInfrastructures.configureExascale","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.createOrUpdate":"Azure.ResourceManager.CloudExadataInfrastructures.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.delete":"Azure.ResourceManager.CloudExadataInfrastructures.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.getByResourceGroup":"Azure.ResourceManager.CloudExadataInfrastructures.get","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CloudExadataInfrastructures.get","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.list":"Azure.ResourceManager.CloudExadataInfrastructures.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.listByResourceGroup":"Oracle.Database.CloudExadataInfrastructures.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.CloudExadataInfrastructuresClient.update":"Azure.ResourceManager.CloudExadataInfrastructures.update","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient":"Oracle.Database.CloudVmClusters","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.addVms":"Oracle.Database.CloudVmClusters.addVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginAddVms":"Oracle.Database.CloudVmClusters.addVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginCreateOrUpdate":"Azure.ResourceManager.CloudVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginDelete":"Azure.ResourceManager.CloudVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginRemoveVms":"Oracle.Database.CloudVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.beginUpdate":"Azure.ResourceManager.CloudVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.createOrUpdate":"Azure.ResourceManager.CloudVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.delete":"Azure.ResourceManager.CloudVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.getByResourceGroup":"Azure.ResourceManager.CloudVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.getByResourceGroupWithResponse":"Azure.ResourceManager.CloudVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.list":"Azure.ResourceManager.CloudVmClusters.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.listByResourceGroup":"Oracle.Database.CloudVmClusters.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.listPrivateIpAddresses":"Oracle.Database.CloudVmClusters.listPrivateIpAddresses","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.listPrivateIpAddressesWithResponse":"Oracle.Database.CloudVmClusters.listPrivateIpAddresses","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.removeVms":"Oracle.Database.CloudVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.CloudVmClustersClient.update":"Azure.ResourceManager.CloudVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient":"Oracle.Database.DbNodes","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.action":"Oracle.Database.DbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.beginAction":"Oracle.Database.DbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.get":"Oracle.Database.DbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.getWithResponse":"Oracle.Database.DbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.DbNodesClient.listByCloudVmCluster":"Oracle.Database.DbNodes.listByParent","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient":"Oracle.Database.DbServers","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient.get":"Oracle.Database.DbServers.get","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient.getWithResponse":"Oracle.Database.DbServers.get","com.azure.resourcemanager.oracledatabase.fluent.DbServersClient.listByCloudExadataInfrastructure":"Oracle.Database.DbServers.listByParent","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient":"Oracle.Database.DbSystemShapes","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.get":"Oracle.Database.DbSystemShapes.get","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.getWithResponse":"Oracle.Database.DbSystemShapes.get","com.azure.resourcemanager.oracledatabase.fluent.DbSystemShapesClient.listByLocation":"Oracle.Database.DbSystemShapes.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient":"Oracle.Database.DbSystems","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.beginCreateOrUpdate":"Azure.ResourceManager.DbSystems.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.beginDelete":"Azure.ResourceManager.DbSystems.delete","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.beginUpdate":"Azure.ResourceManager.DbSystems.update","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.createOrUpdate":"Azure.ResourceManager.DbSystems.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.delete":"Azure.ResourceManager.DbSystems.delete","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.getByResourceGroup":"Azure.ResourceManager.DbSystems.get","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.DbSystems.get","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.list":"Azure.ResourceManager.DbSystems.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.listByResourceGroup":"Oracle.Database.DbSystems.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.DbSystemsClient.update":"Azure.ResourceManager.DbSystems.update","com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient":"Oracle.Database.DbVersions","com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient.get":"Oracle.Database.DbVersions.get","com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient.getWithResponse":"Oracle.Database.DbVersions.get","com.azure.resourcemanager.oracledatabase.fluent.DbVersionsClient.listByLocation":"Oracle.Database.DbVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient":"Oracle.Database.DnsPrivateViews","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.get":"Oracle.Database.DnsPrivateViews.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.getWithResponse":"Oracle.Database.DnsPrivateViews.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateViewsClient.listByLocation":"Oracle.Database.DnsPrivateViews.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient":"Oracle.Database.DnsPrivateZones","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient.get":"Oracle.Database.DnsPrivateZones.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient.getWithResponse":"Oracle.Database.DnsPrivateZones.get","com.azure.resourcemanager.oracledatabase.fluent.DnsPrivateZonesClient.listByLocation":"Oracle.Database.DnsPrivateZones.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient":"Oracle.Database.ExadbVmClusters","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginCreateOrUpdate":"Azure.ResourceManager.ExadbVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginDelete":"Azure.ResourceManager.ExadbVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginRemoveVms":"Oracle.Database.ExadbVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.beginUpdate":"Azure.ResourceManager.ExadbVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.createOrUpdate":"Azure.ResourceManager.ExadbVmClusters.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.delete":"Azure.ResourceManager.ExadbVmClusters.delete","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.getByResourceGroup":"Azure.ResourceManager.ExadbVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.getByResourceGroupWithResponse":"Azure.ResourceManager.ExadbVmClusters.get","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.list":"Azure.ResourceManager.ExadbVmClusters.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.listByResourceGroup":"Oracle.Database.ExadbVmClusters.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.removeVms":"Oracle.Database.ExadbVmClusters.removeVms","com.azure.resourcemanager.oracledatabase.fluent.ExadbVmClustersClient.update":"Azure.ResourceManager.ExadbVmClusters.update","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient":"Oracle.Database.ExascaleDbNodes","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.action":"Oracle.Database.ExascaleDbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.beginAction":"Oracle.Database.ExascaleDbNodes.action","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.get":"Oracle.Database.ExascaleDbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.getWithResponse":"Oracle.Database.ExascaleDbNodes.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbNodesClient.listByParent":"Oracle.Database.ExascaleDbNodes.listByParent","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient":"Oracle.Database.ExascaleDbStorageVaults","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.beginCreate":"Oracle.Database.ExascaleDbStorageVaults.create","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.beginDelete":"Oracle.Database.ExascaleDbStorageVaults.delete","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.beginUpdate":"Oracle.Database.ExascaleDbStorageVaults.update","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.create":"Oracle.Database.ExascaleDbStorageVaults.create","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.delete":"Oracle.Database.ExascaleDbStorageVaults.delete","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.getByResourceGroup":"Oracle.Database.ExascaleDbStorageVaults.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.getByResourceGroupWithResponse":"Oracle.Database.ExascaleDbStorageVaults.get","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.list":"Oracle.Database.ExascaleDbStorageVaults.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.listByResourceGroup":"Oracle.Database.ExascaleDbStorageVaults.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.ExascaleDbStorageVaultsClient.update":"Oracle.Database.ExascaleDbStorageVaults.update","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient":"Oracle.Database.FlexComponents","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient.get":"Oracle.Database.FlexComponents.get","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient.getWithResponse":"Oracle.Database.FlexComponents.get","com.azure.resourcemanager.oracledatabase.fluent.FlexComponentsClient.listByParent":"Oracle.Database.FlexComponents.listByParent","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient":"Oracle.Database.GiMinorVersions","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient.get":"Oracle.Database.GiMinorVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient.getWithResponse":"Oracle.Database.GiMinorVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiMinorVersionsClient.listByParent":"Oracle.Database.GiMinorVersions.listByParent","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient":"Oracle.Database.GiVersions","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.get":"Oracle.Database.GiVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.getWithResponse":"Oracle.Database.GiVersions.get","com.azure.resourcemanager.oracledatabase.fluent.GiVersionsClient.listByLocation":"Oracle.Database.GiVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient":"Oracle.Database.NetworkAnchors","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.beginCreateOrUpdate":"Azure.ResourceManager.NetworkAnchors.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.beginDelete":"Azure.ResourceManager.NetworkAnchors.delete","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.beginUpdate":"Azure.ResourceManager.NetworkAnchors.update","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.createOrUpdate":"Azure.ResourceManager.NetworkAnchors.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.delete":"Azure.ResourceManager.NetworkAnchors.delete","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.getByResourceGroup":"Azure.ResourceManager.NetworkAnchors.get","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.NetworkAnchors.get","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.list":"Azure.ResourceManager.NetworkAnchors.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.listByResourceGroup":"Oracle.Database.NetworkAnchors.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.NetworkAnchorsClient.update":"Azure.ResourceManager.NetworkAnchors.update","com.azure.resourcemanager.oracledatabase.fluent.OperationsClient":"Oracle.Database.Operations","com.azure.resourcemanager.oracledatabase.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","com.azure.resourcemanager.oracledatabase.fluent.OracleDatabaseManagementClient":"Oracle.Database","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient":"Oracle.Database.OracleSubscriptions","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.addAzureSubscriptions":"Oracle.Database.OracleSubscriptions.addAzureSubscriptions","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginAddAzureSubscriptions":"Oracle.Database.OracleSubscriptions.addAzureSubscriptions","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginCreateOrUpdate":"Azure.ResourceManager.OracleSubscriptions.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginDelete":"Azure.ResourceManager.OracleSubscriptions.delete","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginListActivationLinks":"Oracle.Database.OracleSubscriptions.listActivationLinks","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginListCloudAccountDetails":"Oracle.Database.OracleSubscriptions.listCloudAccountDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginListSaasSubscriptionDetails":"Oracle.Database.OracleSubscriptions.listSaasSubscriptionDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.beginUpdate":"Oracle.Database.OracleSubscriptions.update","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.createOrUpdate":"Azure.ResourceManager.OracleSubscriptions.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.delete":"Azure.ResourceManager.OracleSubscriptions.delete","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.get":"Azure.ResourceManager.OracleSubscriptions.get","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.getWithResponse":"Azure.ResourceManager.OracleSubscriptions.get","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.list":"Azure.ResourceManager.OracleSubscriptions.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listActivationLinks":"Oracle.Database.OracleSubscriptions.listActivationLinks","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listCloudAccountDetails":"Oracle.Database.OracleSubscriptions.listCloudAccountDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.listSaasSubscriptionDetails":"Oracle.Database.OracleSubscriptions.listSaasSubscriptionDetails","com.azure.resourcemanager.oracledatabase.fluent.OracleSubscriptionsClient.update":"Oracle.Database.OracleSubscriptions.update","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient":"Oracle.Database.ResourceAnchors","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.beginCreateOrUpdate":"Azure.ResourceManager.ResourceAnchors.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.beginDelete":"Azure.ResourceManager.ResourceAnchors.delete","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.beginUpdate":"Azure.ResourceManager.ResourceAnchors.update","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.createOrUpdate":"Azure.ResourceManager.ResourceAnchors.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.delete":"Azure.ResourceManager.ResourceAnchors.delete","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.getByResourceGroup":"Azure.ResourceManager.ResourceAnchors.get","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.getByResourceGroupWithResponse":"Azure.ResourceManager.ResourceAnchors.get","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.list":"Azure.ResourceManager.ResourceAnchors.listBySubscription","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.listByResourceGroup":"Oracle.Database.ResourceAnchors.listByResourceGroup","com.azure.resourcemanager.oracledatabase.fluent.ResourceAnchorsClient.update":"Azure.ResourceManager.ResourceAnchors.update","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient":"Oracle.Database.SystemVersions","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.get":"Oracle.Database.SystemVersions.get","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.getWithResponse":"Oracle.Database.SystemVersions.get","com.azure.resourcemanager.oracledatabase.fluent.SystemVersionsClient.listByLocation":"Oracle.Database.SystemVersions.listByLocation","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient":"Oracle.Database.VirtualNetworkAddresses","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.beginCreateOrUpdate":"Azure.ResourceManager.VirtualNetworkAddresses.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.beginDelete":"Azure.ResourceManager.VirtualNetworkAddresses.delete","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.createOrUpdate":"Azure.ResourceManager.VirtualNetworkAddresses.createOrUpdate","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.delete":"Azure.ResourceManager.VirtualNetworkAddresses.delete","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.get":"Azure.ResourceManager.VirtualNetworkAddresses.get","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.getWithResponse":"Azure.ResourceManager.VirtualNetworkAddresses.get","com.azure.resourcemanager.oracledatabase.fluent.VirtualNetworkAddressesClient.listByCloudVmCluster":"Oracle.Database.VirtualNetworkAddresses.listByParent","com.azure.resourcemanager.oracledatabase.fluent.models.ActivationLinksInner":"Oracle.Database.ActivationLinks","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseBackupInner":"Oracle.Database.AutonomousDatabaseBackup","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseCharacterSetInner":"Oracle.Database.AutonomousDatabaseCharacterSet","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseInner":"Oracle.Database.AutonomousDatabase","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseNationalCharacterSetInner":"Oracle.Database.AutonomousDatabaseNationalCharacterSet","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDatabaseWalletFileInner":"Oracle.Database.AutonomousDatabaseWalletFile","com.azure.resourcemanager.oracledatabase.fluent.models.AutonomousDbVersionInner":"Oracle.Database.AutonomousDbVersion","com.azure.resourcemanager.oracledatabase.fluent.models.CloudAccountDetailsInner":"Oracle.Database.CloudAccountDetails","com.azure.resourcemanager.oracledatabase.fluent.models.CloudExadataInfrastructureInner":"Oracle.Database.CloudExadataInfrastructure","com.azure.resourcemanager.oracledatabase.fluent.models.CloudVmClusterInner":"Oracle.Database.CloudVmCluster","com.azure.resourcemanager.oracledatabase.fluent.models.DbActionResponseInner":"Oracle.Database.DbActionResponse","com.azure.resourcemanager.oracledatabase.fluent.models.DbNodeInner":"Oracle.Database.DbNode","com.azure.resourcemanager.oracledatabase.fluent.models.DbServerInner":"Oracle.Database.DbServer","com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemInner":"Oracle.Database.DbSystem","com.azure.resourcemanager.oracledatabase.fluent.models.DbSystemShapeInner":"Oracle.Database.DbSystemShape","com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner":"Oracle.Database.DbVersion","com.azure.resourcemanager.oracledatabase.fluent.models.DnsPrivateViewInner":"Oracle.Database.DnsPrivateView","com.azure.resourcemanager.oracledatabase.fluent.models.DnsPrivateZoneInner":"Oracle.Database.DnsPrivateZone","com.azure.resourcemanager.oracledatabase.fluent.models.ExadbVmClusterInner":"Oracle.Database.ExadbVmCluster","com.azure.resourcemanager.oracledatabase.fluent.models.ExascaleDbNodeInner":"Oracle.Database.ExascaleDbNode","com.azure.resourcemanager.oracledatabase.fluent.models.ExascaleDbStorageVaultInner":"Oracle.Database.ExascaleDbStorageVault","com.azure.resourcemanager.oracledatabase.fluent.models.FlexComponentInner":"Oracle.Database.FlexComponent","com.azure.resourcemanager.oracledatabase.fluent.models.GiMinorVersionInner":"Oracle.Database.GiMinorVersion","com.azure.resourcemanager.oracledatabase.fluent.models.GiVersionInner":"Oracle.Database.GiVersion","com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner":"Oracle.Database.NetworkAnchor","com.azure.resourcemanager.oracledatabase.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","com.azure.resourcemanager.oracledatabase.fluent.models.OracleSubscriptionInner":"Oracle.Database.OracleSubscription","com.azure.resourcemanager.oracledatabase.fluent.models.PrivateIpAddressPropertiesInner":"Oracle.Database.PrivateIpAddressProperties","com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner":"Oracle.Database.ResourceAnchor","com.azure.resourcemanager.oracledatabase.fluent.models.SaasSubscriptionDetailsInner":"Oracle.Database.SaasSubscriptionDetails","com.azure.resourcemanager.oracledatabase.fluent.models.SystemVersionInner":"Oracle.Database.SystemVersion","com.azure.resourcemanager.oracledatabase.fluent.models.VirtualNetworkAddressInner":"Oracle.Database.VirtualNetworkAddress","com.azure.resourcemanager.oracledatabase.implementation.OracleDatabaseManagementClientBuilder":"Oracle.Database","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseBackupListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseCharacterSetListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDatabaseNationalCharacterSetListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.AutonomousDbVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.CloudExadataInfrastructureListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.CloudVmClusterListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbNodeListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbServerListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbSystemListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbSystemShapeListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DbVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DnsPrivateViewListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.DnsPrivateZoneListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ExadbVmClusterListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ExascaleDbNodeListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ExascaleDbStorageVaultListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.FlexComponentListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.GiMinorVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.GiVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.NetworkAnchorListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","com.azure.resourcemanager.oracledatabase.implementation.models.OracleSubscriptionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.ResourceAnchorListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.SystemVersionListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.implementation.models.VirtualNetworkAddressListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.oracledatabase.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","com.azure.resourcemanager.oracledatabase.models.AddRemoveDbNode":"Oracle.Database.AddRemoveDbNode","com.azure.resourcemanager.oracledatabase.models.AddSubscriptionOperationState":"Oracle.Database.AddSubscriptionOperationState","com.azure.resourcemanager.oracledatabase.models.AllConnectionStringType":"Oracle.Database.AllConnectionStringType","com.azure.resourcemanager.oracledatabase.models.ApexDetailsType":"Oracle.Database.ApexDetailsType","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupLifecycleState":"Oracle.Database.AutonomousDatabaseBackupLifecycleState","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupProperties":"Oracle.Database.AutonomousDatabaseBackupProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupType":"Oracle.Database.AutonomousDatabaseBackupType","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBaseProperties":"Oracle.Database.AutonomousDatabaseBaseProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCharacterSetProperties":"Oracle.Database.AutonomousDatabaseCharacterSetProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCloneProperties":"Oracle.Database.AutonomousDatabaseCloneProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCrossRegionDisasterRecoveryProperties":"Oracle.Database.AutonomousDatabaseCrossRegionDisasterRecoveryProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseFromBackupTimestampProperties":"Oracle.Database.AutonomousDatabaseFromBackupTimestampProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction":"Oracle.Database.AutonomousDatabaseLifecycleAction","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleActionEnum":"Oracle.Database.AutonomousDatabaseLifecycleActionEnum","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleState":"Oracle.Database.AutonomousDatabaseLifecycleState","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseNationalCharacterSetProperties":"Oracle.Database.AutonomousDatabaseNationalCharacterSetProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseProperties":"Oracle.Database.AutonomousDatabaseProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseStandbySummary":"Oracle.Database.AutonomousDatabaseStandbySummary","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdate":"Oracle.Database.AutonomousDatabaseUpdate","com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdateProperties":"Oracle.Database.AutonomousDatabaseUpdateProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousDbVersionProperties":"Oracle.Database.AutonomousDbVersionProperties","com.azure.resourcemanager.oracledatabase.models.AutonomousMaintenanceScheduleType":"Oracle.Database.AutonomousMaintenanceScheduleType","com.azure.resourcemanager.oracledatabase.models.AzureResourceProvisioningState":"Oracle.Database.AzureResourceProvisioningState","com.azure.resourcemanager.oracledatabase.models.AzureSubscriptions":"Oracle.Database.AzureSubscriptions","com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes":"Oracle.Database.BaseDbSystemShapes","com.azure.resourcemanager.oracledatabase.models.CloneType":"Oracle.Database.CloneType","com.azure.resourcemanager.oracledatabase.models.CloudAccountProvisioningState":"Oracle.Database.CloudAccountProvisioningState","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureLifecycleState":"Oracle.Database.CloudExadataInfrastructureLifecycleState","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureProperties":"Oracle.Database.CloudExadataInfrastructureProperties","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterLifecycleState":"Oracle.Database.CloudVmClusterLifecycleState","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterProperties":"Oracle.Database.CloudVmClusterProperties","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.ComputeModel":"Oracle.Database.ComputeModel","com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails":"Oracle.Database.ConfigureExascaleCloudExadataInfrastructureDetails","com.azure.resourcemanager.oracledatabase.models.ConnectionStringType":"Oracle.Database.ConnectionStringType","com.azure.resourcemanager.oracledatabase.models.ConnectionUrlType":"Oracle.Database.ConnectionUrlType","com.azure.resourcemanager.oracledatabase.models.ConsumerGroup":"Oracle.Database.ConsumerGroup","com.azure.resourcemanager.oracledatabase.models.CustomerContact":"Oracle.Database.CustomerContact","com.azure.resourcemanager.oracledatabase.models.DataBaseType":"Oracle.Database.DataBaseType","com.azure.resourcemanager.oracledatabase.models.DataCollectionOptions":"Oracle.Database.DataCollectionOptions","com.azure.resourcemanager.oracledatabase.models.DataSafeStatusType":"Oracle.Database.DataSafeStatusType","com.azure.resourcemanager.oracledatabase.models.DatabaseEditionType":"Oracle.Database.DatabaseEditionType","com.azure.resourcemanager.oracledatabase.models.DayOfWeek":"Oracle.Database.DayOfWeek","com.azure.resourcemanager.oracledatabase.models.DayOfWeekName":"Oracle.Database.DayOfWeekName","com.azure.resourcemanager.oracledatabase.models.DayOfWeekUpdate":"Oracle.Database.DayOfWeekUpdate","com.azure.resourcemanager.oracledatabase.models.DbIormConfig":"Oracle.Database.DbIormConfig","com.azure.resourcemanager.oracledatabase.models.DbNodeAction":"Oracle.Database.DbNodeAction","com.azure.resourcemanager.oracledatabase.models.DbNodeActionEnum":"Oracle.Database.DbNodeActionEnum","com.azure.resourcemanager.oracledatabase.models.DbNodeDetails":"Oracle.Database.DbNodeDetails","com.azure.resourcemanager.oracledatabase.models.DbNodeMaintenanceType":"Oracle.Database.DbNodeMaintenanceType","com.azure.resourcemanager.oracledatabase.models.DbNodeProperties":"Oracle.Database.DbNodeProperties","com.azure.resourcemanager.oracledatabase.models.DbNodeProvisioningState":"Oracle.Database.DbNodeProvisioningState","com.azure.resourcemanager.oracledatabase.models.DbServerPatchingDetails":"Oracle.Database.DbServerPatchingDetails","com.azure.resourcemanager.oracledatabase.models.DbServerPatchingStatus":"Oracle.Database.DbServerPatchingStatus","com.azure.resourcemanager.oracledatabase.models.DbServerProperties":"Oracle.Database.DbServerProperties","com.azure.resourcemanager.oracledatabase.models.DbServerProvisioningState":"Oracle.Database.DbServerProvisioningState","com.azure.resourcemanager.oracledatabase.models.DbSystemBaseProperties":"Oracle.Database.DbSystemBaseProperties","com.azure.resourcemanager.oracledatabase.models.DbSystemDatabaseEditionType":"Oracle.Database.DbSystemDatabaseEditionType","com.azure.resourcemanager.oracledatabase.models.DbSystemLifecycleState":"Oracle.Database.DbSystemLifecycleState","com.azure.resourcemanager.oracledatabase.models.DbSystemOptions":"Oracle.Database.DbSystemOptions","com.azure.resourcemanager.oracledatabase.models.DbSystemProperties":"Oracle.Database.DbSystemProperties","com.azure.resourcemanager.oracledatabase.models.DbSystemShapeProperties":"Oracle.Database.DbSystemShapeProperties","com.azure.resourcemanager.oracledatabase.models.DbSystemSourceType":"Oracle.Database.DbSystemSourceType","com.azure.resourcemanager.oracledatabase.models.DbSystemUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.DbSystemUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.DbVersionProperties":"Oracle.Database.DbVersionProperties","com.azure.resourcemanager.oracledatabase.models.DefinedFileSystemConfiguration":"Oracle.Database.DefinedFileSystemConfiguration","com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails":"Oracle.Database.DisasterRecoveryConfigurationDetails","com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryType":"Oracle.Database.DisasterRecoveryType","com.azure.resourcemanager.oracledatabase.models.DiskRedundancy":"Oracle.Database.DiskRedundancy","com.azure.resourcemanager.oracledatabase.models.DiskRedundancyType":"Oracle.Database.DiskRedundancyType","com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule":"Oracle.Database.DnsForwardingRule","com.azure.resourcemanager.oracledatabase.models.DnsPrivateViewProperties":"Oracle.Database.DnsPrivateViewProperties","com.azure.resourcemanager.oracledatabase.models.DnsPrivateViewsLifecycleState":"Oracle.Database.DnsPrivateViewsLifecycleState","com.azure.resourcemanager.oracledatabase.models.DnsPrivateZoneProperties":"Oracle.Database.DnsPrivateZoneProperties","com.azure.resourcemanager.oracledatabase.models.DnsPrivateZonesLifecycleState":"Oracle.Database.DnsPrivateZonesLifecycleState","com.azure.resourcemanager.oracledatabase.models.EstimatedPatchingTime":"Oracle.Database.EstimatedPatchingTime","com.azure.resourcemanager.oracledatabase.models.ExadataIormConfig":"Oracle.Database.ExadataIormConfig","com.azure.resourcemanager.oracledatabase.models.ExadataVmClusterStorageManagementType":"Oracle.Database.ExadataVmClusterStorageManagementType","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterLifecycleState":"Oracle.Database.ExadbVmClusterLifecycleState","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterProperties":"Oracle.Database.ExadbVmClusterProperties","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterStorageDetails":"Oracle.Database.ExadbVmClusterStorageDetails","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.ExadbVmClusterUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.ExascaleConfigDetails":"Oracle.Database.ExascaleConfigDetails","com.azure.resourcemanager.oracledatabase.models.ExascaleDbNodeProperties":"Oracle.Database.ExascaleDbNodeProperties","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageDetails":"Oracle.Database.ExascaleDbStorageDetails","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageInputDetails":"Oracle.Database.ExascaleDbStorageInputDetails","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageVaultLifecycleState":"Oracle.Database.ExascaleDbStorageVaultLifecycleState","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageVaultProperties":"Oracle.Database.ExascaleDbStorageVaultProperties","com.azure.resourcemanager.oracledatabase.models.ExascaleDbStorageVaultTagsUpdate":"Azure.ResourceManager.Foundations.TagsUpdateModel","com.azure.resourcemanager.oracledatabase.models.FileSystemConfigurationDetails":"Oracle.Database.FileSystemConfigurationDetails","com.azure.resourcemanager.oracledatabase.models.FlexComponentProperties":"Oracle.Database.FlexComponentProperties","com.azure.resourcemanager.oracledatabase.models.GenerateAutonomousDatabaseWalletDetails":"Oracle.Database.GenerateAutonomousDatabaseWalletDetails","com.azure.resourcemanager.oracledatabase.models.GenerateType":"Oracle.Database.GenerateType","com.azure.resourcemanager.oracledatabase.models.GiMinorVersionProperties":"Oracle.Database.GiMinorVersionProperties","com.azure.resourcemanager.oracledatabase.models.GiVersionProperties":"Oracle.Database.GiVersionProperties","com.azure.resourcemanager.oracledatabase.models.GridImageType":"Oracle.Database.GridImageType","com.azure.resourcemanager.oracledatabase.models.HardwareType":"Oracle.Database.HardwareType","com.azure.resourcemanager.oracledatabase.models.HostFormatType":"Oracle.Database.HostFormatType","com.azure.resourcemanager.oracledatabase.models.Intent":"Oracle.Database.Intent","com.azure.resourcemanager.oracledatabase.models.IormLifecycleState":"Oracle.Database.IormLifecycleState","com.azure.resourcemanager.oracledatabase.models.LicenseModel":"Oracle.Database.LicenseModel","com.azure.resourcemanager.oracledatabase.models.LongTermBackUpScheduleDetails":"Oracle.Database.LongTermBackUpScheduleDetails","com.azure.resourcemanager.oracledatabase.models.MaintenanceWindow":"Oracle.Database.MaintenanceWindow","com.azure.resourcemanager.oracledatabase.models.Month":"Oracle.Database.Month","com.azure.resourcemanager.oracledatabase.models.MonthName":"Oracle.Database.MonthName","com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties":"Oracle.Database.NetworkAnchorProperties","com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.NsgCidr":"Oracle.Database.NsgCidr","com.azure.resourcemanager.oracledatabase.models.Objective":"Oracle.Database.Objective","com.azure.resourcemanager.oracledatabase.models.OpenModeType":"Oracle.Database.OpenModeType","com.azure.resourcemanager.oracledatabase.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","com.azure.resourcemanager.oracledatabase.models.OperationsInsightsStatusType":"Oracle.Database.OperationsInsightsStatusType","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionProperties":"Oracle.Database.OracleSubscriptionProperties","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionProvisioningState":"Oracle.Database.OracleSubscriptionProvisioningState","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdateProperties":"Azure.ResourceManager.Foundations.ResourceUpdateModelProperties","com.azure.resourcemanager.oracledatabase.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","com.azure.resourcemanager.oracledatabase.models.PatchingMode":"Oracle.Database.PatchingMode","com.azure.resourcemanager.oracledatabase.models.PeerDbDetails":"Oracle.Database.PeerDbDetails","com.azure.resourcemanager.oracledatabase.models.PermissionLevelType":"Oracle.Database.PermissionLevelType","com.azure.resourcemanager.oracledatabase.models.Plan":"Azure.ResourceManager.CommonTypes.Plan","com.azure.resourcemanager.oracledatabase.models.PlanUpdate":"Oracle.Database.PlanUpdate","com.azure.resourcemanager.oracledatabase.models.PortRange":"Oracle.Database.PortRange","com.azure.resourcemanager.oracledatabase.models.Preference":"Oracle.Database.Preference","com.azure.resourcemanager.oracledatabase.models.PrivateIpAddressesFilter":"Oracle.Database.PrivateIpAddressesFilter","com.azure.resourcemanager.oracledatabase.models.ProfileType":"Oracle.Database.ProfileType","com.azure.resourcemanager.oracledatabase.models.ProtocolType":"Oracle.Database.ProtocolType","com.azure.resourcemanager.oracledatabase.models.RefreshableModelType":"Oracle.Database.RefreshableModelType","com.azure.resourcemanager.oracledatabase.models.RefreshableStatusType":"Oracle.Database.RefreshableStatusType","com.azure.resourcemanager.oracledatabase.models.RemoveVirtualMachineFromExadbVmClusterDetails":"Oracle.Database.RemoveVirtualMachineFromExadbVmClusterDetails","com.azure.resourcemanager.oracledatabase.models.RepeatCadenceType":"Oracle.Database.RepeatCadenceType","com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties":"Oracle.Database.ResourceAnchorProperties","com.azure.resourcemanager.oracledatabase.models.ResourceAnchorUpdate":"Azure.ResourceManager.Foundations.ResourceUpdateModel","com.azure.resourcemanager.oracledatabase.models.ResourceProvisioningState":"Azure.ResourceManager.ResourceProvisioningState","com.azure.resourcemanager.oracledatabase.models.RestoreAutonomousDatabaseDetails":"Oracle.Database.RestoreAutonomousDatabaseDetails","com.azure.resourcemanager.oracledatabase.models.RoleType":"Oracle.Database.RoleType","com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsType":"Oracle.Database.ScheduledOperationsType","com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsTypeUpdate":"Oracle.Database.ScheduledOperationsTypeUpdate","com.azure.resourcemanager.oracledatabase.models.SessionModeType":"Oracle.Database.SessionModeType","com.azure.resourcemanager.oracledatabase.models.ShapeAttribute":"Oracle.Database.ShapeAttribute","com.azure.resourcemanager.oracledatabase.models.ShapeFamily":"Oracle.Database.ShapeFamily","com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType":"Oracle.Database.ShapeFamilyType","com.azure.resourcemanager.oracledatabase.models.SourceType":"Oracle.Database.SourceType","com.azure.resourcemanager.oracledatabase.models.StorageManagementType":"Oracle.Database.StorageManagementType","com.azure.resourcemanager.oracledatabase.models.StorageVolumePerformanceMode":"Oracle.Database.StorageVolumePerformanceMode","com.azure.resourcemanager.oracledatabase.models.SyntaxFormatType":"Oracle.Database.SyntaxFormatType","com.azure.resourcemanager.oracledatabase.models.SystemShapes":"Oracle.Database.SystemShapes","com.azure.resourcemanager.oracledatabase.models.SystemVersionProperties":"Oracle.Database.SystemVersionProperties","com.azure.resourcemanager.oracledatabase.models.TlsAuthenticationType":"Oracle.Database.TlsAuthenticationType","com.azure.resourcemanager.oracledatabase.models.VirtualNetworkAddressLifecycleState":"Oracle.Database.VirtualNetworkAddressLifecycleState","com.azure.resourcemanager.oracledatabase.models.VirtualNetworkAddressProperties":"Oracle.Database.VirtualNetworkAddressProperties","com.azure.resourcemanager.oracledatabase.models.WorkloadType":"Oracle.Database.WorkloadType","com.azure.resourcemanager.oracledatabase.models.ZoneType":"Oracle.Database.ZoneType"},"generatedFiles":["src/main/java/com/azure/resourcemanager/oracledatabase/OracleDatabaseManager.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseBackupsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseCharacterSetsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseNationalCharacterSetsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabaseVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/AutonomousDatabasesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudExadataInfrastructuresClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/CloudVmClustersClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbNodesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbServersClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemShapesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbSystemsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DbVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DnsPrivateViewsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/DnsPrivateZonesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ExadbVmClustersClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ExascaleDbNodesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ExascaleDbStorageVaultsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/FlexComponentsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiMinorVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/GiVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/NetworkAnchorsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OperationsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleDatabaseManagementClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/OracleSubscriptionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/ResourceAnchorsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/SystemVersionsClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/VirtualNetworkAddressesClient.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ActivationLinksInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseBackupInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseCharacterSetInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseNationalCharacterSetInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDatabaseWalletFileInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/AutonomousDbVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/CloudAccountDetailsInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/CloudExadataInfrastructureInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/CloudVmClusterInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbActionResponseInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbNodeInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbServerInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbSystemInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbSystemShapeInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DbVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DnsPrivateViewInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/DnsPrivateZoneInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ExadbVmClusterInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ExascaleDbNodeInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ExascaleDbStorageVaultInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/FlexComponentInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/GiMinorVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/GiVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/NetworkAnchorInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/OperationInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/OracleSubscriptionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/PrivateIpAddressPropertiesInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/ResourceAnchorInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/SaasSubscriptionDetailsInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/SystemVersionInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/VirtualNetworkAddressInner.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/models/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/fluent/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ActivationLinksImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseBackupImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseBackupsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseBackupsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseCharacterSetImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseCharacterSetsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseCharacterSetsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseNationalCharacterSetImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseNationalCharacterSetsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseNationalCharacterSetsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabaseWalletFileImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDatabasesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/AutonomousDbVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudAccountDetailsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructureImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudExadataInfrastructuresImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudVmClusterImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudVmClustersClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/CloudVmClustersImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbActionResponseImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbNodeImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbNodesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbNodesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbServerImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbServersClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbServersImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapeImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemShapesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbSystemsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DbVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateViewImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateViewsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateViewsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateZoneImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateZonesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/DnsPrivateZonesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExadbVmClusterImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExadbVmClustersClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExadbVmClustersImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbNodeImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbNodesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbNodesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbStorageVaultImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbStorageVaultsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ExascaleDbStorageVaultsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/FlexComponentImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/FlexComponentsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/FlexComponentsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiMinorVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiMinorVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiMinorVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/GiVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/NetworkAnchorsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OperationImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OperationsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OperationsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientBuilder.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleDatabaseManagementClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleSubscriptionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleSubscriptionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/OracleSubscriptionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/PrivateIpAddressPropertiesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceAnchorsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/ResourceManagerUtils.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SaasSubscriptionDetailsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SystemVersionImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SystemVersionsClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/SystemVersionsImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/VirtualNetworkAddressImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/VirtualNetworkAddressesClientImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/VirtualNetworkAddressesImpl.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseBackupListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseCharacterSetListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDatabaseNationalCharacterSetListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/AutonomousDbVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/CloudExadataInfrastructureListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/CloudVmClusterListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbNodeListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbServerListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbSystemListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbSystemShapeListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DbVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DnsPrivateViewListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/DnsPrivateZoneListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ExadbVmClusterListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ExascaleDbNodeListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ExascaleDbStorageVaultListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/FlexComponentListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/GiMinorVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/GiVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/NetworkAnchorListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/OperationListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/OracleSubscriptionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/ResourceAnchorListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/SystemVersionListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/models/VirtualNetworkAddressListResult.java","src/main/java/com/azure/resourcemanager/oracledatabase/implementation/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ActionType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ActivationLinks.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AddRemoveDbNode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AddSubscriptionOperationState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AllConnectionStringType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ApexDetailsType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabase.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackup.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackupUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBackups.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseBaseProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCharacterSet.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCharacterSetProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCharacterSets.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCloneProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseCrossRegionDisasterRecoveryProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseFromBackupTimestampProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleAction.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleActionEnum.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseNationalCharacterSet.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseNationalCharacterSetProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseNationalCharacterSets.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseStandbySummary.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabaseWalletFile.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDatabases.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDbVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousDbVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AutonomousMaintenanceScheduleType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AzureResourceProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/AzureSubscriptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/BaseDbSystemShapes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloneType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudAccountDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudAccountProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructure.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructureUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudExadataInfrastructures.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmCluster.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusterUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CloudVmClusters.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ComputeModel.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConfigureExascaleCloudExadataInfrastructureDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConnectionStringType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConnectionUrlType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ConsumerGroup.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/CustomerContact.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DataBaseType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DataCollectionOptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DataSafeStatusType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DatabaseEditionType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DayOfWeek.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DayOfWeekName.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DayOfWeekUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbActionResponse.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbIormConfig.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeAction.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeActionEnum.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeMaintenanceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodeProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbNodes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServer.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerPatchingDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerPatchingStatus.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServerProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbServers.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystem.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemBaseProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemDatabaseEditionType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemOptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShape.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapeProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemShapes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemSourceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystemUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbSystems.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DbVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DefinedFileSystemConfiguration.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DisasterRecoveryConfigurationDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DisasterRecoveryType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DiskRedundancy.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DiskRedundancyType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsForwardingRule.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateView.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateViewProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateViews.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateViewsLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZone.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZoneProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZones.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/DnsPrivateZonesLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/EstimatedPatchingTime.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadataIormConfig.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadataVmClusterStorageManagementType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmCluster.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterStorageDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusterUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExadbVmClusters.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleConfigDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbNode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbNodeProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbNodes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageInputDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVault.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaultTagsUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ExascaleDbStorageVaults.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FileSystemConfigurationDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FlexComponent.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FlexComponentProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/FlexComponents.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GenerateAutonomousDatabaseWalletDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GenerateType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiMinorVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiMinorVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiMinorVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GiVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/GridImageType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/HardwareType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/HostFormatType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Intent.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/IormLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/LicenseModel.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/LongTermBackUpScheduleDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/MaintenanceWindow.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Month.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/MonthName.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchor.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchorUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NetworkAnchors.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/NsgCidr.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Objective.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OpenModeType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Operation.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OperationDisplay.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Operations.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OperationsInsightsStatusType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscription.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptionUpdateProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/OracleSubscriptions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Origin.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PatchingMode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PeerDbDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PermissionLevelType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Plan.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PlanUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PortRange.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/Preference.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PrivateIpAddressProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/PrivateIpAddressesFilter.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ProfileType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ProtocolType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RefreshableModelType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RefreshableStatusType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RemoveVirtualMachineFromExadbVmClusterDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RepeatCadenceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchor.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchorUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceAnchors.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ResourceProvisioningState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RestoreAutonomousDatabaseDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/RoleType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SaasSubscriptionDetails.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ScheduledOperationsType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ScheduledOperationsTypeUpdate.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SessionModeType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeAttribute.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeFamily.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ShapeFamilyType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SourceType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageManagementType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/StorageVolumePerformanceMode.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SyntaxFormatType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemShapes.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemVersion.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemVersionProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/SystemVersions.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/TlsAuthenticationType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddress.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddressLifecycleState.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddressProperties.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/VirtualNetworkAddresses.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/WorkloadType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/ZoneType.java","src/main/java/com/azure/resourcemanager/oracledatabase/models/package-info.java","src/main/java/com/azure/resourcemanager/oracledatabase/package-info.java","src/main/java/module-info.java"]}
\ No newline at end of file
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-oracledatabase/proxy-config.json b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-oracledatabase/proxy-config.json
index 8d042121ef51..053fe34cc8a7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-oracledatabase/proxy-config.json
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/main/resources/META-INF/native-image/com.azure.resourcemanager/azure-resourcemanager-oracledatabase/proxy-config.json
@@ -1 +1 @@
-[["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseBackupsClientImpl$AutonomousDatabaseBackupsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseCharacterSetsClientImpl$AutonomousDatabaseCharacterSetsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseNationalCharacterSetsClientImpl$AutonomousDatabaseNationalCharacterSetsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseVersionsClientImpl$AutonomousDatabaseVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabasesClientImpl$AutonomousDatabasesService"],["com.azure.resourcemanager.oracledatabase.implementation.CloudExadataInfrastructuresClientImpl$CloudExadataInfrastructuresService"],["com.azure.resourcemanager.oracledatabase.implementation.CloudVmClustersClientImpl$CloudVmClustersService"],["com.azure.resourcemanager.oracledatabase.implementation.DbNodesClientImpl$DbNodesService"],["com.azure.resourcemanager.oracledatabase.implementation.DbServersClientImpl$DbServersService"],["com.azure.resourcemanager.oracledatabase.implementation.DbSystemShapesClientImpl$DbSystemShapesService"],["com.azure.resourcemanager.oracledatabase.implementation.DnsPrivateViewsClientImpl$DnsPrivateViewsService"],["com.azure.resourcemanager.oracledatabase.implementation.DnsPrivateZonesClientImpl$DnsPrivateZonesService"],["com.azure.resourcemanager.oracledatabase.implementation.ExadbVmClustersClientImpl$ExadbVmClustersService"],["com.azure.resourcemanager.oracledatabase.implementation.ExascaleDbNodesClientImpl$ExascaleDbNodesService"],["com.azure.resourcemanager.oracledatabase.implementation.ExascaleDbStorageVaultsClientImpl$ExascaleDbStorageVaultsService"],["com.azure.resourcemanager.oracledatabase.implementation.FlexComponentsClientImpl$FlexComponentsService"],["com.azure.resourcemanager.oracledatabase.implementation.GiMinorVersionsClientImpl$GiMinorVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.GiVersionsClientImpl$GiVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.oracledatabase.implementation.OracleSubscriptionsClientImpl$OracleSubscriptionsService"],["com.azure.resourcemanager.oracledatabase.implementation.SystemVersionsClientImpl$SystemVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.VirtualNetworkAddressesClientImpl$VirtualNetworkAddressesService"]]
\ No newline at end of file
+[["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseBackupsClientImpl$AutonomousDatabaseBackupsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseCharacterSetsClientImpl$AutonomousDatabaseCharacterSetsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseNationalCharacterSetsClientImpl$AutonomousDatabaseNationalCharacterSetsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabaseVersionsClientImpl$AutonomousDatabaseVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.AutonomousDatabasesClientImpl$AutonomousDatabasesService"],["com.azure.resourcemanager.oracledatabase.implementation.CloudExadataInfrastructuresClientImpl$CloudExadataInfrastructuresService"],["com.azure.resourcemanager.oracledatabase.implementation.CloudVmClustersClientImpl$CloudVmClustersService"],["com.azure.resourcemanager.oracledatabase.implementation.DbNodesClientImpl$DbNodesService"],["com.azure.resourcemanager.oracledatabase.implementation.DbServersClientImpl$DbServersService"],["com.azure.resourcemanager.oracledatabase.implementation.DbSystemShapesClientImpl$DbSystemShapesService"],["com.azure.resourcemanager.oracledatabase.implementation.DbSystemsClientImpl$DbSystemsService"],["com.azure.resourcemanager.oracledatabase.implementation.DbVersionsClientImpl$DbVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.DnsPrivateViewsClientImpl$DnsPrivateViewsService"],["com.azure.resourcemanager.oracledatabase.implementation.DnsPrivateZonesClientImpl$DnsPrivateZonesService"],["com.azure.resourcemanager.oracledatabase.implementation.ExadbVmClustersClientImpl$ExadbVmClustersService"],["com.azure.resourcemanager.oracledatabase.implementation.ExascaleDbNodesClientImpl$ExascaleDbNodesService"],["com.azure.resourcemanager.oracledatabase.implementation.ExascaleDbStorageVaultsClientImpl$ExascaleDbStorageVaultsService"],["com.azure.resourcemanager.oracledatabase.implementation.FlexComponentsClientImpl$FlexComponentsService"],["com.azure.resourcemanager.oracledatabase.implementation.GiMinorVersionsClientImpl$GiMinorVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.GiVersionsClientImpl$GiVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.NetworkAnchorsClientImpl$NetworkAnchorsService"],["com.azure.resourcemanager.oracledatabase.implementation.OperationsClientImpl$OperationsService"],["com.azure.resourcemanager.oracledatabase.implementation.OracleSubscriptionsClientImpl$OracleSubscriptionsService"],["com.azure.resourcemanager.oracledatabase.implementation.ResourceAnchorsClientImpl$ResourceAnchorsService"],["com.azure.resourcemanager.oracledatabase.implementation.SystemVersionsClientImpl$SystemVersionsService"],["com.azure.resourcemanager.oracledatabase.implementation.VirtualNetworkAddressesClientImpl$VirtualNetworkAddressesService"]]
\ No newline at end of file
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateSamples.java
index 00a67d1f5735..83d0f3575d42 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateSamples.java
@@ -11,7 +11,25 @@
  */
 public final class AutonomousDatabaseBackupsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_create.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseBackups_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Create Autonomous Database Backup. - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createAutonomousDatabaseBackupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseBackups()
+            .define("1711644130")
+            .withExistingAutonomousDatabase("rgopenapi", "databasedb1")
+            .withProperties(new AutonomousDatabaseBackupProperties().withDisplayName("Nightly Backup")
+                .withRetentionPeriodInDays(365))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_create.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_CreateOrUpdate.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsDeleteSamples.java
index 0c4bf86d31ce..124feaacb3e9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabaseBackupsDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_delete.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_delete.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_Delete.
@@ -21,4 +21,18 @@ public final class AutonomousDatabaseBackupsDeleteSamples {
         manager.autonomousDatabaseBackups()
             .delete("rg000", "databasedb1", "1711644130", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseBackups_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Autonomous Database Backup. - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteAutonomousDatabaseBackupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseBackups()
+            .delete("rgopenapi", "databasedb1", "1711644130", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetSamples.java
index 4001bfcb3e12..1759a88d047d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetSamples.java
@@ -9,7 +9,21 @@
  */
 public final class AutonomousDatabaseBackupsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_get.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseBackups_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Autonomous Database Backup. - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAutonomousDatabaseBackupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseBackups()
+            .getWithResponse("rgopenapi", "databasedb1", "1711644130", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_get.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_Get.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseSamples.java
index a2dc1f9d5e5c..c882b013fc6b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabaseBackupsListByAutonomousDatabaseSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_listByParent.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_listByParent.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_ListByAutonomousDatabase.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsUpdateSamples.java
index f01035e10a39..89f6a506fbf6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsUpdateSamples.java
@@ -5,13 +5,32 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackup;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseBackupUpdateProperties;
 
 /**
  * Samples for AutonomousDatabaseBackups Update.
  */
 public final class AutonomousDatabaseBackupsUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseBackup_patch.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseBackups_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Autonomous Database Backup. - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchAutonomousDatabaseBackupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        AutonomousDatabaseBackup resource = manager.autonomousDatabaseBackups()
+            .getWithResponse("rgopenapi", "databasedb1", "1711644130", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withProperties(new AutonomousDatabaseBackupUpdateProperties().withRetentionPeriodInDays(90))
+            .apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseBackup_patch.json
      */
     /**
      * Sample code: AutonomousDatabaseBackups_Update.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetSamples.java
index df22b515e270..cc04bf5500f1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetSamples.java
@@ -9,7 +9,22 @@
  */
 public final class AutonomousDatabaseCharacterSetsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseCharacterSet_get.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseCharacterSets_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get autonomous db character set - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAutonomousDbCharacterSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseCharacterSets()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseCharacterSet_get.json
      */
     /**
      * Sample code: AutonomousDatabaseCharacterSets_get.
@@ -21,4 +36,19 @@ public final class AutonomousDatabaseCharacterSetsGetSamples {
         manager.autonomousDatabaseCharacterSets()
             .getWithResponse("eastus", "DATABASE", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseCharacterSets_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get autonomous db character set - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAutonomousDbCharacterSetGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseCharacterSets()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationSamples.java
index 3a6525806634..b09ff49524f0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationSamples.java
@@ -9,7 +9,33 @@
  */
 public final class AutonomousDatabaseCharacterSetsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseCharacterSet_listByLocation.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseCharacterSets_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List autonomous db character sets by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDbCharacterSetsByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseCharacterSets().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseCharacterSets_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List autonomous db character sets by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDbCharacterSetsByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseCharacterSets().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseCharacterSet_listByLocation.json
      */
     /**
      * Sample code: AutonomousDatabaseCharacterSets_listByLocation.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetSamples.java
index c0d0f1b24680..9ac5009c579f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetSamples.java
@@ -9,7 +9,22 @@
  */
 public final class AutonomousDatabaseNationalCharacterSetsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseNationalCharacterSet_get.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseNationalCharacterSets_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get autonomous db national character set - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAutonomousDbNationalCharacterSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseNationalCharacterSets()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseNationalCharacterSet_get.json
      */
     /**
      * Sample code: AutonomousDatabaseNationalCharacterSets_get.
@@ -21,4 +36,19 @@ public static void autonomousDatabaseNationalCharacterSetsGet(
         manager.autonomousDatabaseNationalCharacterSets()
             .getWithResponse("eastus", "NATIONAL", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseNationalCharacterSets_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get autonomous db national character set - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAutonomousDbNationalCharacterSetGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseNationalCharacterSets()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationSamples.java
index 6069d1aef1bd..29e41917f80c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabaseNationalCharacterSetsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseNationalCharacterSet_listByLocation.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseNationalCharacterSet_listByLocation.json
      */
     /**
      * Sample code: AutonomousDatabaseNationalCharacterSets_listByLocation.
@@ -20,4 +20,30 @@ public static void autonomousDatabaseNationalCharacterSetsListByLocation(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabaseNationalCharacterSets().listByLocation("eastus", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseNationalCharacterSets_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List autonomous db national character sets by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDbNationalCharacterSetsByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseNationalCharacterSets().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseNationalCharacterSets_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List autonomous db national character sets by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDbNationalCharacterSetsByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseNationalCharacterSets().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetSamples.java
index 67f8515a396e..41df31293f14 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabaseVersionsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseVersion_get.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseVersion_get.json
      */
     /**
      * Sample code: AutonomousDatabaseVersions_get.
@@ -20,4 +20,34 @@ public final class AutonomousDatabaseVersionsGetSamples {
         autonomousDatabaseVersionsGet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabaseVersions().getWithResponse("eastus", "18.4.0.0", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseVersions_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get an autonomous version - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAnAutonomousVersionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseVersions()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseVersions_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get an autonomous version - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAnAutonomousVersionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseVersions()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationSamples.java
index 94f0d3f77a29..afedb9a78439 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabaseVersionsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseVersion_listByLocation.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseVersion_listByLocation.json
      */
     /**
      * Sample code: AutonomousDatabaseVersions_listByLocation.
@@ -20,4 +20,30 @@ public static void autonomousDatabaseVersionsListByLocation(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabaseVersions().listByLocation("eastus", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseVersions_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List an autonomous versions by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAnAutonomousVersionsByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseVersions().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabaseVersions_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List an autonomous versions by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAnAutonomousVersionsByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabaseVersions().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesActionSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesActionSamples.java
new file mode 100644
index 000000000000..f2043490caff
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesActionSamples.java
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleActionEnum;
+
+/**
+ * Samples for AutonomousDatabases Action.
+ */
+public final class AutonomousDatabasesActionSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Action_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: AutonomousDatabases_Action_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        autonomousDatabasesActionMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .action("rgopenapi", "databasedb1",
+                new AutonomousDatabaseLifecycleAction().withAction(AutonomousDatabaseLifecycleActionEnum.START),
+                com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesChangeDisasterRecoveryConfigurationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesChangeDisasterRecoveryConfigurationSamples.java
index 01ca9af7a6fa..35f7aa471182 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesChangeDisasterRecoveryConfigurationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesChangeDisasterRecoveryConfigurationSamples.java
@@ -6,13 +6,34 @@
 
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryConfigurationDetails;
 import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryType;
+import java.time.OffsetDateTime;
 
 /**
  * Samples for AutonomousDatabases ChangeDisasterRecoveryConfiguration.
  */
 public final class AutonomousDatabasesChangeDisasterRecoveryConfigurationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_changeDisasterRecoveryConfiguration.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ChangeDisasterRecoveryConfiguration_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform ChangeDisasterRecoveryConfiguration action on Autonomous Database - generated by
+     * [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performChangeDisasterRecoveryConfigurationActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .changeDisasterRecoveryConfiguration("rgopenapi", "databasedb1",
+                new DisasterRecoveryConfigurationDetails().withDisasterRecoveryType(DisasterRecoveryType.ADG)
+                    .withTimeSnapshotStandbyEnabledTill(OffsetDateTime.parse("2025-08-01T04:32:58.725Z"))
+                    .withIsSnapshotStandby(true)
+                    .withIsReplicateAutomaticBackups(true),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_changeDisasterRecoveryConfiguration.json
      */
     /**
      * Sample code: AutonomousDatabases_ChangeDisasterRecoveryConfiguration.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesCreateOrUpdateSamples.java
index 80f13bf891fd..13b058666982 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesCreateOrUpdateSamples.java
@@ -5,11 +5,24 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCloneProperties;
-import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseCrossRegionDisasterRecoveryProperties;
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseProperties;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousMaintenanceScheduleType;
 import com.azure.resourcemanager.oracledatabase.models.CloneType;
 import com.azure.resourcemanager.oracledatabase.models.ComputeModel;
-import com.azure.resourcemanager.oracledatabase.models.DisasterRecoveryType;
+import com.azure.resourcemanager.oracledatabase.models.CustomerContact;
+import com.azure.resourcemanager.oracledatabase.models.DatabaseEditionType;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeek;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekName;
+import com.azure.resourcemanager.oracledatabase.models.LicenseModel;
+import com.azure.resourcemanager.oracledatabase.models.LongTermBackUpScheduleDetails;
+import com.azure.resourcemanager.oracledatabase.models.OpenModeType;
+import com.azure.resourcemanager.oracledatabase.models.PermissionLevelType;
+import com.azure.resourcemanager.oracledatabase.models.RepeatCadenceType;
+import com.azure.resourcemanager.oracledatabase.models.RoleType;
+import com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsType;
+import com.azure.resourcemanager.oracledatabase.models.WorkloadType;
+import java.time.OffsetDateTime;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,65 +31,101 @@
  */
 public final class AutonomousDatabasesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_create.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_CreateOrUpdate_MaximumSet_Gen.json
      */
     /**
-     * Sample code: AutonomousDatabases_CreateOrUpdate.
+     * Sample code: Create Autonomous Database - generated by [MaximumSet] rule.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
-    public static void
-        autonomousDatabasesCreateOrUpdate(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+    public static void createAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabases()
             .define("databasedb1")
             .withRegion("eastus")
-            .withExistingResourceGroup("rg000")
-            .withTags(mapOf("tagK1", "tagV1"))
+            .withExistingResourceGroup("rgopenapi")
+            .withTags(mapOf())
             .withProperties(new AutonomousDatabaseProperties().withAdminPassword("fakeTokenPlaceholder")
+                .withAutonomousMaintenanceScheduleType(AutonomousMaintenanceScheduleType.REGULAR)
                 .withCharacterSet("AL32UTF8")
                 .withComputeCount(2.0D)
                 .withComputeModel(ComputeModel.ECPU)
+                .withCpuCoreCount(1)
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail(
+                    "agyiqecugrloatgwpvmilmvutcnyjpxzhbilhhqfvqqblfgursqelzjjnwnmpfstitmcgkovzxnstiqqwjnhwwaufbnkebpqxlqwmfnmtlkgkoxcnjwcnfqbdtokhjalagxphkuiwxtxrzuipokiuczmuwoqoebkjvhytlhtxzshwsdoywluoggznuyuozqibiwdgwqbgnyogysdjpvlowmvuvq")))
                 .withDataStorageSizeInTbs(1)
+                .withDataStorageSizeInGbs(1024)
                 .withDbVersion("18.4.0.0")
+                .withDbWorkload(WorkloadType.OLTP)
                 .withDisplayName("example_autonomous_databasedb1")
+                .withIsAutoScalingEnabled(true)
+                .withIsAutoScalingForStorageEnabled(true)
+                .withPeerDbId(
+                    "jghxnzevghltfytskymsxgyrugfedzchifwoezwbcwzzvpikoqqjcdiesbidbeqkmncodchlmktetjlgjgbaofwpwmpvckmusaunrzdrctypasgcabyjwxwzkodwugdpeprikvxygxyb")
+                .withIsLocalDataGuardEnabled(true)
+                .withIsMtlsConnectionRequired(true)
+                .withIsPreviewVersionWithServiceTermsAccepted(true)
+                .withLicenseModel(LicenseModel.BRING_YOUR_OWN_LICENSE)
                 .withNcharacterSet("AL16UTF16")
+                .withScheduledOperationsList(Arrays
+                    .asList(new ScheduledOperationsType().withDayOfWeek(new DayOfWeek().withName(DayOfWeekName.MONDAY))
+                        .withScheduledStartTime("lwwvkazgmfremfwhckfb")
+                        .withScheduledStopTime("hjwagzxijpiaogulmnmbuqakpqxhkjvaypjqnvbvtjddc")))
+                .withPrivateEndpointIp("rdlbhw")
+                .withPrivateEndpointLabel("worwqllbglhyakksevparfuaivc")
                 .withSubnetId(
                     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1")
                 .withVnetId(
-                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1"))
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1")
+                .withDatabaseEdition(DatabaseEditionType.ENTERPRISE_EDITION)
+                .withAutonomousDatabaseId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Oracle.Database/autonomousDatabases/databasedb1")
+                .withLongTermBackupSchedule(
+                    new LongTermBackUpScheduleDetails().withRepeatCadence(RepeatCadenceType.ONE_TIME)
+                        .withTimeOfBackup(OffsetDateTime.parse("2025-08-01T04:32:58.715Z"))
+                        .withRetentionPeriodInDays(188)
+                        .withIsDisabled(true))
+                .withLocalAdgAutoFailoverMaxDataLossLimit(1759)
+                .withOpenMode(OpenModeType.READ_ONLY)
+                .withPermissionLevel(PermissionLevelType.RESTRICTED)
+                .withRole(RoleType.PRIMARY)
+                .withBackupRetentionPeriodInDays(1)
+                .withWhitelistedIps(Arrays.asList("1.1.1.1", "1.1.1.0/24", "1.1.2.25")))
             .create();
     }
 
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseCrossRegionPeer_create.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_create.json
      */
     /**
-     * Sample code: AutonomousDatabases_CreateOrUpdate_CrossRegionPeer.
+     * Sample code: AutonomousDatabases_CreateOrUpdate.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
-    public static void autonomousDatabasesCreateOrUpdateCrossRegionPeer(
-        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+    public static void
+        autonomousDatabasesCreateOrUpdate(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabases()
             .define("databasedb1")
             .withRegion("eastus")
             .withExistingResourceGroup("rg000")
             .withTags(mapOf("tagK1", "tagV1"))
-            .withProperties(new AutonomousDatabaseCrossRegionDisasterRecoveryProperties().withSubnetId(
-                "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1")
+            .withProperties(new AutonomousDatabaseProperties().withAdminPassword("fakeTokenPlaceholder")
+                .withCharacterSet("AL32UTF8")
+                .withComputeCount(2.0D)
+                .withComputeModel(ComputeModel.ECPU)
+                .withDataStorageSizeInTbs(1)
+                .withDbVersion("18.4.0.0")
+                .withDisplayName("example_autonomous_databasedb1")
+                .withNcharacterSet("AL16UTF16")
+                .withSubnetId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1")
                 .withVnetId(
-                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1")
-                .withSourceId(
-                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Oracle.Database/autonomousDatabases/databasedb1")
-                .withSourceLocation("germanywestcentral")
-                .withSourceOcid("ocid1..aaaaa")
-                .withRemoteDisasterRecoveryType(DisasterRecoveryType.ADG)
-                .withIsReplicateAutomaticBackups(false))
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1"))
             .create();
     }
 
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabaseClone_create.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabaseClone_create.json
      */
     /**
      * Sample code: AutonomousDatabases_CreateOrUpdate_clone.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesDeleteSamples.java
index 1187e28911f3..d91ef48449dd 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesDeleteSamples.java
@@ -9,7 +9,20 @@
  */
 public final class AutonomousDatabasesDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_delete.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().delete("rgopenapi", "databasedb1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_delete.json
      */
     /**
      * Sample code: AutonomousDatabases_delete.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesFailoverSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesFailoverSamples.java
index f49b5d85d143..adbcbbc3ee00 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesFailoverSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesFailoverSamples.java
@@ -11,7 +11,7 @@
  */
 public final class AutonomousDatabasesFailoverSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_failover.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_failover.json
      */
     /**
      * Sample code: AutonomousDatabases_Failover.
@@ -24,4 +24,22 @@ public final class AutonomousDatabasesFailoverSamples {
             .failover("rg000", "databasedb1", new PeerDbDetails().withPeerDbId("peerDbId"),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Failover_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform failover action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performFailoverActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .failover("rgopenapi", "databasedb1*",
+                new PeerDbDetails().withPeerDbId("peerDbId")
+                    .withPeerDbOcid("yozpqyefqhirkybmzwgoidyl")
+                    .withPeerDbLocation("cxlzbzbfzi"),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGenerateWalletSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGenerateWalletSamples.java
index b382236d6c33..d01df64de7da 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGenerateWalletSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGenerateWalletSamples.java
@@ -12,7 +12,25 @@
  */
 public final class AutonomousDatabasesGenerateWalletSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_generateWallet.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_GenerateWallet_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Generate wallet action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void generateWalletActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .generateWalletWithResponse("rgopenapi", "databasedb1",
+                new GenerateAutonomousDatabaseWalletDetails().withGenerateType(GenerateType.SINGLE)
+                    .withIsRegional(true)
+                    .withPassword("fakeTokenPlaceholder"),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_generateWallet.json
      */
     /**
      * Sample code: AutonomousDatabases_generateWallet.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGetByResourceGroupSamples.java
index 54322d118640..72f7b08c4f47 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGetByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesGetByResourceGroupSamples.java
@@ -9,7 +9,21 @@
  */
 public final class AutonomousDatabasesGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_get.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .getByResourceGroupWithResponse("rgopenapi", "database1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_get.json
      */
     /**
      * Sample code: AutonomousDatabases_Get.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListByResourceGroupSamples.java
index 1d068a13060a..0d7511b8ad2f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabasesListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_listByResourceGroup.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_listByResourceGroup.json
      */
     /**
      * Sample code: AutonomousDatabases_listByResourceGroup.
@@ -20,4 +20,30 @@ public final class AutonomousDatabasesListByResourceGroupSamples {
         autonomousDatabasesListByResourceGroup(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabases().listByResourceGroup("rg000", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Autonomous Database by resource group - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDatabaseByResourceGroupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Autonomous Database by resource group - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDatabaseByResourceGroupGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListSamples.java
index 20e7f91d66b8..21fef6a0bf27 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AutonomousDatabasesListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_listBySubscription.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_listBySubscription.json
      */
     /**
      * Sample code: AutonomousDatabases_listBySubscription.
@@ -20,4 +20,30 @@ public final class AutonomousDatabasesListSamples {
         autonomousDatabasesListBySubscription(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.autonomousDatabases().list(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Autonomous Database by subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDatabaseBySubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Autonomous Database by subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listAutonomousDatabaseBySubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().list(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesRestoreSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesRestoreSamples.java
index 03015ab90214..5bf115d40b48 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesRestoreSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesRestoreSamples.java
@@ -12,7 +12,7 @@
  */
 public final class AutonomousDatabasesRestoreSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_restore.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_restore.json
      */
     /**
      * Sample code: AutonomousDatabases_Restore.
@@ -26,4 +26,20 @@ public final class AutonomousDatabasesRestoreSamples {
                 new RestoreAutonomousDatabaseDetails().withTimestamp(OffsetDateTime.parse("2024-04-23T00:00:00.000Z")),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Restore_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform restore action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performRestoreActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .restore("rgopenapi", "database1",
+                new RestoreAutonomousDatabaseDetails().withTimestamp(OffsetDateTime.parse("2024-04-23T00:00:00.000Z")),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesShrinkSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesShrinkSamples.java
new file mode 100644
index 000000000000..0f807bec17a9
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesShrinkSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for AutonomousDatabases Shrink.
+ */
+public final class AutonomousDatabasesShrinkSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Shrink_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform shrink action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performShrinkActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases().shrink("rgopenapi", "database1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesSwitchoverSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesSwitchoverSamples.java
index 7272c2ed6388..fa289d8e16b7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesSwitchoverSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesSwitchoverSamples.java
@@ -11,7 +11,25 @@
  */
 public final class AutonomousDatabasesSwitchoverSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_switchover.json
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Switchover_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform switchover action on Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performSwitchoverActionOnAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.autonomousDatabases()
+            .switchover("rgopenapi", "databasedb1",
+                new PeerDbDetails().withPeerDbId("peerDbId")
+                    .withPeerDbOcid("yozpqyefqhirkybmzwgoidyl")
+                    .withPeerDbLocation("cxlzbzbfzi"),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_switchover.json
      */
     /**
      * Sample code: AutonomousDatabases_Switchover.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesUpdateSamples.java
index 71acb7c404d5..4c083191cbc1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabasesUpdateSamples.java
@@ -5,13 +5,30 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabase;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousMaintenanceScheduleType;
+import com.azure.resourcemanager.oracledatabase.models.CustomerContact;
+import com.azure.resourcemanager.oracledatabase.models.DatabaseEditionType;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekName;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekUpdate;
+import com.azure.resourcemanager.oracledatabase.models.LicenseModel;
+import com.azure.resourcemanager.oracledatabase.models.LongTermBackUpScheduleDetails;
+import com.azure.resourcemanager.oracledatabase.models.OpenModeType;
+import com.azure.resourcemanager.oracledatabase.models.PermissionLevelType;
+import com.azure.resourcemanager.oracledatabase.models.RepeatCadenceType;
+import com.azure.resourcemanager.oracledatabase.models.RoleType;
+import com.azure.resourcemanager.oracledatabase.models.ScheduledOperationsTypeUpdate;
+import java.time.OffsetDateTime;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Samples for AutonomousDatabases Update.
  */
 public final class AutonomousDatabasesUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/autonomousDatabase_patch.json
+     * x-ms-original-file: 2025-09-01/autonomousDatabase_patch.json
      */
     /**
      * Sample code: AutonomousDatabases_update.
@@ -25,4 +42,65 @@ public final class AutonomousDatabasesUpdateSamples {
             .getValue();
         resource.update().apply();
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/AutonomousDatabases_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Autonomous Database - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchAutonomousDatabaseGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        AutonomousDatabase resource = manager.autonomousDatabases()
+            .getByResourceGroupWithResponse("rgopenapi", "databasedb1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("key9827", "fakeTokenPlaceholder"))
+            .withProperties(new AutonomousDatabaseUpdateProperties().withAdminPassword("fakeTokenPlaceholder")
+                .withAutonomousMaintenanceScheduleType(AutonomousMaintenanceScheduleType.EARLY)
+                .withComputeCount(56.1D)
+                .withCpuCoreCount(45)
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("dummyemail@microsoft.com")))
+                .withDataStorageSizeInTbs(133)
+                .withDataStorageSizeInGbs(175271)
+                .withDisplayName("lrdrjpyyvufnxdzpwvlkmfukpstrjftdxcejcxtnqhxqbhvtzeiokllnspotsqeggddxkjjtf")
+                .withIsAutoScalingEnabled(true)
+                .withIsAutoScalingForStorageEnabled(true)
+                .withPeerDbId("qmpfwtvpfvbgmulethqznsyyjlpxmyfqfanrymzqsgraavtmlqqbexpzguyqybngoupbshlzpxv")
+                .withIsLocalDataGuardEnabled(true)
+                .withIsMtlsConnectionRequired(true)
+                .withLicenseModel(LicenseModel.LICENSE_INCLUDED)
+                .withScheduledOperationsList(Arrays.asList(new ScheduledOperationsTypeUpdate()
+                    .withDayOfWeek(new DayOfWeekUpdate().withName(DayOfWeekName.MONDAY))
+                    .withScheduledStartTime("lwwvkazgmfremfwhckfb")
+                    .withScheduledStopTime("hjwagzxijpiaogulmnmbuqakpqxhkjvaypjqnvbvtjddc")))
+                .withDatabaseEdition(DatabaseEditionType.STANDARD_EDITION)
+                .withLongTermBackupSchedule(
+                    new LongTermBackUpScheduleDetails().withRepeatCadence(RepeatCadenceType.ONE_TIME)
+                        .withTimeOfBackup(OffsetDateTime.parse("2025-08-01T04:32:58.715Z"))
+                        .withRetentionPeriodInDays(188)
+                        .withIsDisabled(true))
+                .withLocalAdgAutoFailoverMaxDataLossLimit(212)
+                .withOpenMode(OpenModeType.READ_ONLY)
+                .withPermissionLevel(PermissionLevelType.RESTRICTED)
+                .withRole(RoleType.PRIMARY)
+                .withBackupRetentionPeriodInDays(12)
+                .withWhitelistedIps(Arrays.asList(
+                    "kfierlppwurtqrhfxwgfgrnqtmvraignzwsddwmpdijeveuevuoejfmbjvpnlrmmdflilxcwkkzvdofctsdjfxrrrwctihhnchtrouauesqbmlcqhzwnppnhrtitecenlfyshassvajukbwxudhlwixkvkgsessvshcwmleoqujeemwenhwlsccbcjnnviugzgylsxkssalqoicatcvkahogdvweymhdxboyqwhaxuzlmrdbvgbnnetobkbwygcsflzanwknlybvvzgjzjirpfrksbxwgllgfxwdflcisvxpkjecpgdaxccqkzxofedkrawvhzeabmunpykwd")))
+            .apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacitySamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacitySamples.java
index b93fe000c36f..ca20a2c1fabf 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacitySamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacitySamples.java
@@ -9,7 +9,37 @@
  */
 public final class CloudExadataInfrastructuresAddStorageCapacitySamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_addStorageCapacity.json
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_AddStorageCapacity_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform add storage capacity on exadata infra - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performAddStorageCapacityOnExadataInfraGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .addStorageCapacity("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_AddStorageCapacity_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Perform add storage capacity on exadata infra - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void performAddStorageCapacityOnExadataInfraGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .addStorageCapacity("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/exaInfra_addStorageCapacity.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_addStorageCapacity.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresConfigureExascaleSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresConfigureExascaleSamples.java
new file mode 100644
index 000000000000..c978314a0daa
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresConfigureExascaleSamples.java
@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
+
+/**
+ * Samples for CloudExadataInfrastructures ConfigureExascale.
+ */
+public final class CloudExadataInfrastructuresConfigureExascaleSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ConfigureExascale_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: CloudExadataInfrastructures_ConfigureExascale_MaximumSet_Gen - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void cloudExadataInfrastructuresConfigureExascaleMaximumSetGenGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .configureExascale("rgopenapi", "Replace this value with a string matching RegExp .*",
+                new ConfigureExascaleCloudExadataInfrastructureDetails().withTotalStorageInGbs(19),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ConfigureExascale_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: CloudExadataInfrastructures_ConfigureExascale_MaximumSet_Gen - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void cloudExadataInfrastructuresConfigureExascaleMaximumSetGenGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .configureExascale("rgopenapi", "Replace this value with a string matching RegExp .*",
+                new ConfigureExascaleCloudExadataInfrastructureDetails().withTotalStorageInGbs(19),
+                com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateSamples.java
index d0cd09837d9f..b496ba167483 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateSamples.java
@@ -5,6 +5,14 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureProperties;
+import com.azure.resourcemanager.oracledatabase.models.CustomerContact;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeek;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekName;
+import com.azure.resourcemanager.oracledatabase.models.MaintenanceWindow;
+import com.azure.resourcemanager.oracledatabase.models.Month;
+import com.azure.resourcemanager.oracledatabase.models.MonthName;
+import com.azure.resourcemanager.oracledatabase.models.PatchingMode;
+import com.azure.resourcemanager.oracledatabase.models.Preference;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +22,7 @@
  */
 public final class CloudExadataInfrastructuresCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_create.json
+     * x-ms-original-file: 2025-09-01/exaInfra_create.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_createOrUpdate.
@@ -36,6 +44,62 @@ public static void cloudExadataInfrastructuresCreateOrUpdate(
             .create();
     }
 
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Create Exadata Infrastructure - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createExadataInfrastructureGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .define("Replace this value with a string matching RegExp .*")
+            .withRegion("eastus")
+            .withExistingResourceGroup("rgopenapi")
+            .withZones(Arrays.asList("1"))
+            .withTags(mapOf())
+            .withProperties(new CloudExadataInfrastructureProperties().withComputeCount(100)
+                .withStorageCount(10)
+                .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
+                    .withMonths(Arrays.asList(new Month().withName(MonthName.JANUARY)))
+                    .withWeeksOfMonth(Arrays.asList(0))
+                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.MONDAY)))
+                    .withHoursOfDay(Arrays.asList(0))
+                    .withLeadTimeInWeeks(10)
+                    .withPatchingMode(PatchingMode.ROLLING)
+                    .withCustomActionTimeoutInMins(120)
+                    .withIsCustomActionTimeoutEnabled(true)
+                    .withIsMonthlyPatchingEnabled(true))
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("noreply@oracle.com")))
+                .withShape("EXADATA.X9M")
+                .withDisplayName("infra 1")
+                .withDatabaseServerType(
+                    "ghnehafjgxkfpirwkmrgzphwhnftkktamoawnawztevnhbszjgkyvqvtxrnmbjqvfsthaptqbjtozuwdswkgrhmifljzjruvedeshwfdyrbzgapyyhkgxrulpttbarqsbgzoigggrsdjjlfmazpinyzmtcpugkgaiitvccklieodrscikvitdfdwczpko")
+                .withStorageServerType(
+                    "ikmrpsmpkbrnxpaaemmljvtvyxbtcjijsowrpislrwkgjhucszljohrnvfotgbiknehciipnkfcqkrqseqz"))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_CreateOrUpdate_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Create Exadata Infrastructure - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createExadataInfrastructureGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .define("Replace this value with a string matching RegExp .*")
+            .withRegion("eastus")
+            .withExistingResourceGroup("rgopenapi")
+            .withZones(Arrays.asList("1"))
+            .create();
+    }
+
     // Use "Map.of" if available
     @SuppressWarnings("unchecked")
     private static <T> Map<String, T> mapOf(Object... inputs) {
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresDeleteSamples.java
index 2e220aedcb89..d38e5f471017 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CloudExadataInfrastructuresDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_delete.json
+     * x-ms-original-file: 2025-09-01/exaInfra_delete.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_delete.
@@ -20,4 +20,34 @@ public final class CloudExadataInfrastructuresDeleteSamples {
         cloudExadataInfrastructuresDelete(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.cloudExadataInfrastructures().delete("rg000", "infra1", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Exadata Infrastructure - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteExadataInfrastructureGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .delete("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Exadata Infrastructure - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteExadataInfrastructureGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .delete("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupSamples.java
index fb0bc74b1f3b..adfa8e13deb4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupSamples.java
@@ -9,7 +9,22 @@
  */
 public final class CloudExadataInfrastructuresGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_get.json
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Exadata Infrastructure - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getExadataInfrastructureGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .getByResourceGroupWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/exaInfra_get.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_get.
@@ -21,4 +36,19 @@ public final class CloudExadataInfrastructuresGetByResourceGroupSamples {
         manager.cloudExadataInfrastructures()
             .getByResourceGroupWithResponse("rg000", "infra1", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Exadata Infrastructure - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getExadataInfrastructureGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures()
+            .getByResourceGroupWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupSamples.java
index 8bf8757c5fda..f8f606efd898 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupSamples.java
@@ -9,7 +9,20 @@
  */
 public final class CloudExadataInfrastructuresListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_listByResourceGroup.json
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Exadata Infrastructure by resource group - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listExadataInfrastructureByResourceGroupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/exaInfra_listByResourceGroup.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_listByResourceGroup.
@@ -20,4 +33,17 @@ public static void cloudExadataInfrastructuresListByResourceGroup(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.cloudExadataInfrastructures().listByResourceGroup("rg000", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Exadata Infrastructure by resource group - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listExadataInfrastructureByResourceGroupGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListSamples.java
index aaef84517279..52313b9a6068 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CloudExadataInfrastructuresListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_listBySubscription.json
+     * x-ms-original-file: 2025-09-01/exaInfra_listBySubscription.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_listBySubscription.
@@ -20,4 +20,30 @@ public static void cloudExadataInfrastructuresListBySubscription(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.cloudExadataInfrastructures().list(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Exadata Infrastructure by subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listExadataInfrastructureBySubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Exadata Infrastructure by subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listExadataInfrastructureBySubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudExadataInfrastructures().list(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresUpdateSamples.java
index 06615ef6fcf3..4c9e1b373993 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresUpdateSamples.java
@@ -5,13 +5,74 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructure;
+import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructureUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.CustomerContact;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeek;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekName;
+import com.azure.resourcemanager.oracledatabase.models.MaintenanceWindow;
+import com.azure.resourcemanager.oracledatabase.models.Month;
+import com.azure.resourcemanager.oracledatabase.models.MonthName;
+import com.azure.resourcemanager.oracledatabase.models.PatchingMode;
+import com.azure.resourcemanager.oracledatabase.models.Preference;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Samples for CloudExadataInfrastructures Update.
  */
 public final class CloudExadataInfrastructuresUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/exaInfra_patch.json
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Exadata Infrastructure - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchExadataInfrastructureGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        CloudExadataInfrastructure resource = manager.cloudExadataInfrastructures()
+            .getByResourceGroupWithResponse("rgopenapi", "cloudexaInfra1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("key831", "fakeTokenPlaceholder"))
+            .withZones(Arrays.asList("wl"))
+            .withProperties(new CloudExadataInfrastructureUpdateProperties().withComputeCount(9)
+                .withStorageCount(4)
+                .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
+                    .withMonths(Arrays.asList(new Month().withName(MonthName.JANUARY)))
+                    .withWeeksOfMonth(Arrays.asList(0))
+                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.MONDAY)))
+                    .withHoursOfDay(Arrays.asList(0))
+                    .withLeadTimeInWeeks(10)
+                    .withPatchingMode(PatchingMode.ROLLING)
+                    .withCustomActionTimeoutInMins(120)
+                    .withIsCustomActionTimeoutEnabled(true)
+                    .withIsMonthlyPatchingEnabled(true))
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("dummyemail@microsoft.com")))
+                .withDisplayName("displayName"))
+            .apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudExadataInfrastructures_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Exadata Infrastructure - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchExadataInfrastructureGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        CloudExadataInfrastructure resource = manager.cloudExadataInfrastructures()
+            .getByResourceGroupWithResponse("rgopenapi", "cloudexainfra1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/exaInfra_patch.json
      */
     /**
      * Sample code: CloudExadataInfrastructures_update.
@@ -25,4 +86,16 @@ public final class CloudExadataInfrastructuresUpdateSamples {
             .getValue();
         resource.update().apply();
     }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersAddVmsSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersAddVmsSamples.java
index 15954e1ceaba..5d7b5ddf69c5 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersAddVmsSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersAddVmsSamples.java
@@ -12,7 +12,23 @@
  */
 public final class CloudVmClustersAddVmsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_addVms.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_AddVms_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Add VMs to VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addVMsToVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .addVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_addVms.json
      */
     /**
      * Sample code: CloudVmClusters_addVms.
@@ -25,4 +41,20 @@ public static void cloudVmClustersAddVms(com.azure.resourcemanager.oracledatabas
                 new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_AddVms_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Add VMs to VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addVMsToVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .addVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersCreateOrUpdateSamples.java
index fd9e8047a996..a40e6548243b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersCreateOrUpdateSamples.java
@@ -6,6 +6,7 @@
 
 import com.azure.resourcemanager.oracledatabase.models.CloudVmClusterProperties;
 import com.azure.resourcemanager.oracledatabase.models.DataCollectionOptions;
+import com.azure.resourcemanager.oracledatabase.models.FileSystemConfigurationDetails;
 import com.azure.resourcemanager.oracledatabase.models.LicenseModel;
 import com.azure.resourcemanager.oracledatabase.models.NsgCidr;
 import com.azure.resourcemanager.oracledatabase.models.PortRange;
@@ -18,7 +19,82 @@
  */
 public final class CloudVmClustersCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_create.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Create VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .define("cloudvmcluster1")
+            .withRegion("eastus")
+            .withExistingResourceGroup("rgopenapi")
+            .withTags(mapOf())
+            .withProperties(new CloudVmClusterProperties().withStorageSizeInGbs(1000)
+                .withFileSystemConfigurationDetails(Arrays.asList(
+                    new FileSystemConfigurationDetails().withMountPoint("gukfhjlmkqfqdgb").withFileSystemSizeGb(20)))
+                .withDataStorageSizeInTbs(1000.0D)
+                .withDbNodeStorageSizeInGbs(1000)
+                .withMemorySizeInGbs(1000)
+                .withTimeZone("UTC")
+                .withZoneId("ocid1..aaaa")
+                .withHostname("hostname1")
+                .withDomain("domain1")
+                .withCpuCoreCount(2)
+                .withOcpuCount(3.0D)
+                .withClusterName("cluster1")
+                .withDataStoragePercentage(100)
+                .withIsLocalBackupEnabled(true)
+                .withCloudExadataInfrastructureId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Oracle.Database/cloudExadataInfrastructures/infra1")
+                .withIsSparseDiskgroupEnabled(true)
+                .withSystemVersion("v1")
+                .withSshPublicKeys(Arrays.asList("ssh-key 1"))
+                .withLicenseModel(LicenseModel.LICENSE_INCLUDED)
+                .withScanListenerPortTcp(1050)
+                .withScanListenerPortTcpSsl(1025)
+                .withVnetId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1")
+                .withGiVersion("19.0.0.0")
+                .withSubnetId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1")
+                .withBackupSubnetCidr("172.17.5.0/24")
+                .withNsgCidrs(Arrays.asList(
+                    new NsgCidr().withSource("10.0.0.0/16")
+                        .withDestinationPortRange(new PortRange().withMin(1520).withMax(1522)),
+                    new NsgCidr().withSource("10.10.0.0/24")
+                        .withDestinationPortRange(new PortRange().withMin(9434).withMax(11996))))
+                .withDataCollectionOptions(new DataCollectionOptions().withIsDiagnosticsEventsEnabled(true)
+                    .withIsHealthMonitoringEnabled(true)
+                    .withIsIncidentLogsEnabled(true))
+                .withDisplayName("cluster 1")
+                .withComputeNodes(Arrays.asList("ggficcnjgibtuqgdbbrzyckmtlhddecfcvjurboqfufqchgpvwmlcdcyyxnjivpkvsvr"))
+                .withDbServers(Arrays.asList("ocid1..aaaa")))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_CreateOrUpdate_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Create VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .define("cloudvmcluster1")
+            .withRegion("eastus")
+            .withExistingResourceGroup("rgopenapi")
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_create.json
      */
     /**
      * Sample code: CloudVmClusters_createOrUpdate.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersDeleteSamples.java
index c7b5b82c8eed..c13986368a77 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersDeleteSamples.java
@@ -9,7 +9,33 @@
  */
 public final class CloudVmClustersDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_delete.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters().delete("rgopenapi", "cloudvmcluster1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters().delete("rgopenapi", "cloudvmcluster1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_delete.json
      */
     /**
      * Sample code: CloudVmClusters_delete.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersGetByResourceGroupSamples.java
index 89d226ced3c9..c9f07107e0d9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersGetByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersGetByResourceGroupSamples.java
@@ -9,7 +9,21 @@
  */
 public final class CloudVmClustersGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_get.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        getVMClusterGeneratedByMinimumSetRule(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .getByResourceGroupWithResponse("rgopenapi", "cloudvmcluster1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_get.json
      */
     /**
      * Sample code: CloudVmClusters_get.
@@ -19,4 +33,18 @@ public final class CloudVmClustersGetByResourceGroupSamples {
     public static void cloudVmClustersGet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.cloudVmClusters().getByResourceGroupWithResponse("rg000", "cluster1", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        getVMClusterGeneratedByMaximumSetRule(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .getByResourceGroupWithResponse("rgopenapi", "cloudvmcluster1", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListByResourceGroupSamples.java
index aa87f2a11d4a..8032d2a8ec7a 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListByResourceGroupSamples.java
@@ -9,7 +9,20 @@
  */
 public final class CloudVmClustersListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_listByResourceGroup.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List VM Clusters by resource group - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listVMClustersByResourceGroupGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_listByResourceGroup.json
      */
     /**
      * Sample code: CloudVmClusters_listByResourceGroup.
@@ -20,4 +33,17 @@ public final class CloudVmClustersListByResourceGroupSamples {
         cloudVmClustersListByResourceGroup(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.cloudVmClusters().listByResourceGroup("rg000", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List VM Clusters by resource group - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listVMClustersByResourceGroupGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesSamples.java
index ae938a1915ca..6a08773671d3 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesSamples.java
@@ -11,7 +11,7 @@
  */
 public final class CloudVmClustersListPrivateIpAddressesSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_listPrivateIpAddresses.json
+     * x-ms-original-file: 2025-09-01/vmClusters_listPrivateIpAddresses.json
      */
     /**
      * Sample code: CloudVmClusters_listPrivateIpAddresses.
@@ -25,4 +25,36 @@ public final class CloudVmClustersListPrivateIpAddressesSamples {
                 new PrivateIpAddressesFilter().withSubnetId("ocid1..aaaaaa").withVnicId("ocid1..aaaaa"),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListPrivateIpAddresses_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Private IP Addresses for VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listPrivateIPAddressesForVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .listPrivateIpAddressesWithResponse("rgopenapi", "cloudvmcluster1",
+                new PrivateIpAddressesFilter().withSubnetId("ocid1..aaaaaa").withVnicId("ocid1..aaaaa"),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListPrivateIpAddresses_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Private IP Addresses for VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listPrivateIPAddressesForVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .listPrivateIpAddressesWithResponse("rgopenapi", "cloudvmcluster1",
+                new PrivateIpAddressesFilter().withSubnetId("ocid1..aaaaaa").withVnicId("ocid1..aaaaa"),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListSamples.java
index 62c615da253e..78388cb71f9d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CloudVmClustersListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_listBySubscription.json
+     * x-ms-original-file: 2025-09-01/vmClusters_listBySubscription.json
      */
     /**
      * Sample code: CloudVmClusters_listBySubscription.
@@ -20,4 +20,30 @@ public final class CloudVmClustersListSamples {
         cloudVmClustersListBySubscription(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.cloudVmClusters().list(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List VM Clusters by subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listVMClustersBySubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List VM Clusters by subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listVMClustersBySubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters().list(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersRemoveVmsSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersRemoveVmsSamples.java
index bf352ada78a5..a6bcc712f2ea 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersRemoveVmsSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersRemoveVmsSamples.java
@@ -12,7 +12,39 @@
  */
 public final class CloudVmClustersRemoveVmsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_removeVms.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_RemoveVms_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Remove VMs from VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void removeVMsFromVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .removeVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_RemoveVms_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Remove VMs from VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void removeVMsFromVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.cloudVmClusters()
+            .removeVms("rgopenapi", "cloudvmcluster1",
+                new AddRemoveDbNode().withDbServers(Arrays.asList("ocid1..aaaa", "ocid1..aaaaaa")),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_removeVms.json
      */
     /**
      * Sample code: CloudVmClusters_removeVms.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersUpdateSamples.java
index 51aebeb93fc2..705c0ddb0d9d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersUpdateSamples.java
@@ -5,13 +5,54 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.models.CloudVmCluster;
+import com.azure.resourcemanager.oracledatabase.models.CloudVmClusterUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.DataCollectionOptions;
+import com.azure.resourcemanager.oracledatabase.models.FileSystemConfigurationDetails;
+import com.azure.resourcemanager.oracledatabase.models.LicenseModel;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Samples for CloudVmClusters Update.
  */
 public final class CloudVmClustersUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/vmClusters_patch.json
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        CloudVmCluster resource = manager.cloudVmClusters()
+            .getByResourceGroupWithResponse("rgopenapi", "cloudvmcluster1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("key4668", "fakeTokenPlaceholder"))
+            .withProperties(new CloudVmClusterUpdateProperties().withStorageSizeInGbs(17)
+                .withFileSystemConfigurationDetails(Arrays.asList(
+                    new FileSystemConfigurationDetails().withMountPoint("gukfhjlmkqfqdgb").withFileSystemSizeGb(20)))
+                .withDataStorageSizeInTbs(29.0D)
+                .withDbNodeStorageSizeInGbs(24)
+                .withMemorySizeInGbs(9)
+                .withCpuCoreCount(18)
+                .withOcpuCount(7.0D)
+                .withSshPublicKeys(Arrays.asList("hazhcc"))
+                .withLicenseModel(LicenseModel.LICENSE_INCLUDED)
+                .withDataCollectionOptions(new DataCollectionOptions().withIsDiagnosticsEventsEnabled(true)
+                    .withIsHealthMonitoringEnabled(true)
+                    .withIsIncidentLogsEnabled(true))
+                .withDisplayName("hvdyewkjqjxwzinkqnnsqxbmccteohzumz")
+                .withComputeNodes(
+                    Arrays.asList("ggficcnjgibtuqgdbbrzyckmtlhddecfcvjurboqfufqchgpvwmlcdcyyxnjivpkvsvr")))
+            .apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/vmClusters_patch.json
      */
     /**
      * Sample code: CloudVmClusters_update.
@@ -24,4 +65,32 @@ public static void cloudVmClustersUpdate(com.azure.resourcemanager.oracledatabas
             .getValue();
         resource.update().apply();
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/CloudVmClusters_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        CloudVmCluster resource = manager.cloudVmClusters()
+            .getByResourceGroupWithResponse("rgopenapi", "cloudvmcluster1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionSamples.java
index 06e67b7f72d6..b0b0866124c0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionSamples.java
@@ -12,7 +12,22 @@
  */
 public final class DbNodesActionSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbNodes_action.json
+     * x-ms-original-file: 2025-09-01/DbNodes_Action_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: VM actions on DbNodes of VM Cluster - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void vmActionsOnDbNodesOfVMClusterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbNodes()
+            .action("rgopenapi", "cloudvmcluster1", "adfedefeewwevkieviect",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbNodes_action.json
      */
     /**
      * Sample code: DbNodes_Action.
@@ -24,4 +39,19 @@ public static void dbNodesAction(com.azure.resourcemanager.oracledatabase.Oracle
             .action("rg000", "cluster1", "ocid1....aaaaaa", new DbNodeAction().withAction(DbNodeActionEnum.START),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbNodes_Action_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: VM actions on DbNodes of VM Cluster - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void vmActionsOnDbNodesOfVMClusterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbNodes()
+            .action("rgopenapi", "cloudvmcluster1", "abciderewdidsereq",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetSamples.java
index 17dafc53aa0d..29fbd2302962 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetSamples.java
@@ -9,7 +9,22 @@
  */
 public final class DbNodesGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbNodes_get.json
+     * x-ms-original-file: 2025-09-01/DbNodes_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get DbNode - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        getDbNodeGeneratedByMinimumSetRule(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbNodes()
+            .getWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbNodes_get.json
      */
     /**
      * Sample code: DbNodes_get.
@@ -19,4 +34,18 @@ public final class DbNodesGetSamples {
     public static void dbNodesGet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.dbNodes().getWithResponse("rg000", "cluster1", "ocid1....aaaaaa", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbNodes_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get DbNode - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        getDbNodeGeneratedByMaximumSetRule(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbNodes()
+            .getWithResponse("rgopenapi", "cloudvmcluster1", "weraeefrwlkjejfiepwcd", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterSamples.java
index 0341a9569218..3b9bb9b84ccc 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterSamples.java
@@ -9,7 +9,7 @@
  */
 public final class DbNodesListByCloudVmClusterSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbNodes_listByParent.json
+     * x-ms-original-file: 2025-09-01/dbNodes_listByParent.json
      */
     /**
      * Sample code: DbNodes_listByCloudVmCluster.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetSamples.java
index 4e1f2f435e24..6fa13c47b43f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetSamples.java
@@ -9,7 +9,22 @@
  */
 public final class DbServersGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbServers_get.json
+     * x-ms-original-file: 2025-09-01/DbServers_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get DbServer by parent - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getDbServerByParentGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbServers()
+            .getWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbServers_get.json
      */
     /**
      * Sample code: DbServers_get.
@@ -19,4 +34,19 @@ public final class DbServersGetSamples {
     public static void dbServersGet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.dbServers().getWithResponse("rg000", "infra1", "ocid1....aaaaaa", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbServers_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get DbServer by parent - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getDbServerByParentGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbServers()
+            .getWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureSamples.java
index b20e9c919986..c4df2d7d87db 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureSamples.java
@@ -9,7 +9,7 @@
  */
 public final class DbServersListByCloudExadataInfrastructureSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbServers_listByParent.json
+     * x-ms-original-file: 2025-09-01/dbServers_listByParent.json
      */
     /**
      * Sample code: DbServers_listByCloudExadataInfrastructure.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetSamples.java
index b565030c534e..9cc9512a31e9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetSamples.java
@@ -9,7 +9,35 @@
  */
 public final class DbSystemShapesGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbSystemShapes_get.json
+     * x-ms-original-file: 2025-09-01/DbSystemShapes_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get a DbSystemShape by name - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getADbSystemShapeByNameGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes().getWithResponse("eastus", "dbsystemshape1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystemShapes_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get a DbSystemShape by name - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getADbSystemShapeByNameGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbSystemShapes_get.json
      */
     /**
      * Sample code: DbSystemShapes_get.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationSamples.java
index 7d9a819e4c20..0edcdae9fa86 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationSamples.java
@@ -9,7 +9,33 @@
  */
 public final class DbSystemShapesListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dbSystemShapes_listByLocation.json
+     * x-ms-original-file: 2025-09-01/DbSystemShapes_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List DbSystemShapes by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDbSystemShapesByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes().listByLocation("eastus", null, null, com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystemShapes_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List DbSystemShapes by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDbSystemShapesByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystemShapes().listByLocation("eastus", "ymedsvqavemtixp", null, com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dbSystemShapes_listByLocation.json
      */
     /**
      * Sample code: DbSystemShapes_listByLocation.
@@ -18,6 +44,6 @@ public final class DbSystemShapesListByLocationSamples {
      */
     public static void
         dbSystemShapesListByLocation(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.dbSystemShapes().listByLocation("eastus", null, com.azure.core.util.Context.NONE);
+        manager.dbSystemShapes().listByLocation("eastus", null, null, com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsCreateOrUpdateSamples.java
new file mode 100644
index 000000000000..8cf6bbd4af37
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsCreateOrUpdateSamples.java
@@ -0,0 +1,74 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.ComputeModel;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemDatabaseEditionType;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemOptions;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemProperties;
+import com.azure.resourcemanager.oracledatabase.models.DiskRedundancyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+import com.azure.resourcemanager.oracledatabase.models.StorageVolumePerformanceMode;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Samples for DbSystems CreateOrUpdate.
+ */
+public final class DbSystemsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_CreateOrUpdate_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemsCreateOrUpdateMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems()
+            .define("dbsystem1")
+            .withRegion("uuh")
+            .withExistingResourceGroup("rgopenapi")
+            .withTags(mapOf("key2549", "fakeTokenPlaceholder"))
+            .withProperties(new DbSystemProperties().withResourceAnchorId(
+                "/subscriptions/00000000-0000-4025-0000-000000000000/resourceGroups/rg001/providers/Oracle.Database/resourceAnchors/resourceanchor1")
+                .withNetworkAnchorId(
+                    "/subscriptions/00000000-0000-4025-0000-000000000000/resourceGroups/rg001/providers/Oracle.Database/networkAnchors/networkanchor1")
+                .withClusterName("icshqxm")
+                .withDisplayName(
+                    "cpvibowyttzngughrisxfglqnffhtbjacuskwmixpczatxyrmrrgjsokonbolesdufrvuganmokwjkziisezqbvhmxtftldjulyixvmrcpmtlhynhbdlufcjdmmlbvcjdwbumjzdgwrxthntbbzscyrgmcfmkkowpujydlofklcrhdhoefeyl")
+                .withInitialDataStorageSizeInGb(19)
+                .withDbSystemOptions(new DbSystemOptions().withStorageManagement(StorageManagementType.LVM))
+                .withDiskRedundancy(DiskRedundancyType.HIGH)
+                .withHostname("krixp")
+                .withNodeCount(24)
+                .withShape(
+                    "kcknzpixkpolhxpcvpzwhjjvyafciktxguoljnixmztvkfryxaqogtrefbjbibzlbojjnuhrrxninevocnigpzenshgqozclxyhzwkavncfvekfpmbxhinwqvupoacgascnmqvplqckjrqbxsejzprsvgvmvkbuvncffjv")
+                .withSshPublicKeys(Arrays.asList("qtozhgwrjzkmwvdsggbivnbcwgykjnuvugqwmzompvbyfi"))
+                .withStorageVolumePerformanceMode(StorageVolumePerformanceMode.BALANCED)
+                .withTimeZone("gyrlmvdtseawpykcpwlgexrcffciyavsshsekacwcfkubcqdbrliy")
+                .withComputeModel(ComputeModel.ECPU)
+                .withComputeCount(28)
+                .withDatabaseEdition(DbSystemDatabaseEditionType.STANDARD_EDITION)
+                .withAdminPassword("fakeTokenPlaceholder")
+                .withDbVersion("nuzcyzulicdscaxxleansibdtqxhf"))
+            .withZones(Arrays.asList("pstozrrpkhlaffxt"))
+            .create();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsDeleteSamples.java
new file mode 100644
index 000000000000..c8dd6fb434b3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsDeleteSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for DbSystems Delete.
+ */
+public final class DbSystemsDeleteSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_Delete_MinimumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemsDeleteMinimumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().delete("rgopenapi", "dbsystem1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_Delete_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemsDeleteMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().delete("rgopenapi", "dbsystem1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsGetByResourceGroupSamples.java
new file mode 100644
index 000000000000..88c9e99d7f54
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsGetByResourceGroupSamples.java
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for DbSystems GetByResourceGroup.
+ */
+public final class DbSystemsGetByResourceGroupSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_Get_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void dbSystemsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().getByResourceGroupWithResponse("rgopenapi", "dbsystem1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsListByResourceGroupSamples.java
new file mode 100644
index 000000000000..cd4eccc35664
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsListByResourceGroupSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for DbSystems ListByResourceGroup.
+ */
+public final class DbSystemsListByResourceGroupSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_ListByResourceGroup_MaximumSet_Gen - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void dbSystemsListByResourceGroupMaximumSetGenGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_ListByResourceGroup_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemsListByResourceGroupMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsListSamples.java
new file mode 100644
index 000000000000..bc7cb12597ab
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsListSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for DbSystems List.
+ */
+public final class DbSystemsListSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_ListBySubscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void dbSystemsListBySubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_ListBySubscription_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemsListBySubscriptionMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbSystems().list(com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsUpdateSamples.java
new file mode 100644
index 000000000000..29a78a6b3184
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemsUpdateSamples.java
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.DbSystem;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemSourceType;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdateProperties;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Samples for DbSystems Update.
+ */
+public final class DbSystemsUpdateSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbSystems_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbSystems_Update_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbSystemsUpdateMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        DbSystem resource = manager.dbSystems()
+            .getByResourceGroupWithResponse("rgopenapi", "dbsystem1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("key5457", "fakeTokenPlaceholder"))
+            .withZones(Arrays.asList("zone1"))
+            .withProperties(new DbSystemUpdateProperties().withSource(DbSystemSourceType.NONE))
+            .apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsGetSamples.java
new file mode 100644
index 000000000000..424b28c86b7a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsGetSamples.java
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for DbVersions Get.
+ */
+public final class DbVersionsGetSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbVersions_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbVersions_Get_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void dbVersionsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbVersions().getWithResponse("eastus", "23.0.0.0.0", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsListByLocationSamples.java
new file mode 100644
index 000000000000..e91cc1cffea1
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsListByLocationSamples.java
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+
+/**
+ * Samples for DbVersions ListByLocation.
+ */
+public final class DbVersionsListByLocationSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/DbVersions_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: DbVersions_ListByLocation_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        dbVersionsListByLocationMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dbVersions()
+            .listByLocation("eastus", BaseDbSystemShapes.VMSTANDARD_X86,
+                "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/group1/providers/Oracle.Database/dbSystems/dbsystem1",
+                StorageManagementType.LVM, true, true, ShapeFamilyType.VIRTUAL_MACHINE,
+                com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetSamples.java
index 0b5354870fa8..636de0baa5f7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetSamples.java
@@ -9,7 +9,22 @@
  */
 public final class DnsPrivateViewsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dnsPrivateViews_get.json
+     * x-ms-original-file: 2025-09-01/DnsPrivateViews_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get a DnsPrivateView by name - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getADnsPrivateViewByNameGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateViews()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dnsPrivateViews_get.json
      */
     /**
      * Sample code: DnsPrivateViews_get.
@@ -19,4 +34,18 @@ public final class DnsPrivateViewsGetSamples {
     public static void dnsPrivateViewsGet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.dnsPrivateViews().getWithResponse("eastus", "ocid1....aaaaaa", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DnsPrivateViews_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get a DnsPrivateView by name - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getADnsPrivateViewByNameGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateViews()
+            .getWithResponse("eastus", "weasefewawelkrlweircicceiwpdic", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationSamples.java
index 4b6b18838b66..2aa110bfc7df 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationSamples.java
@@ -9,7 +9,33 @@
  */
 public final class DnsPrivateViewsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dnsPrivateViews_listByLocation.json
+     * x-ms-original-file: 2025-09-01/DnsPrivateViews_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List DnsPrivateViews by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDnsPrivateViewsByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateViews().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DnsPrivateViews_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List DnsPrivateViews by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDnsPrivateViewsByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateViews().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dnsPrivateViews_listByLocation.json
      */
     /**
      * Sample code: DnsPrivateViews_listByLocation.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetSamples.java
index 2ebe0dde9473..57aad6a3671b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetSamples.java
@@ -9,7 +9,33 @@
  */
 public final class DnsPrivateZonesGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dnsPrivateZones_get.json
+     * x-ms-original-file: 2025-09-01/DnsPrivateZones_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get a DnsPrivateZone by name - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getADnsPrivateZoneByNameGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateZones().getWithResponse("eastus", "dnsprivatezone1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DnsPrivateZones_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get a DnsPrivateZone by name - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getADnsPrivateZoneByNameGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateZones().getWithResponse("eastus", "dnsprivatezone1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dnsPrivateZones_get.json
      */
     /**
      * Sample code: DnsPrivateZones_get.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationSamples.java
index 6f0e3ad351c8..4c93bb618cba 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationSamples.java
@@ -9,7 +9,33 @@
  */
 public final class DnsPrivateZonesListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/dnsPrivateZones_listByLocation.json
+     * x-ms-original-file: 2025-09-01/DnsPrivateZones_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List DnsPrivateZones by location - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDnsPrivateZonesByLocationGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateZones().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/DnsPrivateZones_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List DnsPrivateZones by location - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listDnsPrivateZonesByLocationGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.dnsPrivateZones().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/dnsPrivateZones_listByLocation.json
      */
     /**
      * Sample code: DnsPrivateZones_listByLocation.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersCreateOrUpdateSamples.java
index 80804792765b..a2e9372f2a87 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersCreateOrUpdateSamples.java
@@ -19,7 +19,24 @@
  */
 public final class ExadbVmClustersCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_CreateOrUpdate_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_CreateOrUpdate_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_CreateOrUpdate_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersCreateOrUpdateMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters()
+            .define("exadbVmClusterName1")
+            .withRegion("eastus")
+            .withExistingResourceGroup("rgopenapi")
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_CreateOrUpdate_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_CreateOrUpdate_MaximumSet.
@@ -29,12 +46,12 @@ public final class ExadbVmClustersCreateOrUpdateSamples {
     public static void exadbVmClustersCreateOrUpdateMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exadbVmClusters()
-            .define("clusterName")
-            .withRegion("xojp")
+            .define("vmcluster1")
+            .withRegion("dsmvbplxdvesmvsgdvorgxalwpqxwt")
             .withExistingResourceGroup("rgopenapi")
-            .withTags(mapOf("key9683", "fakeTokenPlaceholder"))
-            .withProperties(new ExadbVmClusterProperties().withClusterName("hssswln")
-                .withBackupSubnetCidr("fr")
+            .withTags(mapOf("key8577", "fakeTokenPlaceholder"))
+            .withProperties(new ExadbVmClusterProperties().withClusterName("p")
+                .withBackupSubnetCidr("ca")
                 .withVnetId(
                     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1")
                 .withSubnetId(
@@ -43,29 +60,28 @@ public static void exadbVmClustersCreateOrUpdateMaximumSet(
                     .withIsHealthMonitoringEnabled(true)
                     .withIsIncidentLogsEnabled(true))
                 .withDisplayName(
-                    "dyhkncxzzgcwlfkfygvqlvqbxekvkbhjprmuxtaukewjnfrrnfqgrqsjfgsayrezkspqplrduuomuvtpkqurcoqjdnadlvedgfngglcgafbxtcewxlgckvehhqgfwkokbjoqftunjsgfjwbdaftxoytsphydwogtlnfxxuzzjvqcrin")
-                .withDomain("vzfak")
+                    "zvnuzwcpevcsnhaheojscyiytcgxvtsuownoyrjddolqzpaalbyrgqgactzrafocjglzjzosrqewmsvdovubrczmlrjoahwgckbbhvimqfhmnrpuszndasfutdyyrvszdawdxvyfpgtoaemjvqpavsfsedbdhbqmqqtxxjthmjbswjbaymibfpbpzuy")
+                .withDomain("akltvmctvumwfuqi")
                 .withEnabledEcpuCount(0)
                 .withExascaleDbStorageVaultId(
                     "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Oracle.Database/exascaleDbStorageVaults/storageVaultName")
-                .withGridImageOcid("ocid1.dbpatch.oc1..aaaaa3klq")
-                .withHostname("tdn")
+                .withGridImageOcid("ocid1.autonomousdatabase.oc1..aaaaa3klq")
+                .withHostname("uwrzwwhrr")
                 .withLicenseModel(LicenseModel.LICENSE_INCLUDED)
-                .withNodeCount(8)
+                .withNodeCount(30)
                 .withNsgCidrs(Arrays.asList(new NsgCidr().withSource("10.0.0.0/16")
                     .withDestinationPortRange(new PortRange().withMin(1520).withMax(1522))))
                 .withPrivateZoneOcid("ocid1.autonomousdatabase.oc1..aaaaa3klq")
-                .withScanListenerPortTcp(9)
-                .withScanListenerPortTcpSsl(18)
-                .withShape("evenjblxxfsztdxlcr")
-                .withSshPublicKeys(Arrays.asList("wiseakllkohemfmnoyteg"))
-                .withSystemVersion(
-                    "udwsykstqawwjrvzebfyyccnjzhxtijvywlgnrkqxnboibyppistnbvqqsnsxmjnzeumgnatmarzfnjhglmtrknszthrxtwewwqjbkwytbhtjbgondtktkpvjmxdcuyjupr")
+                .withScanListenerPortTcp(30)
+                .withScanListenerPortTcpSsl(14)
+                .withShape("pzfyfjznebdsakeira")
+                .withSshPublicKeys(Arrays.asList("wzzayf"))
+                .withSystemVersion("ssqzevdtjtcnxpdspcyqzgdtmonqjj")
                 .withTimeZone(
-                    "ayuqnpfkasdzmxlfnkjzrenyogbvcysdbkstjhyjdgxygitlykihtwdiktilukyplgxovaonrqcqaviyaqgyrqfrklqvqyobnxgmzpqbgjhdtjdquhyqnvhavnqpfupaqhdedgdvfomeueeuwjjfiqiyxspybpyj")
-                .withTotalEcpuCount(56)
-                .withVmFileSystemStorage(new ExadbVmClusterStorageDetails().withTotalSizeInGbs(10)))
-            .withZones(Arrays.asList("iupjvcfsbvfhrebwf"))
+                    "lkqvpvoczhoytxmeukzepgqgpdvdnigwxfojzfanqhracxsvgchwahzcifrkxlknixdrsopatguwccnejgyehnwfrvfedlefgneiudaqxbqnjkjedmcjocfvjdabwlyridcjvhzmlomgotwvnqqsrdjufsmebedckwwurmdoddknnfsm")
+                .withTotalEcpuCount(10)
+                .withVmFileSystemStorage(new ExadbVmClusterStorageDetails().withTotalSizeInGbs(18)))
+            .withZones(Arrays.asList("ozwhowofqaq"))
             .create();
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersDeleteSamples.java
index 752e6ec56daf..780f840c20e1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExadbVmClustersDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_Delete_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_Delete_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_Delete_MaximumSet.
@@ -18,6 +18,19 @@ public final class ExadbVmClustersDeleteSamples {
      */
     public static void
         exadbVmClustersDeleteMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.exadbVmClusters().delete("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+        manager.exadbVmClusters().delete("rgopenapi", "exadaVmClusterName1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_Delete_MinimumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        exadbVmClustersDeleteMinimumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters().delete("rgopenapi", "exadaVmClusterName1", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersGetByResourceGroupSamples.java
index bd1247a60fec..acdfbe6251f4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersGetByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExadbVmClustersGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_Get_MaximumSet.
@@ -19,6 +19,20 @@ public final class ExadbVmClustersGetByResourceGroupSamples {
     public static void
         exadbVmClustersGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exadbVmClusters()
-            .getByResourceGroupWithResponse("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+            .getByResourceGroupWithResponse("rgopenapi", "exadbVmClusterName1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_Get_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersGetMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters()
+            .getByResourceGroupWithResponse("rgopenapi", "exadbVmClusterName1*", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListByResourceGroupSamples.java
index 353c3ec996ac..946a78a57a89 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExadbVmClustersListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_ListByResourceGroup_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_ListByResourceGroup_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_ListByResourceGroup_MaximumSet.
@@ -20,4 +20,17 @@ public static void exadbVmClustersListByResourceGroupMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exadbVmClusters().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_ListByResourceGroup_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersListByResourceGroupMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListSamples.java
index ac85a45e3d8a..f77312823c4f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExadbVmClustersListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_ListBySubscription_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_ListBySubscription_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_ListBySubscription_MaximumSet.
@@ -20,4 +20,17 @@ public static void exadbVmClustersListBySubscriptionMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exadbVmClusters().list(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_ListBySubscription_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersListBySubscriptionMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters().list(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersRemoveVmsSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersRemoveVmsSamples.java
index f21546866f2f..b3fb543ab04c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersRemoveVmsSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersRemoveVmsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ExadbVmClustersRemoveVmsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_RemoveVms_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_RemoveVms_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_RemoveVms_MaximumSet.
@@ -23,7 +23,24 @@ public final class ExadbVmClustersRemoveVmsSamples {
     public static void
         exadbVmClustersRemoveVmsMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exadbVmClusters()
-            .removeVms("rgopenapi", "vmClusterName", new RemoveVirtualMachineFromExadbVmClusterDetails()
+            .removeVms("rgopenapi", "exadbVmClusterName1", new RemoveVirtualMachineFromExadbVmClusterDetails()
+                .withDbNodes(Arrays.asList(new DbNodeDetails().withDbNodeId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Oracle.Database/exadbVmClusters/vmCluster/dbNodes/dbNodeName"))),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_RemoveVms_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_RemoveVms_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersRemoveVmsMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exadbVmClusters()
+            .removeVms("rgopenapi", "vmCluster1", new RemoveVirtualMachineFromExadbVmClusterDetails()
                 .withDbNodes(Arrays.asList(new DbNodeDetails().withDbNodeId(
                     "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Oracle.Database/exadbVmClusters/vmCluster/dbNodes/dbNodeName"))),
                 com.azure.core.util.Context.NONE);
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersUpdateSamples.java
index 93fe8135c336..3b4546f87e57 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClustersUpdateSamples.java
@@ -15,7 +15,23 @@
  */
 public final class ExadbVmClustersUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExadbVmClusters_Update_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExadbVmClusters_Update_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exadbVmClustersUpdateMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        ExadbVmCluster resource = manager.exadbVmClusters()
+            .getByResourceGroupWithResponse("rgopenapi", "exadbvmclusterq", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExadbVmClusters_Update_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExadbVmClusters_Update_MaximumSet.
@@ -25,12 +41,12 @@ public final class ExadbVmClustersUpdateSamples {
     public static void
         exadbVmClustersUpdateMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         ExadbVmCluster resource = manager.exadbVmClusters()
-            .getByResourceGroupWithResponse("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE)
+            .getByResourceGroupWithResponse("rgopenapi", "exadbvmcluster1", com.azure.core.util.Context.NONE)
             .getValue();
         resource.update()
-            .withTags(mapOf("key6027", "fakeTokenPlaceholder"))
-            .withZones(Arrays.asList("zcqfxmpauiqjphmhwwt"))
-            .withProperties(new ExadbVmClusterUpdateProperties().withNodeCount(9))
+            .withTags(mapOf("key4195", "fakeTokenPlaceholder"))
+            .withZones(Arrays.asList("yd"))
+            .withProperties(new ExadbVmClusterUpdateProperties().withNodeCount(17))
             .apply();
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionSamples.java
index ef96321c1cb1..4922c1ac38d5 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionSamples.java
@@ -12,7 +12,7 @@
  */
 public final class ExascaleDbNodesActionSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbNodes_Action_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_Action_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbNodes_Action_MaximumSet.
@@ -22,7 +22,22 @@ public final class ExascaleDbNodesActionSamples {
     public static void
         exascaleDbNodesActionMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbNodes()
-            .action("rgopenapi", "vmClusterName", "dbNodeName", new DbNodeAction().withAction(DbNodeActionEnum.START),
-                com.azure.core.util.Context.NONE);
+            .action("rgopenapi", "exadbvmcluster1", "exascaledbnode1",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_Action_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbNodes_Action_MinimumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        exascaleDbNodesActionMinimumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbNodes()
+            .action("rgopenapi", "exadbvmcluster1", "exascaledbnode1",
+                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetSamples.java
index 3bb7ebb70e3f..4adef80a814d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetSamples.java
@@ -9,7 +9,21 @@
  */
 public final class ExascaleDbNodesGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbNodes_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbNodes_Get_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbNodesGetMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbNodes()
+            .getWithResponse("rgopenapi", "vmcluster", "exascaledbnode1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbNodes_Get_MaximumSet.
@@ -19,6 +33,6 @@ public final class ExascaleDbNodesGetSamples {
     public static void
         exascaleDbNodesGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbNodes()
-            .getWithResponse("rgopenapi", "vmClusterName", "dbNodeName", com.azure.core.util.Context.NONE);
+            .getWithResponse("rgopenapi", "exadbvmcluster1", "exascaledbnode1", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentSamples.java
index 5c83e395ea2e..4007ead932f6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExascaleDbNodesListByParentSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbNodes_ListByParent_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_ListByParent_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbNodes_ListByParent_MaximumSet.
@@ -18,6 +18,19 @@ public final class ExascaleDbNodesListByParentSamples {
      */
     public static void
         exascaleDbNodesListByParentMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.exascaleDbNodes().listByParent("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+        manager.exascaleDbNodes().listByParent("rgopenapi", "vmcluster", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbNodes_ListByParent_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbNodes_ListByParent_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbNodesListByParentMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbNodes().listByParent("rgopenapi", "vmcluster", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateSamples.java
index 82f07833184e..8c71832d8692 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateSamples.java
@@ -15,7 +15,24 @@
  */
 public final class ExascaleDbStorageVaultsCreateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Create_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Create_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Create_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsCreateMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults()
+            .define("storagevault1")
+            .withRegion("odxgtv")
+            .withExistingResourceGroup("rgopenapi")
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Create_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Create_MaximumSet.
@@ -25,18 +42,17 @@ public final class ExascaleDbStorageVaultsCreateSamples {
     public static void exascaleDbStorageVaultsCreateMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbStorageVaults()
-            .define("vmClusterName")
-            .withRegion("ltguhzffucaytqg")
+            .define("storagevault1")
+            .withRegion("zuoudqbvlxerpjtlfooyqlb")
             .withExistingResourceGroup("rgopenapi")
-            .withTags(mapOf("key7827", "fakeTokenPlaceholder"))
+            .withTags(mapOf("key4521", "fakeTokenPlaceholder"))
             .withProperties(new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(0)
-                .withDescription("dmnvnnduldfmrmkkvvsdtuvmsmruxzzpsfdydgytlckutfozephjygjetrauvbdfcwmti")
-                .withDisplayName(
-                    "hbsybtelyvhpalemszcvartlhwvskrnpiveqfblvkdihoytqaotdgsgauvgivzaftfgeiwlyeqzssicwrrnlxtsmeakbcsxabjlt")
-                .withHighCapacityDatabaseStorageInput(new ExascaleDbStorageInputDetails().withTotalSizeInGbs(21))
-                .withTimeZone(
-                    "ltrbozwxjunncicrtzjrpqnqrcjgghohztrdlbfjrbkpenopyldwolslwgrgumjfkyovvkzcuxjujuxtjjzubvqvnhrswnbdgcbslopeofmtepbrrlymqwwszvsglmyuvlcuejshtpokirwklnwpcykhyinjmlqvxtyixlthtdishhmtipbygsayvgqzfrprgppylydlcskbmvwctxifdltippfvsxiughqbojqpqrekxsotnqsk"))
-            .withZones(Arrays.asList("qk"))
+                .withDescription(
+                    "kgqvxvtegzwyppegpvqxnlslvetbjlgveofcpjddenhbpocyzwtswaeaetqkipcxyhedsymuljalirryldlbviuvidhssyiwodacajjnbpkbvbvzwzsjctsidchalyjkievnivikwnnypaojcvhmokddstxwiqxmbfmbvglfimseguwyvibwzllggjtwejdfgezoeuvjjbsyfozswihydzuscjrqnklewongumiljeordhqlsclwlmftzdoey")
+                .withDisplayName("storagevault1")
+                .withHighCapacityDatabaseStorageInput(new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1))
+                .withTimeZone("hyjcftlal"))
+            .withZones(Arrays.asList("npqjhyekyumfybqas"))
             .create();
     }
 
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsDeleteSamples.java
index d239a5cf91b8..45c94485a6e1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExascaleDbStorageVaultsDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Delete_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Delete_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Delete_MaximumSet.
@@ -18,6 +18,19 @@ public final class ExascaleDbStorageVaultsDeleteSamples {
      */
     public static void exascaleDbStorageVaultsDeleteMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.exascaleDbStorageVaults().delete("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+        manager.exascaleDbStorageVaults().delete("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Delete_MinimumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsDeleteMinimumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults().delete("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupSamples.java
index 4a97677ed45f..395016ce7e6b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExascaleDbStorageVaultsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Get_MaximumSet.
@@ -19,6 +19,20 @@ public final class ExascaleDbStorageVaultsGetByResourceGroupSamples {
     public static void
         exascaleDbStorageVaultsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbStorageVaults()
-            .getByResourceGroupWithResponse("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE);
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Get_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsGetMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults()
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupSamples.java
index 3e64a448127b..15a6e9671d0c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExascaleDbStorageVaultsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet.
@@ -20,4 +20,17 @@ public static void exascaleDbStorageVaultsListByResourceGroupMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.exascaleDbStorageVaults().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_ListByResourceGroup_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsListByResourceGroupMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListSamples.java
index fcd3f0f055f4..548ee3fae85b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListSamples.java
@@ -9,7 +9,20 @@
  */
 public final class ExascaleDbStorageVaultsListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_ListBySubscription_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_ListBySubscription_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsListBySubscriptionMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.exascaleDbStorageVaults().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_ListBySubscription_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_ListBySubscription_MaximumSet.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsUpdateSamples.java
index 137ab7079a6e..ec6c5bd200e4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ExascaleDbStorageVaultsUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/ExascaleDbStorageVaults_Update_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Update_MaximumSet_Gen.json
      */
     /**
      * Sample code: ExascaleDbStorageVaults_Update_MaximumSet.
@@ -23,9 +23,25 @@ public final class ExascaleDbStorageVaultsUpdateSamples {
     public static void exascaleDbStorageVaultsUpdateMaximumSet(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         ExascaleDbStorageVault resource = manager.exascaleDbStorageVaults()
-            .getByResourceGroupWithResponse("rgopenapi", "vmClusterName", com.azure.core.util.Context.NONE)
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE)
             .getValue();
-        resource.update().withTags(mapOf("key6179", "fakeTokenPlaceholder")).apply();
+        resource.update().withTags(mapOf("key6486", "fakeTokenPlaceholder")).apply();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ExascaleDbStorageVaults_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ExascaleDbStorageVaults_Update_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void exascaleDbStorageVaultsUpdateMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        ExascaleDbStorageVault resource = manager.exascaleDbStorageVaults()
+            .getByResourceGroupWithResponse("rgopenapi", "storagevault1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().apply();
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetSamples.java
index d25f6a33b266..29e5483244e1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FlexComponentsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/FlexComponents_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/FlexComponents_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: FlexComponents_Get_MaximumSet.
@@ -18,6 +18,6 @@ public final class FlexComponentsGetSamples {
      */
     public static void
         flexComponentsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.flexComponents().getWithResponse("eastus", "flexComponent", com.azure.core.util.Context.NONE);
+        manager.flexComponents().getWithResponse("eastus", "flexname1", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentSamples.java
index 88a18b46a52b..2eb6c3edc39b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentSamples.java
@@ -11,7 +11,7 @@
  */
 public final class FlexComponentsListByParentSamples {
     /*
-     * x-ms-original-file: 2025-03-01/FlexComponents_ListByParent_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/FlexComponents_ListByParent_MaximumSet_Gen.json
      */
     /**
      * Sample code: FlexComponents_ListByParent_MaximumSet.
@@ -20,6 +20,19 @@ public final class FlexComponentsListByParentSamples {
      */
     public static void
         flexComponentsListByParentMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.flexComponents().listByParent("eastus", SystemShapes.EXADATA_X11M, com.azure.core.util.Context.NONE);
+        manager.flexComponents().listByParent("eastus", SystemShapes.EXADATA_X9M, com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/FlexComponents_ListByParent_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: FlexComponents_ListByParent_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void flexComponentsListByParentMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.flexComponents().listByParent("eastus", null, com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetSamples.java
index 62bef0800031..15ba811909aa 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GiMinorVersionsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiMinorVersions_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiMinorVersions_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: GiMinorVersions_Get_MaximumSet.
@@ -19,6 +19,6 @@ public final class GiMinorVersionsGetSamples {
     public static void
         giMinorVersionsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.giMinorVersions()
-            .getWithResponse("eastus", "giVersionName", "giMinorVersionName", com.azure.core.util.Context.NONE);
+            .getWithResponse("eastus", "19.0.0.0", "minorversion", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentSamples.java
index c9b820f27632..9d8b33016a02 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentSamples.java
@@ -11,7 +11,7 @@
  */
 public final class GiMinorVersionsListByParentSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiMinorVersions_ListByParent_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiMinorVersions_ListByParent_MaximumSet_Gen.json
      */
     /**
      * Sample code: GiMinorVersions_ListByParent_MaximumSet.
@@ -21,7 +21,20 @@ public final class GiMinorVersionsListByParentSamples {
     public static void
         giMinorVersionsListByParentMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.giMinorVersions()
-            .listByParent("eastus", "giVersionName", ShapeFamily.fromString("rtfcosvtlpeeqoicsjqggtgc"), null,
-                com.azure.core.util.Context.NONE);
+            .listByParent("eastus", "name1", ShapeFamily.EXADATA, "zone1", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/GiMinorVersions_ListByParent_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: GiMinorVersions_ListByParent_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void giMinorVersionsListByParentMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.giMinorVersions()
+            .listByParent("eastus", "giMinorVersionName", null, null, com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetSamples.java
index bb871d64d503..b519544a92b4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class GiVersionsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiVersions_Get_MinimumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiVersions_Get_MinimumSet_Gen.json
      */
     /**
      * Sample code: Get a GiVersion by name - generated by [MinimumSet] rule.
@@ -18,11 +18,13 @@ public final class GiVersionsGetSamples {
      */
     public static void getAGiVersionByNameGeneratedByMinimumSetRule(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.giVersions().getWithResponse("eastus", "giVersionName", com.azure.core.util.Context.NONE);
+        manager.giVersions()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
     }
 
     /*
-     * x-ms-original-file: 2025-03-01/giVersions_get.json
+     * x-ms-original-file: 2025-09-01/giVersions_get.json
      */
     /**
      * Sample code: GiVersions_get.
@@ -34,7 +36,7 @@ public static void giVersionsGet(com.azure.resourcemanager.oracledatabase.Oracle
     }
 
     /*
-     * x-ms-original-file: 2025-03-01/GiVersions_Get_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiVersions_Get_MaximumSet_Gen.json
      */
     /**
      * Sample code: Get a GiVersion by name - generated by [MaximumSet] rule.
@@ -43,6 +45,6 @@ public static void giVersionsGet(com.azure.resourcemanager.oracledatabase.Oracle
      */
     public static void getAGiVersionByNameGeneratedByMaximumSetRule(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.giVersions().getWithResponse("eastus", "giVersionName", com.azure.core.util.Context.NONE);
+        manager.giVersions().getWithResponse("eastus", "giversion1", com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationSamples.java
index 5e2b36ed078a..ee50e5bb6c8a 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationSamples.java
@@ -11,31 +11,29 @@
  */
 public final class GiVersionsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/GiVersions_ListByLocation_MaximumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiVersions_ListByLocation_MinimumSet_Gen.json
      */
     /**
-     * Sample code: List GiVersions by location - generated by [MaximumSet] rule.
+     * Sample code: GiVersions_ListByLocation_MinimumSet.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
-    public static void listGiVersionsByLocationGeneratedByMaximumSetRule(
-        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.giVersions()
-            .listByLocation("eastus", SystemShapes.fromString(
-                "osixsklyaauhoqnkxvnvsqeqenhzogntqnpubldrrfvqncwetdtwqwjjcvspwhgecbimdlulwcubikebrdzmidrucgtsuqvytkqutmbyrvvyioxpocpmuwiivyanjzucaegihztluuvpznzaoakfsselumhhsvrtrbzwpjhcihsvyouonlxdluwhqfxoqvgthkaxppbydtqjntscgzbivfdcaobbkthrbdjwpejirqmbly"),
-                null, com.azure.core.util.Context.NONE);
+    public static void
+        giVersionsListByLocationMinimumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.giVersions().listByLocation("eastus", null, null, null, com.azure.core.util.Context.NONE);
     }
 
     /*
-     * x-ms-original-file: 2025-03-01/GiVersions_ListByLocation_MinimumSet_Gen.json
+     * x-ms-original-file: 2025-09-01/GiVersions_ListByLocation_MaximumSet_Gen.json
      */
     /**
-     * Sample code: List GiVersions by location - generated by [MinimumSet] rule.
+     * Sample code: GiVersions_ListByLocation_MaximumSet.
      * 
      * @param manager Entry point to OracleDatabaseManager.
      */
-    public static void listGiVersionsByLocationGeneratedByMinimumSetRule(
-        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
-        manager.giVersions().listByLocation("eastus", null, null, com.azure.core.util.Context.NONE);
+    public static void
+        giVersionsListByLocationMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.giVersions()
+            .listByLocation("eastus", SystemShapes.EXADATA_X9M, "hpzuyaemum", null, com.azure.core.util.Context.NONE);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsCreateOrUpdateSamples.java
new file mode 100644
index 000000000000..723e6346fe12
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsCreateOrUpdateSamples.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Samples for NetworkAnchors CreateOrUpdate.
+ */
+public final class NetworkAnchorsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_CreateOrUpdate_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        networkAnchorsCreateOrUpdateMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors()
+            .define("networkAnchor1")
+            .withRegion("igamtwfkkmjnkcceh")
+            .withExistingResourceGroup("rgopenapi")
+            .withTags(mapOf("key4863", "fakeTokenPlaceholder"))
+            .withProperties(new NetworkAnchorProperties().withResourceAnchorId("ivxnsdkelptazxrbzzrs")
+                .withSubnetId(
+                    "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg000/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1")
+                .withOciVcnDnsLabel("taqimtjhlsshwakiaocbsrewvkq")
+                .withOciBackupCidrBlock("i")
+                .withIsOracleToAzureDnsZoneSyncEnabled(true)
+                .withIsOracleDnsListeningEndpointEnabled(true)
+                .withIsOracleDnsForwardingEndpointEnabled(true)
+                .withDnsForwardingRules(Arrays
+                    .asList(new DnsForwardingRule().withDomainNames("domain1, domain2").withForwardingIpAddress("qe"))))
+            .withZones(Arrays.asList("qwrgwcmycokwbhdafhoheaxzoxx"))
+            .create();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsDeleteSamples.java
new file mode 100644
index 000000000000..9da797d8dc63
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsDeleteSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for NetworkAnchors Delete.
+ */
+public final class NetworkAnchorsDeleteSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_Delete_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        networkAnchorsDeleteMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors().delete("rgopenapi", "networkAnchor1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsGetByResourceGroupSamples.java
new file mode 100644
index 000000000000..66d75f32645e
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsGetByResourceGroupSamples.java
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for NetworkAnchors GetByResourceGroup.
+ */
+public final class NetworkAnchorsGetByResourceGroupSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_Get_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        networkAnchorsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors()
+            .getByResourceGroupWithResponse("rgopenapi", "networkanchor1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListByResourceGroupSamples.java
new file mode 100644
index 000000000000..1772f7d3c4a0
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListByResourceGroupSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for NetworkAnchors ListByResourceGroup.
+ */
+public final class NetworkAnchorsListByResourceGroupSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_ListByResourceGroup_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void networkAnchorsListByResourceGroupMaximumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_ListByResourceGroup_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void networkAnchorsListByResourceGroupMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListSamples.java
new file mode 100644
index 000000000000..77d3a3303c3b
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for NetworkAnchors List.
+ */
+public final class NetworkAnchorsListSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_ListBySubscription_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void networkAnchorsListBySubscriptionMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_ListBySubscription_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void networkAnchorsListBySubscriptionMaximumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.networkAnchors().list(com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsUpdateSamples.java
new file mode 100644
index 000000000000..b3ec614f146e
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsUpdateSamples.java
@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdateProperties;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Samples for NetworkAnchors Update.
+ */
+public final class NetworkAnchorsUpdateSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/NetworkAnchors_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: NetworkAnchors_Update_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        networkAnchorsUpdateMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        NetworkAnchor resource = manager.networkAnchors()
+            .getByResourceGroupWithResponse("rgopenapi", "networkanchor1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("key8038", "fakeTokenPlaceholder"))
+            .withZones(Arrays.asList("zone1"))
+            .withProperties(new NetworkAnchorUpdateProperties().withOciBackupCidrBlock("waoztwkdpplgjtkiwkfnnohu")
+                .withIsOracleToAzureDnsZoneSyncEnabled(true)
+                .withIsOracleDnsListeningEndpointEnabled(true)
+                .withIsOracleDnsForwardingEndpointEnabled(true))
+            .apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListSamples.java
index 4f0490985f54..c94a9bd1f720 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListSamples.java
@@ -9,7 +9,20 @@
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/operations_list.json
+     * x-ms-original-file: 2025-09-01/Operations_List_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Operations - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listOperationsGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.operations().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/operations_list.json
      */
     /**
      * Sample code: Operations_list.
@@ -19,4 +32,17 @@ public final class OperationsListSamples {
     public static void operationsList(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.operations().list(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/Operations_List_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Operations - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listOperationsGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.operations().list(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsAddAzureSubscriptionsSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsAddAzureSubscriptionsSamples.java
index 7ed4330a6114..d52f562bce25 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsAddAzureSubscriptionsSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsAddAzureSubscriptionsSamples.java
@@ -12,7 +12,7 @@
  */
 public final class OracleSubscriptionsAddAzureSubscriptionsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_addAzureSubscriptions.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_addAzureSubscriptions.json
      */
     /**
      * Sample code: OracleSubscriptions_addAzureSubscriptions.
@@ -25,4 +25,34 @@ public static void oracleSubscriptionsAddAzureSubscriptions(
             .addAzureSubscriptions(new AzureSubscriptions().withAzureSubscriptionIds(
                 Arrays.asList("00000000-0000-0000-0000-000000000001")), com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_AddAzureSubscriptions_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Add Azure Subscriptions to the OracleSubscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addAzureSubscriptionsToTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .addAzureSubscriptions(new AzureSubscriptions().withAzureSubscriptionIds(
+                Arrays.asList("00000000-0000-0000-0000-000000000001")), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_AddAzureSubscriptions_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Add Azure Subscriptions to the OracleSubscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void addAzureSubscriptionsToTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .addAzureSubscriptions(new AzureSubscriptions().withAzureSubscriptionIds(
+                Arrays.asList("00000000-0000-0000-0000-000000000001")), com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsCreateOrUpdateSamples.java
index adf643d2ebdd..7254a00a265d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsCreateOrUpdateSamples.java
@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.oracledatabase.generated;
 
 import com.azure.resourcemanager.oracledatabase.fluent.models.OracleSubscriptionInner;
+import com.azure.resourcemanager.oracledatabase.models.Intent;
 import com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionProperties;
 import com.azure.resourcemanager.oracledatabase.models.Plan;
 
@@ -13,7 +14,20 @@
  */
 public final class OracleSubscriptionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_create.json
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_CreateOrUpdate_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Create or Update Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createOrUpdateOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().createOrUpdate(new OracleSubscriptionInner(), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_create.json
      */
     /**
      * Sample code: OracleSubscriptions_createOrUpdate.
@@ -31,4 +45,27 @@ public final class OracleSubscriptionsCreateOrUpdateSamples {
                     .withVersion("alpha")),
                 com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Create or Update Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createOrUpdateOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .createOrUpdate(new OracleSubscriptionInner()
+                .withProperties(new OracleSubscriptionProperties().withTermUnit("akzq")
+                    .withProductCode("fakeTokenPlaceholder")
+                    .withIntent(Intent.RETAIN))
+                .withPlan(new Plan().withName("plan1")
+                    .withPublisher("publisher1")
+                    .withProduct("product1")
+                    .withPromotionCode("fakeTokenPlaceholder")
+                    .withVersion("alpha")),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsDeleteSamples.java
index 73b70fdac267..e0c5c627f64b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsDeleteSamples.java
@@ -9,7 +9,33 @@
  */
 public final class OracleSubscriptionsDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_delete.json
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().delete(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().delete(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_delete.json
      */
     /**
      * Sample code: OracleSubscriptions_delete.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsGetSamples.java
index a105d159df83..f9649c369bda 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsGetSamples.java
@@ -9,7 +9,33 @@
  */
 public final class OracleSubscriptionsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_get.json
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().getWithResponse(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().getWithResponse(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_get.json
      */
     /**
      * Sample code: OracleSubscriptions_get.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksSamples.java
index 44f786e57e87..a3e4ee41fee8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksSamples.java
@@ -9,7 +9,33 @@
  */
 public final class OracleSubscriptionsListActivationLinksSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listActivationLinks.json
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListActivationLinks_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Activation Links for the Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listActivationLinksForTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listActivationLinks(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListActivationLinks_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Activation Links for the Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listActivationLinksForTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listActivationLinks(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listActivationLinks.json
      */
     /**
      * Sample code: OracleSubscriptions_listActivationLinks.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsSamples.java
index 2f5985c82a81..91f5bd853627 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class OracleSubscriptionsListCloudAccountDetailsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listCloudAccountDetails.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listCloudAccountDetails.json
      */
     /**
      * Sample code: OracleSubscriptions_listCloudAccountDetails.
@@ -20,4 +20,30 @@ public static void oracleSubscriptionsListCloudAccountDetails(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.oracleSubscriptions().listCloudAccountDetails(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListCloudAccountDetails_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Cloud Account details for the Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listCloudAccountDetailsForTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listCloudAccountDetails(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListCloudAccountDetails_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Cloud Account details for the Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listCloudAccountDetailsForTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listCloudAccountDetails(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsSamples.java
index 63896db9aba9..6887336f6a02 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class OracleSubscriptionsListSaasSubscriptionDetailsSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listSaasSubscriptionDetails.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listSaasSubscriptionDetails.json
      */
     /**
      * Sample code: OracleSubscriptions_listSaasSubscriptionDetails.
@@ -20,4 +20,30 @@ public static void oracleSubscriptionsListSaasSubscriptionDetails(
         com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.oracleSubscriptions().listSaasSubscriptionDetails(com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListSaasSubscriptionDetails_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Saas Subscription details for the Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listSaasSubscriptionDetailsForTheOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listSaasSubscriptionDetails(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListSaasSubscriptionDetails_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Saas Subscription details for the Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listSaasSubscriptionDetailsForTheOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().listSaasSubscriptionDetails(com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSamples.java
index a75d8e798700..22d6e946d76a 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSamples.java
@@ -9,7 +9,33 @@
  */
 public final class OracleSubscriptionsListSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_listBySubscription.json
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Oracle Subscriptions by subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listOracleSubscriptionsBySubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Oracle Subscriptions by subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listOracleSubscriptionsBySubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_listBySubscription.json
      */
     /**
      * Sample code: OracleSubscriptions_listBySubscription.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsUpdateSamples.java
index 4ae022c5c9da..c13dd9e2ca73 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsUpdateSamples.java
@@ -4,14 +4,17 @@
 
 package com.azure.resourcemanager.oracledatabase.generated;
 
+import com.azure.resourcemanager.oracledatabase.models.Intent;
 import com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdate;
+import com.azure.resourcemanager.oracledatabase.models.OracleSubscriptionUpdateProperties;
+import com.azure.resourcemanager.oracledatabase.models.PlanUpdate;
 
 /**
  * Samples for OracleSubscriptions Update.
  */
 public final class OracleSubscriptionsUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/oracleSubscriptions_patch.json
+     * x-ms-original-file: 2025-09-01/oracleSubscriptions_patch.json
      */
     /**
      * Sample code: OracleSubscriptions_update.
@@ -22,4 +25,39 @@ public final class OracleSubscriptionsUpdateSamples {
         oracleSubscriptionsUpdate(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.oracleSubscriptions().update(new OracleSubscriptionUpdate(), com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Update_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Oracle Subscription - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchOracleSubscriptionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions().update(new OracleSubscriptionUpdate(), com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/OracleSubscriptions_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Patch Oracle Subscription - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void patchOracleSubscriptionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.oracleSubscriptions()
+            .update(new OracleSubscriptionUpdate()
+                .withPlan(new PlanUpdate().withName("klnnbggrxhvvaiajvjx")
+                    .withPublisher("xvsarzadrjqergudsohjk")
+                    .withProduct("hivkczjyrimjilbmqj")
+                    .withPromotionCode("fakeTokenPlaceholder")
+                    .withVersion("ueudckjmuqpjvsmmenzyflgpa"))
+                .withProperties(new OracleSubscriptionUpdateProperties().withProductCode("fakeTokenPlaceholder")
+                    .withIntent(Intent.RETAIN)),
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsCreateOrUpdateSamples.java
new file mode 100644
index 000000000000..bc4f96bb8ef1
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsCreateOrUpdateSamples.java
@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Samples for ResourceAnchors CreateOrUpdate.
+ */
+public final class ResourceAnchorsCreateOrUpdateSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_CreateOrUpdate_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void resourceAnchorsCreateOrUpdateMaximumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors()
+            .define("resourceanchor1")
+            .withRegion("at")
+            .withExistingResourceGroup("rgopenapi")
+            .withTags(mapOf("key236", "fakeTokenPlaceholder"))
+            .withProperties(new ResourceAnchorProperties())
+            .create();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsDeleteSamples.java
new file mode 100644
index 000000000000..02536e885b75
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsDeleteSamples.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for ResourceAnchors Delete.
+ */
+public final class ResourceAnchorsDeleteSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_Delete_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        resourceAnchorsDeleteMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors().delete("rgopenapi", "resourceanchor1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsGetByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsGetByResourceGroupSamples.java
new file mode 100644
index 000000000000..41ff07f7e337
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsGetByResourceGroupSamples.java
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for ResourceAnchors GetByResourceGroup.
+ */
+public final class ResourceAnchorsGetByResourceGroupSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_Get_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        resourceAnchorsGetMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors()
+            .getByResourceGroupWithResponse("rgopenapi", "resourceanchor1", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListByResourceGroupSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListByResourceGroupSamples.java
new file mode 100644
index 000000000000..0e6b9cec72b8
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListByResourceGroupSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for ResourceAnchors ListByResourceGroup.
+ */
+public final class ResourceAnchorsListByResourceGroupSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_ListByResourceGroup_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_ListByResourceGroup_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void resourceAnchorsListByResourceGroupMaximumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_ListByResourceGroup_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_ListByResourceGroup_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void resourceAnchorsListByResourceGroupMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors().listByResourceGroup("rgopenapi", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListSamples.java
new file mode 100644
index 000000000000..c1d4707485bb
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListSamples.java
@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+/**
+ * Samples for ResourceAnchors List.
+ */
+public final class ResourceAnchorsListSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_ListBySubscription_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_ListBySubscription_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void resourceAnchorsListBySubscriptionMaximumSet(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors().list(com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_ListBySubscription_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_ListBySubscription_MaximumSet - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void resourceAnchorsListBySubscriptionMaximumSetGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.resourceAnchors().list(com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsUpdateSamples.java
new file mode 100644
index 000000000000..e7f306cf574c
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsUpdateSamples.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Samples for ResourceAnchors Update.
+ */
+public final class ResourceAnchorsUpdateSamples {
+    /*
+     * x-ms-original-file: 2025-09-01/ResourceAnchors_Update_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: ResourceAnchors_Update_MaximumSet.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void
+        resourceAnchorsUpdateMaximumSet(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        ResourceAnchor resource = manager.resourceAnchors()
+            .getByResourceGroupWithResponse("rgopenapi", "resourceanchor1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update().withTags(mapOf("key3998", "fakeTokenPlaceholder")).apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetSamples.java
index b707898f307a..a4ac73cb3bde 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SystemVersionsGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/systemVersions_get.json
+     * x-ms-original-file: 2025-09-01/systemVersions_get.json
      */
     /**
      * Sample code: systemVersions_listSystemVersions.
@@ -20,4 +20,34 @@ public final class SystemVersionsGetSamples {
         systemVersionsListSystemVersions(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.systemVersions().getWithResponse("eastus", "22.x", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/SystemVersions_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Exadata System Version - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getExadataSystemVersionGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.systemVersions()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/SystemVersions_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Exadata System Version - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getExadataSystemVersionGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.systemVersions()
+            .getWithResponse("eastus", "Replace this value with a string matching RegExp .*",
+                com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationSamples.java
index 619826da23f3..bb2383cf158d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SystemVersionsListByLocationSamples {
     /*
-     * x-ms-original-file: 2025-03-01/systemVersions_listByLocation.json
+     * x-ms-original-file: 2025-09-01/systemVersions_listByLocation.json
      */
     /**
      * Sample code: systemVersions_listByLocation.
@@ -20,4 +20,30 @@ public final class SystemVersionsListByLocationSamples {
         systemVersionsListByLocation(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.systemVersions().listByLocation("eastus", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/SystemVersions_ListByLocation_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: List Exadata System Versions by the provided filter - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listExadataSystemVersionsByTheProvidedFilterGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.systemVersions().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/SystemVersions_ListByLocation_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: List Exadata System Versions by the provided filter - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void listExadataSystemVersionsByTheProvidedFilterGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.systemVersions().listByLocation("eastus", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateSamples.java
index 847f0e644f4d..1f4069d3b276 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkAddressesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: 2025-03-01/virtualNetworkAddresses_create.json
+     * x-ms-original-file: 2025-09-01/virtualNetworkAddresses_create.json
      */
     /**
      * Sample code: VirtualNetworkAddresses_createOrUpdate.
@@ -27,4 +27,38 @@ public final class VirtualNetworkAddressesCreateOrUpdateSamples {
                 new VirtualNetworkAddressProperties().withIpAddress("192.168.0.1").withVmOcid("ocid1..aaaa"))
             .create();
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/VirtualNetworkAddresses_CreateOrUpdate_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Create Virtual Network Address - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createVirtualNetworkAddressGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.virtualNetworkAddresses()
+            .define("Replace this value with a string matching RegExp .*")
+            .withExistingCloudVmCluster("rgopenapi", "Replace this value with a string matching RegExp .*")
+            .withProperties(
+                new VirtualNetworkAddressProperties().withIpAddress("192.168.0.1").withVmOcid("ocid1..aaaa"))
+            .create();
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/VirtualNetworkAddresses_CreateOrUpdate_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Create Virtual Network Address - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void createVirtualNetworkAddressGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.virtualNetworkAddresses()
+            .define("Replace this value with a string matching RegExp .*")
+            .withExistingCloudVmCluster("rgopenapi", "Replace this value with a string matching RegExp .*")
+            .create();
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesDeleteSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesDeleteSamples.java
index a22605f0f2fd..a5510a2bfb20 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesDeleteSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesDeleteSamples.java
@@ -9,7 +9,22 @@
  */
 public final class VirtualNetworkAddressesDeleteSamples {
     /*
-     * x-ms-original-file: 2025-03-01/virtualNetworkAddresses_delete.json
+     * x-ms-original-file: 2025-09-01/VirtualNetworkAddresses_Delete_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Virtual Network Address - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteVirtualNetworkAddressGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.virtualNetworkAddresses()
+            .delete("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/virtualNetworkAddresses_delete.json
      */
     /**
      * Sample code: VirtualNetworkAddresses_delete.
@@ -20,4 +35,19 @@ public final class VirtualNetworkAddressesDeleteSamples {
         virtualNetworkAddressesDelete(com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
         manager.virtualNetworkAddresses().delete("rg000", "cluster1", "hostname1", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/VirtualNetworkAddresses_Delete_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Delete Virtual Network Address - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void deleteVirtualNetworkAddressGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.virtualNetworkAddresses()
+            .delete("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetSamples.java
index 554034688df5..362a1d2418b5 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkAddressesGetSamples {
     /*
-     * x-ms-original-file: 2025-03-01/virtualNetworkAddresses_get.json
+     * x-ms-original-file: 2025-09-01/virtualNetworkAddresses_get.json
      */
     /**
      * Sample code: VirtualNetworkAddresses_get.
@@ -21,4 +21,34 @@ public final class VirtualNetworkAddressesGetSamples {
         manager.virtualNetworkAddresses()
             .getWithResponse("rg000", "cluster1", "hostname1", com.azure.core.util.Context.NONE);
     }
+
+    /*
+     * x-ms-original-file: 2025-09-01/VirtualNetworkAddresses_Get_MinimumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Virtual Network Address - generated by [MinimumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getVirtualNetworkAddressGeneratedByMinimumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.virtualNetworkAddresses()
+            .getWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: 2025-09-01/VirtualNetworkAddresses_Get_MaximumSet_Gen.json
+     */
+    /**
+     * Sample code: Get Virtual Network Address - generated by [MaximumSet] rule.
+     * 
+     * @param manager Entry point to OracleDatabaseManager.
+     */
+    public static void getVirtualNetworkAddressGeneratedByMaximumSetRule(
+        com.azure.resourcemanager.oracledatabase.OracleDatabaseManager manager) {
+        manager.virtualNetworkAddresses()
+            .getWithResponse("rgopenapi", "Replace this value with a string matching RegExp .*",
+                "Replace this value with a string matching RegExp .*", com.azure.core.util.Context.NONE);
+    }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterSamples.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterSamples.java
index c1a25c3d00e4..b1259f5bbc71 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterSamples.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/samples/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkAddressesListByCloudVmClusterSamples {
     /*
-     * x-ms-original-file: 2025-03-01/virtualNetworkAddresses_listByParent.json
+     * x-ms-original-file: 2025-09-01/virtualNetworkAddresses_listByParent.json
      */
     /**
      * Sample code: VirtualNetworkAddresses_listByCloudVmCluster.
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ActivationLinksInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ActivationLinksInnerTests.java
index efe21f8c9edb..d598bf6d7b2f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ActivationLinksInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ActivationLinksInnerTests.java
@@ -10,8 +10,8 @@
 public final class ActivationLinksInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ActivationLinksInner model = BinaryData
-            .fromString("{\"newCloudAccountActivationLink\":\"lwwrl\",\"existingCloudAccountActivationLink\":\"m\"}")
+        ActivationLinksInner model = BinaryData.fromString(
+            "{\"newCloudAccountActivationLink\":\"mnpkukghimdblxg\",\"existingCloudAccountActivationLink\":\"mfnjh\"}")
             .toObject(ActivationLinksInner.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AddRemoveDbNodeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AddRemoveDbNodeTests.java
index 1e063f978bbc..87303444c692 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AddRemoveDbNodeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AddRemoveDbNodeTests.java
@@ -12,15 +12,17 @@
 public final class AddRemoveDbNodeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        AddRemoveDbNode model = BinaryData.fromString("{\"dbServers\":[\"duhavhqlkt\",\"umaq\",\"lbg\",\"cdui\"]}")
+        AddRemoveDbNode model = BinaryData
+            .fromString("{\"dbServers\":[\"ievseotgqrllt\",\"u\",\"lauwzizxbmpgcjef\",\"zmuvpbttdumorppx\"]}")
             .toObject(AddRemoveDbNode.class);
-        Assertions.assertEquals("duhavhqlkt", model.dbServers().get(0));
+        Assertions.assertEquals("ievseotgqrllt", model.dbServers().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AddRemoveDbNode model = new AddRemoveDbNode().withDbServers(Arrays.asList("duhavhqlkt", "umaq", "lbg", "cdui"));
+        AddRemoveDbNode model = new AddRemoveDbNode()
+            .withDbServers(Arrays.asList("ievseotgqrllt", "u", "lauwzizxbmpgcjef", "zmuvpbttdumorppx"));
         model = BinaryData.fromObject(model).toObject(AddRemoveDbNode.class);
-        Assertions.assertEquals("duhavhqlkt", model.dbServers().get(0));
+        Assertions.assertEquals("ievseotgqrllt", model.dbServers().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AllConnectionStringTypeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AllConnectionStringTypeTests.java
index ea6540fd76ab..dacb4f07312b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AllConnectionStringTypeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AllConnectionStringTypeTests.java
@@ -12,10 +12,10 @@ public final class AllConnectionStringTypeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AllConnectionStringType model
-            = BinaryData.fromString("{\"high\":\"xmrhu\",\"low\":\"wp\",\"medium\":\"sutrgjup\"}")
+            = BinaryData.fromString("{\"high\":\"pvruudlg\",\"low\":\"bth\",\"medium\":\"tgk\"}")
                 .toObject(AllConnectionStringType.class);
-        Assertions.assertEquals("xmrhu", model.high());
-        Assertions.assertEquals("wp", model.low());
-        Assertions.assertEquals("sutrgjup", model.medium());
+        Assertions.assertEquals("pvruudlg", model.high());
+        Assertions.assertEquals("bth", model.low());
+        Assertions.assertEquals("tgk", model.medium());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ApexDetailsTypeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ApexDetailsTypeTests.java
index 39d83d12d3a9..b142f63bbb80 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ApexDetailsTypeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ApexDetailsTypeTests.java
@@ -11,9 +11,10 @@
 public final class ApexDetailsTypeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ApexDetailsType model = BinaryData.fromString("{\"apexVersion\":\"ydxtqm\",\"ordsVersion\":\"ox\"}")
-            .toObject(ApexDetailsType.class);
-        Assertions.assertEquals("ydxtqm", model.apexVersion());
-        Assertions.assertEquals("ox", model.ordsVersion());
+        ApexDetailsType model
+            = BinaryData.fromString("{\"apexVersion\":\"qnrnrpxehuwryk\",\"ordsVersion\":\"aifmvikl\"}")
+                .toObject(ApexDetailsType.class);
+        Assertions.assertEquals("qnrnrpxehuwryk", model.apexVersion());
+        Assertions.assertEquals("aifmvikl", model.ordsVersion());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupInnerTests.java
index 3fd9c4ef157c..ace2fdb59d33 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupInnerTests.java
@@ -13,19 +13,18 @@ public final class AutonomousDatabaseBackupInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseBackupInner model = BinaryData.fromString(
-            "{\"properties\":{\"autonomousDatabaseOcid\":\"pvruudlg\",\"databaseSizeInTbs\":17.853765649649766,\"dbVersion\":\"ostgkts\",\"displayName\":\"dxeclzedqbcvh\",\"ocid\":\"h\",\"isAutomatic\":true,\"isRestorable\":false,\"lifecycleDetails\":\"dlwwqfbumlkxt\",\"lifecycleState\":\"Active\",\"retentionPeriodInDays\":2076050898,\"sizeInTbs\":79.85167278535754,\"timeAvailableTil\":\"2021-08-23T05:36:57Z\",\"timeStarted\":\"hwgfwsrt\",\"timeEnded\":\"coezbrhubskh\",\"backupType\":\"Incremental\",\"provisioningState\":\"Failed\"},\"id\":\"okkqfqjbvleo\",\"name\":\"fmluiqtqzfavyvn\",\"type\":\"qybaryeua\"}")
+            "{\"properties\":{\"autonomousDatabaseOcid\":\"a\",\"databaseSizeInTbs\":82.40192998154433,\"dbVersion\":\"hminyflnorwmduv\",\"displayName\":\"klvxwmyg\",\"ocid\":\"pgpqchiszepnnb\",\"isAutomatic\":false,\"isRestorable\":false,\"lifecycleDetails\":\"bbdaxco\",\"lifecycleState\":\"Deleting\",\"retentionPeriodInDays\":536315027,\"sizeInTbs\":62.79288188149956,\"timeAvailableTil\":\"2021-03-03T08:46:38Z\",\"timeStarted\":\"okwbqplh\",\"timeEnded\":\"nuuepzlrp\",\"backupType\":\"Incremental\",\"provisioningState\":\"Canceled\"},\"id\":\"dweyuqdunv\",\"name\":\"nnrwrbiork\",\"type\":\"alywjhhgdn\"}")
             .toObject(AutonomousDatabaseBackupInner.class);
-        Assertions.assertEquals("dxeclzedqbcvh", model.properties().displayName());
-        Assertions.assertEquals(2076050898, model.properties().retentionPeriodInDays());
+        Assertions.assertEquals("klvxwmyg", model.properties().displayName());
+        Assertions.assertEquals(536315027, model.properties().retentionPeriodInDays());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AutonomousDatabaseBackupInner model = new AutonomousDatabaseBackupInner()
-            .withProperties(new AutonomousDatabaseBackupProperties().withDisplayName("dxeclzedqbcvh")
-                .withRetentionPeriodInDays(2076050898));
+        AutonomousDatabaseBackupInner model = new AutonomousDatabaseBackupInner().withProperties(
+            new AutonomousDatabaseBackupProperties().withDisplayName("klvxwmyg").withRetentionPeriodInDays(536315027));
         model = BinaryData.fromObject(model).toObject(AutonomousDatabaseBackupInner.class);
-        Assertions.assertEquals("dxeclzedqbcvh", model.properties().displayName());
-        Assertions.assertEquals(2076050898, model.properties().retentionPeriodInDays());
+        Assertions.assertEquals("klvxwmyg", model.properties().displayName());
+        Assertions.assertEquals(536315027, model.properties().retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupListResultTests.java
index 550782978da4..bd2d232814f3 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupListResultTests.java
@@ -12,10 +12,10 @@ public final class AutonomousDatabaseBackupListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseBackupListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"autonomousDatabaseOcid\":\"aufactkahzovajjz\",\"databaseSizeInTbs\":58.101849517808134,\"dbVersion\":\"s\",\"displayName\":\"eekulfgslqubkwd\",\"ocid\":\"nrdsutujbazpjuoh\",\"isAutomatic\":false,\"isRestorable\":true,\"lifecycleDetails\":\"norwmduvwpklvx\",\"lifecycleState\":\"Updating\",\"retentionPeriodInDays\":1917702529,\"sizeInTbs\":85.42979852196028,\"timeAvailableTil\":\"2021-01-04T00:18:57Z\",\"timeStarted\":\"hiszepnnbjcrxgib\",\"timeEnded\":\"axconfozauo\",\"backupType\":\"LongTerm\",\"provisioningState\":\"Failed\"},\"id\":\"wbqpl\",\"name\":\"lvnuuepzlrph\",\"type\":\"zsoldwey\"},{\"properties\":{\"autonomousDatabaseOcid\":\"unvmnnr\",\"databaseSizeInTbs\":46.880625215979464,\"dbVersion\":\"rk\",\"displayName\":\"lywjhh\",\"ocid\":\"nhxmsi\",\"isAutomatic\":false,\"isRestorable\":true,\"lifecycleDetails\":\"ox\",\"lifecycleState\":\"Active\",\"retentionPeriodInDays\":524951220,\"sizeInTbs\":1.7481186593642062,\"timeAvailableTil\":\"2021-09-12T11:48:09Z\",\"timeStarted\":\"uzaofjchvcyyy\",\"timeEnded\":\"gdotcubiipuipwo\",\"backupType\":\"LongTerm\",\"provisioningState\":\"Failed\"},\"id\":\"jeknizshq\",\"name\":\"cimpevfg\",\"type\":\"b\"},{\"properties\":{\"autonomousDatabaseOcid\":\"ilbywdxsm\",\"databaseSizeInTbs\":31.605477205960717,\"dbVersion\":\"wfscjfn\",\"displayName\":\"szqujizdvoq\",\"ocid\":\"ibyowbblgyavutp\",\"isAutomatic\":false,\"isRestorable\":false,\"lifecycleDetails\":\"ismsksbpimlqolj\",\"lifecycleState\":\"Deleting\",\"retentionPeriodInDays\":1266653897,\"sizeInTbs\":31.413313090178196,\"timeAvailableTil\":\"2021-11-22T22:55:42Z\",\"timeStarted\":\"gcvizqzdwlvwlyou\",\"timeEnded\":\"gfbkjubdyh\",\"backupType\":\"LongTerm\",\"provisioningState\":\"Succeeded\"},\"id\":\"sgow\",\"name\":\"fttsttk\",\"type\":\"lahb\"},{\"properties\":{\"autonomousDatabaseOcid\":\"tx\",\"databaseSizeInTbs\":78.56374425211347,\"dbVersion\":\"xitmmqtgqqq\",\"displayName\":\"rnxrxcpj\",\"ocid\":\"savokqdzf\",\"isAutomatic\":false,\"isRestorable\":false,\"lifecycleDetails\":\"l\",\"lifecycleState\":\"Active\",\"retentionPeriodInDays\":234618918,\"sizeInTbs\":47.08657793645696,\"timeAvailableTil\":\"2021-09-28T07:29:49Z\",\"timeStarted\":\"tnwxy\",\"timeEnded\":\"pidkqqfkuvscxkdm\",\"backupType\":\"LongTerm\",\"provisioningState\":\"Provisioning\"},\"id\":\"brxk\",\"name\":\"mloazuru\",\"type\":\"cbgoor\"}],\"nextLink\":\"eoybfhjxakvvjgs\"}")
+            "{\"value\":[{\"properties\":{\"autonomousDatabaseOcid\":\"fnynszqujizdvoqy\",\"databaseSizeInTbs\":86.6445080916979,\"dbVersion\":\"wb\",\"displayName\":\"gyavu\",\"ocid\":\"thjoxoism\",\"isAutomatic\":false,\"isRestorable\":false,\"lifecycleDetails\":\"mlqoljx\",\"lifecycleState\":\"Updating\",\"retentionPeriodInDays\":601502455,\"sizeInTbs\":55.95818854752517,\"timeAvailableTil\":\"2021-01-05T13:36:37Z\",\"timeStarted\":\"cvizqzdwlvw\",\"timeEnded\":\"oupfgfb\",\"backupType\":\"Incremental\",\"provisioningState\":\"Canceled\"},\"id\":\"hgkfmin\",\"name\":\"g\",\"type\":\"wzf\"},{\"properties\":{\"autonomousDatabaseOcid\":\"ttktlahbq\",\"databaseSizeInTbs\":11.302462171145955,\"dbVersion\":\"gzukxitmm\",\"displayName\":\"gqqqxh\",\"ocid\":\"xrxc\",\"isAutomatic\":false,\"isRestorable\":true,\"lifecycleDetails\":\"vokqdzfv\",\"lifecycleState\":\"Updating\",\"retentionPeriodInDays\":1224292307,\"sizeInTbs\":82.5578507505425,\"timeAvailableTil\":\"2021-01-02T17:49:26Z\",\"timeStarted\":\"bajlka\",\"timeEnded\":\"wxyiopidkqq\",\"backupType\":\"LongTerm\",\"provisioningState\":\"Succeeded\"},\"id\":\"xkdmligo\",\"name\":\"ibrxkp\",\"type\":\"loazuruocbgoo\"}],\"nextLink\":\"te\"}")
             .toObject(AutonomousDatabaseBackupListResult.class);
-        Assertions.assertEquals("eekulfgslqubkwd", model.value().get(0).properties().displayName());
-        Assertions.assertEquals(1917702529, model.value().get(0).properties().retentionPeriodInDays());
-        Assertions.assertEquals("eoybfhjxakvvjgs", model.nextLink());
+        Assertions.assertEquals("gyavu", model.value().get(0).properties().displayName());
+        Assertions.assertEquals(601502455, model.value().get(0).properties().retentionPeriodInDays());
+        Assertions.assertEquals("te", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupPropertiesTests.java
index 6f3f09ce9806..dcd4fe93c3f3 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupPropertiesTests.java
@@ -12,18 +12,18 @@ public final class AutonomousDatabaseBackupPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseBackupProperties model = BinaryData.fromString(
-            "{\"autonomousDatabaseOcid\":\"kq\",\"databaseSizeInTbs\":42.18581462849447,\"dbVersion\":\"slesjcbhernnt\",\"displayName\":\"w\",\"ocid\":\"cv\",\"isAutomatic\":true,\"isRestorable\":false,\"lifecycleDetails\":\"ehwagoh\",\"lifecycleState\":\"Active\",\"retentionPeriodInDays\":569382071,\"sizeInTbs\":59.088246772904384,\"timeAvailableTil\":\"2021-11-12T21:50:06Z\",\"timeStarted\":\"vhmxtdrjfu\",\"timeEnded\":\"coebjvewzcj\",\"backupType\":\"Full\",\"provisioningState\":\"Provisioning\"}")
+            "{\"autonomousDatabaseOcid\":\"msi\",\"databaseSizeInTbs\":17.68460269000731,\"dbVersion\":\"loxggdufiqn\",\"displayName\":\"euzaof\",\"ocid\":\"hvcyyysfg\",\"isAutomatic\":true,\"isRestorable\":true,\"lifecycleDetails\":\"iipuipwoqonm\",\"lifecycleState\":\"Updating\",\"retentionPeriodInDays\":167629289,\"sizeInTbs\":20.112407568905265,\"timeAvailableTil\":\"2021-10-27T20:39:18Z\",\"timeStarted\":\"vcimpev\",\"timeEnded\":\"mblrrilbywd\",\"backupType\":\"Incremental\",\"provisioningState\":\"Succeeded\"}")
             .toObject(AutonomousDatabaseBackupProperties.class);
-        Assertions.assertEquals("w", model.displayName());
-        Assertions.assertEquals(569382071, model.retentionPeriodInDays());
+        Assertions.assertEquals("euzaof", model.displayName());
+        Assertions.assertEquals(167629289, model.retentionPeriodInDays());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         AutonomousDatabaseBackupProperties model
-            = new AutonomousDatabaseBackupProperties().withDisplayName("w").withRetentionPeriodInDays(569382071);
+            = new AutonomousDatabaseBackupProperties().withDisplayName("euzaof").withRetentionPeriodInDays(167629289);
         model = BinaryData.fromObject(model).toObject(AutonomousDatabaseBackupProperties.class);
-        Assertions.assertEquals("w", model.displayName());
-        Assertions.assertEquals(569382071, model.retentionPeriodInDays());
+        Assertions.assertEquals("euzaof", model.displayName());
+        Assertions.assertEquals(167629289, model.retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdatePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdatePropertiesTests.java
index 5112d68f77a5..aca9e3ef7cb8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdatePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdatePropertiesTests.java
@@ -11,16 +11,16 @@
 public final class AutonomousDatabaseBackupUpdatePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        AutonomousDatabaseBackupUpdateProperties model = BinaryData.fromString("{\"retentionPeriodInDays\":1356128244}")
+        AutonomousDatabaseBackupUpdateProperties model = BinaryData.fromString("{\"retentionPeriodInDays\":1445033324}")
             .toObject(AutonomousDatabaseBackupUpdateProperties.class);
-        Assertions.assertEquals(1356128244, model.retentionPeriodInDays());
+        Assertions.assertEquals(1445033324, model.retentionPeriodInDays());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         AutonomousDatabaseBackupUpdateProperties model
-            = new AutonomousDatabaseBackupUpdateProperties().withRetentionPeriodInDays(1356128244);
+            = new AutonomousDatabaseBackupUpdateProperties().withRetentionPeriodInDays(1445033324);
         model = BinaryData.fromObject(model).toObject(AutonomousDatabaseBackupUpdateProperties.class);
-        Assertions.assertEquals(1356128244, model.retentionPeriodInDays());
+        Assertions.assertEquals(1445033324, model.retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdateTests.java
index abcc912d30b8..57ccd4eb588e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdateTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupUpdateTests.java
@@ -13,16 +13,16 @@ public final class AutonomousDatabaseBackupUpdateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseBackupUpdate model
-            = BinaryData.fromString("{\"properties\":{\"retentionPeriodInDays\":2030279992}}")
+            = BinaryData.fromString("{\"properties\":{\"retentionPeriodInDays\":1866560405}}")
                 .toObject(AutonomousDatabaseBackupUpdate.class);
-        Assertions.assertEquals(2030279992, model.properties().retentionPeriodInDays());
+        Assertions.assertEquals(1866560405, model.properties().retentionPeriodInDays());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         AutonomousDatabaseBackupUpdate model = new AutonomousDatabaseBackupUpdate()
-            .withProperties(new AutonomousDatabaseBackupUpdateProperties().withRetentionPeriodInDays(2030279992));
+            .withProperties(new AutonomousDatabaseBackupUpdateProperties().withRetentionPeriodInDays(1866560405));
         model = BinaryData.fromObject(model).toObject(AutonomousDatabaseBackupUpdate.class);
-        Assertions.assertEquals(2030279992, model.properties().retentionPeriodInDays());
+        Assertions.assertEquals(1866560405, model.properties().retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateMockTests.java
index 75a66e3f6336..c41c22a2959c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsCreateOrUpdateMockTests.java
@@ -22,7 +22,7 @@ public final class AutonomousDatabaseBackupsCreateOrUpdateMockTests {
     @Test
     public void testCreateOrUpdate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"autonomousDatabaseOcid\":\"jvaannggiycwkd\",\"databaseSizeInTbs\":38.89668532297505,\"dbVersion\":\"wfekaumrrqmb\",\"displayName\":\"qkratbnxwbjsid\",\"ocid\":\"rkfpks\",\"isAutomatic\":false,\"isRestorable\":false,\"lifecycleDetails\":\"ewijymrhbguz\",\"lifecycleState\":\"Active\",\"retentionPeriodInDays\":901614269,\"sizeInTbs\":40.12606897846549,\"timeAvailableTil\":\"2021-11-24T21:17:03Z\",\"timeStarted\":\"hhqosmffjku\",\"timeEnded\":\"cyar\",\"backupType\":\"Incremental\",\"provisioningState\":\"Succeeded\"},\"id\":\"uabzoghkt\",\"name\":\"pyc\",\"type\":\"hcoeocnhzq\"}";
+            = "{\"properties\":{\"autonomousDatabaseOcid\":\"f\",\"databaseSizeInTbs\":93.10834441563006,\"dbVersion\":\"xhmw\",\"displayName\":\"bckyoikxk\",\"ocid\":\"negknjzrb\",\"isAutomatic\":false,\"isRestorable\":true,\"lifecycleDetails\":\"vukaobrlbpgsnb\",\"lifecycleState\":\"Active\",\"retentionPeriodInDays\":1428881069,\"sizeInTbs\":6.319268088247442,\"timeAvailableTil\":\"2021-09-17T17:45:32Z\",\"timeStarted\":\"owa\",\"timeEnded\":\"wa\",\"backupType\":\"Incremental\",\"provisioningState\":\"Succeeded\"},\"id\":\"cgqtag\",\"name\":\"rclsso\",\"type\":\"jomevtfycnlb\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,13 +32,13 @@ public void testCreateOrUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AutonomousDatabaseBackup response = manager.autonomousDatabaseBackups()
-            .define("swyskbruffg")
-            .withExistingAutonomousDatabase("ttxpnrupza", "mrdixtreki")
-            .withProperties(new AutonomousDatabaseBackupProperties().withDisplayName("vmblcouqe")
-                .withRetentionPeriodInDays(2060643943))
+            .define("kb")
+            .withExistingAutonomousDatabase("trpc", "qkio")
+            .withProperties(
+                new AutonomousDatabaseBackupProperties().withDisplayName("sqxutr").withRetentionPeriodInDays(191200387))
             .create();
 
-        Assertions.assertEquals("qkratbnxwbjsid", response.properties().displayName());
-        Assertions.assertEquals(901614269, response.properties().retentionPeriodInDays());
+        Assertions.assertEquals("bckyoikxk", response.properties().displayName());
+        Assertions.assertEquals(1428881069, response.properties().retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetWithResponseMockTests.java
index 9800e1d8ba6a..b044a4aaddae 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class AutonomousDatabaseBackupsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"autonomousDatabaseOcid\":\"illcecfehu\",\"databaseSizeInTbs\":41.80036188758282,\"dbVersion\":\"uhicqllizstacsjv\",\"displayName\":\"weftkwq\",\"ocid\":\"pmvssehaep\",\"isAutomatic\":false,\"isRestorable\":true,\"lifecycleDetails\":\"czhupeukni\",\"lifecycleState\":\"Updating\",\"retentionPeriodInDays\":1251720208,\"sizeInTbs\":21.732626018932322,\"timeAvailableTil\":\"2021-07-13T08:05:36Z\",\"timeStarted\":\"fbocyvhh\",\"timeEnded\":\"rtywi\",\"backupType\":\"Incremental\",\"provisioningState\":\"Provisioning\"},\"id\":\"kuflgbh\",\"name\":\"auacdixmxufrsr\",\"type\":\"jqgdkfnozoeo\"}";
+            = "{\"properties\":{\"autonomousDatabaseOcid\":\"ltrfowtdvrf\",\"databaseSizeInTbs\":66.01458357505724,\"dbVersion\":\"cvjdrqcrjidhft\",\"displayName\":\"vhdxlwyo\",\"ocid\":\"fqz\",\"isAutomatic\":false,\"isRestorable\":false,\"lifecycleDetails\":\"ixh\",\"lifecycleState\":\"Deleting\",\"retentionPeriodInDays\":1416309389,\"sizeInTbs\":48.794259649277116,\"timeAvailableTil\":\"2021-03-01T22:13:55Z\",\"timeStarted\":\"oum\",\"timeEnded\":\"n\",\"backupType\":\"Full\",\"provisioningState\":\"Failed\"},\"id\":\"huzgfxo\",\"name\":\"jtpusllywpvtiotz\",\"type\":\"pdbollg\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AutonomousDatabaseBackup response = manager.autonomousDatabaseBackups()
-            .getWithResponse("gctmgxuupbezq", "cydrtceukdqkk", "ihztgeqmgqzgwldo", com.azure.core.util.Context.NONE)
+            .getWithResponse("lnwy", "mouvbl", "mo", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("weftkwq", response.properties().displayName());
-        Assertions.assertEquals(1251720208, response.properties().retentionPeriodInDays());
+        Assertions.assertEquals("vhdxlwyo", response.properties().displayName());
+        Assertions.assertEquals(1416309389, response.properties().retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseMockTests.java
index 044113ae93fe..f9e86c84a841 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseBackupsListByAutonomousDatabaseMockTests.java
@@ -22,7 +22,7 @@ public final class AutonomousDatabaseBackupsListByAutonomousDatabaseMockTests {
     @Test
     public void testListByAutonomousDatabase() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"autonomousDatabaseOcid\":\"ps\",\"databaseSizeInTbs\":83.35540295555349,\"dbVersion\":\"fkyjpmspbpssdfpp\",\"displayName\":\"gt\",\"ocid\":\"yujtvczkcnyx\",\"isAutomatic\":true,\"isRestorable\":true,\"lifecycleDetails\":\"d\",\"lifecycleState\":\"Updating\",\"retentionPeriodInDays\":937586674,\"sizeInTbs\":24.883832140034677,\"timeAvailableTil\":\"2021-05-29T00:39:17Z\",\"timeStarted\":\"aglqivbgkcvkh\",\"timeEnded\":\"vuqd\",\"backupType\":\"Full\",\"provisioningState\":\"Canceled\"},\"id\":\"yp\",\"name\":\"pubcpzgpxtivhjk\",\"type\":\"idibgqjxgpn\"}]}";
+            = "{\"value\":[{\"properties\":{\"autonomousDatabaseOcid\":\"mtqjkqevadrmm\",\"databaseSizeInTbs\":50.16402116378394,\"dbVersion\":\"vcmjzkxiidisczsk\",\"displayName\":\"woqiqazugamxzkrr\",\"ocid\":\"iisb\",\"isAutomatic\":false,\"isRestorable\":true,\"lifecycleDetails\":\"cekuz\",\"lifecycleState\":\"Failed\",\"retentionPeriodInDays\":864478942,\"sizeInTbs\":93.55106326577133,\"timeAvailableTil\":\"2021-04-13T20:07:26Z\",\"timeStarted\":\"kzxuiz\",\"timeEnded\":\"hnepkpeti\",\"backupType\":\"Full\",\"provisioningState\":\"Canceled\"},\"id\":\"bxdukecpxdazvd\",\"name\":\"ctmmkoszudbl\",\"type\":\"s\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,9 +32,9 @@ public void testListByAutonomousDatabase() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<AutonomousDatabaseBackup> response = manager.autonomousDatabaseBackups()
-            .listByAutonomousDatabase("hxqszdtmaajquh", "xylrjvmtygjbmz", com.azure.core.util.Context.NONE);
+            .listByAutonomousDatabase("yfqiuasig", "owsocnequygdjbo", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("gt", response.iterator().next().properties().displayName());
-        Assertions.assertEquals(937586674, response.iterator().next().properties().retentionPeriodInDays());
+        Assertions.assertEquals("woqiqazugamxzkrr", response.iterator().next().properties().displayName());
+        Assertions.assertEquals(864478942, response.iterator().next().properties().retentionPeriodInDays());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetInnerTests.java
index d99589c2af09..df87112d8af4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetInnerTests.java
@@ -12,8 +12,8 @@ public final class AutonomousDatabaseCharacterSetInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseCharacterSetInner model = BinaryData.fromString(
-            "{\"properties\":{\"characterSet\":\"r\"},\"id\":\"lmywwtkgkxnyed\",\"name\":\"b\",\"type\":\"yvudtjuewbci\"}")
+            "{\"properties\":{\"characterSet\":\"bfhjxakvvjgsl\"},\"id\":\"dilmyww\",\"name\":\"kgkxn\",\"type\":\"edabgyvudtjue\"}")
             .toObject(AutonomousDatabaseCharacterSetInner.class);
-        Assertions.assertEquals("r", model.properties().characterSet());
+        Assertions.assertEquals("bfhjxakvvjgsl", model.properties().characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetListResultTests.java
index 2660604af3df..2d2ecb6e1e73 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetListResultTests.java
@@ -12,9 +12,9 @@ public final class AutonomousDatabaseCharacterSetListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseCharacterSetListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"characterSet\":\"cybvpayakkudzpxg\"},\"id\":\"plmag\",\"name\":\"tcyohpfkyrk\",\"type\":\"bdgiogsjk\"},{\"properties\":{\"characterSet\":\"wqjnob\"},\"id\":\"yhddvia\",\"name\":\"egfnmntfpmvmemfn\",\"type\":\"zdwvvbalxl\"}],\"nextLink\":\"chp\"}")
+            "{\"value\":[{\"properties\":{\"characterSet\":\"ccybvp\"},\"id\":\"akkud\",\"name\":\"px\",\"type\":\"wjplma\"},{\"properties\":{\"characterSet\":\"tcyohpfkyrk\"},\"id\":\"dg\",\"name\":\"ogsjkmnwqjno\",\"type\":\"aiy\"}],\"nextLink\":\"d\"}")
             .toObject(AutonomousDatabaseCharacterSetListResult.class);
-        Assertions.assertEquals("cybvpayakkudzpxg", model.value().get(0).properties().characterSet());
-        Assertions.assertEquals("chp", model.nextLink());
+        Assertions.assertEquals("ccybvp", model.value().get(0).properties().characterSet());
+        Assertions.assertEquals("d", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetPropertiesTests.java
index a2c02a7f67be..3e8b411d34dc 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetPropertiesTests.java
@@ -11,8 +11,8 @@
 public final class AutonomousDatabaseCharacterSetPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        AutonomousDatabaseCharacterSetProperties model = BinaryData.fromString("{\"characterSet\":\"xuuwhcj\"}")
+        AutonomousDatabaseCharacterSetProperties model = BinaryData.fromString("{\"characterSet\":\"bcihxuuwhc\"}")
             .toObject(AutonomousDatabaseCharacterSetProperties.class);
-        Assertions.assertEquals("xuuwhcj", model.characterSet());
+        Assertions.assertEquals("bcihxuuwhc", model.characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetWithResponseMockTests.java
index a12baaec0da8..8653861ce6cb 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class AutonomousDatabaseCharacterSetsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"characterSet\":\"h\"},\"id\":\"qinfszpyglqd\",\"name\":\"mrjzral\",\"type\":\"xpjb\"}";
+            = "{\"properties\":{\"characterSet\":\"iiy\"},\"id\":\"sik\",\"name\":\"z\",\"type\":\"cufqbvntnrgmqs\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,9 +31,9 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AutonomousDatabaseCharacterSet response = manager.autonomousDatabaseCharacterSets()
-            .getWithResponse("ot", "jzcfyjzptwr", com.azure.core.util.Context.NONE)
+            .getWithResponse("gjco", "kk", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("h", response.properties().characterSet());
+        Assertions.assertEquals("iiy", response.properties().characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationMockTests.java
index be74d8532e5b..0a5238b4cc79 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseCharacterSetsListByLocationMockTests.java
@@ -22,7 +22,7 @@ public final class AutonomousDatabaseCharacterSetsListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"characterSet\":\"enky\"},\"id\":\"qzvs\",\"name\":\"xfxjelgcmpzqj\",\"type\":\"hhqxuwyvcacoyviv\"}]}";
+            = "{\"value\":[{\"properties\":{\"characterSet\":\"xcpwzvmdok\"},\"id\":\"dt\",\"name\":\"wlwxlboncqbazqic\",\"type\":\"chygtvxbyjane\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,8 +32,8 @@ public void testListByLocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<AutonomousDatabaseCharacterSet> response
-            = manager.autonomousDatabaseCharacterSets().listByLocation("ypsjoq", com.azure.core.util.Context.NONE);
+            = manager.autonomousDatabaseCharacterSets().listByLocation("rhcekxgnly", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("enky", response.iterator().next().properties().characterSet());
+        Assertions.assertEquals("xcpwzvmdok", response.iterator().next().properties().characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseLifecycleActionTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseLifecycleActionTests.java
new file mode 100644
index 000000000000..32d21eac8f7a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseLifecycleActionTests.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleAction;
+import com.azure.resourcemanager.oracledatabase.models.AutonomousDatabaseLifecycleActionEnum;
+import org.junit.jupiter.api.Assertions;
+
+public final class AutonomousDatabaseLifecycleActionTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        AutonomousDatabaseLifecycleAction model
+            = BinaryData.fromString("{\"action\":\"Start\"}").toObject(AutonomousDatabaseLifecycleAction.class);
+        Assertions.assertEquals(AutonomousDatabaseLifecycleActionEnum.START, model.action());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        AutonomousDatabaseLifecycleAction model
+            = new AutonomousDatabaseLifecycleAction().withAction(AutonomousDatabaseLifecycleActionEnum.START);
+        model = BinaryData.fromObject(model).toObject(AutonomousDatabaseLifecycleAction.class);
+        Assertions.assertEquals(AutonomousDatabaseLifecycleActionEnum.START, model.action());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetInnerTests.java
index 70beab19981a..da35d07e5a5b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetInnerTests.java
@@ -12,8 +12,8 @@ public final class AutonomousDatabaseNationalCharacterSetInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseNationalCharacterSetInner model = BinaryData.fromString(
-            "{\"properties\":{\"characterSet\":\"bzevwrd\"},\"id\":\"fukuvsjcswsmystu\",\"name\":\"uqypfcvle\",\"type\":\"chpqbmfpjba\"}")
+            "{\"properties\":{\"characterSet\":\"acegfnmntf\"},\"id\":\"vm\",\"name\":\"mfnczd\",\"type\":\"vvbalx\"}")
             .toObject(AutonomousDatabaseNationalCharacterSetInner.class);
-        Assertions.assertEquals("bzevwrd", model.properties().characterSet());
+        Assertions.assertEquals("acegfnmntf", model.properties().characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetListResultTests.java
index 5e6295168fac..62c067ffffe1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetListResultTests.java
@@ -12,9 +12,9 @@ public final class AutonomousDatabaseNationalCharacterSetListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseNationalCharacterSetListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"characterSet\":\"spuunnoxyhkxgq\"},\"id\":\"rihpfhoq\",\"name\":\"aaewdaomdjv\",\"type\":\"pjxxkzb\"},{\"properties\":{\"characterSet\":\"sgeivsiy\"},\"id\":\"kdncj\",\"name\":\"xonbzoggculapz\",\"type\":\"y\"},{\"properties\":{\"characterSet\":\"gogtqxepnylbf\"},\"id\":\"jlyjtlvofq\",\"name\":\"hvfcibyfmow\",\"type\":\"xrkjpvdw\"},{\"properties\":{\"characterSet\":\"zwiivwzjbhyzs\"},\"id\":\"rkambt\",\"name\":\"negvmnvuqe\",\"type\":\"vldspa\"}],\"nextLink\":\"jbkkdmflvestmjl\"}")
+            "{\"value\":[{\"properties\":{\"characterSet\":\"podbzevwrdnh\"},\"id\":\"kuvsjcswsm\",\"name\":\"stul\",\"type\":\"qypfcv\"}],\"nextLink\":\"rchpqbmfpjbabwid\"}")
             .toObject(AutonomousDatabaseNationalCharacterSetListResult.class);
-        Assertions.assertEquals("spuunnoxyhkxgq", model.value().get(0).properties().characterSet());
-        Assertions.assertEquals("jbkkdmflvestmjl", model.nextLink());
+        Assertions.assertEquals("podbzevwrdnh", model.value().get(0).properties().characterSet());
+        Assertions.assertEquals("rchpqbmfpjbabwid", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetPropertiesTests.java
index 3239d063e4d8..65c823776c73 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetPropertiesTests.java
@@ -11,8 +11,8 @@
 public final class AutonomousDatabaseNationalCharacterSetPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        AutonomousDatabaseNationalCharacterSetProperties model = BinaryData.fromString("{\"characterSet\":\"widf\"}")
+        AutonomousDatabaseNationalCharacterSetProperties model = BinaryData.fromString("{\"characterSet\":\"l\"}")
             .toObject(AutonomousDatabaseNationalCharacterSetProperties.class);
-        Assertions.assertEquals("widf", model.characterSet());
+        Assertions.assertEquals("l", model.characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetWithResponseMockTests.java
index c87101e03e27..f0397c5fdfd4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class AutonomousDatabaseNationalCharacterSetsGetWithResponseMockTes
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"characterSet\":\"scmnlziji\"},\"id\":\"ehgmvflnwyv\",\"name\":\"kxrerlniylylyfwx\",\"type\":\"utgqztwh\"}";
+            = "{\"properties\":{\"characterSet\":\"vohkxdxuws\"},\"id\":\"fmcwnosb\",\"name\":\"lehgcvkbc\",\"type\":\"njolgjyyxpv\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,9 +31,9 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AutonomousDatabaseNationalCharacterSet response = manager.autonomousDatabaseNationalCharacterSets()
-            .getWithResponse("s", "zusjsz", com.azure.core.util.Context.NONE)
+            .getWithResponse("ubdpkxyqvgxi", "od", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("scmnlziji", response.properties().characterSet());
+        Assertions.assertEquals("vohkxdxuws", response.properties().characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationMockTests.java
index d76bd5e0a3d2..6f1801fab646 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseNationalCharacterSetsListByLocationMockTests.java
@@ -22,7 +22,7 @@ public final class AutonomousDatabaseNationalCharacterSetsListByLocationMockTest
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"characterSet\":\"tabenbbk\"},\"id\":\"pxzuca\",\"name\":\"e\",\"type\":\"dwwnl\"}]}";
+            = "{\"value\":[{\"properties\":{\"characterSet\":\"eintxwaljglzobl\"},\"id\":\"aafrqulhmzyqbhd\",\"name\":\"afjrqpjiyrqjcrg\",\"type\":\"xwmzwdfkbnrz\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,8 +33,8 @@ public void testListByLocation() throws Exception {
 
         PagedIterable<AutonomousDatabaseNationalCharacterSet> response
             = manager.autonomousDatabaseNationalCharacterSets()
-                .listByLocation("hmupgxyjtcdxabbu", com.azure.core.util.Context.NONE);
+                .listByLocation("lszerqzevx", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("tabenbbk", response.iterator().next().properties().characterSet());
+        Assertions.assertEquals("eintxwaljglzobl", response.iterator().next().properties().characterSet());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseStandbySummaryTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseStandbySummaryTests.java
index 6563e445b001..3b5cfd5300b6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseStandbySummaryTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseStandbySummaryTests.java
@@ -13,12 +13,12 @@ public final class AutonomousDatabaseStandbySummaryTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDatabaseStandbySummary model = BinaryData.fromString(
-            "{\"lagTimeInSeconds\":1245185583,\"lifecycleState\":\"BackupInProgress\",\"lifecycleDetails\":\"svbuswdvzyy\",\"timeDataGuardRoleChanged\":\"cnunvjsr\",\"timeDisasterRecoveryRoleChanged\":\"f\"}")
+            "{\"lagTimeInSeconds\":1233687153,\"lifecycleState\":\"Terminated\",\"lifecycleDetails\":\"acvlhv\",\"timeDataGuardRoleChanged\":\"dyftumrtwna\",\"timeDisasterRecoveryRoleChanged\":\"slbi\"}")
             .toObject(AutonomousDatabaseStandbySummary.class);
-        Assertions.assertEquals(1245185583, model.lagTimeInSeconds());
-        Assertions.assertEquals(AutonomousDatabaseLifecycleState.BACKUP_IN_PROGRESS, model.lifecycleState());
-        Assertions.assertEquals("svbuswdvzyy", model.lifecycleDetails());
-        Assertions.assertEquals("cnunvjsr", model.timeDataGuardRoleChanged());
-        Assertions.assertEquals("f", model.timeDisasterRecoveryRoleChanged());
+        Assertions.assertEquals(1233687153, model.lagTimeInSeconds());
+        Assertions.assertEquals(AutonomousDatabaseLifecycleState.TERMINATED, model.lifecycleState());
+        Assertions.assertEquals("acvlhv", model.lifecycleDetails());
+        Assertions.assertEquals("dyftumrtwna", model.timeDataGuardRoleChanged());
+        Assertions.assertEquals("slbi", model.timeDisasterRecoveryRoleChanged());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetWithResponseMockTests.java
index a072914ec84c..482b28eaa1fa 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class AutonomousDatabaseVersionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"version\":\"ookrtalvnbw\",\"dbWorkload\":\"AJD\",\"isDefaultForFree\":true,\"isDefaultForPaid\":true,\"isFreeTierEnabled\":true,\"isPaidEnabled\":true},\"id\":\"jjukyrdnqodxah\",\"name\":\"xhqf\",\"type\":\"qnvzoqgyipemch\"}";
+            = "{\"properties\":{\"version\":\"dgvpyig\",\"dbWorkload\":\"OLTP\",\"isDefaultForFree\":true,\"isDefaultForPaid\":true,\"isFreeTierEnabled\":true,\"isPaidEnabled\":true},\"id\":\"joedx\",\"name\":\"gucaif\",\"type\":\"aurwwgilfjq\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,11 +32,11 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AutonomousDbVersion response = manager.autonomousDatabaseVersions()
-            .getWithResponse("a", "wxudgn", com.azure.core.util.Context.NONE)
+            .getWithResponse("rpdltbq", "tqjfgxxsaet", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("ookrtalvnbw", response.properties().version());
-        Assertions.assertEquals(WorkloadType.AJD, response.properties().dbWorkload());
+        Assertions.assertEquals("dgvpyig", response.properties().version());
+        Assertions.assertEquals(WorkloadType.OLTP, response.properties().dbWorkload());
         Assertions.assertTrue(response.properties().isDefaultForFree());
         Assertions.assertTrue(response.properties().isDefaultForPaid());
         Assertions.assertTrue(response.properties().isFreeTierEnabled());
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationMockTests.java
index 8bd57b264fdf..603faad4dcb5 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseVersionsListByLocationMockTests.java
@@ -23,7 +23,7 @@ public final class AutonomousDatabaseVersionsListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"version\":\"ghwzhomewjjstli\",\"dbWorkload\":\"AJD\",\"isDefaultForFree\":true,\"isDefaultForPaid\":true,\"isFreeTierEnabled\":false,\"isPaidEnabled\":true},\"id\":\"znvodrrslblxydk\",\"name\":\"rxvvbxi\",\"type\":\"kgfbqljnqkhy\"}]}";
+            = "{\"value\":[{\"properties\":{\"version\":\"mkxwxdcvjwcyziak\",\"dbWorkload\":\"OLTP\",\"isDefaultForFree\":true,\"isDefaultForPaid\":false,\"isFreeTierEnabled\":false,\"isPaidEnabled\":false},\"id\":\"dsiwdfmmp\",\"name\":\"hzzwvywrgyngy\",\"type\":\"grpxncakiqaondjr\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,13 +33,13 @@ public void testListByLocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<AutonomousDbVersion> response
-            = manager.autonomousDatabaseVersions().listByLocation("avsczuejdtxp", com.azure.core.util.Context.NONE);
+            = manager.autonomousDatabaseVersions().listByLocation("a", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("ghwzhomewjjstli", response.iterator().next().properties().version());
-        Assertions.assertEquals(WorkloadType.AJD, response.iterator().next().properties().dbWorkload());
+        Assertions.assertEquals("mkxwxdcvjwcyziak", response.iterator().next().properties().version());
+        Assertions.assertEquals(WorkloadType.OLTP, response.iterator().next().properties().dbWorkload());
         Assertions.assertTrue(response.iterator().next().properties().isDefaultForFree());
-        Assertions.assertTrue(response.iterator().next().properties().isDefaultForPaid());
+        Assertions.assertFalse(response.iterator().next().properties().isDefaultForPaid());
         Assertions.assertFalse(response.iterator().next().properties().isFreeTierEnabled());
-        Assertions.assertTrue(response.iterator().next().properties().isPaidEnabled());
+        Assertions.assertFalse(response.iterator().next().properties().isPaidEnabled());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseWalletFileInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseWalletFileInnerTests.java
index 5c3d9f8c960a..f7ffa5eca9d3 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseWalletFileInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDatabaseWalletFileInnerTests.java
@@ -11,8 +11,8 @@
 public final class AutonomousDatabaseWalletFileInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        AutonomousDatabaseWalletFileInner model
-            = BinaryData.fromString("{\"walletFiles\":\"kpyklyhp\"}").toObject(AutonomousDatabaseWalletFileInner.class);
-        Assertions.assertEquals("kpyklyhp", model.walletFiles());
+        AutonomousDatabaseWalletFileInner model = BinaryData.fromString("{\"walletFiles\":\"bkwdlenrds\"}")
+            .toObject(AutonomousDatabaseWalletFileInner.class);
+        Assertions.assertEquals("bkwdlenrds", model.walletFiles());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionInnerTests.java
index bfc06fbba52d..78396090e4bf 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionInnerTests.java
@@ -13,13 +13,13 @@ public final class AutonomousDbVersionInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDbVersionInner model = BinaryData.fromString(
-            "{\"properties\":{\"version\":\"ril\",\"dbWorkload\":\"AJD\",\"isDefaultForFree\":true,\"isDefaultForPaid\":false,\"isFreeTierEnabled\":true,\"isPaidEnabled\":true},\"id\":\"ktwkuziyc\",\"name\":\"levufuztcktyhj\",\"type\":\"qedcgzulwm\"}")
+            "{\"properties\":{\"version\":\"xsspuunnoxyhk\",\"dbWorkload\":\"APEX\",\"isDefaultForFree\":true,\"isDefaultForPaid\":false,\"isFreeTierEnabled\":true,\"isPaidEnabled\":false},\"id\":\"qcaaewdaomdjvl\",\"name\":\"jxxkzbrmsgei\",\"type\":\"siykzkdncjdxonbz\"}")
             .toObject(AutonomousDbVersionInner.class);
-        Assertions.assertEquals("ril", model.properties().version());
-        Assertions.assertEquals(WorkloadType.AJD, model.properties().dbWorkload());
+        Assertions.assertEquals("xsspuunnoxyhk", model.properties().version());
+        Assertions.assertEquals(WorkloadType.APEX, model.properties().dbWorkload());
         Assertions.assertTrue(model.properties().isDefaultForFree());
         Assertions.assertFalse(model.properties().isDefaultForPaid());
         Assertions.assertTrue(model.properties().isFreeTierEnabled());
-        Assertions.assertTrue(model.properties().isPaidEnabled());
+        Assertions.assertFalse(model.properties().isPaidEnabled());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionListResultTests.java
index 135581be5d5a..d3e5ad2cb507 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionListResultTests.java
@@ -13,14 +13,14 @@ public final class AutonomousDbVersionListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDbVersionListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"version\":\"vqeevtoep\",\"dbWorkload\":\"APEX\",\"isDefaultForFree\":false,\"isDefaultForPaid\":false,\"isFreeTierEnabled\":false,\"isPaidEnabled\":true},\"id\":\"o\",\"name\":\"zvfvaawz\",\"type\":\"adflgzu\"}],\"nextLink\":\"glae\"}")
+            "{\"value\":[{\"properties\":{\"version\":\"pnylb\",\"dbWorkload\":\"APEX\",\"isDefaultForFree\":false,\"isDefaultForPaid\":true,\"isFreeTierEnabled\":true,\"isPaidEnabled\":false},\"id\":\"qzhv\",\"name\":\"cib\",\"type\":\"fmo\"},{\"properties\":{\"version\":\"xrkjpvdw\",\"dbWorkload\":\"APEX\",\"isDefaultForFree\":true,\"isDefaultForPaid\":false,\"isFreeTierEnabled\":false,\"isPaidEnabled\":false},\"id\":\"yzsxjrkambtrne\",\"name\":\"vmnvu\",\"type\":\"eqvldspast\"}],\"nextLink\":\"kkdmfl\"}")
             .toObject(AutonomousDbVersionListResult.class);
-        Assertions.assertEquals("vqeevtoep", model.value().get(0).properties().version());
+        Assertions.assertEquals("pnylb", model.value().get(0).properties().version());
         Assertions.assertEquals(WorkloadType.APEX, model.value().get(0).properties().dbWorkload());
         Assertions.assertFalse(model.value().get(0).properties().isDefaultForFree());
-        Assertions.assertFalse(model.value().get(0).properties().isDefaultForPaid());
-        Assertions.assertFalse(model.value().get(0).properties().isFreeTierEnabled());
-        Assertions.assertTrue(model.value().get(0).properties().isPaidEnabled());
-        Assertions.assertEquals("glae", model.nextLink());
+        Assertions.assertTrue(model.value().get(0).properties().isDefaultForPaid());
+        Assertions.assertTrue(model.value().get(0).properties().isFreeTierEnabled());
+        Assertions.assertFalse(model.value().get(0).properties().isPaidEnabled());
+        Assertions.assertEquals("kkdmfl", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionPropertiesTests.java
index 33753e8d282b..0fb1718ae881 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AutonomousDbVersionPropertiesTests.java
@@ -13,12 +13,12 @@ public final class AutonomousDbVersionPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AutonomousDbVersionProperties model = BinaryData.fromString(
-            "{\"version\":\"rqzz\",\"dbWorkload\":\"AJD\",\"isDefaultForFree\":false,\"isDefaultForPaid\":false,\"isFreeTierEnabled\":false,\"isPaidEnabled\":true}")
+            "{\"version\":\"ggcula\",\"dbWorkload\":\"APEX\",\"isDefaultForFree\":true,\"isDefaultForPaid\":true,\"isFreeTierEnabled\":false,\"isPaidEnabled\":true}")
             .toObject(AutonomousDbVersionProperties.class);
-        Assertions.assertEquals("rqzz", model.version());
-        Assertions.assertEquals(WorkloadType.AJD, model.dbWorkload());
-        Assertions.assertFalse(model.isDefaultForFree());
-        Assertions.assertFalse(model.isDefaultForPaid());
+        Assertions.assertEquals("ggcula", model.version());
+        Assertions.assertEquals(WorkloadType.APEX, model.dbWorkload());
+        Assertions.assertTrue(model.isDefaultForFree());
+        Assertions.assertTrue(model.isDefaultForPaid());
         Assertions.assertFalse(model.isFreeTierEnabled());
         Assertions.assertTrue(model.isPaidEnabled());
     }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AzureSubscriptionsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AzureSubscriptionsTests.java
index 8915de46d8b0..86d7eccab3d4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AzureSubscriptionsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/AzureSubscriptionsTests.java
@@ -13,16 +13,14 @@ public final class AzureSubscriptionsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AzureSubscriptions model
-            = BinaryData.fromString("{\"azureSubscriptionIds\":[\"cvokotllxdyhg\",\"y\",\"cogjltdtbn\",\"hadoocrk\"]}")
-                .toObject(AzureSubscriptions.class);
-        Assertions.assertEquals("cvokotllxdyhg", model.azureSubscriptionIds().get(0));
+            = BinaryData.fromString("{\"azureSubscriptionIds\":[\"xw\"]}").toObject(AzureSubscriptions.class);
+        Assertions.assertEquals("xw", model.azureSubscriptionIds().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AzureSubscriptions model = new AzureSubscriptions()
-            .withAzureSubscriptionIds(Arrays.asList("cvokotllxdyhg", "y", "cogjltdtbn", "hadoocrk"));
+        AzureSubscriptions model = new AzureSubscriptions().withAzureSubscriptionIds(Arrays.asList("xw"));
         model = BinaryData.fromObject(model).toObject(AzureSubscriptions.class);
-        Assertions.assertEquals("cvokotllxdyhg", model.azureSubscriptionIds().get(0));
+        Assertions.assertEquals("xw", model.azureSubscriptionIds().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudAccountDetailsInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudAccountDetailsInnerTests.java
index 189f15d69536..8749743801c8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudAccountDetailsInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudAccountDetailsInnerTests.java
@@ -11,7 +11,7 @@ public final class CloudAccountDetailsInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CloudAccountDetailsInner model
-            = BinaryData.fromString("{\"cloudAccountName\":\"huopxodlqiynto\",\"cloudAccountHomeRegion\":\"ihleos\"}")
+            = BinaryData.fromString("{\"cloudAccountName\":\"xkalla\",\"cloudAccountHomeRegion\":\"elwuipi\"}")
                 .toObject(CloudAccountDetailsInner.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureInnerTests.java
index ae277b3f803a..28032ebd2747 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureInnerTests.java
@@ -24,78 +24,79 @@ public final class CloudExadataInfrastructureInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CloudExadataInfrastructureInner model = BinaryData.fromString(
-            "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":86962705,\"mountPoint\":\"aqw\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":804356907,\"mountPoint\":\"qvpkvlrxnjeaseip\"},{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":1111118193,\"mountPoint\":\"yyien\"}],\"ocid\":\"dlwtgrhpdj\",\"computeCount\":523400535,\"storageCount\":1984471736,\"totalStorageSizeInGbs\":1012728769,\"availableStorageSizeInGbs\":271162944,\"timeCreated\":\"pqyegualhbxxh\",\"lifecycleDetails\":\"jzzvdud\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"December\"},{\"name\":\"June\"}],\"weeksOfMonth\":[743935236],\"daysOfWeek\":[{\"name\":\"Monday\"},{\"name\":\"Friday\"}],\"hoursOfDay\":[1264549438,991937495,420824086,1848552059],\"leadTimeInWeeks\":1185214536,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1348050771,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1194387790,\"estimatedNetworkSwitchesPatchingTime\":1099330569,\"estimatedStorageServerPatchingTime\":737203180,\"totalEstimatedPatchingTime\":1772029927},\"customerContacts\":[{\"email\":\"uesnzwdejbavo\"},{\"email\":\"xzdmohctb\"}],\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"MaintenanceInProgress\",\"shape\":\"xdn\",\"ociUrl\":\"vo\",\"cpuCount\":999513360,\"maxCpuCount\":884625398,\"memorySizeInGbs\":408024361,\"maxMemoryInGbs\":1929800645,\"dbNodeStorageSizeInGbs\":1738162864,\"maxDbNodeStorageSizeInGbs\":1440300304,\"dataStorageSizeInTbs\":45.07384888214448,\"maxDataStorageInTbs\":12.228123099703847,\"dbServerVersion\":\"yggdtjixh\",\"storageServerVersion\":\"uofqwe\",\"activatedStorageCount\":1965159297,\"additionalStorageCount\":1807410645,\"displayName\":\"n\",\"lastMaintenanceRunId\":\"fyexfwhy\",\"nextMaintenanceRunId\":\"i\",\"monthlyDbServerVersion\":\"yvdcsitynnaa\",\"monthlyStorageServerVersion\":\"ectehf\",\"databaseServerType\":\"scjeypv\",\"storageServerType\":\"zrkgqhcjrefovg\",\"computeModel\":\"ECPU\"},\"zones\":[\"leyyvx\"],\"location\":\"jpkcattpng\",\"tags\":{\"jh\":\"cczsq\",\"ysou\":\"mdajv\",\"canoaeupf\":\"q\"},\"id\":\"yhltrpmopjmcm\",\"name\":\"tuo\",\"type\":\"thfuiuaodsfcpkvx\"}")
+            "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":635672501,\"mountPoint\":\"eipheoflokeyy\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":147839675,\"mountPoint\":\"tgrhpdjpjumas\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1063088657,\"mountPoint\":\"gual\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":344964368,\"mountPoint\":\"zzvdudgwds\"}],\"ocid\":\"hotwmcynpwlbjnp\",\"computeCount\":1690822953,\"storageCount\":1625524147,\"totalStorageSizeInGbs\":1405360141,\"availableStorageSizeInGbs\":55863349,\"timeCreated\":\"nltyfsoppusuesnz\",\"lifecycleDetails\":\"ej\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"October\"},{\"name\":\"February\"},{\"name\":\"April\"}],\"weeksOfMonth\":[226877862,1623917209,780236043],\"daysOfWeek\":[{\"name\":\"Sunday\"},{\"name\":\"Tuesday\"}],\"hoursOfDay\":[1758852414],\"leadTimeInWeeks\":1492638603,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":202688177,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":247911704,\"estimatedNetworkSwitchesPatchingTime\":175400299,\"estimatedStorageServerPatchingTime\":2105007169,\"totalEstimatedPatchingTime\":1100840258},\"customerContacts\":[{\"email\":\"azjdyggd\"},{\"email\":\"jixhbk\"},{\"email\":\"ofqweykhmenevfye\"},{\"email\":\"fwhybcibvy\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Terminating\",\"shape\":\"tynnaamdectehfi\",\"ociUrl\":\"cj\",\"cpuCount\":1266013577,\"maxCpuCount\":1797610507,\"memorySizeInGbs\":1363658384,\"maxMemoryInGbs\":902064602,\"dbNodeStorageSizeInGbs\":177141497,\"maxDbNodeStorageSizeInGbs\":61185346,\"dataStorageSizeInTbs\":93.9889586513849,\"maxDataStorageInTbs\":3.033752731716688,\"dbServerVersion\":\"mkqsleyyv\",\"storageServerVersion\":\"qjpkcattpngjcrc\",\"activatedStorageCount\":957799467,\"additionalStorageCount\":822789925,\"displayName\":\"jh\",\"lastMaintenanceRunId\":\"daj\",\"nextMaintenanceRunId\":\"ysou\",\"monthlyDbServerVersion\":\"e\",\"monthlyStorageServerVersion\":\"noae\",\"databaseServerType\":\"fhyhltrpmopjmcma\",\"storageServerType\":\"okth\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":94424945,\"availableStorageInGbs\":1445775245}},\"zones\":[\"fcp\",\"vxodpu\",\"zmyzydagf\",\"axbezyiuo\"],\"location\":\"twhrdxwzywqsm\",\"tags\":{\"ksymd\":\"reximoryocfs\",\"kiiuxhqyudxor\":\"ys\",\"poczvyifqrvkdvjs\":\"qn\",\"d\":\"lrmv\"},\"id\":\"watkpnpulexxb\",\"name\":\"zwtruwiqzbqjvsov\",\"type\":\"yokacspkw\"}")
             .toObject(CloudExadataInfrastructureInner.class);
-        Assertions.assertEquals("jpkcattpng", model.location());
-        Assertions.assertEquals("cczsq", model.tags().get("jh"));
-        Assertions.assertEquals(523400535, model.properties().computeCount());
-        Assertions.assertEquals(1984471736, model.properties().storageCount());
-        Assertions.assertEquals(Preference.NO_PREFERENCE, model.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.DECEMBER, model.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(743935236, model.properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.MONDAY,
+        Assertions.assertEquals("twhrdxwzywqsm", model.location());
+        Assertions.assertEquals("reximoryocfs", model.tags().get("ksymd"));
+        Assertions.assertEquals(1690822953, model.properties().computeCount());
+        Assertions.assertEquals(1625524147, model.properties().storageCount());
+        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.OCTOBER, model.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(226877862, model.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.SUNDAY,
             model.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(1264549438, model.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(1185214536, model.properties().maintenanceWindow().leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.NON_ROLLING, model.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1348050771, model.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertEquals(1758852414, model.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1492638603, model.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.ROLLING, model.properties().maintenanceWindow().patchingMode());
+        Assertions.assertEquals(202688177, model.properties().maintenanceWindow().customActionTimeoutInMins());
         Assertions.assertTrue(model.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertTrue(model.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("uesnzwdejbavo", model.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("xdn", model.properties().shape());
-        Assertions.assertEquals("n", model.properties().displayName());
-        Assertions.assertEquals("scjeypv", model.properties().databaseServerType());
-        Assertions.assertEquals("zrkgqhcjrefovg", model.properties().storageServerType());
-        Assertions.assertEquals("leyyvx", model.zones().get(0));
+        Assertions.assertEquals("azjdyggd", model.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("tynnaamdectehfi", model.properties().shape());
+        Assertions.assertEquals("jh", model.properties().displayName());
+        Assertions.assertEquals("fhyhltrpmopjmcma", model.properties().databaseServerType());
+        Assertions.assertEquals("okth", model.properties().storageServerType());
+        Assertions.assertEquals("fcp", model.zones().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CloudExadataInfrastructureInner model = new CloudExadataInfrastructureInner().withLocation("jpkcattpng")
-            .withTags(mapOf("jh", "cczsq", "ysou", "mdajv", "canoaeupf", "q"))
-            .withProperties(new CloudExadataInfrastructureProperties().withComputeCount(523400535)
-                .withStorageCount(1984471736)
-                .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
-                    .withMonths(
-                        Arrays.asList(new Month().withName(MonthName.DECEMBER), new Month().withName(MonthName.JUNE)))
-                    .withWeeksOfMonth(Arrays.asList(743935236))
-                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.MONDAY),
-                        new DayOfWeek().withName(DayOfWeekName.FRIDAY)))
-                    .withHoursOfDay(Arrays.asList(1264549438, 991937495, 420824086, 1848552059))
-                    .withLeadTimeInWeeks(1185214536)
-                    .withPatchingMode(PatchingMode.NON_ROLLING)
-                    .withCustomActionTimeoutInMins(1348050771)
+        CloudExadataInfrastructureInner model = new CloudExadataInfrastructureInner().withLocation("twhrdxwzywqsm")
+            .withTags(mapOf("ksymd", "reximoryocfs", "kiiuxhqyudxor", "ys", "poczvyifqrvkdvjs", "qn", "d", "lrmv"))
+            .withProperties(new CloudExadataInfrastructureProperties().withComputeCount(1690822953)
+                .withStorageCount(1625524147)
+                .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.CUSTOM_PREFERENCE)
+                    .withMonths(Arrays.asList(new Month().withName(MonthName.OCTOBER),
+                        new Month().withName(MonthName.FEBRUARY), new Month().withName(MonthName.APRIL)))
+                    .withWeeksOfMonth(Arrays.asList(226877862, 1623917209, 780236043))
+                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.SUNDAY),
+                        new DayOfWeek().withName(DayOfWeekName.TUESDAY)))
+                    .withHoursOfDay(Arrays.asList(1758852414))
+                    .withLeadTimeInWeeks(1492638603)
+                    .withPatchingMode(PatchingMode.ROLLING)
+                    .withCustomActionTimeoutInMins(202688177)
                     .withIsCustomActionTimeoutEnabled(true)
                     .withIsMonthlyPatchingEnabled(true))
-                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("uesnzwdejbavo"),
-                    new CustomerContact().withEmail("xzdmohctb")))
-                .withShape("xdn")
-                .withDisplayName("n")
-                .withDatabaseServerType("scjeypv")
-                .withStorageServerType("zrkgqhcjrefovg"))
-            .withZones(Arrays.asList("leyyvx"));
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("azjdyggd"),
+                    new CustomerContact().withEmail("jixhbk"), new CustomerContact().withEmail("ofqweykhmenevfye"),
+                    new CustomerContact().withEmail("fwhybcibvy")))
+                .withShape("tynnaamdectehfi")
+                .withDisplayName("jh")
+                .withDatabaseServerType("fhyhltrpmopjmcma")
+                .withStorageServerType("okth"))
+            .withZones(Arrays.asList("fcp", "vxodpu", "zmyzydagf", "axbezyiuo"));
         model = BinaryData.fromObject(model).toObject(CloudExadataInfrastructureInner.class);
-        Assertions.assertEquals("jpkcattpng", model.location());
-        Assertions.assertEquals("cczsq", model.tags().get("jh"));
-        Assertions.assertEquals(523400535, model.properties().computeCount());
-        Assertions.assertEquals(1984471736, model.properties().storageCount());
-        Assertions.assertEquals(Preference.NO_PREFERENCE, model.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.DECEMBER, model.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(743935236, model.properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.MONDAY,
+        Assertions.assertEquals("twhrdxwzywqsm", model.location());
+        Assertions.assertEquals("reximoryocfs", model.tags().get("ksymd"));
+        Assertions.assertEquals(1690822953, model.properties().computeCount());
+        Assertions.assertEquals(1625524147, model.properties().storageCount());
+        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.OCTOBER, model.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(226877862, model.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.SUNDAY,
             model.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(1264549438, model.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(1185214536, model.properties().maintenanceWindow().leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.NON_ROLLING, model.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1348050771, model.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertEquals(1758852414, model.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1492638603, model.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.ROLLING, model.properties().maintenanceWindow().patchingMode());
+        Assertions.assertEquals(202688177, model.properties().maintenanceWindow().customActionTimeoutInMins());
         Assertions.assertTrue(model.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertTrue(model.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("uesnzwdejbavo", model.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("xdn", model.properties().shape());
-        Assertions.assertEquals("n", model.properties().displayName());
-        Assertions.assertEquals("scjeypv", model.properties().databaseServerType());
-        Assertions.assertEquals("zrkgqhcjrefovg", model.properties().storageServerType());
-        Assertions.assertEquals("leyyvx", model.zones().get(0));
+        Assertions.assertEquals("azjdyggd", model.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("tynnaamdectehfi", model.properties().shape());
+        Assertions.assertEquals("jh", model.properties().displayName());
+        Assertions.assertEquals("fhyhltrpmopjmcma", model.properties().databaseServerType());
+        Assertions.assertEquals("okth", model.properties().storageServerType());
+        Assertions.assertEquals("fcp", model.zones().get(0));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureListResultTests.java
index 914146d2ab8b..0d0333b7fa25 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureListResultTests.java
@@ -16,10 +16,10 @@ public final class CloudExadataInfrastructureListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CloudExadataInfrastructureListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1041467339,\"mountPoint\":\"symglzufcyz\"},{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":1730607260,\"mountPoint\":\"nufhf\"}],\"ocid\":\"jysagith\",\"computeCount\":731883185,\"storageCount\":676674728,\"totalStorageSizeInGbs\":135475125,\"availableStorageSizeInGbs\":1105410727,\"timeCreated\":\"xwczbyscnp\",\"lifecycleDetails\":\"uhivyqniw\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"August\"}],\"weeksOfMonth\":[832798449,920256064,1629282531],\"daysOfWeek\":[{\"name\":\"Friday\"},{\"name\":\"Sunday\"},{\"name\":\"Saturday\"}],\"hoursOfDay\":[2033205532],\"leadTimeInWeeks\":224471404,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":300178324,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1290060857,\"estimatedNetworkSwitchesPatchingTime\":1518133549,\"estimatedStorageServerPatchingTime\":1617618462,\"totalEstimatedPatchingTime\":1833864756},\"customerContacts\":[{\"email\":\"tnapczwlokjyemkk\"},{\"email\":\"ni\"},{\"email\":\"joxzjnchgejspodm\"},{\"email\":\"ilzyd\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Provisioning\",\"shape\":\"yahux\",\"ociUrl\":\"pmqnja\",\"cpuCount\":1876507017,\"maxCpuCount\":1052966015,\"memorySizeInGbs\":2020254457,\"maxMemoryInGbs\":1750576238,\"dbNodeStorageSizeInGbs\":2136786806,\"maxDbNodeStorageSizeInGbs\":750883620,\"dataStorageSizeInTbs\":49.21394749789002,\"maxDataStorageInTbs\":40.087762783830804,\"dbServerVersion\":\"mfdatscmdvpj\",\"storageServerVersion\":\"lsuuvmkjozkrwfnd\",\"activatedStorageCount\":1567164641,\"additionalStorageCount\":418817666,\"displayName\":\"slwejdpvw\",\"lastMaintenanceRunId\":\"oqpsoa\",\"nextMaintenanceRunId\":\"tazak\",\"monthlyDbServerVersion\":\"lahbcryff\",\"monthlyStorageServerVersion\":\"dosyg\",\"databaseServerType\":\"paojakhmsbzjh\",\"storageServerType\":\"zevdphlx\",\"computeModel\":\"OCPU\"},\"zones\":[\"hqtrgqjbpf\"],\"location\":\"s\",\"tags\":{\"wzo\":\"gvfcj\",\"np\":\"xjtfelluwfzit\",\"lxofpdvhpfxxypin\":\"qfpjk\"},\"id\":\"nmayhuybb\",\"name\":\"podepoo\",\"type\":\"inuvamiheogn\"},{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":1638968400,\"mountPoint\":\"si\"},{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":1323562973,\"mountPoint\":\"ihnhun\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":1547644863,\"mountPoint\":\"ygxgispemvtz\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1861825815,\"mountPoint\":\"ofx\"}],\"ocid\":\"ofjaeqjhqjb\",\"computeCount\":91789189,\"storageCount\":1818222173,\"totalStorageSizeInGbs\":928331689,\"availableStorageSizeInGbs\":2070892597,\"timeCreated\":\"ngsntnbybk\",\"lifecycleDetails\":\"cwrwclxxwrljdous\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"July\"},{\"name\":\"November\"}],\"weeksOfMonth\":[1012894603,747491790,1553776793],\"daysOfWeek\":[{\"name\":\"Saturday\"}],\"hoursOfDay\":[1728330738,1299495603,1272736991,1320429450],\"leadTimeInWeeks\":703766696,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1218196264,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":229383056,\"estimatedNetworkSwitchesPatchingTime\":1191449994,\"estimatedStorageServerPatchingTime\":1077635314,\"totalEstimatedPatchingTime\":2145631458},\"customerContacts\":[{\"email\":\"mppeebvmgxs\"},{\"email\":\"bkyqduu\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"shape\":\"czdzev\",\"ociUrl\":\"hkr\",\"cpuCount\":7278367,\"maxCpuCount\":923544052,\"memorySizeInGbs\":681393134,\"maxMemoryInGbs\":264024813,\"dbNodeStorageSizeInGbs\":253055122,\"maxDbNodeStorageSizeInGbs\":1615541658,\"dataStorageSizeInTbs\":76.41479729813713,\"maxDataStorageInTbs\":48.28691258830874,\"dbServerVersion\":\"nhutjeltmrldhugj\",\"storageServerVersion\":\"datqxhocdgeabl\",\"activatedStorageCount\":743985587,\"additionalStorageCount\":388527245,\"displayName\":\"icndvkaozwyifty\",\"lastMaintenanceRunId\":\"hurokftyxoln\",\"nextMaintenanceRunId\":\"pwcukjfkgiawxk\",\"monthlyDbServerVersion\":\"ypl\",\"monthlyStorageServerVersion\":\"kbasyypn\",\"databaseServerType\":\"hsgcbacphejkot\",\"storageServerType\":\"qgoulznd\",\"computeModel\":\"ECPU\"},\"zones\":[\"yqkgfg\",\"bmadgak\",\"qsrxybzqqed\"],\"location\":\"tbciqfouflmm\",\"tags\":{\"b\":\"smodmgloug\"},\"id\":\"wtmutduq\",\"name\":\"ta\",\"type\":\"spwgcuertumkdosv\"},{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":398280406,\"mountPoint\":\"ddgmb\"}],\"ocid\":\"ex\",\"computeCount\":1535190702,\"storageCount\":388497474,\"totalStorageSizeInGbs\":1830936153,\"availableStorageSizeInGbs\":367130174,\"timeCreated\":\"fpfpsalgbquxigj\",\"lifecycleDetails\":\"gzjaoyfhrtxilne\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"May\"}],\"weeksOfMonth\":[969433721],\"daysOfWeek\":[{\"name\":\"Saturday\"},{\"name\":\"Sunday\"},{\"name\":\"Thursday\"},{\"name\":\"Sunday\"}],\"hoursOfDay\":[1718797623,1242969129,1113809263,1106115756],\"leadTimeInWeeks\":658406237,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1705333634,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1017472579,\"estimatedNetworkSwitchesPatchingTime\":928932995,\"estimatedStorageServerPatchingTime\":1198925267,\"totalEstimatedPatchingTime\":1314012997},\"customerContacts\":[{\"email\":\"nruj\"},{\"email\":\"guhmuouqfpr\"},{\"email\":\"zw\"},{\"email\":\"nguitnwuizgazxu\"}],\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminated\",\"shape\":\"kyfi\",\"ociUrl\":\"fidfvzw\",\"cpuCount\":537623059,\"maxCpuCount\":881303294,\"memorySizeInGbs\":1424073065,\"maxMemoryInGbs\":1847084741,\"dbNodeStorageSizeInGbs\":396497881,\"maxDbNodeStorageSizeInGbs\":1072165585,\"dataStorageSizeInTbs\":61.41952663964281,\"maxDataStorageInTbs\":46.82535460983207,\"dbServerVersion\":\"eiwaopvkmi\",\"storageServerVersion\":\"mmxdcu\",\"activatedStorageCount\":1044179724,\"additionalStorageCount\":723507577,\"displayName\":\"pymzidnsezcxtbzs\",\"lastMaintenanceRunId\":\"yc\",\"nextMaintenanceRunId\":\"newmdwzjeiachbo\",\"monthlyDbServerVersion\":\"flnrosfqpteehzz\",\"monthlyStorageServerVersion\":\"pyqr\",\"databaseServerType\":\"z\",\"storageServerType\":\"pvswjdkirso\",\"computeModel\":\"ECPU\"},\"zones\":[\"hc\"],\"location\":\"nohjt\",\"tags\":{\"soifiyipjxsqw\":\"h\",\"bznorcjxvsnby\":\"gr\",\"cyshurzafbljjgp\":\"qabnmoc\"},\"id\":\"toqcjmklja\",\"name\":\"bqidtqaj\",\"type\":\"yulpkudjkr\"},{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":98964950,\"mountPoint\":\"gqexzlocxs\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":2010275395,\"mountPoint\":\"bcsglumma\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1291201271,\"mountPoint\":\"bnbdxkqpxokajion\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":1127619232,\"mountPoint\":\"xgcp\"}],\"ocid\":\"gmaajrm\",\"computeCount\":1305884847,\"storageCount\":2081594756,\"totalStorageSizeInGbs\":1277488223,\"availableStorageSizeInGbs\":1274470316,\"timeCreated\":\"clwhijcoejctbz\",\"lifecycleDetails\":\"s\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"March\"},{\"name\":\"June\"}],\"weeksOfMonth\":[1357856800,1619207085,395689109],\"daysOfWeek\":[{\"name\":\"Monday\"},{\"name\":\"Thursday\"},{\"name\":\"Thursday\"},{\"name\":\"Saturday\"}],\"hoursOfDay\":[1211894174],\"leadTimeInWeeks\":1878270858,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":825369958,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":263932996,\"estimatedNetworkSwitchesPatchingTime\":217282590,\"estimatedStorageServerPatchingTime\":1680873734,\"totalEstimatedPatchingTime\":256483207},\"customerContacts\":[{\"email\":\"uexhdzx\"}],\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminating\",\"shape\":\"jnxqbzvddntwn\",\"ociUrl\":\"icbtwnpzao\",\"cpuCount\":1330155911,\"maxCpuCount\":114023042,\"memorySizeInGbs\":569590311,\"maxMemoryInGbs\":1387185134,\"dbNodeStorageSizeInGbs\":331700984,\"maxDbNodeStorageSizeInGbs\":848102718,\"dataStorageSizeInTbs\":40.2097009387695,\"maxDataStorageInTbs\":0.2837749257303068,\"dbServerVersion\":\"qkwpyeicxmqc\",\"storageServerVersion\":\"q\",\"activatedStorageCount\":1200172783,\"additionalStorageCount\":1191010695,\"displayName\":\"xuigdtopbobj\",\"lastMaintenanceRunId\":\"hm\",\"nextMaintenanceRunId\":\"u\",\"monthlyDbServerVersion\":\"a\",\"monthlyStorageServerVersion\":\"rzayv\",\"databaseServerType\":\"pgvdf\",\"storageServerType\":\"otkftutqxlngx\",\"computeModel\":\"OCPU\"},\"zones\":[\"ugnxkrxdqmi\"],\"location\":\"thz\",\"tags\":{\"oqfbowskanyk\":\"drabhjybige\",\"nhzgpphrcgyn\":\"zlcuiywgqywgndrv\",\"fsxlzevgbmqjqa\":\"ocpecfvmmco\",\"pmivkwlzu\":\"c\"},\"id\":\"ccfwnfnbacfion\",\"name\":\"ebxetqgtzxdp\",\"type\":\"qbqqwxr\"}],\"nextLink\":\"eallnwsubisnj\"}")
+            "{\"value\":[{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1041467339,\"mountPoint\":\"symglzufcyz\"},{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":1730607260,\"mountPoint\":\"nufhf\"}],\"ocid\":\"jysagith\",\"computeCount\":731883185,\"storageCount\":676674728,\"totalStorageSizeInGbs\":135475125,\"availableStorageSizeInGbs\":1105410727,\"timeCreated\":\"xwczbyscnp\",\"lifecycleDetails\":\"uhivyqniw\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"August\"}],\"weeksOfMonth\":[832798449,920256064,1629282531],\"daysOfWeek\":[{\"name\":\"Friday\"},{\"name\":\"Sunday\"},{\"name\":\"Saturday\"}],\"hoursOfDay\":[2033205532],\"leadTimeInWeeks\":224471404,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":300178324,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1290060857,\"estimatedNetworkSwitchesPatchingTime\":1518133549,\"estimatedStorageServerPatchingTime\":1617618462,\"totalEstimatedPatchingTime\":1833864756},\"customerContacts\":[{\"email\":\"tnapczwlokjyemkk\"},{\"email\":\"ni\"},{\"email\":\"joxzjnchgejspodm\"},{\"email\":\"ilzyd\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Provisioning\",\"shape\":\"yahux\",\"ociUrl\":\"pmqnja\",\"cpuCount\":1876507017,\"maxCpuCount\":1052966015,\"memorySizeInGbs\":2020254457,\"maxMemoryInGbs\":1750576238,\"dbNodeStorageSizeInGbs\":2136786806,\"maxDbNodeStorageSizeInGbs\":750883620,\"dataStorageSizeInTbs\":49.21394749789002,\"maxDataStorageInTbs\":40.087762783830804,\"dbServerVersion\":\"mfdatscmdvpj\",\"storageServerVersion\":\"lsuuvmkjozkrwfnd\",\"activatedStorageCount\":1567164641,\"additionalStorageCount\":418817666,\"displayName\":\"slwejdpvw\",\"lastMaintenanceRunId\":\"oqpsoa\",\"nextMaintenanceRunId\":\"tazak\",\"monthlyDbServerVersion\":\"lahbcryff\",\"monthlyStorageServerVersion\":\"dosyg\",\"databaseServerType\":\"paojakhmsbzjh\",\"storageServerType\":\"zevdphlx\",\"computeModel\":\"OCPU\",\"exascaleConfig\":{\"totalStorageInGbs\":527902610,\"availableStorageInGbs\":578472109}},\"zones\":[\"gqjbpfzfsin\",\"gvfcj\",\"wzo\",\"xjtfelluwfzit\"],\"location\":\"peqfpjkjl\",\"tags\":{\"nmayhuybb\":\"pdvhpfxxypin\",\"inuvamiheogn\":\"podepoo\",\"usivye\":\"rxzxtheo\"},\"id\":\"cciqihnhungbwjz\",\"name\":\"nfygxgispemvtz\",\"type\":\"kufubljo\"},{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1887671612,\"mountPoint\":\"hqjbasvmsmj\"},{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":186594005,\"mountPoint\":\"nbybkzgcwrwcl\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":2010758823,\"mountPoint\":\"uskcqvkocrcj\"}],\"ocid\":\"wtnhxbnjbiksqr\",\"computeCount\":1154463022,\"storageCount\":1356626713,\"totalStorageSizeInGbs\":1437691312,\"availableStorageSizeInGbs\":229383056,\"timeCreated\":\"wnzlljfmppeeb\",\"lifecycleDetails\":\"gxsabkyq\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"June\"}],\"weeksOfMonth\":[1939991929,372276294],\"daysOfWeek\":[{\"name\":\"Friday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[1700892403],\"leadTimeInWeeks\":968287955,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":923544052,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1130701644,\"estimatedNetworkSwitchesPatchingTime\":1278778169,\"estimatedStorageServerPatchingTime\":1695148564,\"totalEstimatedPatchingTime\":2073907119},\"customerContacts\":[{\"email\":\"nhutjeltmrldhugj\"}],\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"MaintenanceInProgress\",\"shape\":\"qxhocdgeablgphut\",\"ociUrl\":\"ndv\",\"cpuCount\":1455747257,\"maxCpuCount\":563001635,\"memorySizeInGbs\":191194169,\"maxMemoryInGbs\":629729450,\"dbNodeStorageSizeInGbs\":655079148,\"maxDbNodeStorageSizeInGbs\":979075419,\"dataStorageSizeInTbs\":30.237473457567386,\"maxDataStorageInTbs\":55.429143652657764,\"dbServerVersion\":\"xolniwpwcukjfk\",\"storageServerVersion\":\"awxklr\",\"activatedStorageCount\":1861456902,\"additionalStorageCount\":727805488,\"displayName\":\"kbasyypn\",\"lastMaintenanceRunId\":\"hsgcbacphejkot\",\"nextMaintenanceRunId\":\"qgoulznd\",\"monthlyDbServerVersion\":\"kwy\",\"monthlyStorageServerVersion\":\"gfgibm\",\"databaseServerType\":\"gakeqsr\",\"storageServerType\":\"bzqqedqytbciq\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":1485441711,\"availableStorageInGbs\":2066415804}},\"zones\":[\"kzsmodm\",\"lougpbkw\",\"mutduqktaps\"],\"location\":\"gcue\",\"tags\":{\"vqwhbmdgbbjfd\":\"mkdo\",\"q\":\"gmbmbexppbh\",\"algbquxigjyjg\":\"rolfpfp\",\"lnerkujysvleju\":\"jaoyfhrtx\"},\"id\":\"fqawrlyxw\",\"name\":\"kcprbnw\",\"type\":\"xgjvtbv\"},{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":308759192,\"mountPoint\":\"guhmuouqfpr\"},{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":2100303933,\"mountPoint\":\"tnwu\"}],\"ocid\":\"gazxuf\",\"computeCount\":1325323583,\"storageCount\":935270600,\"totalStorageSizeInGbs\":1585023957,\"availableStorageSizeInGbs\":284238049,\"timeCreated\":\"fidfvzw\",\"lifecycleDetails\":\"uht\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"February\"},{\"name\":\"May\"},{\"name\":\"June\"}],\"weeksOfMonth\":[404172620,2011133690,183094185],\"daysOfWeek\":[{\"name\":\"Wednesday\"},{\"name\":\"Wednesday\"},{\"name\":\"Wednesday\"}],\"hoursOfDay\":[1147717382,269791591,1562310773,1582483628],\"leadTimeInWeeks\":93191871,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":962982014,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":723507577,\"estimatedNetworkSwitchesPatchingTime\":1460749034,\"estimatedStorageServerPatchingTime\":2146966484,\"totalEstimatedPatchingTime\":560653281},\"customerContacts\":[{\"email\":\"ezcxtbzsgfyccsne\"},{\"email\":\"mdwzjeiachboo\"}],\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminating\",\"shape\":\"osfqpteehzzv\",\"ociUrl\":\"yqrimzin\",\"cpuCount\":11335031,\"maxCpuCount\":694156912,\"memorySizeInGbs\":541162578,\"maxMemoryInGbs\":1577087193,\"dbNodeStorageSizeInGbs\":158859960,\"maxDbNodeStorageSizeInGbs\":1909707701,\"dataStorageSizeInTbs\":20.800987021581484,\"maxDataStorageInTbs\":34.670517161184435,\"dbServerVersion\":\"ohjtckw\",\"storageServerVersion\":\"soifiyipjxsqw\",\"activatedStorageCount\":629629065,\"additionalStorageCount\":1124714443,\"displayName\":\"znorcj\",\"lastMaintenanceRunId\":\"snb\",\"nextMaintenanceRunId\":\"qabnmoc\",\"monthlyDbServerVersion\":\"ysh\",\"monthlyStorageServerVersion\":\"zafb\",\"databaseServerType\":\"j\",\"storageServerType\":\"btoqcjmkljavbqid\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":1134924822,\"availableStorageInGbs\":303743621}},\"zones\":[\"pku\"],\"location\":\"krlkhbzhfepg\",\"tags\":{\"zloc\":\"e\"},\"id\":\"scpai\",\"name\":\"rhhbcs\",\"type\":\"l\"},{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":865429737,\"mountPoint\":\"obnbdxkqpxokaj\"}],\"ocid\":\"npime\",\"computeCount\":1127619232,\"storageCount\":971264827,\"totalStorageSizeInGbs\":373468277,\"availableStorageSizeInGbs\":1489591694,\"timeCreated\":\"gmaajrm\",\"lifecycleDetails\":\"jwzrl\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"November\"},{\"name\":\"October\"},{\"name\":\"March\"},{\"name\":\"April\"}],\"weeksOfMonth\":[1526151596,1491222167,1742437249,1583993126],\"daysOfWeek\":[{\"name\":\"Tuesday\"},{\"name\":\"Tuesday\"},{\"name\":\"Tuesday\"}],\"hoursOfDay\":[1712979680],\"leadTimeInWeeks\":1302368966,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":544085929,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1238498062,\"estimatedNetworkSwitchesPatchingTime\":1041117095,\"estimatedStorageServerPatchingTime\":922056801,\"totalEstimatedPatchingTime\":2119531336},\"customerContacts\":[{\"email\":\"c\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"MaintenanceInProgress\",\"shape\":\"dtocj\",\"ociUrl\":\"hvpmoue\",\"cpuCount\":1945947631,\"maxCpuCount\":9507758,\"memorySizeInGbs\":738311617,\"maxMemoryInGbs\":996013729,\"dbNodeStorageSizeInGbs\":1074421821,\"maxDbNodeStorageSizeInGbs\":954835443,\"dataStorageSizeInTbs\":12.802907776871598,\"maxDataStorageInTbs\":52.78354694339231,\"dbServerVersion\":\"t\",\"storageServerVersion\":\"deicbtwnpzao\",\"activatedStorageCount\":1330155911,\"additionalStorageCount\":114023042,\"displayName\":\"hcffcyddglmjthjq\",\"lastMaintenanceRunId\":\"pyeicxm\",\"nextMaintenanceRunId\":\"iwqvhkh\",\"monthlyDbServerVersion\":\"uigdtopbobjog\",\"monthlyStorageServerVersion\":\"e\",\"databaseServerType\":\"a\",\"storageServerType\":\"uhrzayvvt\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":266379679,\"availableStorageInGbs\":723087340}},\"zones\":[\"tkftutqxlngx\",\"efgugnxk\",\"xdqmidtthzrvqdra\",\"hjybigehoqfbo\"],\"location\":\"kanyktzlcuiywg\",\"tags\":{\"gpphrcgyn\":\"gndrvynh\",\"fsxlzevgbmqjqa\":\"ocpecfvmmco\",\"pmivkwlzu\":\"c\",\"ebxetqgtzxdp\":\"ccfwnfnbacfion\"},\"id\":\"qbqqwxr\",\"name\":\"feallnwsu\",\"type\":\"isnjampmngnz\"}],\"nextLink\":\"xaqwoochcbonqv\"}")
             .toObject(CloudExadataInfrastructureListResult.class);
-        Assertions.assertEquals("s", model.value().get(0).location());
-        Assertions.assertEquals("gvfcj", model.value().get(0).tags().get("wzo"));
+        Assertions.assertEquals("peqfpjkjl", model.value().get(0).location());
+        Assertions.assertEquals("pdvhpfxxypin", model.value().get(0).tags().get("nmayhuybb"));
         Assertions.assertEquals(731883185, model.value().get(0).properties().computeCount());
         Assertions.assertEquals(676674728, model.value().get(0).properties().storageCount());
         Assertions.assertEquals(Preference.NO_PREFERENCE,
@@ -43,7 +43,7 @@ public void testDeserialize() throws Exception {
         Assertions.assertEquals("slwejdpvw", model.value().get(0).properties().displayName());
         Assertions.assertEquals("paojakhmsbzjh", model.value().get(0).properties().databaseServerType());
         Assertions.assertEquals("zevdphlx", model.value().get(0).properties().storageServerType());
-        Assertions.assertEquals("hqtrgqjbpf", model.value().get(0).zones().get(0));
-        Assertions.assertEquals("eallnwsubisnj", model.nextLink());
+        Assertions.assertEquals("gqjbpfzfsin", model.value().get(0).zones().get(0));
+        Assertions.assertEquals("xaqwoochcbonqv", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructurePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructurePropertiesTests.java
index e49ae92e4d8e..eb3e1ddad370 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructurePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructurePropertiesTests.java
@@ -21,68 +21,66 @@ public final class CloudExadataInfrastructurePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CloudExadataInfrastructureProperties model = BinaryData.fromString(
-            "{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":2044584540,\"mountPoint\":\"dagfuaxbezyiuok\"},{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":291798162,\"mountPoint\":\"zywqsmbsu\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1115871957,\"mountPoint\":\"ocfs\"}],\"ocid\":\"s\",\"computeCount\":1143177413,\"storageCount\":376493890,\"totalStorageSizeInGbs\":666664165,\"availableStorageSizeInGbs\":30564685,\"timeCreated\":\"uxh\",\"lifecycleDetails\":\"udxorrqn\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"December\"},{\"name\":\"January\"},{\"name\":\"January\"},{\"name\":\"April\"}],\"weeksOfMonth\":[1661944066],\"daysOfWeek\":[{\"name\":\"Wednesday\"},{\"name\":\"Monday\"},{\"name\":\"Monday\"}],\"hoursOfDay\":[952204067],\"leadTimeInWeeks\":31465947,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":1391003633,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":608072417,\"estimatedNetworkSwitchesPatchingTime\":1948903121,\"estimatedStorageServerPatchingTime\":825397815,\"totalEstimatedPatchingTime\":2143826704},\"customerContacts\":[{\"email\":\"ruwiqzbqjvsov\"},{\"email\":\"yokacspkw\"}],\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminating\",\"shape\":\"bpxjmfl\",\"ociUrl\":\"vnchrkcci\",\"cpuCount\":480188509,\"maxCpuCount\":970071122,\"memorySizeInGbs\":962380204,\"maxMemoryInGbs\":734048187,\"dbNodeStorageSizeInGbs\":1786560396,\"maxDbNodeStorageSizeInGbs\":2114864042,\"dataStorageSizeInTbs\":6.714905965653417,\"maxDataStorageInTbs\":77.08143476611616,\"dbServerVersion\":\"kg\",\"storageServerVersion\":\"auu\",\"activatedStorageCount\":1525008184,\"additionalStorageCount\":981074224,\"displayName\":\"xieduugidyjrr\",\"lastMaintenanceRunId\":\"y\",\"nextMaintenanceRunId\":\"svexcsonpclhoco\",\"monthlyDbServerVersion\":\"lkevle\",\"monthlyStorageServerVersion\":\"zfbuhf\",\"databaseServerType\":\"faxkffeii\",\"storageServerType\":\"lvmezyvshxmzsbbz\",\"computeModel\":\"ECPU\"}")
+            "{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":432282678,\"mountPoint\":\"flbvvnchrkcciwwz\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":330822059,\"mountPoint\":\"jiwkuofoskghsau\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":1194326763,\"mountPoint\":\"eduugi\"},{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":857489891,\"mountPoint\":\"aos\"}],\"ocid\":\"xc\",\"computeCount\":635298433,\"storageCount\":66931546,\"totalStorageSizeInGbs\":316608134,\"availableStorageSizeInGbs\":1879062252,\"timeCreated\":\"hslkevleggzf\",\"lifecycleDetails\":\"hfmvfaxkffe\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"February\"},{\"name\":\"November\"}],\"weeksOfMonth\":[72720177,2122365511],\"daysOfWeek\":[{\"name\":\"Monday\"},{\"name\":\"Friday\"},{\"name\":\"Tuesday\"}],\"hoursOfDay\":[2042967034,820071175,681165656],\"leadTimeInWeeks\":1542879301,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":2011180934,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1552581674,\"estimatedNetworkSwitchesPatchingTime\":2030028307,\"estimatedStorageServerPatchingTime\":1875025396,\"totalEstimatedPatchingTime\":655244901},\"customerContacts\":[{\"email\":\"koen\"}],\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Provisioning\",\"shape\":\"vudwtiukbldng\",\"ociUrl\":\"ocipazyxoeg\",\"cpuCount\":245724981,\"maxCpuCount\":1764023919,\"memorySizeInGbs\":799434019,\"maxMemoryInGbs\":1445231933,\"dbNodeStorageSizeInGbs\":2007054909,\"maxDbNodeStorageSizeInGbs\":846419016,\"dataStorageSizeInTbs\":39.61017052503307,\"maxDataStorageInTbs\":96.58484617586141,\"dbServerVersion\":\"mrbpizcdrqj\",\"storageServerVersion\":\"pyd\",\"activatedStorageCount\":1305817330,\"additionalStorageCount\":229483686,\"displayName\":\"de\",\"lastMaintenanceRunId\":\"jzicwifsjt\",\"nextMaintenanceRunId\":\"zfbishcbkhaj\",\"monthlyDbServerVersion\":\"yeamdphagalpb\",\"monthlyStorageServerVersion\":\"wgipwhono\",\"databaseServerType\":\"gshwankixz\",\"storageServerType\":\"njeputtmrywn\",\"computeModel\":\"OCPU\",\"exascaleConfig\":{\"totalStorageInGbs\":643142457,\"availableStorageInGbs\":1790198839}}")
             .toObject(CloudExadataInfrastructureProperties.class);
-        Assertions.assertEquals(1143177413, model.computeCount());
-        Assertions.assertEquals(376493890, model.storageCount());
+        Assertions.assertEquals(635298433, model.computeCount());
+        Assertions.assertEquals(66931546, model.storageCount());
         Assertions.assertEquals(Preference.NO_PREFERENCE, model.maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.DECEMBER, model.maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1661944066, model.maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(952204067, model.maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(31465947, model.maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(MonthName.FEBRUARY, model.maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(72720177, model.maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.MONDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
+        Assertions.assertEquals(2042967034, model.maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1542879301, model.maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.ROLLING, model.maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1391003633, model.maintenanceWindow().customActionTimeoutInMins());
-        Assertions.assertTrue(model.maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertEquals(2011180934, model.maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertFalse(model.maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertFalse(model.maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("ruwiqzbqjvsov", model.customerContacts().get(0).email());
-        Assertions.assertEquals("bpxjmfl", model.shape());
-        Assertions.assertEquals("xieduugidyjrr", model.displayName());
-        Assertions.assertEquals("faxkffeii", model.databaseServerType());
-        Assertions.assertEquals("lvmezyvshxmzsbbz", model.storageServerType());
+        Assertions.assertEquals("koen", model.customerContacts().get(0).email());
+        Assertions.assertEquals("vudwtiukbldng", model.shape());
+        Assertions.assertEquals("de", model.displayName());
+        Assertions.assertEquals("gshwankixz", model.databaseServerType());
+        Assertions.assertEquals("njeputtmrywn", model.storageServerType());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CloudExadataInfrastructureProperties model
-            = new CloudExadataInfrastructureProperties().withComputeCount(1143177413)
-                .withStorageCount(376493890)
-                .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
-                    .withMonths(
-                        Arrays.asList(new Month().withName(MonthName.DECEMBER), new Month().withName(MonthName.JANUARY),
-                            new Month().withName(MonthName.JANUARY), new Month().withName(MonthName.APRIL)))
-                    .withWeeksOfMonth(Arrays.asList(1661944066))
-                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.WEDNESDAY),
-                        new DayOfWeek().withName(DayOfWeekName.MONDAY), new DayOfWeek().withName(DayOfWeekName.MONDAY)))
-                    .withHoursOfDay(Arrays.asList(952204067))
-                    .withLeadTimeInWeeks(31465947)
-                    .withPatchingMode(PatchingMode.ROLLING)
-                    .withCustomActionTimeoutInMins(1391003633)
-                    .withIsCustomActionTimeoutEnabled(true)
-                    .withIsMonthlyPatchingEnabled(false))
-                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("ruwiqzbqjvsov"),
-                    new CustomerContact().withEmail("yokacspkw")))
-                .withShape("bpxjmfl")
-                .withDisplayName("xieduugidyjrr")
-                .withDatabaseServerType("faxkffeii")
-                .withStorageServerType("lvmezyvshxmzsbbz");
+        CloudExadataInfrastructureProperties model = new CloudExadataInfrastructureProperties()
+            .withComputeCount(635298433)
+            .withStorageCount(66931546)
+            .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
+                .withMonths(
+                    Arrays.asList(new Month().withName(MonthName.FEBRUARY), new Month().withName(MonthName.NOVEMBER)))
+                .withWeeksOfMonth(Arrays.asList(72720177, 2122365511))
+                .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.MONDAY),
+                    new DayOfWeek().withName(DayOfWeekName.FRIDAY), new DayOfWeek().withName(DayOfWeekName.TUESDAY)))
+                .withHoursOfDay(Arrays.asList(2042967034, 820071175, 681165656))
+                .withLeadTimeInWeeks(1542879301)
+                .withPatchingMode(PatchingMode.ROLLING)
+                .withCustomActionTimeoutInMins(2011180934)
+                .withIsCustomActionTimeoutEnabled(false)
+                .withIsMonthlyPatchingEnabled(false))
+            .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("koen")))
+            .withShape("vudwtiukbldng")
+            .withDisplayName("de")
+            .withDatabaseServerType("gshwankixz")
+            .withStorageServerType("njeputtmrywn");
         model = BinaryData.fromObject(model).toObject(CloudExadataInfrastructureProperties.class);
-        Assertions.assertEquals(1143177413, model.computeCount());
-        Assertions.assertEquals(376493890, model.storageCount());
+        Assertions.assertEquals(635298433, model.computeCount());
+        Assertions.assertEquals(66931546, model.storageCount());
         Assertions.assertEquals(Preference.NO_PREFERENCE, model.maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.DECEMBER, model.maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1661944066, model.maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(952204067, model.maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(31465947, model.maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(MonthName.FEBRUARY, model.maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(72720177, model.maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.MONDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
+        Assertions.assertEquals(2042967034, model.maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1542879301, model.maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.ROLLING, model.maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1391003633, model.maintenanceWindow().customActionTimeoutInMins());
-        Assertions.assertTrue(model.maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertEquals(2011180934, model.maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertFalse(model.maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertFalse(model.maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("ruwiqzbqjvsov", model.customerContacts().get(0).email());
-        Assertions.assertEquals("bpxjmfl", model.shape());
-        Assertions.assertEquals("xieduugidyjrr", model.displayName());
-        Assertions.assertEquals("faxkffeii", model.databaseServerType());
-        Assertions.assertEquals("lvmezyvshxmzsbbz", model.storageServerType());
+        Assertions.assertEquals("koen", model.customerContacts().get(0).email());
+        Assertions.assertEquals("vudwtiukbldng", model.shape());
+        Assertions.assertEquals("de", model.displayName());
+        Assertions.assertEquals("gshwankixz", model.databaseServerType());
+        Assertions.assertEquals("njeputtmrywn", model.storageServerType());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdatePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdatePropertiesTests.java
index 2b3f6f595722..e0d9b204897c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdatePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdatePropertiesTests.java
@@ -21,58 +21,60 @@ public final class CloudExadataInfrastructureUpdatePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CloudExadataInfrastructureUpdateProperties model = BinaryData.fromString(
-            "{\"computeCount\":2007375757,\"storageCount\":1079433286,\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"November\"}],\"weeksOfMonth\":[1399923471,585426916],\"daysOfWeek\":[{\"name\":\"Thursday\"},{\"name\":\"Monday\"},{\"name\":\"Friday\"},{\"name\":\"Wednesday\"}],\"hoursOfDay\":[1769488182,518689832],\"leadTimeInWeeks\":564919751,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":752212445,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"customerContacts\":[{\"email\":\"wlrsffrzpwv\"},{\"email\":\"qdqgbi\"}],\"displayName\":\"lihkaetcktvfc\"}")
+            "{\"computeCount\":175699877,\"storageCount\":1233954324,\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"December\"},{\"name\":\"December\"},{\"name\":\"December\"}],\"weeksOfMonth\":[1728715445,1381039739,1526069036],\"daysOfWeek\":[{\"name\":\"Tuesday\"},{\"name\":\"Wednesday\"},{\"name\":\"Wednesday\"}],\"hoursOfDay\":[64383308,1202809910],\"leadTimeInWeeks\":1251924272,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":567432535,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":true},\"customerContacts\":[{\"email\":\"uqqkpik\"},{\"email\":\"drgvtqagn\"},{\"email\":\"uynhijg\"},{\"email\":\"mebf\"}],\"displayName\":\"arbu\"}")
             .toObject(CloudExadataInfrastructureUpdateProperties.class);
-        Assertions.assertEquals(2007375757, model.computeCount());
-        Assertions.assertEquals(1079433286, model.storageCount());
+        Assertions.assertEquals(175699877, model.computeCount());
+        Assertions.assertEquals(1233954324, model.storageCount());
         Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.NOVEMBER, model.maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1399923471, model.maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.THURSDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(1769488182, model.maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(564919751, model.maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(MonthName.DECEMBER, model.maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(1728715445, model.maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.TUESDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
+        Assertions.assertEquals(64383308, model.maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1251924272, model.maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.ROLLING, model.maintenanceWindow().patchingMode());
-        Assertions.assertEquals(752212445, model.maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertEquals(567432535, model.maintenanceWindow().customActionTimeoutInMins());
         Assertions.assertFalse(model.maintenanceWindow().isCustomActionTimeoutEnabled());
-        Assertions.assertFalse(model.maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("wlrsffrzpwv", model.customerContacts().get(0).email());
-        Assertions.assertEquals("lihkaetcktvfc", model.displayName());
+        Assertions.assertTrue(model.maintenanceWindow().isMonthlyPatchingEnabled());
+        Assertions.assertEquals("uqqkpik", model.customerContacts().get(0).email());
+        Assertions.assertEquals("arbu", model.displayName());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         CloudExadataInfrastructureUpdateProperties model
-            = new CloudExadataInfrastructureUpdateProperties().withComputeCount(2007375757)
-                .withStorageCount(1079433286)
+            = new CloudExadataInfrastructureUpdateProperties().withComputeCount(175699877)
+                .withStorageCount(1233954324)
                 .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.CUSTOM_PREFERENCE)
-                    .withMonths(Arrays.asList(new Month().withName(MonthName.NOVEMBER)))
-                    .withWeeksOfMonth(Arrays.asList(1399923471, 585426916))
-                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.THURSDAY),
-                        new DayOfWeek().withName(DayOfWeekName.MONDAY), new DayOfWeek().withName(DayOfWeekName.FRIDAY),
+                    .withMonths(Arrays.asList(new Month().withName(MonthName.DECEMBER),
+                        new Month().withName(MonthName.DECEMBER), new Month().withName(MonthName.DECEMBER)))
+                    .withWeeksOfMonth(Arrays.asList(1728715445, 1381039739, 1526069036))
+                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.TUESDAY),
+                        new DayOfWeek().withName(DayOfWeekName.WEDNESDAY),
                         new DayOfWeek().withName(DayOfWeekName.WEDNESDAY)))
-                    .withHoursOfDay(Arrays.asList(1769488182, 518689832))
-                    .withLeadTimeInWeeks(564919751)
+                    .withHoursOfDay(Arrays.asList(64383308, 1202809910))
+                    .withLeadTimeInWeeks(1251924272)
                     .withPatchingMode(PatchingMode.ROLLING)
-                    .withCustomActionTimeoutInMins(752212445)
+                    .withCustomActionTimeoutInMins(567432535)
                     .withIsCustomActionTimeoutEnabled(false)
-                    .withIsMonthlyPatchingEnabled(false))
-                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("wlrsffrzpwv"),
-                    new CustomerContact().withEmail("qdqgbi")))
-                .withDisplayName("lihkaetcktvfc");
+                    .withIsMonthlyPatchingEnabled(true))
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("uqqkpik"),
+                    new CustomerContact().withEmail("drgvtqagn"), new CustomerContact().withEmail("uynhijg"),
+                    new CustomerContact().withEmail("mebf")))
+                .withDisplayName("arbu");
         model = BinaryData.fromObject(model).toObject(CloudExadataInfrastructureUpdateProperties.class);
-        Assertions.assertEquals(2007375757, model.computeCount());
-        Assertions.assertEquals(1079433286, model.storageCount());
+        Assertions.assertEquals(175699877, model.computeCount());
+        Assertions.assertEquals(1233954324, model.storageCount());
         Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.NOVEMBER, model.maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1399923471, model.maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.THURSDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(1769488182, model.maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(564919751, model.maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(MonthName.DECEMBER, model.maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(1728715445, model.maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.TUESDAY, model.maintenanceWindow().daysOfWeek().get(0).name());
+        Assertions.assertEquals(64383308, model.maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1251924272, model.maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.ROLLING, model.maintenanceWindow().patchingMode());
-        Assertions.assertEquals(752212445, model.maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertEquals(567432535, model.maintenanceWindow().customActionTimeoutInMins());
         Assertions.assertFalse(model.maintenanceWindow().isCustomActionTimeoutEnabled());
-        Assertions.assertFalse(model.maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("wlrsffrzpwv", model.customerContacts().get(0).email());
-        Assertions.assertEquals("lihkaetcktvfc", model.displayName());
+        Assertions.assertTrue(model.maintenanceWindow().isMonthlyPatchingEnabled());
+        Assertions.assertEquals("uqqkpik", model.customerContacts().get(0).email());
+        Assertions.assertEquals("arbu", model.displayName());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdateTests.java
index b5dae6ff8120..a1c1c26f27fe 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdateTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructureUpdateTests.java
@@ -24,70 +24,66 @@ public final class CloudExadataInfrastructureUpdateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         CloudExadataInfrastructureUpdate model = BinaryData.fromString(
-            "{\"zones\":[\"qzntypm\",\"bpizcdrqjsdpydn\",\"yhxdeoejzicwi\",\"sjttgzfbish\"],\"tags\":{\"alpbuxwgipwhon\":\"hajdeyeamdpha\"},\"properties\":{\"computeCount\":353771493,\"storageCount\":1714142157,\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"January\"},{\"name\":\"February\"},{\"name\":\"December\"},{\"name\":\"June\"}],\"weeksOfMonth\":[1868038426,491108548,1363231227],\"daysOfWeek\":[{\"name\":\"Sunday\"},{\"name\":\"Friday\"}],\"hoursOfDay\":[998969185,1563071511,2134987728,1133422967],\"leadTimeInWeeks\":643142457,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":1348586485,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"customerContacts\":[{\"email\":\"vyxlwhzlsicohoqq\"},{\"email\":\"wvl\"},{\"email\":\"yav\"},{\"email\":\"hheunmmqhgyx\"}],\"displayName\":\"onocukok\"}}")
+            "{\"zones\":[\"rmjmwvvjektc\",\"senhwlrs\",\"frzpwvlqdqgb\",\"qylihkaetckt\"],\"tags\":{\"m\":\"ivfsnk\",\"jf\":\"ctq\",\"fuwutttxf\":\"ebrjcxe\",\"hfnljkyq\":\"jrbirphxepcyv\"},\"properties\":{\"computeCount\":1640197955,\"storageCount\":9347197,\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"July\"}],\"weeksOfMonth\":[792619615,10143119],\"daysOfWeek\":[{\"name\":\"Sunday\"},{\"name\":\"Sunday\"}],\"hoursOfDay\":[784453000,384639682,1773557410,1059812914],\"leadTimeInWeeks\":1745548413,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1435851366,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"customerContacts\":[{\"email\":\"bijhtxfvgxbf\"},{\"email\":\"mxnehmp\"},{\"email\":\"ec\"}],\"displayName\":\"odebfqkkrbmpu\"}}")
             .toObject(CloudExadataInfrastructureUpdate.class);
-        Assertions.assertEquals("qzntypm", model.zones().get(0));
-        Assertions.assertEquals("hajdeyeamdpha", model.tags().get("alpbuxwgipwhon"));
-        Assertions.assertEquals(353771493, model.properties().computeCount());
-        Assertions.assertEquals(1714142157, model.properties().storageCount());
-        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.JANUARY, model.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1868038426, model.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals("rmjmwvvjektc", model.zones().get(0));
+        Assertions.assertEquals("ivfsnk", model.tags().get("m"));
+        Assertions.assertEquals(1640197955, model.properties().computeCount());
+        Assertions.assertEquals(9347197, model.properties().storageCount());
+        Assertions.assertEquals(Preference.NO_PREFERENCE, model.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.JULY, model.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(792619615, model.properties().maintenanceWindow().weeksOfMonth().get(0));
         Assertions.assertEquals(DayOfWeekName.SUNDAY,
             model.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(998969185, model.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(643142457, model.properties().maintenanceWindow().leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.ROLLING, model.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1348586485, model.properties().maintenanceWindow().customActionTimeoutInMins());
-        Assertions.assertTrue(model.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertEquals(784453000, model.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1745548413, model.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.NON_ROLLING, model.properties().maintenanceWindow().patchingMode());
+        Assertions.assertEquals(1435851366, model.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertFalse(model.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertFalse(model.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("vyxlwhzlsicohoqq", model.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("onocukok", model.properties().displayName());
+        Assertions.assertEquals("bijhtxfvgxbf", model.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("odebfqkkrbmpu", model.properties().displayName());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CloudExadataInfrastructureUpdate model
-            = new CloudExadataInfrastructureUpdate()
-                .withZones(Arrays.asList("qzntypm", "bpizcdrqjsdpydn", "yhxdeoejzicwi", "sjttgzfbish"))
-                .withTags(mapOf("alpbuxwgipwhon", "hajdeyeamdpha"))
-                .withProperties(new CloudExadataInfrastructureUpdateProperties().withComputeCount(353771493)
-                    .withStorageCount(1714142157)
-                    .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.CUSTOM_PREFERENCE)
-                        .withMonths(Arrays.asList(new Month().withName(MonthName.JANUARY),
-                            new Month().withName(MonthName.FEBRUARY), new Month().withName(MonthName.DECEMBER),
-                            new Month().withName(MonthName.JUNE)))
-                        .withWeeksOfMonth(Arrays.asList(1868038426, 491108548, 1363231227))
-                        .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.SUNDAY),
-                            new DayOfWeek().withName(DayOfWeekName.FRIDAY)))
-                        .withHoursOfDay(Arrays.asList(998969185, 1563071511, 2134987728, 1133422967))
-                        .withLeadTimeInWeeks(643142457)
-                        .withPatchingMode(PatchingMode.ROLLING)
-                        .withCustomActionTimeoutInMins(1348586485)
-                        .withIsCustomActionTimeoutEnabled(true)
-                        .withIsMonthlyPatchingEnabled(false))
-                    .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("vyxlwhzlsicohoqq"),
-                        new CustomerContact().withEmail("wvl"), new CustomerContact().withEmail("yav"),
-                        new CustomerContact().withEmail("hheunmmqhgyx")))
-                    .withDisplayName("onocukok"));
+        CloudExadataInfrastructureUpdate model = new CloudExadataInfrastructureUpdate()
+            .withZones(Arrays.asList("rmjmwvvjektc", "senhwlrs", "frzpwvlqdqgb", "qylihkaetckt"))
+            .withTags(mapOf("m", "ivfsnk", "jf", "ctq", "fuwutttxf", "ebrjcxe", "hfnljkyq", "jrbirphxepcyv"))
+            .withProperties(new CloudExadataInfrastructureUpdateProperties().withComputeCount(1640197955)
+                .withStorageCount(9347197)
+                .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
+                    .withMonths(Arrays.asList(new Month().withName(MonthName.JULY)))
+                    .withWeeksOfMonth(Arrays.asList(792619615, 10143119))
+                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.SUNDAY),
+                        new DayOfWeek().withName(DayOfWeekName.SUNDAY)))
+                    .withHoursOfDay(Arrays.asList(784453000, 384639682, 1773557410, 1059812914))
+                    .withLeadTimeInWeeks(1745548413)
+                    .withPatchingMode(PatchingMode.NON_ROLLING)
+                    .withCustomActionTimeoutInMins(1435851366)
+                    .withIsCustomActionTimeoutEnabled(false)
+                    .withIsMonthlyPatchingEnabled(false))
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("bijhtxfvgxbf"),
+                    new CustomerContact().withEmail("mxnehmp"), new CustomerContact().withEmail("ec")))
+                .withDisplayName("odebfqkkrbmpu"));
         model = BinaryData.fromObject(model).toObject(CloudExadataInfrastructureUpdate.class);
-        Assertions.assertEquals("qzntypm", model.zones().get(0));
-        Assertions.assertEquals("hajdeyeamdpha", model.tags().get("alpbuxwgipwhon"));
-        Assertions.assertEquals(353771493, model.properties().computeCount());
-        Assertions.assertEquals(1714142157, model.properties().storageCount());
-        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.JANUARY, model.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1868038426, model.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals("rmjmwvvjektc", model.zones().get(0));
+        Assertions.assertEquals("ivfsnk", model.tags().get("m"));
+        Assertions.assertEquals(1640197955, model.properties().computeCount());
+        Assertions.assertEquals(9347197, model.properties().storageCount());
+        Assertions.assertEquals(Preference.NO_PREFERENCE, model.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.JULY, model.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(792619615, model.properties().maintenanceWindow().weeksOfMonth().get(0));
         Assertions.assertEquals(DayOfWeekName.SUNDAY,
             model.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(998969185, model.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(643142457, model.properties().maintenanceWindow().leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.ROLLING, model.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1348586485, model.properties().maintenanceWindow().customActionTimeoutInMins());
-        Assertions.assertTrue(model.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertEquals(784453000, model.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1745548413, model.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.NON_ROLLING, model.properties().maintenanceWindow().patchingMode());
+        Assertions.assertEquals(1435851366, model.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertFalse(model.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertFalse(model.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("vyxlwhzlsicohoqq", model.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("onocukok", model.properties().displayName());
+        Assertions.assertEquals("bijhtxfvgxbf", model.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("odebfqkkrbmpu", model.properties().displayName());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacityMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacityMockTests.java
index f25007b9d0b1..a196307e7c42 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacityMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresAddStorageCapacityMockTests.java
@@ -25,7 +25,7 @@ public final class CloudExadataInfrastructuresAddStorageCapacityMockTests {
     @Test
     public void testAddStorageCapacity() throws Exception {
         String responseStr
-            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":182361785,\"mountPoint\":\"prhptillu\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1467633348,\"mountPoint\":\"ohmcwsld\"}],\"ocid\":\"zetpwbra\",\"computeCount\":1155046174,\"storageCount\":1996411708,\"totalStorageSizeInGbs\":1970354054,\"availableStorageSizeInGbs\":1461058147,\"timeCreated\":\"mizak\",\"lifecycleDetails\":\"ankjpdnjzh\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"December\"},{\"name\":\"June\"}],\"weeksOfMonth\":[2002582337],\"daysOfWeek\":[{\"name\":\"Sunday\"},{\"name\":\"Saturday\"},{\"name\":\"Monday\"}],\"hoursOfDay\":[2131634319,1631755461,2035956497],\"leadTimeInWeeks\":1942024435,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1554382719,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":749085962,\"estimatedNetworkSwitchesPatchingTime\":1672946681,\"estimatedStorageServerPatchingTime\":2018313749,\"totalEstimatedPatchingTime\":899027368},\"customerContacts\":[{\"email\":\"aumweoohguufu\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Terminating\",\"shape\":\"athwt\",\"ociUrl\":\"lbaemwmdxmeb\",\"cpuCount\":8048243,\"maxCpuCount\":120953176,\"memorySizeInGbs\":1124568750,\"maxMemoryInGbs\":140579702,\"dbNodeStorageSizeInGbs\":1860405842,\"maxDbNodeStorageSizeInGbs\":125446577,\"dataStorageSizeInTbs\":0.688981211046169,\"maxDataStorageInTbs\":54.2090184351919,\"dbServerVersion\":\"mqt\",\"storageServerVersion\":\"xyi\",\"activatedStorageCount\":462307774,\"additionalStorageCount\":460830566,\"displayName\":\"qcttadijaeukmrsi\",\"lastMaintenanceRunId\":\"kpn\",\"nextMaintenanceRunId\":\"aapm\",\"monthlyDbServerVersion\":\"qmeqwigpibudqwyx\",\"monthlyStorageServerVersion\":\"e\",\"databaseServerType\":\"pmzznrtffya\",\"storageServerType\":\"tmhheioqa\",\"computeModel\":\"ECPU\"},\"zones\":[\"eufuqyrxpdlcgql\",\"ismjqfrddgamqu\"],\"location\":\"os\",\"tags\":{\"irnxz\":\"uivfcdis\"},\"id\":\"czexrxzbujrtrhqv\",\"name\":\"revkhgnlnzo\",\"type\":\"zlrpiqywncvj\"}";
+            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":451973602,\"mountPoint\":\"hhtklnvnafvvkyfe\"},{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":705317709,\"mountPoint\":\"cqxypokkhminq\"},{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":331015750,\"mountPoint\":\"bdxxe\"}],\"ocid\":\"ninvudbchaqdt\",\"computeCount\":308339857,\"storageCount\":589842741,\"totalStorageSizeInGbs\":313351461,\"availableStorageSizeInGbs\":720636191,\"timeCreated\":\"xdtddmflhuytxzv\",\"lifecycleDetails\":\"napxbannovv\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"February\"},{\"name\":\"August\"}],\"weeksOfMonth\":[1788406883,451158053,1584430006,457437874],\"daysOfWeek\":[{\"name\":\"Monday\"},{\"name\":\"Friday\"},{\"name\":\"Tuesday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[589113457,1862922267],\"leadTimeInWeeks\":67510907,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1321738154,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":810647712,\"estimatedNetworkSwitchesPatchingTime\":1326881009,\"estimatedStorageServerPatchingTime\":1031456845,\"totalEstimatedPatchingTime\":1975991801},\"customerContacts\":[{\"email\":\"klobdxnazpmk\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"shape\":\"vfxzopjh\",\"ociUrl\":\"xliohrdddt\",\"cpuCount\":1812415709,\"maxCpuCount\":354945221,\"memorySizeInGbs\":530417864,\"maxMemoryInGbs\":540353819,\"dbNodeStorageSizeInGbs\":796010051,\"maxDbNodeStorageSizeInGbs\":2068748786,\"dataStorageSizeInTbs\":82.81682706563538,\"maxDataStorageInTbs\":26.268060074478605,\"dbServerVersion\":\"qofyuicdhzbdy\",\"storageServerVersion\":\"wgbdvibidmhmwffp\",\"activatedStorageCount\":1436158527,\"additionalStorageCount\":1159295504,\"displayName\":\"apckccrrvw\",\"lastMaintenanceRunId\":\"oxoyyukp\",\"nextMaintenanceRunId\":\"immoiroqboshbrag\",\"monthlyDbServerVersion\":\"yyrmfsvbp\",\"monthlyStorageServerVersion\":\"bopfppdbwnup\",\"databaseServerType\":\"hxkumasjcaacfdmm\",\"storageServerType\":\"ugmehqepvufhbze\",\"computeModel\":\"OCPU\",\"exascaleConfig\":{\"totalStorageInGbs\":1514485818,\"availableStorageInGbs\":574841417}},\"zones\":[\"lbqnbldxeacl\",\"schori\",\"krsrrmoucs\",\"fldpuviyfc\"],\"location\":\"beolh\",\"tags\":{\"kcudfbsfarfsiowl\":\"vbmxuqibsx\",\"wgfstmhqykizm\":\"jxnqp\",\"ycjimryvwgcwwpbm\":\"ksaoafcluqvox\",\"ydsx\":\"gwe\"},\"id\":\"efoh\",\"name\":\"cbvopwndyqleallk\",\"type\":\"mtkhlowkxxpvbr\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,29 +34,29 @@ public void testAddStorageCapacity() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        CloudExadataInfrastructure response
-            = manager.cloudExadataInfrastructures().addStorageCapacity("smkss", "h", com.azure.core.util.Context.NONE);
+        CloudExadataInfrastructure response = manager.cloudExadataInfrastructures()
+            .addStorageCapacity("ogwxhnsduugwb", "reur", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("os", response.location());
-        Assertions.assertEquals("uivfcdis", response.tags().get("irnxz"));
-        Assertions.assertEquals(1155046174, response.properties().computeCount());
-        Assertions.assertEquals(1996411708, response.properties().storageCount());
-        Assertions.assertEquals(Preference.NO_PREFERENCE, response.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.DECEMBER, response.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(2002582337, response.properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.SUNDAY,
+        Assertions.assertEquals("beolh", response.location());
+        Assertions.assertEquals("vbmxuqibsx", response.tags().get("kcudfbsfarfsiowl"));
+        Assertions.assertEquals(308339857, response.properties().computeCount());
+        Assertions.assertEquals(589842741, response.properties().storageCount());
+        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, response.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.FEBRUARY, response.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(1788406883, response.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.MONDAY,
             response.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(2131634319, response.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(1942024435, response.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(589113457, response.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(67510907, response.properties().maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.NON_ROLLING, response.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1554382719, response.properties().maintenanceWindow().customActionTimeoutInMins());
-        Assertions.assertFalse(response.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
-        Assertions.assertFalse(response.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("aumweoohguufu", response.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("athwt", response.properties().shape());
-        Assertions.assertEquals("qcttadijaeukmrsi", response.properties().displayName());
-        Assertions.assertEquals("pmzznrtffya", response.properties().databaseServerType());
-        Assertions.assertEquals("tmhheioqa", response.properties().storageServerType());
-        Assertions.assertEquals("eufuqyrxpdlcgql", response.zones().get(0));
+        Assertions.assertEquals(1321738154, response.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertTrue(response.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertTrue(response.properties().maintenanceWindow().isMonthlyPatchingEnabled());
+        Assertions.assertEquals("klobdxnazpmk", response.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("vfxzopjh", response.properties().shape());
+        Assertions.assertEquals("apckccrrvw", response.properties().displayName());
+        Assertions.assertEquals("hxkumasjcaacfdmm", response.properties().databaseServerType());
+        Assertions.assertEquals("ugmehqepvufhbze", response.properties().storageServerType());
+        Assertions.assertEquals("lbqnbldxeacl", response.zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresConfigureExascaleMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresConfigureExascaleMockTests.java
new file mode 100644
index 000000000000..00590fd3b7e5
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresConfigureExascaleMockTests.java
@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.CloudExadataInfrastructure;
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
+import com.azure.resourcemanager.oracledatabase.models.DayOfWeekName;
+import com.azure.resourcemanager.oracledatabase.models.MonthName;
+import com.azure.resourcemanager.oracledatabase.models.PatchingMode;
+import com.azure.resourcemanager.oracledatabase.models.Preference;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class CloudExadataInfrastructuresConfigureExascaleMockTests {
+    @Test
+    public void testConfigureExascale() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":1171634090,\"mountPoint\":\"icphvtrrmhw\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":256145081,\"mountPoint\":\"ubhvj\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1104352328,\"mountPoint\":\"lw\"}],\"ocid\":\"memhooclutnpq\",\"computeCount\":1579133253,\"storageCount\":978013329,\"totalStorageSizeInGbs\":1328694478,\"availableStorageSizeInGbs\":865152185,\"timeCreated\":\"kyujxsglhsrrr\",\"lifecycleDetails\":\"jylmbkzudnigr\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"August\"},{\"name\":\"January\"},{\"name\":\"November\"}],\"weeksOfMonth\":[349681251,1513568409,289344898],\"daysOfWeek\":[{\"name\":\"Saturday\"},{\"name\":\"Thursday\"},{\"name\":\"Monday\"}],\"hoursOfDay\":[1865358517,753839837],\"leadTimeInWeeks\":2143800860,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":1185666084,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":2061594635,\"estimatedNetworkSwitchesPatchingTime\":430469096,\"estimatedStorageServerPatchingTime\":1733569114,\"totalEstimatedPatchingTime\":995984285},\"customerContacts\":[{\"email\":\"dqtvhcsp\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"shape\":\"xsi\",\"ociUrl\":\"etgbebjfulb\",\"cpuCount\":1731116741,\"maxCpuCount\":239290276,\"memorySizeInGbs\":796050147,\"maxMemoryInGbs\":816539003,\"dbNodeStorageSizeInGbs\":339595762,\"maxDbNodeStorageSizeInGbs\":160209701,\"dataStorageSizeInTbs\":49.53742534557637,\"maxDataStorageInTbs\":86.99459131476785,\"dbServerVersion\":\"viqsowsaaelcattc\",\"storageServerVersion\":\"hplrvkmjcwmjvlg\",\"activatedStorageCount\":2110078268,\"additionalStorageCount\":1459066733,\"displayName\":\"kyylizr\",\"lastMaintenanceRunId\":\"jpsfxsfu\",\"nextMaintenanceRunId\":\"lvt\",\"monthlyDbServerVersion\":\"agb\",\"monthlyStorageServerVersion\":\"dqlvhukoveof\",\"databaseServerType\":\"rvjfnmjmvlw\",\"storageServerType\":\"giblkujrllf\",\"computeModel\":\"OCPU\",\"exascaleConfig\":{\"totalStorageInGbs\":558783309,\"availableStorageInGbs\":615136855}},\"zones\":[\"uyjucejikzo\",\"ovvtzejetjkln\",\"ikyju\"],\"location\":\"dbqzolxrzvhqjw\",\"tags\":{\"rrkolawjmjs\":\"tgvgzp\"},\"id\":\"wro\",\"name\":\"cdxfzzzwyjafitl\",\"type\":\"guyn\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        CloudExadataInfrastructure response = manager.cloudExadataInfrastructures()
+            .configureExascale("fjmzsyzfho", "lhikcyychunsj",
+                new ConfigureExascaleCloudExadataInfrastructureDetails().withTotalStorageInGbs(1472348146),
+                com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("dbqzolxrzvhqjw", response.location());
+        Assertions.assertEquals("tgvgzp", response.tags().get("rrkolawjmjs"));
+        Assertions.assertEquals(1579133253, response.properties().computeCount());
+        Assertions.assertEquals(978013329, response.properties().storageCount());
+        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, response.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.AUGUST, response.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(349681251, response.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.SATURDAY,
+            response.properties().maintenanceWindow().daysOfWeek().get(0).name());
+        Assertions.assertEquals(1865358517, response.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(2143800860, response.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.ROLLING, response.properties().maintenanceWindow().patchingMode());
+        Assertions.assertEquals(1185666084, response.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertFalse(response.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertFalse(response.properties().maintenanceWindow().isMonthlyPatchingEnabled());
+        Assertions.assertEquals("dqtvhcsp", response.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("xsi", response.properties().shape());
+        Assertions.assertEquals("kyylizr", response.properties().displayName());
+        Assertions.assertEquals("rvjfnmjmvlw", response.properties().databaseServerType());
+        Assertions.assertEquals("giblkujrllf", response.properties().storageServerType());
+        Assertions.assertEquals("uyjucejikzo", response.zones().get(0));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateMockTests.java
index e130d21de646..b5e61f61fbf1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresCreateOrUpdateMockTests.java
@@ -33,7 +33,7 @@ public final class CloudExadataInfrastructuresCreateOrUpdateMockTests {
     @Test
     public void testCreateOrUpdate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":497291047,\"mountPoint\":\"nptfujgi\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":2031389525,\"mountPoint\":\"taqutdewem\"},{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":140983404,\"mountPoint\":\"zzjgehkfki\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1844192797,\"mountPoint\":\"fqyinljqepqw\"}],\"ocid\":\"xmonstshi\",\"computeCount\":1369464715,\"storageCount\":211589475,\"totalStorageSizeInGbs\":1196099059,\"availableStorageSizeInGbs\":1732481769,\"timeCreated\":\"uccbirdsvuw\",\"lifecycleDetails\":\"b\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"July\"},{\"name\":\"December\"},{\"name\":\"May\"},{\"name\":\"October\"}],\"weeksOfMonth\":[2100756233,1305077670],\"daysOfWeek\":[{\"name\":\"Thursday\"},{\"name\":\"Sunday\"},{\"name\":\"Monday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[403294934],\"leadTimeInWeeks\":884114239,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":428803930,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":934679534,\"estimatedNetworkSwitchesPatchingTime\":1588574812,\"estimatedStorageServerPatchingTime\":1178102371,\"totalEstimatedPatchingTime\":411885173},\"customerContacts\":[{\"email\":\"ycucrwnamikzeb\"},{\"email\":\"qbsms\"},{\"email\":\"ziqgfuh\"},{\"email\":\"kzruswh\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Available\",\"shape\":\"n\",\"ociUrl\":\"bycjsxjwwix\",\"cpuCount\":156341242,\"maxCpuCount\":1790440808,\"memorySizeInGbs\":1286205076,\"maxMemoryInGbs\":1685347257,\"dbNodeStorageSizeInGbs\":1978421071,\"maxDbNodeStorageSizeInGbs\":1385229994,\"dataStorageSizeInTbs\":40.05324193033235,\"maxDataStorageInTbs\":89.90167363208273,\"dbServerVersion\":\"haohdjhhflzokxc\",\"storageServerVersion\":\"pelnjetag\",\"activatedStorageCount\":1066573650,\"additionalStorageCount\":1886970927,\"displayName\":\"atftgzpnpbsw\",\"lastMaintenanceRunId\":\"floccsrmozih\",\"nextMaintenanceRunId\":\"pgawtxxpkyjcxcjx\",\"monthlyDbServerVersion\":\"ytfmpc\",\"monthlyStorageServerVersion\":\"ilrmcaykggnox\",\"databaseServerType\":\"t\",\"storageServerType\":\"sxwpndfcpfnznthj\",\"computeModel\":\"OCPU\"},\"zones\":[\"aosrxuz\",\"oamktcq\",\"os\"],\"location\":\"bzahgxqd\",\"tags\":{\"ap\":\"tlt\",\"oqeq\":\"ltzkatbhjmznnb\"},\"id\":\"larvlagunbtg\",\"name\":\"ebwlnbmhyreeudzq\",\"type\":\"vbpdqmjxlyyzglgo\"}";
+            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":2106682244,\"mountPoint\":\"k\"}],\"ocid\":\"ve\",\"computeCount\":789888473,\"storageCount\":1201328527,\"totalStorageSizeInGbs\":664192070,\"availableStorageSizeInGbs\":133046174,\"timeCreated\":\"rnfxtgddp\",\"lifecycleDetails\":\"hehnmnaoya\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"March\"},{\"name\":\"July\"},{\"name\":\"September\"},{\"name\":\"January\"}],\"weeksOfMonth\":[41999694,2076319922],\"daysOfWeek\":[{\"name\":\"Tuesday\"},{\"name\":\"Tuesday\"},{\"name\":\"Wednesday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[769796066,1705440283],\"leadTimeInWeeks\":673142894,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":750712079,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1025559588,\"estimatedNetworkSwitchesPatchingTime\":718100150,\"estimatedStorageServerPatchingTime\":1431974621,\"totalEstimatedPatchingTime\":13572541},\"customerContacts\":[{\"email\":\"eeczgfbu\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"MaintenanceInProgress\",\"shape\":\"s\",\"ociUrl\":\"blycsxzujksr\",\"cpuCount\":1416694484,\"maxCpuCount\":1476026923,\"memorySizeInGbs\":2007657169,\"maxMemoryInGbs\":1385495234,\"dbNodeStorageSizeInGbs\":240034814,\"maxDbNodeStorageSizeInGbs\":1725604269,\"dataStorageSizeInTbs\":62.25711902969204,\"maxDataStorageInTbs\":10.052213521418807,\"dbServerVersion\":\"dyvt\",\"storageServerVersion\":\"wxvgpiudeugfsxze\",\"activatedStorageCount\":1024094635,\"additionalStorageCount\":1582290810,\"displayName\":\"kufykhvu\",\"lastMaintenanceRunId\":\"epmrut\",\"nextMaintenanceRunId\":\"abaobnslujdjltym\",\"monthlyDbServerVersion\":\"vguihywar\",\"monthlyStorageServerVersion\":\"pphkixkykxds\",\"databaseServerType\":\"pemmucfxhik\",\"storageServerType\":\"lrmymyincqlhri\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":1018402550,\"availableStorageInGbs\":521413145}},\"zones\":[\"ovgqcgxuugqkctot\"],\"location\":\"wlxte\",\"tags\":{\"anblwphqlkccu\":\"tjgwdtguk\",\"iul\":\"gygqwah\"},\"id\":\"gniiprglvaw\",\"name\":\"wzdufypivlsbb\",\"type\":\"pmcubkmifoxxkub\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -43,55 +43,51 @@ public void testCreateOrUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CloudExadataInfrastructure response = manager.cloudExadataInfrastructures()
-            .define("wcltyjede")
-            .withRegion("n")
-            .withExistingResourceGroup("cpopmxel")
-            .withZones(Arrays.asList("snvpdibmi", "ostbzbkiwb"))
-            .withTags(
-                mapOf("nezzcezelfwyfwlw", "hzfylsgcrpfbc", "zvaylptrsqqw", "jwetnpsihcla", "waxfewzjkj", "tcmwqkchc"))
-            .withProperties(new CloudExadataInfrastructureProperties().withComputeCount(967398069)
-                .withStorageCount(1448410077)
+            .define("mltx")
+            .withRegion("rseqwjksghudgz")
+            .withExistingResourceGroup("chl")
+            .withZones(Arrays.asList("bbmpxdlvykfre"))
+            .withTags(mapOf("u", "gjggsv", "kmdyomkxfbvfbh", "kxibdafh", "rhpw", "y", "o", "gddeimaw"))
+            .withProperties(new CloudExadataInfrastructureProperties().withComputeCount(1282661494)
+                .withStorageCount(369643942)
                 .withMaintenanceWindow(new MaintenanceWindow().withPreference(Preference.NO_PREFERENCE)
-                    .withMonths(Arrays.asList(new Month().withName(MonthName.MAY)))
-                    .withWeeksOfMonth(Arrays.asList(669649169, 1331204401, 1461231451, 351004258))
-                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.SATURDAY),
-                        new DayOfWeek().withName(DayOfWeekName.SATURDAY),
-                        new DayOfWeek().withName(DayOfWeekName.SUNDAY)))
-                    .withHoursOfDay(Arrays.asList(488941852, 414360047))
-                    .withLeadTimeInWeeks(1016884622)
-                    .withPatchingMode(PatchingMode.ROLLING)
-                    .withCustomActionTimeoutInMins(1417437720)
-                    .withIsCustomActionTimeoutEnabled(false)
+                    .withMonths(Arrays.asList(new Month().withName(MonthName.DECEMBER)))
+                    .withWeeksOfMonth(Arrays.asList(1605415287, 60991993, 1628791507))
+                    .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.FRIDAY)))
+                    .withHoursOfDay(Arrays.asList(224237712, 105087140, 496590668, 755954714))
+                    .withLeadTimeInWeeks(1031040752)
+                    .withPatchingMode(PatchingMode.NON_ROLLING)
+                    .withCustomActionTimeoutInMins(283342736)
+                    .withIsCustomActionTimeoutEnabled(true)
                     .withIsMonthlyPatchingEnabled(true))
-                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("ibg"),
-                    new CustomerContact().withEmail("xgnxfyqonmpqoxwd")))
-                .withShape("iqxeiiqbimht")
-                .withDisplayName("jfelisdjubggbqig")
-                .withDatabaseServerType("jed")
-                .withStorageServerType("tkvnlvxbcuiiznkt"))
+                .withCustomerContacts(Arrays.asList(new CustomerContact().withEmail("gj")))
+                .withShape("irwgdnqzbrf")
+                .withDisplayName("cxnmskwhqjjyslu")
+                .withDatabaseServerType("rrleaesinuqt")
+                .withStorageServerType("qobbpihehcec"))
             .create();
 
-        Assertions.assertEquals("bzahgxqd", response.location());
-        Assertions.assertEquals("tlt", response.tags().get("ap"));
-        Assertions.assertEquals(1369464715, response.properties().computeCount());
-        Assertions.assertEquals(211589475, response.properties().storageCount());
-        Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, response.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.JULY, response.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(2100756233, response.properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.THURSDAY,
+        Assertions.assertEquals("wlxte", response.location());
+        Assertions.assertEquals("tjgwdtguk", response.tags().get("anblwphqlkccu"));
+        Assertions.assertEquals(789888473, response.properties().computeCount());
+        Assertions.assertEquals(1201328527, response.properties().storageCount());
+        Assertions.assertEquals(Preference.NO_PREFERENCE, response.properties().maintenanceWindow().preference());
+        Assertions.assertEquals(MonthName.MARCH, response.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(41999694, response.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.TUESDAY,
             response.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(403294934, response.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(884114239, response.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(769796066, response.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(673142894, response.properties().maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.ROLLING, response.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(428803930, response.properties().maintenanceWindow().customActionTimeoutInMins());
-        Assertions.assertFalse(response.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertEquals(750712079, response.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertTrue(response.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertTrue(response.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("ycucrwnamikzeb", response.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("n", response.properties().shape());
-        Assertions.assertEquals("atftgzpnpbsw", response.properties().displayName());
-        Assertions.assertEquals("t", response.properties().databaseServerType());
-        Assertions.assertEquals("sxwpndfcpfnznthj", response.properties().storageServerType());
-        Assertions.assertEquals("aosrxuz", response.zones().get(0));
+        Assertions.assertEquals("eeczgfbu", response.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("s", response.properties().shape());
+        Assertions.assertEquals("kufykhvu", response.properties().displayName());
+        Assertions.assertEquals("pemmucfxhik", response.properties().databaseServerType());
+        Assertions.assertEquals("lrmymyincqlhri", response.properties().storageServerType());
+        Assertions.assertEquals("ovgqcgxuugqkctot", response.zones().get(0));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupWithResponseMockTests.java
index 9d89e536d63f..993763268c42 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresGetByResourceGroupWithResponseMockTests.java
@@ -25,7 +25,7 @@ public final class CloudExadataInfrastructuresGetByResourceGroupWithResponseMock
     @Test
     public void testGetByResourceGroupWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":575797032,\"mountPoint\":\"v\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":24644358,\"mountPoint\":\"keifzzhmkdasv\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":432756215,\"mountPoint\":\"dchxgsrboldfor\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":998979559,\"mountPoint\":\"bfhfovvacqp\"}],\"ocid\":\"uodxesza\",\"computeCount\":1654037219,\"storageCount\":1797957614,\"totalStorageSizeInGbs\":2002905028,\"availableStorageSizeInGbs\":308639473,\"timeCreated\":\"slzkwrrwoycqu\",\"lifecycleDetails\":\"yhahnomdrkyw\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"October\"},{\"name\":\"November\"},{\"name\":\"November\"}],\"weeksOfMonth\":[1702145471,502695723,1783251204,1188948288],\"daysOfWeek\":[{\"name\":\"Wednesday\"},{\"name\":\"Wednesday\"},{\"name\":\"Sunday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[2141850057,116262403],\"leadTimeInWeeks\":1599319524,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1705044964,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":2090759507,\"estimatedNetworkSwitchesPatchingTime\":883576169,\"estimatedStorageServerPatchingTime\":255810244,\"totalEstimatedPatchingTime\":55723460},\"customerContacts\":[{\"email\":\"zyvli\"},{\"email\":\"q\"},{\"email\":\"rkcxkj\"},{\"email\":\"bn\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"MaintenanceInProgress\",\"shape\":\"xs\",\"ociUrl\":\"rntvlwijp\",\"cpuCount\":169879542,\"maxCpuCount\":1924013089,\"memorySizeInGbs\":246018660,\"maxMemoryInGbs\":382801077,\"dbNodeStorageSizeInGbs\":1761852553,\"maxDbNodeStorageSizeInGbs\":1230489128,\"dataStorageSizeInTbs\":59.37275961543765,\"maxDataStorageInTbs\":75.47673620969648,\"dbServerVersion\":\"cuwmqsp\",\"storageServerVersion\":\"dqzh\",\"activatedStorageCount\":1980287093,\"additionalStorageCount\":1365011291,\"displayName\":\"unqndyfpchrqb\",\"lastMaintenanceRunId\":\"jrcg\",\"nextMaintenanceRunId\":\"ydcwboxjumv\",\"monthlyDbServerVersion\":\"olihrra\",\"monthlyStorageServerVersion\":\"uaubrj\",\"databaseServerType\":\"oq\",\"storageServerType\":\"uojrngiflr\",\"computeModel\":\"ECPU\"},\"zones\":[\"ccbiuimzdlyjdfq\",\"mkyoqufdvruzsl\",\"ojhp\"],\"location\":\"fnmdxotn\",\"tags\":{\"i\":\"gugey\"},\"id\":\"grkyuizabsnmfpph\",\"name\":\"jee\",\"type\":\"yhyhsgzfczb\"}";
+            = "{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":833975977,\"mountPoint\":\"auxofshfph\"}],\"ocid\":\"nulaiywzejywhsl\",\"computeCount\":2105999737,\"storageCount\":1709096498,\"totalStorageSizeInGbs\":157420871,\"availableStorageSizeInGbs\":444812162,\"timeCreated\":\"pdwrpqafgfugsn\",\"lifecycleDetails\":\"hyet\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"March\"}],\"weeksOfMonth\":[1012855702,1575776706],\"daysOfWeek\":[{\"name\":\"Sunday\"}],\"hoursOfDay\":[1163986546,597638958],\"leadTimeInWeeks\":1870960882,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":2014891569,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":188673440,\"estimatedNetworkSwitchesPatchingTime\":1927248982,\"estimatedStorageServerPatchingTime\":544390704,\"totalEstimatedPatchingTime\":1633694520},\"customerContacts\":[{\"email\":\"ionszonwp\"}],\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminating\",\"shape\":\"n\",\"ociUrl\":\"xjawrt\",\"cpuCount\":968564059,\"maxCpuCount\":1250352030,\"memorySizeInGbs\":1418512133,\"maxMemoryInGbs\":1315835072,\"dbNodeStorageSizeInGbs\":1048232639,\"maxDbNodeStorageSizeInGbs\":1400866339,\"dataStorageSizeInTbs\":3.2587933902541,\"maxDataStorageInTbs\":89.16949382859644,\"dbServerVersion\":\"henlusfnr\",\"storageServerVersion\":\"jxtxrdc\",\"activatedStorageCount\":1970813350,\"additionalStorageCount\":109325859,\"displayName\":\"dt\",\"lastMaintenanceRunId\":\"epu\",\"nextMaintenanceRunId\":\"vyjtcvu\",\"monthlyDbServerVersion\":\"asiz\",\"monthlyStorageServerVersion\":\"sfuughtuqfecjx\",\"databaseServerType\":\"gtuhxuicbu\",\"storageServerType\":\"mr\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":397140554,\"availableStorageInGbs\":1405699851}},\"zones\":[\"rhwpus\",\"jbaqehgpdoh\"],\"location\":\"qatucoigebxnc\",\"tags\":{\"jgcgbjbgdlfgtdys\":\"epbnwgfm\",\"zjrwdkqze\":\"aquflqbctqha\",\"fza\":\"yjleziunjx\",\"eg\":\"tkw\"},\"id\":\"amlbnseqacjjvpil\",\"name\":\"uooqjagmdit\",\"type\":\"ueio\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -35,29 +35,29 @@ public void testGetByResourceGroupWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         CloudExadataInfrastructure response = manager.cloudExadataInfrastructures()
-            .getByResourceGroupWithResponse("lvidizozs", "bccxjmonfdgn", com.azure.core.util.Context.NONE)
+            .getByResourceGroupWithResponse("mtdherngb", "c", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("fnmdxotn", response.location());
-        Assertions.assertEquals("gugey", response.tags().get("i"));
-        Assertions.assertEquals(1654037219, response.properties().computeCount());
-        Assertions.assertEquals(1797957614, response.properties().storageCount());
+        Assertions.assertEquals("qatucoigebxnc", response.location());
+        Assertions.assertEquals("epbnwgfm", response.tags().get("jgcgbjbgdlfgtdys"));
+        Assertions.assertEquals(2105999737, response.properties().computeCount());
+        Assertions.assertEquals(1709096498, response.properties().storageCount());
         Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, response.properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.OCTOBER, response.properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1702145471, response.properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY,
+        Assertions.assertEquals(MonthName.MARCH, response.properties().maintenanceWindow().months().get(0).name());
+        Assertions.assertEquals(1012855702, response.properties().maintenanceWindow().weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.SUNDAY,
             response.properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(2141850057, response.properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(1599319524, response.properties().maintenanceWindow().leadTimeInWeeks());
+        Assertions.assertEquals(1163986546, response.properties().maintenanceWindow().hoursOfDay().get(0));
+        Assertions.assertEquals(1870960882, response.properties().maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.NON_ROLLING, response.properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1705044964, response.properties().maintenanceWindow().customActionTimeoutInMins());
+        Assertions.assertEquals(2014891569, response.properties().maintenanceWindow().customActionTimeoutInMins());
         Assertions.assertFalse(response.properties().maintenanceWindow().isCustomActionTimeoutEnabled());
-        Assertions.assertFalse(response.properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("zyvli", response.properties().customerContacts().get(0).email());
-        Assertions.assertEquals("xs", response.properties().shape());
-        Assertions.assertEquals("unqndyfpchrqb", response.properties().displayName());
-        Assertions.assertEquals("oq", response.properties().databaseServerType());
-        Assertions.assertEquals("uojrngiflr", response.properties().storageServerType());
-        Assertions.assertEquals("ccbiuimzdlyjdfq", response.zones().get(0));
+        Assertions.assertTrue(response.properties().maintenanceWindow().isMonthlyPatchingEnabled());
+        Assertions.assertEquals("ionszonwp", response.properties().customerContacts().get(0).email());
+        Assertions.assertEquals("n", response.properties().shape());
+        Assertions.assertEquals("dt", response.properties().displayName());
+        Assertions.assertEquals("gtuhxuicbu", response.properties().databaseServerType());
+        Assertions.assertEquals("mr", response.properties().storageServerType());
+        Assertions.assertEquals("rhwpus", response.zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupMockTests.java
index 36f8fd010a40..9e023af2b473 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListByResourceGroupMockTests.java
@@ -26,7 +26,7 @@ public final class CloudExadataInfrastructuresListByResourceGroupMockTests {
     @Test
     public void testListByResourceGroup() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":416708927,\"mountPoint\":\"xeeebtijvacvbmqz\"}],\"ocid\":\"q\",\"computeCount\":498607950,\"storageCount\":2093325150,\"totalStorageSizeInGbs\":99469711,\"availableStorageSizeInGbs\":799727678,\"timeCreated\":\"evehjkuyxoaf\",\"lifecycleDetails\":\"oqltfae\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"February\"},{\"name\":\"January\"},{\"name\":\"December\"},{\"name\":\"February\"}],\"weeksOfMonth\":[497715430,1446560637,1536245403,2125141991],\"daysOfWeek\":[{\"name\":\"Saturday\"},{\"name\":\"Thursday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[677707515,761412131,98815164],\"leadTimeInWeeks\":370083816,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":70706634,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":184808617,\"estimatedNetworkSwitchesPatchingTime\":229847887,\"estimatedStorageServerPatchingTime\":390291796,\"totalEstimatedPatchingTime\":1994491974},\"customerContacts\":[{\"email\":\"dfuxtya\"},{\"email\":\"iibmi\"}],\"provisioningState\":\"Failed\",\"lifecycleState\":\"Provisioning\",\"shape\":\"stgnl\",\"ociUrl\":\"nmgixh\",\"cpuCount\":331597501,\"maxCpuCount\":27658455,\"memorySizeInGbs\":1356013965,\"maxMemoryInGbs\":1277274936,\"dbNodeStorageSizeInGbs\":308634203,\"maxDbNodeStorageSizeInGbs\":1053565042,\"dataStorageSizeInTbs\":54.6522864099499,\"maxDataStorageInTbs\":20.421445323330023,\"dbServerVersion\":\"twypundmbxh\",\"storageServerVersion\":\"cmjkavlgorbmftpm\",\"activatedStorageCount\":1503356934,\"additionalStorageCount\":1649651263,\"displayName\":\"ltfvnz\",\"lastMaintenanceRunId\":\"jtotpvopvpbd\",\"nextMaintenanceRunId\":\"qgqqihedsvqwthmk\",\"monthlyDbServerVersion\":\"bcysih\",\"monthlyStorageServerVersion\":\"qcwdhoh\",\"databaseServerType\":\"tmcdzsufcohd\",\"storageServerType\":\"zlmcmuapcvhdb\",\"computeModel\":\"OCPU\"},\"zones\":[\"qxeysko\",\"qzinkfkbg\",\"z\"],\"location\":\"wxeqocljmygvkzqk\",\"tags\":{\"zrxcczurt\":\"okbzef\",\"pqxbkwvzgnzvdf\":\"e\"},\"id\":\"zdix\",\"name\":\"mqpnoda\",\"type\":\"opqhewjptmc\"}]}";
+            = "{\"value\":[{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":317625705,\"mountPoint\":\"slmot\"},{\"isBackupPartition\":false,\"isResizable\":false,\"minSizeGb\":49810118,\"mountPoint\":\"vcjkgd\"}],\"ocid\":\"azftxejwabmdujtm\",\"computeCount\":271162273,\"storageCount\":1046719550,\"totalStorageSizeInGbs\":206055715,\"availableStorageSizeInGbs\":1931798752,\"timeCreated\":\"rbuhhlky\",\"lifecycleDetails\":\"tqsrogtuwkff\",\"maintenanceWindow\":{\"preference\":\"NoPreference\",\"months\":[{\"name\":\"May\"},{\"name\":\"July\"},{\"name\":\"March\"}],\"weeksOfMonth\":[122155375,1946092516,259560415],\"daysOfWeek\":[{\"name\":\"Tuesday\"},{\"name\":\"Sunday\"},{\"name\":\"Tuesday\"},{\"name\":\"Tuesday\"}],\"hoursOfDay\":[1368305159],\"leadTimeInWeeks\":1299538115,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1183676629,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":869245621,\"estimatedNetworkSwitchesPatchingTime\":1973519317,\"estimatedStorageServerPatchingTime\":917606077,\"totalEstimatedPatchingTime\":1139641337},\"customerContacts\":[{\"email\":\"t\"},{\"email\":\"iqxf\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"MaintenanceInProgress\",\"shape\":\"tvwkpqhjpenu\",\"ociUrl\":\"bqeqqekewvnqvcd\",\"cpuCount\":1408895656,\"maxCpuCount\":1458855216,\"memorySizeInGbs\":1607576677,\"maxMemoryInGbs\":1323683698,\"dbNodeStorageSizeInGbs\":1722049750,\"maxDbNodeStorageSizeInGbs\":1773834271,\"dataStorageSizeInTbs\":38.31046408396851,\"maxDataStorageInTbs\":43.657891658296286,\"dbServerVersion\":\"ikczvvitacgxmf\",\"storageServerVersion\":\"serxht\",\"activatedStorageCount\":1164479404,\"additionalStorageCount\":47746370,\"displayName\":\"lwntsjgqrs\",\"lastMaintenanceRunId\":\"p\",\"nextMaintenanceRunId\":\"uuybnchrsz\",\"monthlyDbServerVersion\":\"oyuelyetn\",\"monthlyStorageServerVersion\":\"bf\",\"databaseServerType\":\"ggagfln\",\"storageServerType\":\"mtrwah\",\"computeModel\":\"ECPU\",\"exascaleConfig\":{\"totalStorageInGbs\":2084932136,\"availableStorageInGbs\":373505246}},\"zones\":[\"yrplrohkpigqfus\",\"ckzmkwklsnox\",\"xmqeqalh\"],\"location\":\"nhg\",\"tags\":{\"ta\":\"yynfsvkhgbv\",\"jcpeogkhnmg\":\"arfdlpukhpyrnei\",\"xddbhfhpfpaz\":\"ro\"},\"id\":\"zoyw\",\"name\":\"xhpdulontacnpqwt\",\"type\":\"htuevrhrljy\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -35,37 +35,37 @@ public void testListByResourceGroup() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        PagedIterable<CloudExadataInfrastructure> response = manager.cloudExadataInfrastructures()
-            .listByResourceGroup("omfgbeglqgleohib", com.azure.core.util.Context.NONE);
+        PagedIterable<CloudExadataInfrastructure> response
+            = manager.cloudExadataInfrastructures().listByResourceGroup("kjbsah", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("wxeqocljmygvkzqk", response.iterator().next().location());
-        Assertions.assertEquals("okbzef", response.iterator().next().tags().get("zrxcczurt"));
-        Assertions.assertEquals(498607950, response.iterator().next().properties().computeCount());
-        Assertions.assertEquals(2093325150, response.iterator().next().properties().storageCount());
+        Assertions.assertEquals("nhg", response.iterator().next().location());
+        Assertions.assertEquals("yynfsvkhgbv", response.iterator().next().tags().get("ta"));
+        Assertions.assertEquals(271162273, response.iterator().next().properties().computeCount());
+        Assertions.assertEquals(1046719550, response.iterator().next().properties().storageCount());
         Assertions.assertEquals(Preference.NO_PREFERENCE,
             response.iterator().next().properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.FEBRUARY,
+        Assertions.assertEquals(MonthName.MAY,
             response.iterator().next().properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(497715430,
+        Assertions.assertEquals(122155375,
             response.iterator().next().properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.SATURDAY,
+        Assertions.assertEquals(DayOfWeekName.TUESDAY,
             response.iterator().next().properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(677707515,
+        Assertions.assertEquals(1368305159,
             response.iterator().next().properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(370083816,
+        Assertions.assertEquals(1299538115,
             response.iterator().next().properties().maintenanceWindow().leadTimeInWeeks());
         Assertions.assertEquals(PatchingMode.NON_ROLLING,
             response.iterator().next().properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(70706634,
+        Assertions.assertEquals(1183676629,
             response.iterator().next().properties().maintenanceWindow().customActionTimeoutInMins());
         Assertions
             .assertTrue(response.iterator().next().properties().maintenanceWindow().isCustomActionTimeoutEnabled());
         Assertions.assertFalse(response.iterator().next().properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("dfuxtya", response.iterator().next().properties().customerContacts().get(0).email());
-        Assertions.assertEquals("stgnl", response.iterator().next().properties().shape());
-        Assertions.assertEquals("ltfvnz", response.iterator().next().properties().displayName());
-        Assertions.assertEquals("tmcdzsufcohd", response.iterator().next().properties().databaseServerType());
-        Assertions.assertEquals("zlmcmuapcvhdb", response.iterator().next().properties().storageServerType());
-        Assertions.assertEquals("qxeysko", response.iterator().next().zones().get(0));
+        Assertions.assertEquals("t", response.iterator().next().properties().customerContacts().get(0).email());
+        Assertions.assertEquals("tvwkpqhjpenu", response.iterator().next().properties().shape());
+        Assertions.assertEquals("lwntsjgqrs", response.iterator().next().properties().displayName());
+        Assertions.assertEquals("ggagfln", response.iterator().next().properties().databaseServerType());
+        Assertions.assertEquals("mtrwah", response.iterator().next().properties().storageServerType());
+        Assertions.assertEquals("yrplrohkpigqfus", response.iterator().next().zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListMockTests.java
index 29119a82207d..951a2d9ee398 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudExadataInfrastructuresListMockTests.java
@@ -26,7 +26,7 @@ public final class CloudExadataInfrastructuresListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":1632871841,\"mountPoint\":\"txfkfweg\"},{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":756597053,\"mountPoint\":\"ucb\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":2010820897,\"mountPoint\":\"mcwsldrizetpwb\"}],\"ocid\":\"lllibph\",\"computeCount\":449888460,\"storageCount\":1515253868,\"totalStorageSizeInGbs\":739440726,\"availableStorageSizeInGbs\":223363577,\"timeCreated\":\"ankjpdnjzh\",\"lifecycleDetails\":\"oylhjlmuoyxprimr\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"July\"}],\"weeksOfMonth\":[1323964253,1372597728],\"daysOfWeek\":[{\"name\":\"Thursday\"}],\"hoursOfDay\":[1491198323,1672946681,605795253],\"leadTimeInWeeks\":1529136023,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1212726658,\"isCustomActionTimeoutEnabled\":false,\"isMonthlyPatchingEnabled\":true},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1221518768,\"estimatedNetworkSwitchesPatchingTime\":1150817005,\"estimatedStorageServerPatchingTime\":2139878069,\"totalEstimatedPatchingTime\":457716497},\"customerContacts\":[{\"email\":\"yjathwtzo\"},{\"email\":\"b\"},{\"email\":\"emwmdxmebwjs\"}],\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"shape\":\"lxveabfqx\",\"ociUrl\":\"wmqtibx\",\"cpuCount\":2042495225,\"maxCpuCount\":462307774,\"memorySizeInGbs\":460830566,\"maxMemoryInGbs\":1410442260,\"dbNodeStorageSizeInGbs\":747956494,\"maxDbNodeStorageSizeInGbs\":930197061,\"dataStorageSizeInTbs\":83.97233674042096,\"maxDataStorageInTbs\":12.647700579937604,\"dbServerVersion\":\"rsiee\",\"storageServerVersion\":\"ndzaapmudq\",\"activatedStorageCount\":1473376981,\"additionalStorageCount\":1760107744,\"displayName\":\"gp\",\"lastMaintenanceRunId\":\"udqwyxebeybpmzz\",\"nextMaintenanceRunId\":\"tffyaqit\",\"monthlyDbServerVersion\":\"heioqa\",\"monthlyStorageServerVersion\":\"v\",\"databaseServerType\":\"ufuqyrx\",\"storageServerType\":\"lcgqlsismj\",\"computeModel\":\"ECPU\"},\"zones\":[\"dgamquhiosrsj\",\"ivfcdisyirnx\",\"hcz\"],\"location\":\"rxzbujr\",\"tags\":{\"khgn\":\"qvwre\",\"piqywnc\":\"nzonzl\",\"zehtdhgb\":\"jtszcof\",\"reljeamur\":\"k\"},\"id\":\"zmlovuanash\",\"name\":\"xlpm\",\"type\":\"erbdk\"}]}";
+            = "{\"value\":[{\"properties\":{\"definedFileSystemConfiguration\":[{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":1538236365,\"mountPoint\":\"vkhlggdhbemz\"},{\"isBackupPartition\":true,\"isResizable\":false,\"minSizeGb\":369373593,\"mountPoint\":\"wtglxx\"}],\"ocid\":\"jfpgpicrmn\",\"computeCount\":1791741914,\"storageCount\":185750645,\"totalStorageSizeInGbs\":1113568853,\"availableStorageSizeInGbs\":1915158747,\"timeCreated\":\"vpqcb\",\"lifecycleDetails\":\"mbodthsqqgvri\",\"maintenanceWindow\":{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"June\"},{\"name\":\"March\"},{\"name\":\"May\"}],\"weeksOfMonth\":[731867794,225802150,1419015231,718112280],\"daysOfWeek\":[{\"name\":\"Monday\"},{\"name\":\"Sunday\"},{\"name\":\"Wednesday\"},{\"name\":\"Thursday\"}],\"hoursOfDay\":[1471469938],\"leadTimeInWeeks\":2126091229,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":414245170,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false},\"estimatedPatchingTime\":{\"estimatedDbServerPatchingTime\":1428837944,\"estimatedNetworkSwitchesPatchingTime\":290394700,\"estimatedStorageServerPatchingTime\":1264104137,\"totalEstimatedPatchingTime\":920817597},\"customerContacts\":[{\"email\":\"nwpztekovmrib\"},{\"email\":\"attgplu\"}],\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Failed\",\"shape\":\"ng\",\"ociUrl\":\"hnykz\",\"cpuCount\":809427492,\"maxCpuCount\":1031306393,\"memorySizeInGbs\":93280086,\"maxMemoryInGbs\":1324984617,\"dbNodeStorageSizeInGbs\":1382791929,\"maxDbNodeStorageSizeInGbs\":2107871356,\"dataStorageSizeInTbs\":76.30087898761334,\"maxDataStorageInTbs\":91.30495118133442,\"dbServerVersion\":\"xmcuqud\",\"storageServerVersion\":\"vclx\",\"activatedStorageCount\":1138354387,\"additionalStorageCount\":267466114,\"displayName\":\"vgfab\",\"lastMaintenanceRunId\":\"yjibuzphdugne\",\"nextMaintenanceRunId\":\"n\",\"monthlyDbServerVersion\":\"oxgjiuqhibt\",\"monthlyStorageServerVersion\":\"ipq\",\"databaseServerType\":\"edmurrxxge\",\"storageServerType\":\"ktvqylkmqpzoy\",\"computeModel\":\"OCPU\",\"exascaleConfig\":{\"totalStorageInGbs\":2059423163,\"availableStorageInGbs\":1487964076}},\"zones\":[\"cloxo\"],\"location\":\"qinjipnwjf\",\"tags\":{\"zpofoiyjwpfilk\":\"lafcbahh\",\"ogphuartvtiu\":\"kkholvdndvia\",\"ahmnxhkxjqirw\":\"yefchnm\",\"ewmozqvbu\":\"weooxffifhxwrs\"},\"id\":\"qmamhsycxhxzga\",\"name\":\"ttaboidvmfqh\",\"type\":\"pubowsepdfg\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -38,34 +38,35 @@ public void testList() throws Exception {
         PagedIterable<CloudExadataInfrastructure> response
             = manager.cloudExadataInfrastructures().list(com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("rxzbujr", response.iterator().next().location());
-        Assertions.assertEquals("qvwre", response.iterator().next().tags().get("khgn"));
-        Assertions.assertEquals(449888460, response.iterator().next().properties().computeCount());
-        Assertions.assertEquals(1515253868, response.iterator().next().properties().storageCount());
+        Assertions.assertEquals("qinjipnwjf", response.iterator().next().location());
+        Assertions.assertEquals("lafcbahh", response.iterator().next().tags().get("zpofoiyjwpfilk"));
+        Assertions.assertEquals(1791741914, response.iterator().next().properties().computeCount());
+        Assertions.assertEquals(185750645, response.iterator().next().properties().storageCount());
         Assertions.assertEquals(Preference.CUSTOM_PREFERENCE,
             response.iterator().next().properties().maintenanceWindow().preference());
-        Assertions.assertEquals(MonthName.JULY,
+        Assertions.assertEquals(MonthName.JUNE,
             response.iterator().next().properties().maintenanceWindow().months().get(0).name());
-        Assertions.assertEquals(1323964253,
+        Assertions.assertEquals(731867794,
             response.iterator().next().properties().maintenanceWindow().weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.THURSDAY,
+        Assertions.assertEquals(DayOfWeekName.MONDAY,
             response.iterator().next().properties().maintenanceWindow().daysOfWeek().get(0).name());
-        Assertions.assertEquals(1491198323,
+        Assertions.assertEquals(1471469938,
             response.iterator().next().properties().maintenanceWindow().hoursOfDay().get(0));
-        Assertions.assertEquals(1529136023,
+        Assertions.assertEquals(2126091229,
             response.iterator().next().properties().maintenanceWindow().leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.NON_ROLLING,
+        Assertions.assertEquals(PatchingMode.ROLLING,
             response.iterator().next().properties().maintenanceWindow().patchingMode());
-        Assertions.assertEquals(1212726658,
+        Assertions.assertEquals(414245170,
             response.iterator().next().properties().maintenanceWindow().customActionTimeoutInMins());
         Assertions
-            .assertFalse(response.iterator().next().properties().maintenanceWindow().isCustomActionTimeoutEnabled());
-        Assertions.assertTrue(response.iterator().next().properties().maintenanceWindow().isMonthlyPatchingEnabled());
-        Assertions.assertEquals("yjathwtzo", response.iterator().next().properties().customerContacts().get(0).email());
-        Assertions.assertEquals("lxveabfqx", response.iterator().next().properties().shape());
-        Assertions.assertEquals("gp", response.iterator().next().properties().displayName());
-        Assertions.assertEquals("ufuqyrx", response.iterator().next().properties().databaseServerType());
-        Assertions.assertEquals("lcgqlsismj", response.iterator().next().properties().storageServerType());
-        Assertions.assertEquals("dgamquhiosrsj", response.iterator().next().zones().get(0));
+            .assertTrue(response.iterator().next().properties().maintenanceWindow().isCustomActionTimeoutEnabled());
+        Assertions.assertFalse(response.iterator().next().properties().maintenanceWindow().isMonthlyPatchingEnabled());
+        Assertions.assertEquals("nwpztekovmrib",
+            response.iterator().next().properties().customerContacts().get(0).email());
+        Assertions.assertEquals("ng", response.iterator().next().properties().shape());
+        Assertions.assertEquals("vgfab", response.iterator().next().properties().displayName());
+        Assertions.assertEquals("edmurrxxge", response.iterator().next().properties().databaseServerType());
+        Assertions.assertEquals("ktvqylkmqpzoy", response.iterator().next().properties().storageServerType());
+        Assertions.assertEquals("cloxo", response.iterator().next().zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesWithResponseMockTests.java
index b82836ed4845..a011cf00fc69 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CloudVmClustersListPrivateIpAddressesWithResponseMockTests.java
@@ -23,7 +23,7 @@ public final class CloudVmClustersListPrivateIpAddressesWithResponseMockTests {
     @Test
     public void testListPrivateIpAddressesWithResponse() throws Exception {
         String responseStr
-            = "[{\"displayName\":\"cvhd\",\"hostnameLabel\":\"evwqqxeyskonq\",\"ocid\":\"inkfkbgbz\",\"ipAddress\":\"owxeqocljmy\",\"subnetId\":\"vkzqk\"},{\"displayName\":\"jeokbzefezrxccz\",\"hostnameLabel\":\"rtle\",\"ocid\":\"pqxbkwvzgnzvdf\",\"ipAddress\":\"zdix\",\"subnetId\":\"mqpnoda\"},{\"displayName\":\"opqhewjptmc\",\"hostnameLabel\":\"sbostzel\",\"ocid\":\"dlat\",\"ipAddress\":\"tmzlbiojlv\",\"subnetId\":\"hrbbpneqvcwwyy\"},{\"displayName\":\"r\",\"hostnameLabel\":\"ochpprpr\",\"ocid\":\"nmokayzejnhlbk\",\"ipAddress\":\"bzpcpiljhahzvec\",\"subnetId\":\"ndbnwieh\"}]";
+            = "[{\"displayName\":\"annggiy\",\"hostnameLabel\":\"wkdtaawxwf\",\"ocid\":\"ka\",\"ipAddress\":\"mrrqmbzmqkratb\",\"subnetId\":\"xwbjs\"}]";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,15 +33,15 @@ public void testListPrivateIpAddressesWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         List<PrivateIpAddressProperties> response = manager.cloudVmClusters()
-            .listPrivateIpAddressesWithResponse("qgqqihedsvqwthmk", "ibcysihsgqc",
-                new PrivateIpAddressesFilter().withSubnetId("dhohsdtmcdzsuf").withVnicId("ohdxbzlmcmu"),
+            .listPrivateIpAddressesWithResponse("xxahmrnadzyqegxy", "vpinbmhwbj",
+                new PrivateIpAddressesFilter().withSubnetId("jkgqxnhmbkez").withVnicId("jauj"),
                 com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("cvhd", response.get(0).displayName());
-        Assertions.assertEquals("evwqqxeyskonq", response.get(0).hostnameLabel());
-        Assertions.assertEquals("inkfkbgbz", response.get(0).ocid());
-        Assertions.assertEquals("owxeqocljmy", response.get(0).ipAddress());
-        Assertions.assertEquals("vkzqk", response.get(0).subnetId());
+        Assertions.assertEquals("annggiy", response.get(0).displayName());
+        Assertions.assertEquals("wkdtaawxwf", response.get(0).hostnameLabel());
+        Assertions.assertEquals("ka", response.get(0).ocid());
+        Assertions.assertEquals("mrrqmbzmqkratb", response.get(0).ipAddress());
+        Assertions.assertEquals("xwbjs", response.get(0).subnetId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConfigureExascaleCloudExadataInfrastructureDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConfigureExascaleCloudExadataInfrastructureDetailsTests.java
new file mode 100644
index 000000000000..1f8013c614c5
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConfigureExascaleCloudExadataInfrastructureDetailsTests.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.ConfigureExascaleCloudExadataInfrastructureDetails;
+import org.junit.jupiter.api.Assertions;
+
+public final class ConfigureExascaleCloudExadataInfrastructureDetailsTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ConfigureExascaleCloudExadataInfrastructureDetails model
+            = BinaryData.fromString("{\"totalStorageInGbs\":2032893006}")
+                .toObject(ConfigureExascaleCloudExadataInfrastructureDetails.class);
+        Assertions.assertEquals(2032893006, model.totalStorageInGbs());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        ConfigureExascaleCloudExadataInfrastructureDetails model
+            = new ConfigureExascaleCloudExadataInfrastructureDetails().withTotalStorageInGbs(2032893006);
+        model = BinaryData.fromObject(model).toObject(ConfigureExascaleCloudExadataInfrastructureDetails.class);
+        Assertions.assertEquals(2032893006, model.totalStorageInGbs());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionStringTypeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionStringTypeTests.java
index cb33418bcd55..32e046898ed7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionStringTypeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionStringTypeTests.java
@@ -18,23 +18,23 @@ public final class ConnectionStringTypeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ConnectionStringType model = BinaryData.fromString(
-            "{\"allConnectionStrings\":{\"high\":\"gufhyaomtbg\",\"low\":\"avgrvkffovjz\",\"medium\":\"jbibg\"},\"dedicated\":\"fxumv\",\"high\":\"luyovwxnbkfezzx\",\"low\":\"yhwzdgiruj\",\"medium\":\"bomvzzbtdcqv\",\"profiles\":[{\"consumerGroup\":\"Medium\",\"displayName\":\"jviylwdshfs\",\"hostFormat\":\"Fqdn\",\"isRegional\":false,\"protocol\":\"TCP\",\"sessionMode\":\"Direct\",\"syntaxFormat\":\"Ezconnectplus\",\"tlsAuthentication\":\"Mutual\",\"value\":\"ymsgaojfmwnc\"},{\"consumerGroup\":\"Medium\",\"displayName\":\"rfh\",\"hostFormat\":\"Fqdn\",\"isRegional\":true,\"protocol\":\"TCPS\",\"sessionMode\":\"Direct\",\"syntaxFormat\":\"Long\",\"tlsAuthentication\":\"Mutual\",\"value\":\"ftpipiwyczu\"},{\"consumerGroup\":\"Low\",\"displayName\":\"cpqjlihhyu\",\"hostFormat\":\"Ip\",\"isRegional\":false,\"protocol\":\"TCP\",\"sessionMode\":\"Redirect\",\"syntaxFormat\":\"Long\",\"tlsAuthentication\":\"Server\",\"value\":\"mfwdgzxu\"},{\"consumerGroup\":\"Medium\",\"displayName\":\"vpa\",\"hostFormat\":\"Fqdn\",\"isRegional\":true,\"protocol\":\"TCP\",\"sessionMode\":\"Direct\",\"syntaxFormat\":\"Ezconnect\",\"tlsAuthentication\":\"Mutual\",\"value\":\"urisjnhnytxifqj\"}]}")
+            "{\"allConnectionStrings\":{\"high\":\"vkhbejdznx\",\"low\":\"dsrhnjiv\",\"medium\":\"v\"},\"dedicated\":\"ovqfzge\",\"high\":\"dftuljltduce\",\"low\":\"tmczuomejwcwwqi\",\"medium\":\"nssxmojmsvpk\",\"profiles\":[{\"consumerGroup\":\"Tp\",\"displayName\":\"wcfzqljyxgt\",\"hostFormat\":\"Ip\",\"isRegional\":false,\"protocol\":\"TCP\",\"sessionMode\":\"Direct\",\"syntaxFormat\":\"Ezconnectplus\",\"tlsAuthentication\":\"Mutual\",\"value\":\"shmkxmaehvbbxur\"},{\"consumerGroup\":\"Medium\",\"displayName\":\"tfnhtbaxkgxywr\",\"hostFormat\":\"Fqdn\",\"isRegional\":true,\"protocol\":\"TCP\",\"sessionMode\":\"Redirect\",\"syntaxFormat\":\"Long\",\"tlsAuthentication\":\"Server\",\"value\":\"lu\"}]}")
             .toObject(ConnectionStringType.class);
-        Assertions.assertEquals("gufhyaomtbg", model.allConnectionStrings().high());
-        Assertions.assertEquals("avgrvkffovjz", model.allConnectionStrings().low());
-        Assertions.assertEquals("jbibg", model.allConnectionStrings().medium());
-        Assertions.assertEquals("fxumv", model.dedicated());
-        Assertions.assertEquals("luyovwxnbkfezzx", model.high());
-        Assertions.assertEquals("yhwzdgiruj", model.low());
-        Assertions.assertEquals("bomvzzbtdcqv", model.medium());
-        Assertions.assertEquals(ConsumerGroup.MEDIUM, model.profiles().get(0).consumerGroup());
-        Assertions.assertEquals("jviylwdshfs", model.profiles().get(0).displayName());
-        Assertions.assertEquals(HostFormatType.FQDN, model.profiles().get(0).hostFormat());
+        Assertions.assertEquals("vkhbejdznx", model.allConnectionStrings().high());
+        Assertions.assertEquals("dsrhnjiv", model.allConnectionStrings().low());
+        Assertions.assertEquals("v", model.allConnectionStrings().medium());
+        Assertions.assertEquals("ovqfzge", model.dedicated());
+        Assertions.assertEquals("dftuljltduce", model.high());
+        Assertions.assertEquals("tmczuomejwcwwqi", model.low());
+        Assertions.assertEquals("nssxmojmsvpk", model.medium());
+        Assertions.assertEquals(ConsumerGroup.TP, model.profiles().get(0).consumerGroup());
+        Assertions.assertEquals("wcfzqljyxgt", model.profiles().get(0).displayName());
+        Assertions.assertEquals(HostFormatType.IP, model.profiles().get(0).hostFormat());
         Assertions.assertFalse(model.profiles().get(0).isRegional());
         Assertions.assertEquals(ProtocolType.TCP, model.profiles().get(0).protocol());
         Assertions.assertEquals(SessionModeType.DIRECT, model.profiles().get(0).sessionMode());
         Assertions.assertEquals(SyntaxFormatType.EZCONNECTPLUS, model.profiles().get(0).syntaxFormat());
         Assertions.assertEquals(TlsAuthenticationType.MUTUAL, model.profiles().get(0).tlsAuthentication());
-        Assertions.assertEquals("ymsgaojfmwnc", model.profiles().get(0).value());
+        Assertions.assertEquals("shmkxmaehvbbxur", model.profiles().get(0).value());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionUrlTypeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionUrlTypeTests.java
index dd3dcbfb9f38..b55901eaddde 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionUrlTypeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ConnectionUrlTypeTests.java
@@ -12,14 +12,14 @@ public final class ConnectionUrlTypeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ConnectionUrlType model = BinaryData.fromString(
-            "{\"apexUrl\":\"imwkslircizj\",\"databaseTransformsUrl\":\"ydfce\",\"graphStudioUrl\":\"vlhv\",\"machineLearningNotebookUrl\":\"dyftumrtwna\",\"mongoDbUrl\":\"slbi\",\"ordsUrl\":\"ojgcyzt\",\"sqlDevWebUrl\":\"mznbaeqphch\"}")
+            "{\"apexUrl\":\"dqkdlwwqfbu\",\"databaseTransformsUrl\":\"kxtrq\",\"graphStudioUrl\":\"smlmbtxhwgfwsrta\",\"machineLearningNotebookUrl\":\"oezbrhubsk\",\"mongoDbUrl\":\"dyg\",\"ordsUrl\":\"okkqfqjbvleo\",\"sqlDevWebUrl\":\"ml\"}")
             .toObject(ConnectionUrlType.class);
-        Assertions.assertEquals("imwkslircizj", model.apexUrl());
-        Assertions.assertEquals("ydfce", model.databaseTransformsUrl());
-        Assertions.assertEquals("vlhv", model.graphStudioUrl());
-        Assertions.assertEquals("dyftumrtwna", model.machineLearningNotebookUrl());
-        Assertions.assertEquals("slbi", model.mongoDbUrl());
-        Assertions.assertEquals("ojgcyzt", model.ordsUrl());
-        Assertions.assertEquals("mznbaeqphch", model.sqlDevWebUrl());
+        Assertions.assertEquals("dqkdlwwqfbu", model.apexUrl());
+        Assertions.assertEquals("kxtrq", model.databaseTransformsUrl());
+        Assertions.assertEquals("smlmbtxhwgfwsrta", model.graphStudioUrl());
+        Assertions.assertEquals("oezbrhubsk", model.machineLearningNotebookUrl());
+        Assertions.assertEquals("dyg", model.mongoDbUrl());
+        Assertions.assertEquals("okkqfqjbvleo", model.ordsUrl());
+        Assertions.assertEquals("ml", model.sqlDevWebUrl());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CustomerContactTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CustomerContactTests.java
index cca273cb1e2a..3d369fb2f6fa 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CustomerContactTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/CustomerContactTests.java
@@ -11,15 +11,14 @@
 public final class CustomerContactTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        CustomerContact model
-            = BinaryData.fromString("{\"email\":\"xoegukgjnpiucgy\"}").toObject(CustomerContact.class);
-        Assertions.assertEquals("xoegukgjnpiucgy", model.email());
+        CustomerContact model = BinaryData.fromString("{\"email\":\"uqszfk\"}").toObject(CustomerContact.class);
+        Assertions.assertEquals("uqszfk", model.email());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        CustomerContact model = new CustomerContact().withEmail("xoegukgjnpiucgy");
+        CustomerContact model = new CustomerContact().withEmail("uqszfk");
         model = BinaryData.fromObject(model).toObject(CustomerContact.class);
-        Assertions.assertEquals("xoegukgjnpiucgy", model.email());
+        Assertions.assertEquals("uqszfk", model.email());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DataCollectionOptionsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DataCollectionOptionsTests.java
index 219ec7c98cd5..94aa8b763ee9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DataCollectionOptionsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DataCollectionOptionsTests.java
@@ -12,21 +12,21 @@ public final class DataCollectionOptionsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DataCollectionOptions model = BinaryData.fromString(
-            "{\"isDiagnosticsEventsEnabled\":true,\"isHealthMonitoringEnabled\":true,\"isIncidentLogsEnabled\":false}")
+            "{\"isDiagnosticsEventsEnabled\":false,\"isHealthMonitoringEnabled\":true,\"isIncidentLogsEnabled\":true}")
             .toObject(DataCollectionOptions.class);
-        Assertions.assertTrue(model.isDiagnosticsEventsEnabled());
+        Assertions.assertFalse(model.isDiagnosticsEventsEnabled());
         Assertions.assertTrue(model.isHealthMonitoringEnabled());
-        Assertions.assertFalse(model.isIncidentLogsEnabled());
+        Assertions.assertTrue(model.isIncidentLogsEnabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DataCollectionOptions model = new DataCollectionOptions().withIsDiagnosticsEventsEnabled(true)
+        DataCollectionOptions model = new DataCollectionOptions().withIsDiagnosticsEventsEnabled(false)
             .withIsHealthMonitoringEnabled(true)
-            .withIsIncidentLogsEnabled(false);
+            .withIsIncidentLogsEnabled(true);
         model = BinaryData.fromObject(model).toObject(DataCollectionOptions.class);
-        Assertions.assertTrue(model.isDiagnosticsEventsEnabled());
+        Assertions.assertFalse(model.isDiagnosticsEventsEnabled());
         Assertions.assertTrue(model.isHealthMonitoringEnabled());
-        Assertions.assertFalse(model.isIncidentLogsEnabled());
+        Assertions.assertTrue(model.isIncidentLogsEnabled());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekTests.java
index 6b7009a8eb5a..9b71f4042025 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekTests.java
@@ -12,14 +12,14 @@
 public final class DayOfWeekTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        DayOfWeek model = BinaryData.fromString("{\"name\":\"Wednesday\"}").toObject(DayOfWeek.class);
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY, model.name());
+        DayOfWeek model = BinaryData.fromString("{\"name\":\"Tuesday\"}").toObject(DayOfWeek.class);
+        Assertions.assertEquals(DayOfWeekName.TUESDAY, model.name());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DayOfWeek model = new DayOfWeek().withName(DayOfWeekName.WEDNESDAY);
+        DayOfWeek model = new DayOfWeek().withName(DayOfWeekName.TUESDAY);
         model = BinaryData.fromObject(model).toObject(DayOfWeek.class);
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY, model.name());
+        Assertions.assertEquals(DayOfWeekName.TUESDAY, model.name());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekUpdateTests.java
index 55fdee5205ed..ed17f3c953cc 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekUpdateTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DayOfWeekUpdateTests.java
@@ -12,14 +12,14 @@
 public final class DayOfWeekUpdateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        DayOfWeekUpdate model = BinaryData.fromString("{\"name\":\"Saturday\"}").toObject(DayOfWeekUpdate.class);
-        Assertions.assertEquals(DayOfWeekName.SATURDAY, model.name());
+        DayOfWeekUpdate model = BinaryData.fromString("{\"name\":\"Tuesday\"}").toObject(DayOfWeekUpdate.class);
+        Assertions.assertEquals(DayOfWeekName.TUESDAY, model.name());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DayOfWeekUpdate model = new DayOfWeekUpdate().withName(DayOfWeekName.SATURDAY);
+        DayOfWeekUpdate model = new DayOfWeekUpdate().withName(DayOfWeekName.TUESDAY);
         model = BinaryData.fromObject(model).toObject(DayOfWeekUpdate.class);
-        Assertions.assertEquals(DayOfWeekName.SATURDAY, model.name());
+        Assertions.assertEquals(DayOfWeekName.TUESDAY, model.name());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbIormConfigTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbIormConfigTests.java
index 6fff93979ae5..e7273fa11e8b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbIormConfigTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbIormConfigTests.java
@@ -12,10 +12,10 @@ public final class DbIormConfigTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbIormConfig model = BinaryData
-            .fromString("{\"dbName\":\"hhkxbp\",\"flashCacheLimit\":\"ymjhxxjyngudivkr\",\"share\":855265021}")
+            .fromString("{\"dbName\":\"havhqlkthumaqolb\",\"flashCacheLimit\":\"cdui\",\"share\":1108910411}")
             .toObject(DbIormConfig.class);
-        Assertions.assertEquals("hhkxbp", model.dbName());
-        Assertions.assertEquals("ymjhxxjyngudivkr", model.flashCacheLimit());
-        Assertions.assertEquals(855265021, model.share());
+        Assertions.assertEquals("havhqlkthumaqolb", model.dbName());
+        Assertions.assertEquals("cdui", model.flashCacheLimit());
+        Assertions.assertEquals(1108910411, model.share());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeActionTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeActionTests.java
index ebad2a72e77c..913475aec295 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeActionTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeActionTests.java
@@ -12,14 +12,14 @@
 public final class DbNodeActionTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        DbNodeAction model = BinaryData.fromString("{\"action\":\"Reset\"}").toObject(DbNodeAction.class);
-        Assertions.assertEquals(DbNodeActionEnum.RESET, model.action());
+        DbNodeAction model = BinaryData.fromString("{\"action\":\"Start\"}").toObject(DbNodeAction.class);
+        Assertions.assertEquals(DbNodeActionEnum.START, model.action());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DbNodeAction model = new DbNodeAction().withAction(DbNodeActionEnum.RESET);
+        DbNodeAction model = new DbNodeAction().withAction(DbNodeActionEnum.START);
         model = BinaryData.fromObject(model).toObject(DbNodeAction.class);
-        Assertions.assertEquals(DbNodeActionEnum.RESET, model.action());
+        Assertions.assertEquals(DbNodeActionEnum.START, model.action());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeDetailsTests.java
index e97f52529a62..2306d23b1ac8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeDetailsTests.java
@@ -11,14 +11,14 @@
 public final class DbNodeDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        DbNodeDetails model = BinaryData.fromString("{\"dbNodeId\":\"jhlfzswpchwahf\"}").toObject(DbNodeDetails.class);
-        Assertions.assertEquals("jhlfzswpchwahf", model.dbNodeId());
+        DbNodeDetails model = BinaryData.fromString("{\"dbNodeId\":\"seypxiutcxapz\"}").toObject(DbNodeDetails.class);
+        Assertions.assertEquals("seypxiutcxapz", model.dbNodeId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DbNodeDetails model = new DbNodeDetails().withDbNodeId("jhlfzswpchwahf");
+        DbNodeDetails model = new DbNodeDetails().withDbNodeId("seypxiutcxapz");
         model = BinaryData.fromObject(model).toObject(DbNodeDetails.class);
-        Assertions.assertEquals("jhlfzswpchwahf", model.dbNodeId());
+        Assertions.assertEquals("seypxiutcxapz", model.dbNodeId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeInnerTests.java
index c7b027b9b076..21470f2b377b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeInnerTests.java
@@ -15,31 +15,31 @@ public final class DbNodeInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbNodeInner model = BinaryData.fromString(
-            "{\"properties\":{\"ocid\":\"ikhnvpamqgxqq\",\"additionalDetails\":\"zikywgg\",\"backupIpId\":\"allatmelwuipic\",\"backupVnic2Id\":\"zkzivgvvcnay\",\"backupVnicId\":\"yrnxxmueedn\",\"cpuCoreCount\":1429248323,\"dbNodeStorageSizeInGbs\":233559890,\"dbServerId\":\"kwqqtchealmf\",\"dbSystemId\":\"tdaaygdvwvg\",\"faultDomain\":\"ohgwxrtfudxepxg\",\"hostIpId\":\"agvrvmnpkuk\",\"hostname\":\"i\",\"lifecycleState\":\"Updating\",\"lifecycleDetails\":\"lxgwimfnjhf\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":205109580,\"softwareStorageSizeInGb\":1343784830,\"timeCreated\":\"2021-01-23T00:44:34Z\",\"timeMaintenanceWindowEnd\":\"2021-08-02T13:39:17Z\",\"timeMaintenanceWindowStart\":\"2020-12-27T03:23:26Z\",\"vnic2Id\":\"yfkzik\",\"vnicId\":\"jawneaiv\",\"provisioningState\":\"Canceled\"},\"id\":\"elpcirelsfeaenwa\",\"name\":\"fatkld\",\"type\":\"xbjhwuaanozjosph\"}")
+            "{\"properties\":{\"ocid\":\"zk\",\"additionalDetails\":\"oqreyfkzikfjawn\",\"backupIpId\":\"ivx\",\"backupVnic2Id\":\"zel\",\"backupVnicId\":\"irels\",\"cpuCoreCount\":1789990861,\"dbNodeStorageSizeInGbs\":730394428,\"dbServerId\":\"abfatkl\",\"dbSystemId\":\"dxbjhwuaanozj\",\"faultDomain\":\"ph\",\"hostIpId\":\"ulpjr\",\"hostname\":\"ag\",\"lifecycleState\":\"Updating\",\"lifecycleDetails\":\"imjwosyt\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":835762361,\"softwareStorageSizeInGb\":992939840,\"timeCreated\":\"2021-01-25T11:09:17Z\",\"timeMaintenanceWindowEnd\":\"2021-07-26T14:22:18Z\",\"timeMaintenanceWindowStart\":\"2021-05-30T00:33:28Z\",\"vnic2Id\":\"iekkezz\",\"vnicId\":\"khly\",\"provisioningState\":\"Canceled\"},\"id\":\"gqggebdunygae\",\"name\":\"idb\",\"type\":\"fatpxllrxcyjmoa\"}")
             .toObject(DbNodeInner.class);
-        Assertions.assertEquals("ikhnvpamqgxqq", model.properties().ocid());
-        Assertions.assertEquals("zikywgg", model.properties().additionalDetails());
-        Assertions.assertEquals("allatmelwuipic", model.properties().backupIpId());
-        Assertions.assertEquals("zkzivgvvcnay", model.properties().backupVnic2Id());
-        Assertions.assertEquals("yrnxxmueedn", model.properties().backupVnicId());
-        Assertions.assertEquals(1429248323, model.properties().cpuCoreCount());
-        Assertions.assertEquals(233559890, model.properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("kwqqtchealmf", model.properties().dbServerId());
-        Assertions.assertEquals("tdaaygdvwvg", model.properties().dbSystemId());
-        Assertions.assertEquals("ohgwxrtfudxepxg", model.properties().faultDomain());
-        Assertions.assertEquals("agvrvmnpkuk", model.properties().hostIpId());
-        Assertions.assertEquals("i", model.properties().hostname());
+        Assertions.assertEquals("zk", model.properties().ocid());
+        Assertions.assertEquals("oqreyfkzikfjawn", model.properties().additionalDetails());
+        Assertions.assertEquals("ivx", model.properties().backupIpId());
+        Assertions.assertEquals("zel", model.properties().backupVnic2Id());
+        Assertions.assertEquals("irels", model.properties().backupVnicId());
+        Assertions.assertEquals(1789990861, model.properties().cpuCoreCount());
+        Assertions.assertEquals(730394428, model.properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("abfatkl", model.properties().dbServerId());
+        Assertions.assertEquals("dxbjhwuaanozj", model.properties().dbSystemId());
+        Assertions.assertEquals("ph", model.properties().faultDomain());
+        Assertions.assertEquals("ulpjr", model.properties().hostIpId());
+        Assertions.assertEquals("ag", model.properties().hostname());
         Assertions.assertEquals(DbNodeProvisioningState.UPDATING, model.properties().lifecycleState());
-        Assertions.assertEquals("lxgwimfnjhf", model.properties().lifecycleDetails());
+        Assertions.assertEquals("imjwosyt", model.properties().lifecycleDetails());
         Assertions.assertEquals(DbNodeMaintenanceType.VMDB_REBOOT_MIGRATION, model.properties().maintenanceType());
-        Assertions.assertEquals(205109580, model.properties().memorySizeInGbs());
-        Assertions.assertEquals(1343784830, model.properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-01-23T00:44:34Z"), model.properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-08-02T13:39:17Z"),
+        Assertions.assertEquals(835762361, model.properties().memorySizeInGbs());
+        Assertions.assertEquals(992939840, model.properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-25T11:09:17Z"), model.properties().timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-26T14:22:18Z"),
             model.properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2020-12-27T03:23:26Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-30T00:33:28Z"),
             model.properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals("yfkzik", model.properties().vnic2Id());
-        Assertions.assertEquals("jawneaiv", model.properties().vnicId());
+        Assertions.assertEquals("iekkezz", model.properties().vnic2Id());
+        Assertions.assertEquals("khly", model.properties().vnicId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeListResultTests.java
index 203f78390148..c7f61aa051e0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodeListResultTests.java
@@ -15,34 +15,34 @@ public final class DbNodeListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbNodeListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"ocid\":\"baaa\",\"additionalDetails\":\"yvayffimrzr\",\"backupIpId\":\"zqogse\",\"backupVnic2Id\":\"evfdnwnwm\",\"backupVnicId\":\"zsyyceuzso\",\"cpuCoreCount\":2025880638,\"dbNodeStorageSizeInGbs\":2135802257,\"dbServerId\":\"frxtrthzvaytdwk\",\"dbSystemId\":\"brqubp\",\"faultDomain\":\"h\",\"hostIpId\":\"iilivpdtiirqtd\",\"hostname\":\"axoruzfgsquy\",\"lifecycleState\":\"Available\",\"lifecycleDetails\":\"xxle\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":1899778245,\"softwareStorageSizeInGb\":1921470091,\"timeCreated\":\"2021-06-08T08:24:15Z\",\"timeMaintenanceWindowEnd\":\"2021-03-29T03:09:07Z\",\"timeMaintenanceWindowStart\":\"2021-11-14T21:34:49Z\",\"vnic2Id\":\"wxuqlcvydypatdoo\",\"vnicId\":\"ojknio\",\"provisioningState\":\"Succeeded\"},\"id\":\"ebwnujhe\",\"name\":\"msbvdkcrodtjinf\",\"type\":\"jlfltkacjvefkdlf\"},{\"properties\":{\"ocid\":\"kggkfpa\",\"additionalDetails\":\"owpulpq\",\"backupIpId\":\"ylsyxkqjnsje\",\"backupVnic2Id\":\"tiagx\",\"backupVnicId\":\"sz\",\"cpuCoreCount\":993241324,\"dbNodeStorageSizeInGbs\":1236978734,\"dbServerId\":\"zkfzbeyv\",\"dbSystemId\":\"nqicvinvkjjxdxrb\",\"faultDomain\":\"kzclewyh\",\"hostIpId\":\"wp\",\"hostname\":\"tzpofncckwyfzq\",\"lifecycleState\":\"Updating\",\"lifecycleDetails\":\"xbuy\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":804013471,\"softwareStorageSizeInGb\":1280631673,\"timeCreated\":\"2021-02-28T13:12:04Z\",\"timeMaintenanceWindowEnd\":\"2021-04-29T15:05:43Z\",\"timeMaintenanceWindowStart\":\"2021-11-22T11:29:41Z\",\"vnic2Id\":\"o\",\"vnicId\":\"xorjaltolmncwsob\",\"provisioningState\":\"Succeeded\"},\"id\":\"dbnw\",\"name\":\"cf\",\"type\":\"ucqdpfuvglsb\"},{\"properties\":{\"ocid\":\"ca\",\"additionalDetails\":\"xbvtvudu\",\"backupIpId\":\"cormr\",\"backupVnic2Id\":\"qtvcofudflvkgj\",\"backupVnicId\":\"gdknnqv\",\"cpuCoreCount\":1989846717,\"dbNodeStorageSizeInGbs\":2039923498,\"dbServerId\":\"tor\",\"dbSystemId\":\"dsg\",\"faultDomain\":\"hmk\",\"hostIpId\":\"grauwjuetaebur\",\"hostname\":\"dmovsm\",\"lifecycleState\":\"Starting\",\"lifecycleDetails\":\"wabm\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":751127894,\"softwareStorageSizeInGb\":1947677125,\"timeCreated\":\"2021-11-25T20:27:09Z\",\"timeMaintenanceWindowEnd\":\"2021-11-12T13:25:33Z\",\"timeMaintenanceWindowStart\":\"2021-06-23T12:44:33Z\",\"vnic2Id\":\"ujmqlgkfbtndoa\",\"vnicId\":\"n\",\"provisioningState\":\"Canceled\"},\"id\":\"ntuji\",\"name\":\"c\",\"type\":\"ed\"},{\"properties\":{\"ocid\":\"wwa\",\"additionalDetails\":\"kojvd\",\"backupIpId\":\"zfoqouicybxar\",\"backupVnic2Id\":\"szufoxciqopidoa\",\"backupVnicId\":\"iodhkhazxkhnz\",\"cpuCoreCount\":1731617397,\"dbNodeStorageSizeInGbs\":1189025238,\"dbServerId\":\"toego\",\"dbSystemId\":\"dwbwhkszzcmrvexz\",\"faultDomain\":\"bt\",\"hostIpId\":\"sfraoyzko\",\"hostname\":\"tlmngu\",\"lifecycleState\":\"Failed\",\"lifecycleDetails\":\"q\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":2048944312,\"softwareStorageSizeInGb\":590697552,\"timeCreated\":\"2021-04-11T11:41:56Z\",\"timeMaintenanceWindowEnd\":\"2021-08-11T15:07:06Z\",\"timeMaintenanceWindowStart\":\"2021-06-17T14:42:30Z\",\"vnic2Id\":\"fobwy\",\"vnicId\":\"nkbykutwpfhp\",\"provisioningState\":\"Succeeded\"},\"id\":\"r\",\"name\":\"kdsnfdsdoakgtdl\",\"type\":\"kkze\"}],\"nextLink\":\"l\"}")
+            "{\"value\":[{\"properties\":{\"ocid\":\"syyceuzsoibjud\",\"additionalDetails\":\"rx\",\"backupIpId\":\"thzvaytdwkqbrqu\",\"backupVnic2Id\":\"axhexiilivp\",\"backupVnicId\":\"iirqtd\",\"cpuCoreCount\":887642500,\"dbNodeStorageSizeInGbs\":1693357038,\"dbServerId\":\"uzf\",\"dbSystemId\":\"squyfxrxxlep\",\"faultDomain\":\"amxjezwlw\",\"hostIpId\":\"xuqlcvydypat\",\"hostname\":\"oa\",\"lifecycleState\":\"Failed\",\"lifecycleDetails\":\"niodkooeb\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":1107083346,\"softwareStorageSizeInGb\":1652844269,\"timeCreated\":\"2021-05-06T02:47:02Z\",\"timeMaintenanceWindowEnd\":\"2021-06-02T00:19:10Z\",\"timeMaintenanceWindowStart\":\"2021-07-03T07:44:33Z\",\"vnic2Id\":\"c\",\"vnicId\":\"odtji\",\"provisioningState\":\"Failed\"},\"id\":\"lfltka\",\"name\":\"jvefkdlfoakggkfp\",\"type\":\"gaowpulpqblylsyx\"},{\"properties\":{\"ocid\":\"jnsjervtiagxsd\",\"additionalDetails\":\"uem\",\"backupIpId\":\"bzkfzbeyvpn\",\"backupVnic2Id\":\"cvinvkjjxdxrbuuk\",\"backupVnicId\":\"lewyhmlwpaz\",\"cpuCoreCount\":1765730251,\"dbNodeStorageSizeInGbs\":437728645,\"dbServerId\":\"cckwyfzqwhxxbu\",\"dbSystemId\":\"qa\",\"faultDomain\":\"feqztppriol\",\"hostIpId\":\"rjaltolmncw\",\"hostname\":\"bqwcsdbnwdcf\",\"lifecycleState\":\"Provisioning\",\"lifecycleDetails\":\"qdpfuvglsbjjca\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":1075232734,\"softwareStorageSizeInGb\":152007455,\"timeCreated\":\"2021-05-11T02:00:05Z\",\"timeMaintenanceWindowEnd\":\"2021-04-07T04:06:35Z\",\"timeMaintenanceWindowStart\":\"2021-10-07T13:15:31Z\",\"vnic2Id\":\"ormrlxqtvcofudfl\",\"vnicId\":\"kgjubgdknnqvsazn\",\"provisioningState\":\"Failed\"},\"id\":\"rudsg\",\"name\":\"a\",\"type\":\"mkycgra\"},{\"properties\":{\"ocid\":\"juetaebur\",\"additionalDetails\":\"dmovsm\",\"backupIpId\":\"xwabmqoe\",\"backupVnic2Id\":\"ifrvtpu\",\"backupVnicId\":\"jmqlgkfb\",\"cpuCoreCount\":1252448159,\"dbNodeStorageSizeInGbs\":1601819937,\"dbServerId\":\"n\",\"dbSystemId\":\"bjcntujitc\",\"faultDomain\":\"df\",\"hostIpId\":\"waezkojvd\",\"hostname\":\"zfoqouicybxar\",\"lifecycleState\":\"Terminated\",\"lifecycleDetails\":\"zuf\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":95404001,\"softwareStorageSizeInGb\":153808073,\"timeCreated\":\"2020-12-29T22:09:15Z\",\"timeMaintenanceWindowEnd\":\"2021-12-03T09:55:25Z\",\"timeMaintenanceWindowStart\":\"2021-12-10T00:14:44Z\",\"vnic2Id\":\"iodhkhazxkhnz\",\"vnicId\":\"onlwntoeg\",\"provisioningState\":\"Succeeded\"},\"id\":\"bwh\",\"name\":\"szzcmrvexztv\",\"type\":\"t\"}],\"nextLink\":\"sfraoyzko\"}")
             .toObject(DbNodeListResult.class);
-        Assertions.assertEquals("baaa", model.value().get(0).properties().ocid());
-        Assertions.assertEquals("yvayffimrzr", model.value().get(0).properties().additionalDetails());
-        Assertions.assertEquals("zqogse", model.value().get(0).properties().backupIpId());
-        Assertions.assertEquals("evfdnwnwm", model.value().get(0).properties().backupVnic2Id());
-        Assertions.assertEquals("zsyyceuzso", model.value().get(0).properties().backupVnicId());
-        Assertions.assertEquals(2025880638, model.value().get(0).properties().cpuCoreCount());
-        Assertions.assertEquals(2135802257, model.value().get(0).properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("frxtrthzvaytdwk", model.value().get(0).properties().dbServerId());
-        Assertions.assertEquals("brqubp", model.value().get(0).properties().dbSystemId());
-        Assertions.assertEquals("h", model.value().get(0).properties().faultDomain());
-        Assertions.assertEquals("iilivpdtiirqtd", model.value().get(0).properties().hostIpId());
-        Assertions.assertEquals("axoruzfgsquy", model.value().get(0).properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.AVAILABLE, model.value().get(0).properties().lifecycleState());
-        Assertions.assertEquals("xxle", model.value().get(0).properties().lifecycleDetails());
+        Assertions.assertEquals("syyceuzsoibjud", model.value().get(0).properties().ocid());
+        Assertions.assertEquals("rx", model.value().get(0).properties().additionalDetails());
+        Assertions.assertEquals("thzvaytdwkqbrqu", model.value().get(0).properties().backupIpId());
+        Assertions.assertEquals("axhexiilivp", model.value().get(0).properties().backupVnic2Id());
+        Assertions.assertEquals("iirqtd", model.value().get(0).properties().backupVnicId());
+        Assertions.assertEquals(887642500, model.value().get(0).properties().cpuCoreCount());
+        Assertions.assertEquals(1693357038, model.value().get(0).properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("uzf", model.value().get(0).properties().dbServerId());
+        Assertions.assertEquals("squyfxrxxlep", model.value().get(0).properties().dbSystemId());
+        Assertions.assertEquals("amxjezwlw", model.value().get(0).properties().faultDomain());
+        Assertions.assertEquals("xuqlcvydypat", model.value().get(0).properties().hostIpId());
+        Assertions.assertEquals("oa", model.value().get(0).properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.FAILED, model.value().get(0).properties().lifecycleState());
+        Assertions.assertEquals("niodkooeb", model.value().get(0).properties().lifecycleDetails());
         Assertions.assertEquals(DbNodeMaintenanceType.VMDB_REBOOT_MIGRATION,
             model.value().get(0).properties().maintenanceType());
-        Assertions.assertEquals(1899778245, model.value().get(0).properties().memorySizeInGbs());
-        Assertions.assertEquals(1921470091, model.value().get(0).properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-06-08T08:24:15Z"),
+        Assertions.assertEquals(1107083346, model.value().get(0).properties().memorySizeInGbs());
+        Assertions.assertEquals(1652844269, model.value().get(0).properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-06T02:47:02Z"),
             model.value().get(0).properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-29T03:09:07Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-02T00:19:10Z"),
             model.value().get(0).properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-14T21:34:49Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-03T07:44:33Z"),
             model.value().get(0).properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals("wxuqlcvydypatdoo", model.value().get(0).properties().vnic2Id());
-        Assertions.assertEquals("ojknio", model.value().get(0).properties().vnicId());
-        Assertions.assertEquals("l", model.nextLink());
+        Assertions.assertEquals("c", model.value().get(0).properties().vnic2Id());
+        Assertions.assertEquals("odtji", model.value().get(0).properties().vnicId());
+        Assertions.assertEquals("sfraoyzko", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodePropertiesTests.java
index 7faf3ac7c037..1cbbf117e8e9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodePropertiesTests.java
@@ -15,29 +15,29 @@ public final class DbNodePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbNodeProperties model = BinaryData.fromString(
-            "{\"ocid\":\"oulpjrv\",\"additionalDetails\":\"glrvimjwosytxi\",\"backupIpId\":\"skfc\",\"backupVnic2Id\":\"qumiek\",\"backupVnicId\":\"zzikhlyfjhdg\",\"cpuCoreCount\":757390701,\"dbNodeStorageSizeInGbs\":558583308,\"dbServerId\":\"unygaeqid\",\"dbSystemId\":\"qfatpxllrxcyjm\",\"faultDomain\":\"dsuvarmywdmjsjqb\",\"hostIpId\":\"hyxxrwlycoduhpk\",\"hostname\":\"gymare\",\"lifecycleState\":\"Available\",\"lifecycleDetails\":\"jxqugjhky\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":642347272,\"softwareStorageSizeInGb\":1615439443,\"timeCreated\":\"2021-06-02T23:36:04Z\",\"timeMaintenanceWindowEnd\":\"2021-05-14T12:39:32Z\",\"timeMaintenanceWindowStart\":\"2021-06-13T04:37:53Z\",\"vnic2Id\":\"mzqa\",\"vnicId\":\"krmnjijpxacqqud\",\"provisioningState\":\"Canceled\"}")
+            "{\"ocid\":\"su\",\"additionalDetails\":\"r\",\"backupIpId\":\"wdmjsjqbjhhyx\",\"backupVnic2Id\":\"wlycoduhpkxkg\",\"backupVnicId\":\"areqna\",\"cpuCoreCount\":672785070,\"dbNodeStorageSizeInGbs\":963278333,\"dbServerId\":\"hky\",\"dbSystemId\":\"ubeddg\",\"faultDomain\":\"ofwq\",\"hostIpId\":\"qal\",\"hostname\":\"mnjijpxacqqudf\",\"lifecycleState\":\"Updating\",\"lifecycleDetails\":\"xbaaabjyv\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":662894219,\"softwareStorageSizeInGb\":936751244,\"timeCreated\":\"2021-08-11T21:58:13Z\",\"timeMaintenanceWindowEnd\":\"2021-09-11T16:38:17Z\",\"timeMaintenanceWindowStart\":\"2021-09-02T14:49:34Z\",\"vnic2Id\":\"ogs\",\"vnicId\":\"xnevfdnwn\",\"provisioningState\":\"Failed\"}")
             .toObject(DbNodeProperties.class);
-        Assertions.assertEquals("oulpjrv", model.ocid());
-        Assertions.assertEquals("glrvimjwosytxi", model.additionalDetails());
-        Assertions.assertEquals("skfc", model.backupIpId());
-        Assertions.assertEquals("qumiek", model.backupVnic2Id());
-        Assertions.assertEquals("zzikhlyfjhdg", model.backupVnicId());
-        Assertions.assertEquals(757390701, model.cpuCoreCount());
-        Assertions.assertEquals(558583308, model.dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("unygaeqid", model.dbServerId());
-        Assertions.assertEquals("qfatpxllrxcyjm", model.dbSystemId());
-        Assertions.assertEquals("dsuvarmywdmjsjqb", model.faultDomain());
-        Assertions.assertEquals("hyxxrwlycoduhpk", model.hostIpId());
-        Assertions.assertEquals("gymare", model.hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.AVAILABLE, model.lifecycleState());
-        Assertions.assertEquals("jxqugjhky", model.lifecycleDetails());
+        Assertions.assertEquals("su", model.ocid());
+        Assertions.assertEquals("r", model.additionalDetails());
+        Assertions.assertEquals("wdmjsjqbjhhyx", model.backupIpId());
+        Assertions.assertEquals("wlycoduhpkxkg", model.backupVnic2Id());
+        Assertions.assertEquals("areqna", model.backupVnicId());
+        Assertions.assertEquals(672785070, model.cpuCoreCount());
+        Assertions.assertEquals(963278333, model.dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("hky", model.dbServerId());
+        Assertions.assertEquals("ubeddg", model.dbSystemId());
+        Assertions.assertEquals("ofwq", model.faultDomain());
+        Assertions.assertEquals("qal", model.hostIpId());
+        Assertions.assertEquals("mnjijpxacqqudf", model.hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.UPDATING, model.lifecycleState());
+        Assertions.assertEquals("xbaaabjyv", model.lifecycleDetails());
         Assertions.assertEquals(DbNodeMaintenanceType.VMDB_REBOOT_MIGRATION, model.maintenanceType());
-        Assertions.assertEquals(642347272, model.memorySizeInGbs());
-        Assertions.assertEquals(1615439443, model.softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-06-02T23:36:04Z"), model.timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-14T12:39:32Z"), model.timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-06-13T04:37:53Z"), model.timeMaintenanceWindowStart());
-        Assertions.assertEquals("mzqa", model.vnic2Id());
-        Assertions.assertEquals("krmnjijpxacqqud", model.vnicId());
+        Assertions.assertEquals(662894219, model.memorySizeInGbs());
+        Assertions.assertEquals(936751244, model.softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-11T21:58:13Z"), model.timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-11T16:38:17Z"), model.timeMaintenanceWindowEnd());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-02T14:49:34Z"), model.timeMaintenanceWindowStart());
+        Assertions.assertEquals("ogs", model.vnic2Id());
+        Assertions.assertEquals("xnevfdnwn", model.vnicId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionMockTests.java
index b9b642001402..b2806ceaf978 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesActionMockTests.java
@@ -25,7 +25,7 @@ public final class DbNodesActionMockTests {
     @Test
     public void testAction() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ocid\":\"qigkx\",\"additionalDetails\":\"sazgakgacyrcmj\",\"backupIpId\":\"spofapvuhry\",\"backupVnic2Id\":\"iofrzgbzjedmstk\",\"backupVnicId\":\"l\",\"cpuCoreCount\":1553181859,\"dbNodeStorageSizeInGbs\":2098964900,\"dbServerId\":\"iznk\",\"dbSystemId\":\"wfansnvpdi\",\"faultDomain\":\"ikostbzbkiwbuqny\",\"hostIpId\":\"hzfylsgcrpfbc\",\"hostname\":\"ezzcez\",\"lifecycleState\":\"Stopped\",\"lifecycleDetails\":\"w\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":377866290,\"softwareStorageSizeInGb\":953163194,\"timeCreated\":\"2021-08-09T12:15:45Z\",\"timeMaintenanceWindowEnd\":\"2021-11-24T16:01:16Z\",\"timeMaintenanceWindowStart\":\"2021-05-28T11:38:45Z\",\"vnic2Id\":\"ihclafzv\",\"vnicId\":\"ylptrsqqwztcm\",\"provisioningState\":\"Succeeded\"},\"id\":\"hcxwaxfewzjk\",\"name\":\"exfdeqvhpsylk\",\"type\":\"shk\"}";
+            = "{\"properties\":{\"ocid\":\"uqwqulsutrjbhxyk\",\"additionalDetails\":\"y\",\"backupIpId\":\"zvqqugdrftbcvexr\",\"backupVnic2Id\":\"quowtljvfwhrea\",\"backupVnicId\":\"hyxvrqt\",\"cpuCoreCount\":363321222,\"dbNodeStorageSizeInGbs\":1247418691,\"dbServerId\":\"lmdgglmepjp\",\"dbSystemId\":\"s\",\"faultDomain\":\"kgsangpszng\",\"hostIpId\":\"p\",\"hostname\":\"lkvec\",\"lifecycleState\":\"Stopped\",\"lifecycleDetails\":\"cngoadyedmzrg\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":778834076,\"softwareStorageSizeInGb\":1135424096,\"timeCreated\":\"2021-05-21T12:15:27Z\",\"timeMaintenanceWindowEnd\":\"2021-11-26T00:13:36Z\",\"timeMaintenanceWindowStart\":\"2021-05-30T18:27:51Z\",\"vnic2Id\":\"pz\",\"vnicId\":\"rgdg\",\"provisioningState\":\"Succeeded\"},\"id\":\"qraswugyxpqitwei\",\"name\":\"l\",\"type\":\"vskbuhzacaq\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -35,32 +35,32 @@ public void testAction() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         DbNode response = manager.dbNodes()
-            .action("vqihebwtswbzuwf", "duragegizvc", "felisdjub",
-                new DbNodeAction().withAction(DbNodeActionEnum.START), com.azure.core.util.Context.NONE);
+            .action("vyfijdkzuqnw", "it", "uqoly", new DbNodeAction().withAction(DbNodeActionEnum.SOFT_RESET),
+                com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("qigkx", response.properties().ocid());
-        Assertions.assertEquals("sazgakgacyrcmj", response.properties().additionalDetails());
-        Assertions.assertEquals("spofapvuhry", response.properties().backupIpId());
-        Assertions.assertEquals("iofrzgbzjedmstk", response.properties().backupVnic2Id());
-        Assertions.assertEquals("l", response.properties().backupVnicId());
-        Assertions.assertEquals(1553181859, response.properties().cpuCoreCount());
-        Assertions.assertEquals(2098964900, response.properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("iznk", response.properties().dbServerId());
-        Assertions.assertEquals("wfansnvpdi", response.properties().dbSystemId());
-        Assertions.assertEquals("ikostbzbkiwbuqny", response.properties().faultDomain());
-        Assertions.assertEquals("hzfylsgcrpfbc", response.properties().hostIpId());
-        Assertions.assertEquals("ezzcez", response.properties().hostname());
+        Assertions.assertEquals("uqwqulsutrjbhxyk", response.properties().ocid());
+        Assertions.assertEquals("y", response.properties().additionalDetails());
+        Assertions.assertEquals("zvqqugdrftbcvexr", response.properties().backupIpId());
+        Assertions.assertEquals("quowtljvfwhrea", response.properties().backupVnic2Id());
+        Assertions.assertEquals("hyxvrqt", response.properties().backupVnicId());
+        Assertions.assertEquals(363321222, response.properties().cpuCoreCount());
+        Assertions.assertEquals(1247418691, response.properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("lmdgglmepjp", response.properties().dbServerId());
+        Assertions.assertEquals("s", response.properties().dbSystemId());
+        Assertions.assertEquals("kgsangpszng", response.properties().faultDomain());
+        Assertions.assertEquals("p", response.properties().hostIpId());
+        Assertions.assertEquals("lkvec", response.properties().hostname());
         Assertions.assertEquals(DbNodeProvisioningState.STOPPED, response.properties().lifecycleState());
-        Assertions.assertEquals("w", response.properties().lifecycleDetails());
+        Assertions.assertEquals("cngoadyedmzrg", response.properties().lifecycleDetails());
         Assertions.assertEquals(DbNodeMaintenanceType.VMDB_REBOOT_MIGRATION, response.properties().maintenanceType());
-        Assertions.assertEquals(377866290, response.properties().memorySizeInGbs());
-        Assertions.assertEquals(953163194, response.properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-08-09T12:15:45Z"), response.properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-24T16:01:16Z"),
+        Assertions.assertEquals(778834076, response.properties().memorySizeInGbs());
+        Assertions.assertEquals(1135424096, response.properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-21T12:15:27Z"), response.properties().timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-11-26T00:13:36Z"),
             response.properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-28T11:38:45Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-30T18:27:51Z"),
             response.properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals("ihclafzv", response.properties().vnic2Id());
-        Assertions.assertEquals("ylptrsqqwztcm", response.properties().vnicId());
+        Assertions.assertEquals("pz", response.properties().vnic2Id());
+        Assertions.assertEquals("rgdg", response.properties().vnicId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetWithResponseMockTests.java
index ee8e407779b2..7613431d7354 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesGetWithResponseMockTests.java
@@ -23,7 +23,7 @@ public final class DbNodesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ocid\":\"q\",\"additionalDetails\":\"jhmqrhvthla\",\"backupIpId\":\"dcxsmlz\",\"backupVnic2Id\":\"zdtxetlgyd\",\"backupVnicId\":\"qvlnnpxybafiqgea\",\"cpuCoreCount\":755954714,\"dbNodeStorageSizeInGbs\":1031040752,\"dbServerId\":\"kglklbyulidwcw\",\"dbSystemId\":\"mzegjon\",\"faultDomain\":\"jirwgdnqzbrfk\",\"hostIpId\":\"zhzmtksjci\",\"hostname\":\"igsxcdgljplk\",\"lifecycleState\":\"Starting\",\"lifecycleDetails\":\"chtomflrytsw\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":1654554720,\"softwareStorageSizeInGb\":1885946932,\"timeCreated\":\"2021-06-30T17:12:26Z\",\"timeMaintenanceWindowEnd\":\"2021-02-03T07:43:53Z\",\"timeMaintenanceWindowStart\":\"2021-05-29T16:33:56Z\",\"vnic2Id\":\"whqjjyslurlpshhk\",\"vnicId\":\"pedwqsl\",\"provisioningState\":\"Succeeded\"},\"id\":\"pq\",\"name\":\"wwsko\",\"type\":\"dcbrwimuvq\"}";
+            = "{\"properties\":{\"ocid\":\"mdew\",\"additionalDetails\":\"sxkrpl\",\"backupIpId\":\"aze\",\"backupVnic2Id\":\"w\",\"backupVnicId\":\"yoyp\",\"cpuCoreCount\":2055673505,\"dbNodeStorageSizeInGbs\":1841980142,\"dbServerId\":\"nhjx\",\"dbSystemId\":\"qwjhqkbiwetpozyc\",\"faultDomain\":\"iqyhgfse\",\"hostIpId\":\"lexbsf\",\"hostname\":\"dynojpziuwfb\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"dtn\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":1176354917,\"softwareStorageSizeInGb\":1450104862,\"timeCreated\":\"2021-04-17T05:36:17Z\",\"timeMaintenanceWindowEnd\":\"2021-11-12T21:16:46Z\",\"timeMaintenanceWindowStart\":\"2021-08-04T14:20:35Z\",\"vnic2Id\":\"bafvafhlbylcc\",\"vnicId\":\"evxrhyz\",\"provisioningState\":\"Succeeded\"},\"id\":\"sofpltd\",\"name\":\"mairrh\",\"type\":\"hfnrac\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,32 +33,32 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         DbNode response = manager.dbNodes()
-            .getWithResponse("lejchcsr", "zknmzlanrupd", "vnphc", com.azure.core.util.Context.NONE)
+            .getWithResponse("jfizfavkjzwfbc", "aykmmf", "sbfwxr", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("q", response.properties().ocid());
-        Assertions.assertEquals("jhmqrhvthla", response.properties().additionalDetails());
-        Assertions.assertEquals("dcxsmlz", response.properties().backupIpId());
-        Assertions.assertEquals("zdtxetlgyd", response.properties().backupVnic2Id());
-        Assertions.assertEquals("qvlnnpxybafiqgea", response.properties().backupVnicId());
-        Assertions.assertEquals(755954714, response.properties().cpuCoreCount());
-        Assertions.assertEquals(1031040752, response.properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("kglklbyulidwcw", response.properties().dbServerId());
-        Assertions.assertEquals("mzegjon", response.properties().dbSystemId());
-        Assertions.assertEquals("jirwgdnqzbrfk", response.properties().faultDomain());
-        Assertions.assertEquals("zhzmtksjci", response.properties().hostIpId());
-        Assertions.assertEquals("igsxcdgljplk", response.properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.STARTING, response.properties().lifecycleState());
-        Assertions.assertEquals("chtomflrytsw", response.properties().lifecycleDetails());
+        Assertions.assertEquals("mdew", response.properties().ocid());
+        Assertions.assertEquals("sxkrpl", response.properties().additionalDetails());
+        Assertions.assertEquals("aze", response.properties().backupIpId());
+        Assertions.assertEquals("w", response.properties().backupVnic2Id());
+        Assertions.assertEquals("yoyp", response.properties().backupVnicId());
+        Assertions.assertEquals(2055673505, response.properties().cpuCoreCount());
+        Assertions.assertEquals(1841980142, response.properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("nhjx", response.properties().dbServerId());
+        Assertions.assertEquals("qwjhqkbiwetpozyc", response.properties().dbSystemId());
+        Assertions.assertEquals("iqyhgfse", response.properties().faultDomain());
+        Assertions.assertEquals("lexbsf", response.properties().hostIpId());
+        Assertions.assertEquals("dynojpziuwfb", response.properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.TERMINATING, response.properties().lifecycleState());
+        Assertions.assertEquals("dtn", response.properties().lifecycleDetails());
         Assertions.assertEquals(DbNodeMaintenanceType.VMDB_REBOOT_MIGRATION, response.properties().maintenanceType());
-        Assertions.assertEquals(1654554720, response.properties().memorySizeInGbs());
-        Assertions.assertEquals(1885946932, response.properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-06-30T17:12:26Z"), response.properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-02-03T07:43:53Z"),
+        Assertions.assertEquals(1176354917, response.properties().memorySizeInGbs());
+        Assertions.assertEquals(1450104862, response.properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-04-17T05:36:17Z"), response.properties().timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-11-12T21:16:46Z"),
             response.properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-29T16:33:56Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-04T14:20:35Z"),
             response.properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals("whqjjyslurlpshhk", response.properties().vnic2Id());
-        Assertions.assertEquals("pedwqsl", response.properties().vnicId());
+        Assertions.assertEquals("bafvafhlbylcc", response.properties().vnic2Id());
+        Assertions.assertEquals("evxrhyz", response.properties().vnicId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterMockTests.java
index 923cef2e5754..fe46c627b635 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbNodesListByCloudVmClusterMockTests.java
@@ -24,7 +24,7 @@ public final class DbNodesListByCloudVmClusterMockTests {
     @Test
     public void testListByCloudVmCluster() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"ocid\":\"zuawxtzxpuamwa\",\"additionalDetails\":\"xrvxcushsphai\",\"backupIpId\":\"xyasflvgsgzw\",\"backupVnic2Id\":\"akoi\",\"backupVnicId\":\"nsmjbl\",\"cpuCoreCount\":1367622983,\"dbNodeStorageSizeInGbs\":141566402,\"dbServerId\":\"ymzotqyryuzcbmq\",\"dbSystemId\":\"vxmvw\",\"faultDomain\":\"tayx\",\"hostIpId\":\"supe\",\"hostname\":\"lzqnhcvs\",\"lifecycleState\":\"Updating\",\"lifecycleDetails\":\"nzoibgsxgnx\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":882491900,\"softwareStorageSizeInGb\":171908956,\"timeCreated\":\"2021-01-30T13:57:25Z\",\"timeMaintenanceWindowEnd\":\"2021-05-25T17:04:08Z\",\"timeMaintenanceWindowStart\":\"2021-08-14T04:57:20Z\",\"vnic2Id\":\"fdbxiqxeiiqbim\",\"vnicId\":\"tmwwi\",\"provisioningState\":\"Failed\"},\"id\":\"f\",\"name\":\"pofvwb\",\"type\":\"blembnkbwvqvxkd\"}]}";
+            = "{\"value\":[{\"properties\":{\"ocid\":\"ujwouhdawsi\",\"additionalDetails\":\"bjb\",\"backupIpId\":\"jybvit\",\"backupVnic2Id\":\"kjyaznumtg\",\"backupVnicId\":\"uwdchozf\",\"cpuCoreCount\":820610981,\"dbNodeStorageSizeInGbs\":418227301,\"dbServerId\":\"v\",\"dbSystemId\":\"noakiz\",\"faultDomain\":\"aikn\",\"hostIpId\":\"lnuwiguy\",\"hostname\":\"ykwphvxzcwxhmpe\",\"lifecycleState\":\"Starting\",\"lifecycleDetails\":\"ke\",\"maintenanceType\":\"VmdbRebootMigration\",\"memorySizeInGbs\":593833942,\"softwareStorageSizeInGb\":1403514337,\"timeCreated\":\"2021-08-12T17:38:45Z\",\"timeMaintenanceWindowEnd\":\"2021-05-04T14:13:26Z\",\"timeMaintenanceWindowStart\":\"2021-08-04T01:58:43Z\",\"vnic2Id\":\"hxknlccrmmkyupi\",\"vnicId\":\"ubyqj\",\"provisioningState\":\"Canceled\"},\"id\":\"fqfrkemyildudxja\",\"name\":\"cowvfdjkp\",\"type\":\"xphlkksnmg\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,34 +34,34 @@ public void testListByCloudVmCluster() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<DbNode> response
-            = manager.dbNodes().listByCloudVmCluster("tyjedex", "mlfmkqs", com.azure.core.util.Context.NONE);
+            = manager.dbNodes().listByCloudVmCluster("npq", "g", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("zuawxtzxpuamwa", response.iterator().next().properties().ocid());
-        Assertions.assertEquals("xrvxcushsphai", response.iterator().next().properties().additionalDetails());
-        Assertions.assertEquals("xyasflvgsgzw", response.iterator().next().properties().backupIpId());
-        Assertions.assertEquals("akoi", response.iterator().next().properties().backupVnic2Id());
-        Assertions.assertEquals("nsmjbl", response.iterator().next().properties().backupVnicId());
-        Assertions.assertEquals(1367622983, response.iterator().next().properties().cpuCoreCount());
-        Assertions.assertEquals(141566402, response.iterator().next().properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("ymzotqyryuzcbmq", response.iterator().next().properties().dbServerId());
-        Assertions.assertEquals("vxmvw", response.iterator().next().properties().dbSystemId());
-        Assertions.assertEquals("tayx", response.iterator().next().properties().faultDomain());
-        Assertions.assertEquals("supe", response.iterator().next().properties().hostIpId());
-        Assertions.assertEquals("lzqnhcvs", response.iterator().next().properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.UPDATING,
+        Assertions.assertEquals("ujwouhdawsi", response.iterator().next().properties().ocid());
+        Assertions.assertEquals("bjb", response.iterator().next().properties().additionalDetails());
+        Assertions.assertEquals("jybvit", response.iterator().next().properties().backupIpId());
+        Assertions.assertEquals("kjyaznumtg", response.iterator().next().properties().backupVnic2Id());
+        Assertions.assertEquals("uwdchozf", response.iterator().next().properties().backupVnicId());
+        Assertions.assertEquals(820610981, response.iterator().next().properties().cpuCoreCount());
+        Assertions.assertEquals(418227301, response.iterator().next().properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("v", response.iterator().next().properties().dbServerId());
+        Assertions.assertEquals("noakiz", response.iterator().next().properties().dbSystemId());
+        Assertions.assertEquals("aikn", response.iterator().next().properties().faultDomain());
+        Assertions.assertEquals("lnuwiguy", response.iterator().next().properties().hostIpId());
+        Assertions.assertEquals("ykwphvxzcwxhmpe", response.iterator().next().properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.STARTING,
             response.iterator().next().properties().lifecycleState());
-        Assertions.assertEquals("nzoibgsxgnx", response.iterator().next().properties().lifecycleDetails());
+        Assertions.assertEquals("ke", response.iterator().next().properties().lifecycleDetails());
         Assertions.assertEquals(DbNodeMaintenanceType.VMDB_REBOOT_MIGRATION,
             response.iterator().next().properties().maintenanceType());
-        Assertions.assertEquals(882491900, response.iterator().next().properties().memorySizeInGbs());
-        Assertions.assertEquals(171908956, response.iterator().next().properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-01-30T13:57:25Z"),
+        Assertions.assertEquals(593833942, response.iterator().next().properties().memorySizeInGbs());
+        Assertions.assertEquals(1403514337, response.iterator().next().properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-12T17:38:45Z"),
             response.iterator().next().properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-25T17:04:08Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-04T14:13:26Z"),
             response.iterator().next().properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-08-14T04:57:20Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-04T01:58:43Z"),
             response.iterator().next().properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals("fdbxiqxeiiqbim", response.iterator().next().properties().vnic2Id());
-        Assertions.assertEquals("tmwwi", response.iterator().next().properties().vnicId());
+        Assertions.assertEquals("hxknlccrmmkyupi", response.iterator().next().properties().vnic2Id());
+        Assertions.assertEquals("ubyqj", response.iterator().next().properties().vnicId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerInnerTests.java
index 7e48b32b2fab..79cf4c59e0f9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerInnerTests.java
@@ -11,7 +11,7 @@ public final class DbServerInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbServerInner model = BinaryData.fromString(
-            "{\"properties\":{\"ocid\":\"snkymuctq\",\"displayName\":\"fbebrjcxer\",\"compartmentId\":\"wutttxfvjrbi\",\"exadataInfrastructureId\":\"hxepcyvahfnlj\",\"cpuCoreCount\":561070013,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":1238878906,\"patchingStatus\":\"MaintenanceInProgress\",\"timePatchingEnded\":\"2021-01-04T05:40:41Z\",\"timePatchingStarted\":\"2021-07-14T10:27:20Z\"},\"maxMemoryInGbs\":528662531,\"dbNodeStorageSizeInGbs\":441208972,\"vmClusterIds\":[\"jyoxgvclt\",\"gsncghkjeszz\",\"bijhtxfvgxbf\"],\"dbNodeIds\":[\"nehmpvecx\",\"odebfqkkrbmpu\",\"gr\"],\"lifecycleDetails\":\"flz\",\"lifecycleState\":\"MaintenanceInProgress\",\"maxCpuCount\":266686286,\"autonomousVmClusterIds\":[\"zycispn\",\"zahmgkbrpyydhibn\",\"qqkpikadrg\"],\"autonomousVirtualMachineIds\":[\"agnb\",\"ynhijggme\"],\"maxDbNodeStorageInGbs\":983171059,\"memorySizeInGbs\":847896625,\"shape\":\"butr\",\"timeCreated\":\"2020-12-24T14:25:03Z\",\"provisioningState\":\"Failed\",\"computeModel\":\"OCPU\"},\"id\":\"hj\",\"name\":\"unmpxttd\",\"type\":\"hrbnlankxmyskpbh\"}")
+            "{\"properties\":{\"ocid\":\"pnazzm\",\"displayName\":\"runmp\",\"compartmentId\":\"tdbhrbnla\",\"exadataInfrastructureId\":\"xmyskp\",\"cpuCoreCount\":743667383,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":1326044907,\"patchingStatus\":\"Scheduled\",\"timePatchingEnded\":\"2021-02-18T02:28:33Z\",\"timePatchingStarted\":\"2021-03-19T14:15:42Z\"},\"maxMemoryInGbs\":1607140752,\"dbNodeStorageSizeInGbs\":917020287,\"vmClusterIds\":[\"nlqidybyxczf\"],\"dbNodeIds\":[\"aaxdbabphlwrq\",\"fkts\",\"hsucoc\"],\"lifecycleDetails\":\"yyazttbt\",\"lifecycleState\":\"Creating\",\"maxCpuCount\":1710095356,\"autonomousVmClusterIds\":[\"dckzywbiexz\",\"eyueaxibxujwb\",\"qwalmuzyoxaepd\",\"zjancuxr\"],\"autonomousVirtualMachineIds\":[\"bavxbniwdjswzt\",\"dbpgnxytxhp\",\"xbzpfzab\"],\"maxDbNodeStorageInGbs\":687811406,\"memorySizeInGbs\":650781860,\"shape\":\"wtctyqi\",\"timeCreated\":\"2021-06-27T19:00:45Z\",\"provisioningState\":\"Canceled\",\"computeModel\":\"OCPU\"},\"id\":\"wzbhvgyugu\",\"name\":\"svmkfssxquk\",\"type\":\"fpl\"}")
             .toObject(DbServerInner.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerListResultTests.java
index 3809f6d7baae..69a6f7c554a2 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerListResultTests.java
@@ -12,8 +12,8 @@ public final class DbServerListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbServerListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"ocid\":\"xpkd\",\"displayName\":\"baiuebbaumny\",\"compartmentId\":\"ped\",\"exadataInfrastructureId\":\"jn\",\"cpuCoreCount\":949740199,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":52556598,\"patchingStatus\":\"Scheduled\",\"timePatchingEnded\":\"2021-11-09T03:48:05Z\",\"timePatchingStarted\":\"2021-05-06T08:00:56Z\"},\"maxMemoryInGbs\":578889985,\"dbNodeStorageSizeInGbs\":74737899,\"vmClusterIds\":[\"pesapskrdqmhjj\",\"htldwk\",\"zxuutkncwscwsvl\",\"otogtwrupqs\"],\"dbNodeIds\":[\"micykvceoveilo\"],\"lifecycleDetails\":\"oty\",\"lifecycleState\":\"Available\",\"maxCpuCount\":1745104172,\"autonomousVmClusterIds\":[\"k\"],\"autonomousVirtualMachineIds\":[\"dhbt\"],\"maxDbNodeStorageInGbs\":1907592616,\"memorySizeInGbs\":1754671531,\"shape\":\"pnvjtoqnermclf\",\"timeCreated\":\"2021-08-17T17:40:25Z\",\"provisioningState\":\"Succeeded\",\"computeModel\":\"OCPU\"},\"id\":\"crpab\",\"name\":\"ye\",\"type\":\"sbj\"},{\"properties\":{\"ocid\":\"qugxywpmueefjzwf\",\"displayName\":\"q\",\"compartmentId\":\"ids\",\"exadataInfrastructureId\":\"onobglaocqx\",\"cpuCoreCount\":1581079817,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":528280521,\"patchingStatus\":\"Scheduled\",\"timePatchingEnded\":\"2021-07-13T20:38:11Z\",\"timePatchingStarted\":\"2021-04-24T05:00:51Z\"},\"maxMemoryInGbs\":2080912340,\"dbNodeStorageSizeInGbs\":656621417,\"vmClusterIds\":[\"wfudwpzntxhdzhl\",\"qj\",\"hckfrlhrx\",\"bkyvp\"],\"dbNodeIds\":[\"n\",\"z\",\"p\",\"kafkuwbcrnwbm\"],\"lifecycleDetails\":\"hseyvju\",\"lifecycleState\":\"MaintenanceInProgress\",\"maxCpuCount\":2138659261,\"autonomousVmClusterIds\":[\"pkdeemaofmxagkvt\",\"elmqk\"],\"autonomousVirtualMachineIds\":[\"hvljuahaquh\",\"dhmdua\",\"aex\"],\"maxDbNodeStorageInGbs\":1809510954,\"memorySizeInGbs\":792525510,\"shape\":\"mwsrcrgvxpvgo\",\"timeCreated\":\"2021-02-13T18:52:29Z\",\"provisioningState\":\"Succeeded\",\"computeModel\":\"OCPU\"},\"id\":\"wbnb\",\"name\":\"e\",\"type\":\"dawkzbali\"}],\"nextLink\":\"rqhakauha\"}")
+            "{\"value\":[{\"properties\":{\"ocid\":\"oyrxvwfudwpzntxh\",\"displayName\":\"hl\",\"compartmentId\":\"jbhckfrlhr\",\"exadataInfrastructureId\":\"bkyvp\",\"cpuCoreCount\":1219489836,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":106855620,\"patchingStatus\":\"Scheduled\",\"timePatchingEnded\":\"2021-03-18T06:16:35Z\",\"timePatchingStarted\":\"2021-09-24T05:43:50Z\"},\"maxMemoryInGbs\":863454925,\"dbNodeStorageSizeInGbs\":133840349,\"vmClusterIds\":[\"nwbmeh\"],\"dbNodeIds\":[\"yvjusrtslhsp\",\"deemao\",\"mx\",\"gkvtmelmqkrhah\"],\"lifecycleDetails\":\"juahaquhcdhmdual\",\"lifecycleState\":\"Creating\",\"maxCpuCount\":758421621,\"autonomousVmClusterIds\":[\"adm\",\"sr\"],\"autonomousVirtualMachineIds\":[\"vxpvgomz\"],\"maxDbNodeStorageInGbs\":1981643623,\"memorySizeInGbs\":491284864,\"shape\":\"wbnb\",\"timeCreated\":\"2021-11-15T23:08:14Z\",\"provisioningState\":\"Failed\",\"computeModel\":\"ECPU\"},\"id\":\"baliourqhakauha\",\"name\":\"hsfwxosowzxcug\",\"type\":\"cjooxdjebwpucwwf\"},{\"properties\":{\"ocid\":\"bvmeuecivy\",\"displayName\":\"ce\",\"compartmentId\":\"jgjrwjueiotwm\",\"exadataInfrastructureId\":\"ytdxwit\",\"cpuCoreCount\":1070997174,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":2004716325,\"patchingStatus\":\"Failed\",\"timePatchingEnded\":\"2021-04-23T19:24:04Z\",\"timePatchingStarted\":\"2021-10-10T15:46:25Z\"},\"maxMemoryInGbs\":676331942,\"dbNodeStorageSizeInGbs\":1840512089,\"vmClusterIds\":[\"bkpyc\"],\"dbNodeIds\":[\"wndnhj\"],\"lifecycleDetails\":\"uwhvylwzbtdhxujz\",\"lifecycleState\":\"MaintenanceInProgress\",\"maxCpuCount\":284483918,\"autonomousVmClusterIds\":[\"wpr\",\"qlveualupjmkh\"],\"autonomousVirtualMachineIds\":[\"bbcswsrtjri\"],\"maxDbNodeStorageInGbs\":1682044570,\"memorySizeInGbs\":1748102022,\"shape\":\"ewtghfgblcgw\",\"timeCreated\":\"2021-01-14T04:37:45Z\",\"provisioningState\":\"Failed\",\"computeModel\":\"OCPU\"},\"id\":\"kbegibt\",\"name\":\"mxiebw\",\"type\":\"aloayqcgwrtzju\"}],\"nextLink\":\"wyzmhtxon\"}")
             .toObject(DbServerListResult.class);
-        Assertions.assertEquals("rqhakauha", model.nextLink());
+        Assertions.assertEquals("wyzmhtxon", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPatchingDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPatchingDetailsTests.java
index 29619507b39e..ccb8443d004a 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPatchingDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPatchingDetailsTests.java
@@ -11,7 +11,7 @@ public final class DbServerPatchingDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbServerPatchingDetails model = BinaryData.fromString(
-            "{\"estimatedPatchDuration\":571941714,\"patchingStatus\":\"Scheduled\",\"timePatchingEnded\":\"2021-02-01T20:47:43Z\",\"timePatchingStarted\":\"2021-01-14T17:47:44Z\"}")
+            "{\"estimatedPatchDuration\":1729543433,\"patchingStatus\":\"Failed\",\"timePatchingEnded\":\"2021-02-11T06:40:02Z\",\"timePatchingStarted\":\"2021-07-13T20:38:11Z\"}")
             .toObject(DbServerPatchingDetails.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPropertiesTests.java
index a794720ccb0b..ea3c42ab2948 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServerPropertiesTests.java
@@ -11,7 +11,7 @@ public final class DbServerPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbServerProperties model = BinaryData.fromString(
-            "{\"ocid\":\"btkcxywnytnrsyn\",\"displayName\":\"idybyxczf\",\"compartmentId\":\"haaxdbabphl\",\"exadataInfrastructureId\":\"qlfktsths\",\"cpuCoreCount\":2034865697,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":2095135848,\"patchingStatus\":\"Complete\",\"timePatchingEnded\":\"2021-08-16T03:52:30Z\",\"timePatchingStarted\":\"2021-08-27T13:10:53Z\"},\"maxMemoryInGbs\":1372436938,\"dbNodeStorageSizeInGbs\":1396816712,\"vmClusterIds\":[\"puedckzywbiexzf\",\"yueaxibxujwb\",\"qwalmuzyoxaepd\",\"zjancuxr\"],\"dbNodeIds\":[\"bavxbniwdjswzt\",\"dbpgnxytxhp\",\"xbzpfzab\"],\"lifecycleDetails\":\"cuh\",\"lifecycleState\":\"Deleted\",\"maxCpuCount\":767485321,\"autonomousVmClusterIds\":[\"iklbbovpl\"],\"autonomousVirtualMachineIds\":[\"hvgyuguosvmk\",\"ss\"],\"maxDbNodeStorageInGbs\":406049393,\"memorySizeInGbs\":773521524,\"shape\":\"plgmgsxnk\",\"timeCreated\":\"2021-07-28T04:14:11Z\",\"provisioningState\":\"Succeeded\",\"computeModel\":\"ECPU\"}")
+            "{\"ocid\":\"gsxnkjzkdeslpv\",\"displayName\":\"pwiyig\",\"compartmentId\":\"pkdwzbai\",\"exadataInfrastructureId\":\"bbaumnyquped\",\"cpuCoreCount\":522910001,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":746279797,\"patchingStatus\":\"Failed\",\"timePatchingEnded\":\"2021-09-17T17:08:43Z\",\"timePatchingStarted\":\"2021-11-20T16:21:10Z\"},\"maxMemoryInGbs\":1045887723,\"dbNodeStorageSizeInGbs\":392832113,\"vmClusterIds\":[\"tfhvpesapskrdqmh\",\"jdhtldwkyzxu\",\"tkncwsc\"],\"dbNodeIds\":[\"lxotogtwrupq\",\"xvnmicykvceov\",\"ilovnot\",\"fj\"],\"lifecycleDetails\":\"njbkcnxdhbttkph\",\"lifecycleState\":\"Creating\",\"maxCpuCount\":1284749235,\"autonomousVmClusterIds\":[\"oqnermclfpl\"],\"autonomousVirtualMachineIds\":[\"xus\",\"rpabg\",\"epsbjtazqu\",\"xywpmueefjzwfqkq\"],\"maxDbNodeStorageInGbs\":640895390,\"memorySizeInGbs\":1148622887,\"shape\":\"yonobgl\",\"timeCreated\":\"2021-08-30T19:29:44Z\",\"provisioningState\":\"Failed\",\"computeModel\":\"ECPU\"}")
             .toObject(DbServerProperties.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetWithResponseMockTests.java
index f2c496f1d938..9812355d843c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersGetWithResponseMockTests.java
@@ -20,7 +20,7 @@ public final class DbServersGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ocid\":\"wrus\",\"displayName\":\"qbhsyrq\",\"compartmentId\":\"jqhden\",\"exadataInfrastructureId\":\"ulkpakd\",\"cpuCoreCount\":466096532,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":1987062682,\"patchingStatus\":\"Complete\",\"timePatchingEnded\":\"2021-04-26T17:24:10Z\",\"timePatchingStarted\":\"2021-10-12T12:03:50Z\"},\"maxMemoryInGbs\":141599202,\"dbNodeStorageSizeInGbs\":1329519591,\"vmClusterIds\":[\"p\",\"gqoweyirdhlisn\",\"wfl\"],\"dbNodeIds\":[\"pizruwnpqxpxiw\",\"cng\"],\"lifecycleDetails\":\"aas\",\"lifecycleState\":\"Deleted\",\"maxCpuCount\":352154258,\"autonomousVmClusterIds\":[\"jvkviirhgfgrws\",\"pgratzvzbglbyvi\",\"tctbrxkjzwrgxffm\",\"hkwfbkgozxwop\"],\"autonomousVirtualMachineIds\":[\"dpizq\"],\"maxDbNodeStorageInGbs\":500776725,\"memorySizeInGbs\":1182183471,\"shape\":\"xbiygnugjknfsmf\",\"timeCreated\":\"2021-11-18T08:04:29Z\",\"provisioningState\":\"Succeeded\",\"computeModel\":\"OCPU\"},\"id\":\"i\",\"name\":\"flqo\",\"type\":\"quvre\"}";
+            = "{\"properties\":{\"ocid\":\"frdbiqmrjgeihf\",\"displayName\":\"ggwfiwz\",\"compartmentId\":\"mjpb\",\"exadataInfrastructureId\":\"phmgtvljvrcmyfq\",\"cpuCoreCount\":1540718771,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":1341200966,\"patchingStatus\":\"Complete\",\"timePatchingEnded\":\"2021-03-15T22:12:36Z\",\"timePatchingStarted\":\"2021-02-05T16:45:52Z\"},\"maxMemoryInGbs\":866269149,\"dbNodeStorageSizeInGbs\":2025357675,\"vmClusterIds\":[\"ilee\"],\"dbNodeIds\":[\"wlpaugmrmfjlrxwt\",\"aukhfkvcisiz\",\"oaedsxjwuivedwcg\"],\"lifecycleDetails\":\"ewxeiqbpsm\",\"lifecycleState\":\"Unavailable\",\"maxCpuCount\":9587252,\"autonomousVmClusterIds\":[\"ljdlrgmspl\",\"gaufcs\",\"hvn\",\"wgnxkympqanxrj\"],\"autonomousVirtualMachineIds\":[\"tw\",\"taoypnyghshxc\"],\"maxDbNodeStorageInGbs\":1743709158,\"memorySizeInGbs\":52524988,\"shape\":\"nsghp\",\"timeCreated\":\"2021-02-16T02:21:14Z\",\"provisioningState\":\"Canceled\",\"computeModel\":\"OCPU\"},\"id\":\"jjkhvyomaclu\",\"name\":\"vxnqmhrpqpd\",\"type\":\"wmkoisq\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,7 +30,7 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         DbServer response = manager.dbServers()
-            .getWithResponse("wtlmjjyuo", "qtobaxkjeyt", "nlb", com.azure.core.util.Context.NONE)
+            .getWithResponse("phavpmhbrb", "gvgovpbbttefjo", "nssqyzqed", com.azure.core.util.Context.NONE)
             .getValue();
 
     }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureMockTests.java
index 4f0b79e0ed3f..ee7a8f0daa27 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbServersListByCloudExadataInfrastructureMockTests.java
@@ -21,7 +21,7 @@ public final class DbServersListByCloudExadataInfrastructureMockTests {
     @Test
     public void testListByCloudExadataInfrastructure() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"ocid\":\"rvzmlovuana\",\"displayName\":\"cxlpmjerb\",\"compartmentId\":\"elvidizozsdbccx\",\"exadataInfrastructureId\":\"on\",\"cpuCoreCount\":1268563330,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":258073184,\"patchingStatus\":\"Complete\",\"timePatchingEnded\":\"2021-01-22T00:16:45Z\",\"timePatchingStarted\":\"2021-04-11T00:16:58Z\"},\"maxMemoryInGbs\":575797032,\"dbNodeStorageSizeInGbs\":36862007,\"vmClusterIds\":[\"jctzenkei\",\"zzhmkd\",\"svflyhbxcudch\"],\"dbNodeIds\":[\"rb\",\"ldforobwj\",\"vizbfhfo\"],\"lifecycleDetails\":\"acqpbtuodxesza\",\"lifecycleState\":\"MaintenanceInProgress\",\"maxCpuCount\":1797957614,\"autonomousVmClusterIds\":[\"muaslzkw\",\"rwoycqucwyh\",\"hnomdrkywuh\",\"svfuurutlwexxwl\"],\"autonomousVirtualMachineIds\":[\"iexzsrzpge\",\"q\",\"yb\",\"wwpgdakchzyvlixq\"],\"maxDbNodeStorageInGbs\":999395263,\"memorySizeInGbs\":264711388,\"shape\":\"jibnxmysu\",\"timeCreated\":\"2021-04-28T09:40:52Z\",\"provisioningState\":\"Succeeded\",\"computeModel\":\"OCPU\"},\"id\":\"lwi\",\"name\":\"psttexoq\",\"type\":\"pwcyyufmhr\"}]}";
+            = "{\"value\":[{\"properties\":{\"ocid\":\"ylollgtrczzydmxz\",\"displayName\":\"jpvuaurkihcirld\",\"compartmentId\":\"xrdcoxnbkkja\",\"exadataInfrastructureId\":\"rnnqb\",\"cpuCoreCount\":535354048,\"dbServerPatchingDetails\":{\"estimatedPatchDuration\":1300330088,\"patchingStatus\":\"MaintenanceInProgress\",\"timePatchingEnded\":\"2021-11-23T17:11:51Z\",\"timePatchingStarted\":\"2021-08-16T00:10:06Z\"},\"maxMemoryInGbs\":1401099475,\"dbNodeStorageSizeInGbs\":1085720337,\"vmClusterIds\":[\"rxvbfihwuh\",\"ctafsrbxrblm\"],\"dbNodeIds\":[\"wxihs\",\"nxw\"],\"lifecycleDetails\":\"gnepz\",\"lifecycleState\":\"Unavailable\",\"maxCpuCount\":751159366,\"autonomousVmClusterIds\":[\"bqqqagwwrxa\"],\"autonomousVirtualMachineIds\":[\"isglrrc\",\"ezkhhltnjadhqo\",\"wjqo\",\"ueayfbpcmsplb\"],\"maxDbNodeStorageInGbs\":2116150799,\"memorySizeInGbs\":1714256429,\"shape\":\"thwmgnmbsc\",\"timeCreated\":\"2021-08-10T07:01:47Z\",\"provisioningState\":\"Succeeded\",\"computeModel\":\"OCPU\"},\"id\":\"iidlop\",\"name\":\"dbwdpyqyybxubmdn\",\"type\":\"fcbqwremjela\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,7 +31,7 @@ public void testListByCloudExadataInfrastructure() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<DbServer> response = manager.dbServers()
-            .listByCloudExadataInfrastructure("szcofizeht", "hgbjkvrelje", com.azure.core.util.Context.NONE);
+            .listByCloudExadataInfrastructure("ssffxuifmc", "ypobkdqzr", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemOptionsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemOptionsTests.java
new file mode 100644
index 000000000000..46a1ece0eff8
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemOptionsTests.java
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemOptions;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+import org.junit.jupiter.api.Assertions;
+
+public final class DbSystemOptionsTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DbSystemOptions model
+            = BinaryData.fromString("{\"storageManagement\":\"LVM\"}").toObject(DbSystemOptions.class);
+        Assertions.assertEquals(StorageManagementType.LVM, model.storageManagement());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        DbSystemOptions model = new DbSystemOptions().withStorageManagement(StorageManagementType.LVM);
+        model = BinaryData.fromObject(model).toObject(DbSystemOptions.class);
+        Assertions.assertEquals(StorageManagementType.LVM, model.storageManagement());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeInnerTests.java
index 7758bc7a1e6a..b4f1ec4be2c9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeInnerTests.java
@@ -13,31 +13,32 @@ public final class DbSystemShapeInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbSystemShapeInner model = BinaryData.fromString(
-            "{\"properties\":{\"shapeFamily\":\"racstwity\",\"shapeName\":\"hevxcced\",\"availableCoreCount\":1900639449,\"minimumCoreCount\":502101574,\"runtimeMinimumCoreCount\":317299302,\"coreCountIncrement\":1994704768,\"minStorageCount\":1858939238,\"maxStorageCount\":987064963,\"availableDataStoragePerServerInTbs\":15.099293123274682,\"availableMemoryPerNodeInGbs\":491638921,\"availableDbNodePerNodeInGbs\":573145067,\"minCoreCountPerNode\":139377731,\"availableMemoryInGbs\":761220037,\"minMemoryPerNodeInGbs\":1498430140,\"availableDbNodeStorageInGbs\":1501738623,\"minDbNodeStoragePerNodeInGbs\":1485792464,\"availableDataStorageInTbs\":1627588082,\"minDataStorageInTbs\":836619519,\"minimumNodeCount\":1911413053,\"maximumNodeCount\":1077177476,\"availableCoreCountPerNode\":1643458041,\"computeModel\":\"ECPU\",\"areServerTypesSupported\":false,\"displayName\":\"lmdjrkvfgbvfvpdb\"},\"id\":\"acizsjqlhkrr\",\"name\":\"bdeibqipqk\",\"type\":\"hvxndzwmkrefajpj\"}")
+            "{\"properties\":{\"shapeFamily\":\"vpdbodaciz\",\"shapeName\":\"j\",\"availableCoreCount\":1933405509,\"minimumCoreCount\":588632763,\"runtimeMinimumCoreCount\":218475539,\"coreCountIncrement\":268834532,\"minStorageCount\":991301746,\"maxStorageCount\":180588113,\"availableDataStoragePerServerInTbs\":79.38383675850163,\"availableMemoryPerNodeInGbs\":840101476,\"availableDbNodePerNodeInGbs\":2080529192,\"minCoreCountPerNode\":1573874006,\"availableMemoryInGbs\":1070567995,\"minMemoryPerNodeInGbs\":485906823,\"availableDbNodeStorageInGbs\":74498684,\"minDbNodeStoragePerNodeInGbs\":1472757866,\"availableDataStorageInTbs\":1155749150,\"minDataStorageInTbs\":754811246,\"minimumNodeCount\":1983061775,\"maximumNodeCount\":1789165646,\"availableCoreCountPerNode\":1363843436,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":true,\"displayName\":\"ij\",\"shapeAttributes\":[\"vfxzsjab\",\"bsystawfsdjpvk\",\"p\",\"jxbkzbzkdvn\"]},\"id\":\"abudurgk\",\"name\":\"kmokz\",\"type\":\"jjklff\"}")
             .toObject(DbSystemShapeInner.class);
-        Assertions.assertEquals("racstwity", model.properties().shapeFamily());
-        Assertions.assertEquals("hevxcced", model.properties().shapeName());
-        Assertions.assertEquals(1900639449, model.properties().availableCoreCount());
-        Assertions.assertEquals(502101574, model.properties().minimumCoreCount());
-        Assertions.assertEquals(317299302, model.properties().runtimeMinimumCoreCount());
-        Assertions.assertEquals(1994704768, model.properties().coreCountIncrement());
-        Assertions.assertEquals(1858939238, model.properties().minStorageCount());
-        Assertions.assertEquals(987064963, model.properties().maxStorageCount());
-        Assertions.assertEquals(15.099293123274682D, model.properties().availableDataStoragePerServerInTbs());
-        Assertions.assertEquals(491638921, model.properties().availableMemoryPerNodeInGbs());
-        Assertions.assertEquals(573145067, model.properties().availableDbNodePerNodeInGbs());
-        Assertions.assertEquals(139377731, model.properties().minCoreCountPerNode());
-        Assertions.assertEquals(761220037, model.properties().availableMemoryInGbs());
-        Assertions.assertEquals(1498430140, model.properties().minMemoryPerNodeInGbs());
-        Assertions.assertEquals(1501738623, model.properties().availableDbNodeStorageInGbs());
-        Assertions.assertEquals(1485792464, model.properties().minDbNodeStoragePerNodeInGbs());
-        Assertions.assertEquals(1627588082, model.properties().availableDataStorageInTbs());
-        Assertions.assertEquals(836619519, model.properties().minDataStorageInTbs());
-        Assertions.assertEquals(1911413053, model.properties().minimumNodeCount());
-        Assertions.assertEquals(1077177476, model.properties().maximumNodeCount());
-        Assertions.assertEquals(1643458041, model.properties().availableCoreCountPerNode());
-        Assertions.assertEquals(ComputeModel.ECPU, model.properties().computeModel());
-        Assertions.assertFalse(model.properties().areServerTypesSupported());
-        Assertions.assertEquals("lmdjrkvfgbvfvpdb", model.properties().displayName());
+        Assertions.assertEquals("vpdbodaciz", model.properties().shapeFamily());
+        Assertions.assertEquals("j", model.properties().shapeName());
+        Assertions.assertEquals(1933405509, model.properties().availableCoreCount());
+        Assertions.assertEquals(588632763, model.properties().minimumCoreCount());
+        Assertions.assertEquals(218475539, model.properties().runtimeMinimumCoreCount());
+        Assertions.assertEquals(268834532, model.properties().coreCountIncrement());
+        Assertions.assertEquals(991301746, model.properties().minStorageCount());
+        Assertions.assertEquals(180588113, model.properties().maxStorageCount());
+        Assertions.assertEquals(79.38383675850163D, model.properties().availableDataStoragePerServerInTbs());
+        Assertions.assertEquals(840101476, model.properties().availableMemoryPerNodeInGbs());
+        Assertions.assertEquals(2080529192, model.properties().availableDbNodePerNodeInGbs());
+        Assertions.assertEquals(1573874006, model.properties().minCoreCountPerNode());
+        Assertions.assertEquals(1070567995, model.properties().availableMemoryInGbs());
+        Assertions.assertEquals(485906823, model.properties().minMemoryPerNodeInGbs());
+        Assertions.assertEquals(74498684, model.properties().availableDbNodeStorageInGbs());
+        Assertions.assertEquals(1472757866, model.properties().minDbNodeStoragePerNodeInGbs());
+        Assertions.assertEquals(1155749150, model.properties().availableDataStorageInTbs());
+        Assertions.assertEquals(754811246, model.properties().minDataStorageInTbs());
+        Assertions.assertEquals(1983061775, model.properties().minimumNodeCount());
+        Assertions.assertEquals(1789165646, model.properties().maximumNodeCount());
+        Assertions.assertEquals(1363843436, model.properties().availableCoreCountPerNode());
+        Assertions.assertEquals(ComputeModel.OCPU, model.properties().computeModel());
+        Assertions.assertTrue(model.properties().areServerTypesSupported());
+        Assertions.assertEquals("ij", model.properties().displayName());
+        Assertions.assertEquals("vfxzsjab", model.properties().shapeAttributes().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeListResultTests.java
index fdbb66a362fb..39870f601d6b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapeListResultTests.java
@@ -13,33 +13,34 @@ public final class DbSystemShapeListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbSystemShapeListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"shapeFamily\":\"lffhmouwqlg\",\"shapeName\":\"rfzeey\",\"availableCoreCount\":437518937,\"minimumCoreCount\":428903037,\"runtimeMinimumCoreCount\":707940784,\"coreCountIncrement\":2103532940,\"minStorageCount\":566949412,\"maxStorageCount\":1810814701,\"availableDataStoragePerServerInTbs\":46.895401356243696,\"availableMemoryPerNodeInGbs\":1692042024,\"availableDbNodePerNodeInGbs\":397813394,\"minCoreCountPerNode\":549914749,\"availableMemoryInGbs\":1463319790,\"minMemoryPerNodeInGbs\":948234782,\"availableDbNodeStorageInGbs\":1918019278,\"minDbNodeStoragePerNodeInGbs\":348550148,\"availableDataStorageInTbs\":1644492935,\"minDataStorageInTbs\":1408041355,\"minimumNodeCount\":1907297138,\"maximumNodeCount\":299337354,\"availableCoreCountPerNode\":1000390440,\"computeModel\":\"ECPU\",\"areServerTypesSupported\":true,\"displayName\":\"x\"},\"id\":\"mwutwbdsre\",\"name\":\"pdrhne\",\"type\":\"yowqkdwytisibir\"},{\"properties\":{\"shapeFamily\":\"ikpzimejza\",\"shapeName\":\"lfzxiavrmbzonoki\",\"availableCoreCount\":988966310,\"minimumCoreCount\":115638191,\"runtimeMinimumCoreCount\":1122267125,\"coreCountIncrement\":1711524187,\"minStorageCount\":2101008571,\"maxStorageCount\":259037414,\"availableDataStoragePerServerInTbs\":89.32879692796732,\"availableMemoryPerNodeInGbs\":1054852433,\"availableDbNodePerNodeInGbs\":1822187571,\"minCoreCountPerNode\":585104541,\"availableMemoryInGbs\":409653705,\"minMemoryPerNodeInGbs\":1988160983,\"availableDbNodeStorageInGbs\":618267634,\"minDbNodeStoragePerNodeInGbs\":506888609,\"availableDataStorageInTbs\":2003190846,\"minDataStorageInTbs\":1007403747,\"minimumNodeCount\":1108840022,\"maximumNodeCount\":85653434,\"availableCoreCountPerNode\":775770123,\"computeModel\":\"ECPU\",\"areServerTypesSupported\":false,\"displayName\":\"szfjvfbgofelja\"},\"id\":\"qmqhldvriii\",\"name\":\"jnalghf\",\"type\":\"vtvsexsowueluq\"}],\"nextLink\":\"ahhxvrh\"}")
+            "{\"value\":[{\"properties\":{\"shapeFamily\":\"kpzi\",\"shapeName\":\"ejzanlfz\",\"availableCoreCount\":1319362662,\"minimumCoreCount\":1937691964,\"runtimeMinimumCoreCount\":187576491,\"coreCountIncrement\":913620687,\"minStorageCount\":1220636721,\"maxStorageCount\":1274938421,\"availableDataStoragePerServerInTbs\":95.66503350475678,\"availableMemoryPerNodeInGbs\":115638191,\"availableDbNodePerNodeInGbs\":1122267125,\"minCoreCountPerNode\":1711524187,\"availableMemoryInGbs\":2101008571,\"minMemoryPerNodeInGbs\":259037414,\"availableDbNodeStorageInGbs\":1689158951,\"minDbNodeStoragePerNodeInGbs\":1438056618,\"availableDataStorageInTbs\":289139579,\"minDataStorageInTbs\":1810862586,\"minimumNodeCount\":755855856,\"maximumNodeCount\":1723984044,\"availableCoreCountPerNode\":427413462,\"computeModel\":\"ECPU\",\"areServerTypesSupported\":true,\"displayName\":\"lwbtlhf\",\"shapeAttributes\":[\"cdhszf\"]},\"id\":\"fbgofeljagrqmqh\",\"name\":\"dvriiiojnal\",\"type\":\"hfkvtvsexsowuel\"},{\"properties\":{\"shapeFamily\":\"hahhxvrhmzkwpj\",\"shapeName\":\"wws\",\"availableCoreCount\":2038816187,\"minimumCoreCount\":1806327837,\"runtimeMinimumCoreCount\":665016103,\"coreCountIncrement\":1926831328,\"minStorageCount\":1227202155,\"maxStorageCount\":2032055045,\"availableDataStoragePerServerInTbs\":4.305473825684814,\"availableMemoryPerNodeInGbs\":649615996,\"availableDbNodePerNodeInGbs\":1485711526,\"minCoreCountPerNode\":2084244471,\"availableMemoryInGbs\":157290009,\"minMemoryPerNodeInGbs\":1889807539,\"availableDbNodeStorageInGbs\":1599924393,\"minDbNodeStoragePerNodeInGbs\":1040551397,\"availableDataStorageInTbs\":1159016951,\"minDataStorageInTbs\":1563611736,\"minimumNodeCount\":1621102365,\"maximumNodeCount\":528928075,\"availableCoreCountPerNode\":1086596152,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"z\",\"shapeAttributes\":[\"amvpphoszqzudph\"]},\"id\":\"mvdk\",\"name\":\"wynwcvtbvkayhm\",\"type\":\"nvyq\"},{\"properties\":{\"shapeFamily\":\"kzwpcnpw\",\"shapeName\":\"cjaesgvvs\",\"availableCoreCount\":2127288077,\"minimumCoreCount\":1555062336,\"runtimeMinimumCoreCount\":248286602,\"coreCountIncrement\":1367034748,\"minStorageCount\":923273166,\"maxStorageCount\":589135345,\"availableDataStoragePerServerInTbs\":83.973841997124,\"availableMemoryPerNodeInGbs\":1249464934,\"availableDbNodePerNodeInGbs\":826622083,\"minCoreCountPerNode\":361846951,\"availableMemoryInGbs\":10642389,\"minMemoryPerNodeInGbs\":2087511541,\"availableDbNodeStorageInGbs\":1547666647,\"minDbNodeStoragePerNodeInGbs\":252265287,\"availableDataStorageInTbs\":372421736,\"minDataStorageInTbs\":114396091,\"minimumNodeCount\":1693108330,\"maximumNodeCount\":857980637,\"availableCoreCountPerNode\":1106936227,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":true,\"displayName\":\"psvuoymgc\",\"shapeAttributes\":[\"vezrypqlmfeo\"]},\"id\":\"rqwky\",\"name\":\"kobopgxed\",\"type\":\"owepbqpcrfkb\"}],\"nextLink\":\"csnjvcdwxlpqekft\"}")
             .toObject(DbSystemShapeListResult.class);
-        Assertions.assertEquals("lffhmouwqlg", model.value().get(0).properties().shapeFamily());
-        Assertions.assertEquals("rfzeey", model.value().get(0).properties().shapeName());
-        Assertions.assertEquals(437518937, model.value().get(0).properties().availableCoreCount());
-        Assertions.assertEquals(428903037, model.value().get(0).properties().minimumCoreCount());
-        Assertions.assertEquals(707940784, model.value().get(0).properties().runtimeMinimumCoreCount());
-        Assertions.assertEquals(2103532940, model.value().get(0).properties().coreCountIncrement());
-        Assertions.assertEquals(566949412, model.value().get(0).properties().minStorageCount());
-        Assertions.assertEquals(1810814701, model.value().get(0).properties().maxStorageCount());
-        Assertions.assertEquals(46.895401356243696D,
+        Assertions.assertEquals("kpzi", model.value().get(0).properties().shapeFamily());
+        Assertions.assertEquals("ejzanlfz", model.value().get(0).properties().shapeName());
+        Assertions.assertEquals(1319362662, model.value().get(0).properties().availableCoreCount());
+        Assertions.assertEquals(1937691964, model.value().get(0).properties().minimumCoreCount());
+        Assertions.assertEquals(187576491, model.value().get(0).properties().runtimeMinimumCoreCount());
+        Assertions.assertEquals(913620687, model.value().get(0).properties().coreCountIncrement());
+        Assertions.assertEquals(1220636721, model.value().get(0).properties().minStorageCount());
+        Assertions.assertEquals(1274938421, model.value().get(0).properties().maxStorageCount());
+        Assertions.assertEquals(95.66503350475678D,
             model.value().get(0).properties().availableDataStoragePerServerInTbs());
-        Assertions.assertEquals(1692042024, model.value().get(0).properties().availableMemoryPerNodeInGbs());
-        Assertions.assertEquals(397813394, model.value().get(0).properties().availableDbNodePerNodeInGbs());
-        Assertions.assertEquals(549914749, model.value().get(0).properties().minCoreCountPerNode());
-        Assertions.assertEquals(1463319790, model.value().get(0).properties().availableMemoryInGbs());
-        Assertions.assertEquals(948234782, model.value().get(0).properties().minMemoryPerNodeInGbs());
-        Assertions.assertEquals(1918019278, model.value().get(0).properties().availableDbNodeStorageInGbs());
-        Assertions.assertEquals(348550148, model.value().get(0).properties().minDbNodeStoragePerNodeInGbs());
-        Assertions.assertEquals(1644492935, model.value().get(0).properties().availableDataStorageInTbs());
-        Assertions.assertEquals(1408041355, model.value().get(0).properties().minDataStorageInTbs());
-        Assertions.assertEquals(1907297138, model.value().get(0).properties().minimumNodeCount());
-        Assertions.assertEquals(299337354, model.value().get(0).properties().maximumNodeCount());
-        Assertions.assertEquals(1000390440, model.value().get(0).properties().availableCoreCountPerNode());
+        Assertions.assertEquals(115638191, model.value().get(0).properties().availableMemoryPerNodeInGbs());
+        Assertions.assertEquals(1122267125, model.value().get(0).properties().availableDbNodePerNodeInGbs());
+        Assertions.assertEquals(1711524187, model.value().get(0).properties().minCoreCountPerNode());
+        Assertions.assertEquals(2101008571, model.value().get(0).properties().availableMemoryInGbs());
+        Assertions.assertEquals(259037414, model.value().get(0).properties().minMemoryPerNodeInGbs());
+        Assertions.assertEquals(1689158951, model.value().get(0).properties().availableDbNodeStorageInGbs());
+        Assertions.assertEquals(1438056618, model.value().get(0).properties().minDbNodeStoragePerNodeInGbs());
+        Assertions.assertEquals(289139579, model.value().get(0).properties().availableDataStorageInTbs());
+        Assertions.assertEquals(1810862586, model.value().get(0).properties().minDataStorageInTbs());
+        Assertions.assertEquals(755855856, model.value().get(0).properties().minimumNodeCount());
+        Assertions.assertEquals(1723984044, model.value().get(0).properties().maximumNodeCount());
+        Assertions.assertEquals(427413462, model.value().get(0).properties().availableCoreCountPerNode());
         Assertions.assertEquals(ComputeModel.ECPU, model.value().get(0).properties().computeModel());
         Assertions.assertTrue(model.value().get(0).properties().areServerTypesSupported());
-        Assertions.assertEquals("x", model.value().get(0).properties().displayName());
-        Assertions.assertEquals("ahhxvrh", model.nextLink());
+        Assertions.assertEquals("lwbtlhf", model.value().get(0).properties().displayName());
+        Assertions.assertEquals("cdhszf", model.value().get(0).properties().shapeAttributes().get(0));
+        Assertions.assertEquals("csnjvcdwxlpqekft", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapePropertiesTests.java
index e446240f80ba..1a837ba2e9c6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapePropertiesTests.java
@@ -13,31 +13,32 @@ public final class DbSystemShapePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DbSystemShapeProperties model = BinaryData.fromString(
-            "{\"shapeFamily\":\"wkqnyhg\",\"shapeName\":\"ij\",\"availableCoreCount\":809935790,\"minimumCoreCount\":1921447285,\"runtimeMinimumCoreCount\":2036493170,\"coreCountIncrement\":1649484823,\"minStorageCount\":410549379,\"maxStorageCount\":193774859,\"availableDataStoragePerServerInTbs\":68.72210780329124,\"availableMemoryPerNodeInGbs\":838227429,\"availableDbNodePerNodeInGbs\":1059509232,\"minCoreCountPerNode\":1997907611,\"availableMemoryInGbs\":2111279751,\"minMemoryPerNodeInGbs\":1073194543,\"availableDbNodeStorageInGbs\":387671304,\"minDbNodeStoragePerNodeInGbs\":250834954,\"availableDataStorageInTbs\":911357247,\"minDataStorageInTbs\":1795251983,\"minimumNodeCount\":1597087074,\"maximumNodeCount\":396051915,\"availableCoreCountPerNode\":1047395682,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"udurgkakmokz\"}")
+            "{\"shapeFamily\":\"ouw\",\"shapeName\":\"lgzrfzeeyeb\",\"availableCoreCount\":428903037,\"minimumCoreCount\":707940784,\"runtimeMinimumCoreCount\":2103532940,\"coreCountIncrement\":566949412,\"minStorageCount\":1810814701,\"maxStorageCount\":2014142159,\"availableDataStoragePerServerInTbs\":38.363659968911456,\"availableMemoryPerNodeInGbs\":397813394,\"availableDbNodePerNodeInGbs\":549914749,\"minCoreCountPerNode\":1463319790,\"availableMemoryInGbs\":948234782,\"minMemoryPerNodeInGbs\":1918019278,\"availableDbNodeStorageInGbs\":348550148,\"minDbNodeStoragePerNodeInGbs\":1644492935,\"availableDataStorageInTbs\":1408041355,\"minDataStorageInTbs\":1907297138,\"minimumNodeCount\":299337354,\"maximumNodeCount\":1000390440,\"availableCoreCountPerNode\":753407395,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"smwutwbdsrezpd\",\"shapeAttributes\":[\"euyowqkd\",\"ytisibir\"]}")
             .toObject(DbSystemShapeProperties.class);
-        Assertions.assertEquals("wkqnyhg", model.shapeFamily());
-        Assertions.assertEquals("ij", model.shapeName());
-        Assertions.assertEquals(809935790, model.availableCoreCount());
-        Assertions.assertEquals(1921447285, model.minimumCoreCount());
-        Assertions.assertEquals(2036493170, model.runtimeMinimumCoreCount());
-        Assertions.assertEquals(1649484823, model.coreCountIncrement());
-        Assertions.assertEquals(410549379, model.minStorageCount());
-        Assertions.assertEquals(193774859, model.maxStorageCount());
-        Assertions.assertEquals(68.72210780329124D, model.availableDataStoragePerServerInTbs());
-        Assertions.assertEquals(838227429, model.availableMemoryPerNodeInGbs());
-        Assertions.assertEquals(1059509232, model.availableDbNodePerNodeInGbs());
-        Assertions.assertEquals(1997907611, model.minCoreCountPerNode());
-        Assertions.assertEquals(2111279751, model.availableMemoryInGbs());
-        Assertions.assertEquals(1073194543, model.minMemoryPerNodeInGbs());
-        Assertions.assertEquals(387671304, model.availableDbNodeStorageInGbs());
-        Assertions.assertEquals(250834954, model.minDbNodeStoragePerNodeInGbs());
-        Assertions.assertEquals(911357247, model.availableDataStorageInTbs());
-        Assertions.assertEquals(1795251983, model.minDataStorageInTbs());
-        Assertions.assertEquals(1597087074, model.minimumNodeCount());
-        Assertions.assertEquals(396051915, model.maximumNodeCount());
-        Assertions.assertEquals(1047395682, model.availableCoreCountPerNode());
+        Assertions.assertEquals("ouw", model.shapeFamily());
+        Assertions.assertEquals("lgzrfzeeyeb", model.shapeName());
+        Assertions.assertEquals(428903037, model.availableCoreCount());
+        Assertions.assertEquals(707940784, model.minimumCoreCount());
+        Assertions.assertEquals(2103532940, model.runtimeMinimumCoreCount());
+        Assertions.assertEquals(566949412, model.coreCountIncrement());
+        Assertions.assertEquals(1810814701, model.minStorageCount());
+        Assertions.assertEquals(2014142159, model.maxStorageCount());
+        Assertions.assertEquals(38.363659968911456D, model.availableDataStoragePerServerInTbs());
+        Assertions.assertEquals(397813394, model.availableMemoryPerNodeInGbs());
+        Assertions.assertEquals(549914749, model.availableDbNodePerNodeInGbs());
+        Assertions.assertEquals(1463319790, model.minCoreCountPerNode());
+        Assertions.assertEquals(948234782, model.availableMemoryInGbs());
+        Assertions.assertEquals(1918019278, model.minMemoryPerNodeInGbs());
+        Assertions.assertEquals(348550148, model.availableDbNodeStorageInGbs());
+        Assertions.assertEquals(1644492935, model.minDbNodeStoragePerNodeInGbs());
+        Assertions.assertEquals(1408041355, model.availableDataStorageInTbs());
+        Assertions.assertEquals(1907297138, model.minDataStorageInTbs());
+        Assertions.assertEquals(299337354, model.minimumNodeCount());
+        Assertions.assertEquals(1000390440, model.maximumNodeCount());
+        Assertions.assertEquals(753407395, model.availableCoreCountPerNode());
         Assertions.assertEquals(ComputeModel.OCPU, model.computeModel());
         Assertions.assertFalse(model.areServerTypesSupported());
-        Assertions.assertEquals("udurgkakmokz", model.displayName());
+        Assertions.assertEquals("smwutwbdsrezpd", model.displayName());
+        Assertions.assertEquals("euyowqkd", model.shapeAttributes().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetWithResponseMockTests.java
index 69d057cc1492..9bc80cf8162a 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class DbSystemShapesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"shapeFamily\":\"nyghshxcylhkgmn\",\"shapeName\":\"ghpxycphdr\",\"availableCoreCount\":1014591780,\"minimumCoreCount\":615187266,\"runtimeMinimumCoreCount\":955668651,\"coreCountIncrement\":1407961228,\"minStorageCount\":270472201,\"maxStorageCount\":1784777493,\"availableDataStoragePerServerInTbs\":55.06537502410025,\"availableMemoryPerNodeInGbs\":1567637911,\"availableDbNodePerNodeInGbs\":54426069,\"minCoreCountPerNode\":1319118699,\"availableMemoryInGbs\":718390639,\"minMemoryPerNodeInGbs\":394760267,\"availableDbNodeStorageInGbs\":1842537071,\"minDbNodeStoragePerNodeInGbs\":1055926637,\"availableDataStorageInTbs\":1691318308,\"minDataStorageInTbs\":480915172,\"minimumNodeCount\":355623092,\"maximumNodeCount\":143922465,\"availableCoreCountPerNode\":1770477631,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"s\"},\"id\":\"obkdqzrdzsyl\",\"name\":\"llg\",\"type\":\"rc\"}";
+            = "{\"properties\":{\"shapeFamily\":\"zmqxucyci\",\"shapeName\":\"oclxiut\",\"availableCoreCount\":387452116,\"minimumCoreCount\":1503510636,\"runtimeMinimumCoreCount\":337524903,\"coreCountIncrement\":1985802258,\"minStorageCount\":336239523,\"maxStorageCount\":2018932667,\"availableDataStoragePerServerInTbs\":77.88850635600404,\"availableMemoryPerNodeInGbs\":200724130,\"availableDbNodePerNodeInGbs\":1356942532,\"minCoreCountPerNode\":1155882652,\"availableMemoryInGbs\":987492533,\"minMemoryPerNodeInGbs\":208870691,\"availableDbNodeStorageInGbs\":437232288,\"minDbNodeStoragePerNodeInGbs\":1136237015,\"availableDataStorageInTbs\":854856644,\"minDataStorageInTbs\":1743289619,\"minimumNodeCount\":847271389,\"maximumNodeCount\":594203198,\"availableCoreCountPerNode\":450731923,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"liys\",\"shapeAttributes\":[\"cvmwfauxxepmy\",\"bormcqmiciijqpkz\",\"bojxjmcsmy\",\"wixvcpwnkwywzw\"]},\"id\":\"alickduoi\",\"name\":\"tamtyv\",\"type\":\"kn\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,32 +31,34 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        DbSystemShape response
-            = manager.dbSystemShapes().getWithResponse("ixt", "bta", com.azure.core.util.Context.NONE).getValue();
+        DbSystemShape response = manager.dbSystemShapes()
+            .getWithResponse("lyujlfyoump", "kyeclcdigpta", com.azure.core.util.Context.NONE)
+            .getValue();
 
-        Assertions.assertEquals("nyghshxcylhkgmn", response.properties().shapeFamily());
-        Assertions.assertEquals("ghpxycphdr", response.properties().shapeName());
-        Assertions.assertEquals(1014591780, response.properties().availableCoreCount());
-        Assertions.assertEquals(615187266, response.properties().minimumCoreCount());
-        Assertions.assertEquals(955668651, response.properties().runtimeMinimumCoreCount());
-        Assertions.assertEquals(1407961228, response.properties().coreCountIncrement());
-        Assertions.assertEquals(270472201, response.properties().minStorageCount());
-        Assertions.assertEquals(1784777493, response.properties().maxStorageCount());
-        Assertions.assertEquals(55.06537502410025D, response.properties().availableDataStoragePerServerInTbs());
-        Assertions.assertEquals(1567637911, response.properties().availableMemoryPerNodeInGbs());
-        Assertions.assertEquals(54426069, response.properties().availableDbNodePerNodeInGbs());
-        Assertions.assertEquals(1319118699, response.properties().minCoreCountPerNode());
-        Assertions.assertEquals(718390639, response.properties().availableMemoryInGbs());
-        Assertions.assertEquals(394760267, response.properties().minMemoryPerNodeInGbs());
-        Assertions.assertEquals(1842537071, response.properties().availableDbNodeStorageInGbs());
-        Assertions.assertEquals(1055926637, response.properties().minDbNodeStoragePerNodeInGbs());
-        Assertions.assertEquals(1691318308, response.properties().availableDataStorageInTbs());
-        Assertions.assertEquals(480915172, response.properties().minDataStorageInTbs());
-        Assertions.assertEquals(355623092, response.properties().minimumNodeCount());
-        Assertions.assertEquals(143922465, response.properties().maximumNodeCount());
-        Assertions.assertEquals(1770477631, response.properties().availableCoreCountPerNode());
+        Assertions.assertEquals("zmqxucyci", response.properties().shapeFamily());
+        Assertions.assertEquals("oclxiut", response.properties().shapeName());
+        Assertions.assertEquals(387452116, response.properties().availableCoreCount());
+        Assertions.assertEquals(1503510636, response.properties().minimumCoreCount());
+        Assertions.assertEquals(337524903, response.properties().runtimeMinimumCoreCount());
+        Assertions.assertEquals(1985802258, response.properties().coreCountIncrement());
+        Assertions.assertEquals(336239523, response.properties().minStorageCount());
+        Assertions.assertEquals(2018932667, response.properties().maxStorageCount());
+        Assertions.assertEquals(77.88850635600404D, response.properties().availableDataStoragePerServerInTbs());
+        Assertions.assertEquals(200724130, response.properties().availableMemoryPerNodeInGbs());
+        Assertions.assertEquals(1356942532, response.properties().availableDbNodePerNodeInGbs());
+        Assertions.assertEquals(1155882652, response.properties().minCoreCountPerNode());
+        Assertions.assertEquals(987492533, response.properties().availableMemoryInGbs());
+        Assertions.assertEquals(208870691, response.properties().minMemoryPerNodeInGbs());
+        Assertions.assertEquals(437232288, response.properties().availableDbNodeStorageInGbs());
+        Assertions.assertEquals(1136237015, response.properties().minDbNodeStoragePerNodeInGbs());
+        Assertions.assertEquals(854856644, response.properties().availableDataStorageInTbs());
+        Assertions.assertEquals(1743289619, response.properties().minDataStorageInTbs());
+        Assertions.assertEquals(847271389, response.properties().minimumNodeCount());
+        Assertions.assertEquals(594203198, response.properties().maximumNodeCount());
+        Assertions.assertEquals(450731923, response.properties().availableCoreCountPerNode());
         Assertions.assertEquals(ComputeModel.OCPU, response.properties().computeModel());
         Assertions.assertFalse(response.properties().areServerTypesSupported());
-        Assertions.assertEquals("s", response.properties().displayName());
+        Assertions.assertEquals("liys", response.properties().displayName());
+        Assertions.assertEquals("cvmwfauxxepmy", response.properties().shapeAttributes().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationMockTests.java
index c214c5ba372f..dbfce9110d51 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemShapesListByLocationMockTests.java
@@ -23,7 +23,7 @@ public final class DbSystemShapesListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"shapeFamily\":\"ruswhv\",\"shapeName\":\"czznvfbycjsxj\",\"availableCoreCount\":649066801,\"minimumCoreCount\":619019093,\"runtimeMinimumCoreCount\":2058612555,\"coreCountIncrement\":1659306080,\"minStorageCount\":1721115521,\"maxStorageCount\":260719859,\"availableDataStoragePerServerInTbs\":45.274637580867186,\"availableMemoryPerNodeInGbs\":1385229994,\"availableDbNodePerNodeInGbs\":1720273649,\"minCoreCountPerNode\":521658697,\"availableMemoryInGbs\":1681386339,\"minMemoryPerNodeInGbs\":1759834581,\"availableDbNodeStorageInGbs\":757674973,\"minDbNodeStoragePerNodeInGbs\":762315907,\"availableDataStorageInTbs\":1605190463,\"minDataStorageInTbs\":1952458367,\"minimumNodeCount\":152942786,\"maximumNodeCount\":589118768,\"availableCoreCountPerNode\":653737679,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"nje\"},\"id\":\"gltsxoat\",\"name\":\"tgzpnpb\",\"type\":\"wvefloccsrmoz\"}]}";
+            = "{\"value\":[{\"properties\":{\"shapeFamily\":\"pweryekzk\",\"shapeName\":\"hmeott\",\"availableCoreCount\":124804316,\"minimumCoreCount\":585155395,\"runtimeMinimumCoreCount\":375034092,\"coreCountIncrement\":543459562,\"minStorageCount\":1246274609,\"maxStorageCount\":74982519,\"availableDataStoragePerServerInTbs\":80.27398746965785,\"availableMemoryPerNodeInGbs\":36011706,\"availableDbNodePerNodeInGbs\":1921386454,\"minCoreCountPerNode\":570487847,\"availableMemoryInGbs\":910597369,\"minMemoryPerNodeInGbs\":964723311,\"availableDbNodeStorageInGbs\":572984126,\"minDbNodeStoragePerNodeInGbs\":1686524732,\"availableDataStorageInTbs\":2030340848,\"minDataStorageInTbs\":1775688336,\"minimumNodeCount\":1502364938,\"maximumNodeCount\":1874803721,\"availableCoreCountPerNode\":535790621,\"computeModel\":\"OCPU\",\"areServerTypesSupported\":false,\"displayName\":\"ehuxiqhzlraym\",\"shapeAttributes\":[\"lskihmxrfdsajred\"]},\"id\":\"yyshtuwgmevua\",\"name\":\"pwzyi\",\"type\":\"rkgwltxeqip\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,33 +32,34 @@ public void testListByLocation() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        PagedIterable<DbSystemShape> response
-            = manager.dbSystemShapes().listByLocation("qbsms", "ziqgfuh", com.azure.core.util.Context.NONE);
+        PagedIterable<DbSystemShape> response = manager.dbSystemShapes()
+            .listByLocation("rwzawnvs", "cfhzagxnvhycv", "imwrzregzgyufu", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("ruswhv", response.iterator().next().properties().shapeFamily());
-        Assertions.assertEquals("czznvfbycjsxj", response.iterator().next().properties().shapeName());
-        Assertions.assertEquals(649066801, response.iterator().next().properties().availableCoreCount());
-        Assertions.assertEquals(619019093, response.iterator().next().properties().minimumCoreCount());
-        Assertions.assertEquals(2058612555, response.iterator().next().properties().runtimeMinimumCoreCount());
-        Assertions.assertEquals(1659306080, response.iterator().next().properties().coreCountIncrement());
-        Assertions.assertEquals(1721115521, response.iterator().next().properties().minStorageCount());
-        Assertions.assertEquals(260719859, response.iterator().next().properties().maxStorageCount());
-        Assertions.assertEquals(45.274637580867186D,
+        Assertions.assertEquals("pweryekzk", response.iterator().next().properties().shapeFamily());
+        Assertions.assertEquals("hmeott", response.iterator().next().properties().shapeName());
+        Assertions.assertEquals(124804316, response.iterator().next().properties().availableCoreCount());
+        Assertions.assertEquals(585155395, response.iterator().next().properties().minimumCoreCount());
+        Assertions.assertEquals(375034092, response.iterator().next().properties().runtimeMinimumCoreCount());
+        Assertions.assertEquals(543459562, response.iterator().next().properties().coreCountIncrement());
+        Assertions.assertEquals(1246274609, response.iterator().next().properties().minStorageCount());
+        Assertions.assertEquals(74982519, response.iterator().next().properties().maxStorageCount());
+        Assertions.assertEquals(80.27398746965785D,
             response.iterator().next().properties().availableDataStoragePerServerInTbs());
-        Assertions.assertEquals(1385229994, response.iterator().next().properties().availableMemoryPerNodeInGbs());
-        Assertions.assertEquals(1720273649, response.iterator().next().properties().availableDbNodePerNodeInGbs());
-        Assertions.assertEquals(521658697, response.iterator().next().properties().minCoreCountPerNode());
-        Assertions.assertEquals(1681386339, response.iterator().next().properties().availableMemoryInGbs());
-        Assertions.assertEquals(1759834581, response.iterator().next().properties().minMemoryPerNodeInGbs());
-        Assertions.assertEquals(757674973, response.iterator().next().properties().availableDbNodeStorageInGbs());
-        Assertions.assertEquals(762315907, response.iterator().next().properties().minDbNodeStoragePerNodeInGbs());
-        Assertions.assertEquals(1605190463, response.iterator().next().properties().availableDataStorageInTbs());
-        Assertions.assertEquals(1952458367, response.iterator().next().properties().minDataStorageInTbs());
-        Assertions.assertEquals(152942786, response.iterator().next().properties().minimumNodeCount());
-        Assertions.assertEquals(589118768, response.iterator().next().properties().maximumNodeCount());
-        Assertions.assertEquals(653737679, response.iterator().next().properties().availableCoreCountPerNode());
+        Assertions.assertEquals(36011706, response.iterator().next().properties().availableMemoryPerNodeInGbs());
+        Assertions.assertEquals(1921386454, response.iterator().next().properties().availableDbNodePerNodeInGbs());
+        Assertions.assertEquals(570487847, response.iterator().next().properties().minCoreCountPerNode());
+        Assertions.assertEquals(910597369, response.iterator().next().properties().availableMemoryInGbs());
+        Assertions.assertEquals(964723311, response.iterator().next().properties().minMemoryPerNodeInGbs());
+        Assertions.assertEquals(572984126, response.iterator().next().properties().availableDbNodeStorageInGbs());
+        Assertions.assertEquals(1686524732, response.iterator().next().properties().minDbNodeStoragePerNodeInGbs());
+        Assertions.assertEquals(2030340848, response.iterator().next().properties().availableDataStorageInTbs());
+        Assertions.assertEquals(1775688336, response.iterator().next().properties().minDataStorageInTbs());
+        Assertions.assertEquals(1502364938, response.iterator().next().properties().minimumNodeCount());
+        Assertions.assertEquals(1874803721, response.iterator().next().properties().maximumNodeCount());
+        Assertions.assertEquals(535790621, response.iterator().next().properties().availableCoreCountPerNode());
         Assertions.assertEquals(ComputeModel.OCPU, response.iterator().next().properties().computeModel());
         Assertions.assertFalse(response.iterator().next().properties().areServerTypesSupported());
-        Assertions.assertEquals("nje", response.iterator().next().properties().displayName());
+        Assertions.assertEquals("ehuxiqhzlraym", response.iterator().next().properties().displayName());
+        Assertions.assertEquals("lskihmxrfdsajred", response.iterator().next().properties().shapeAttributes().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemUpdatePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemUpdatePropertiesTests.java
new file mode 100644
index 000000000000..e1375beab925
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemUpdatePropertiesTests.java
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemSourceType;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdateProperties;
+import org.junit.jupiter.api.Assertions;
+
+public final class DbSystemUpdatePropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DbSystemUpdateProperties model
+            = BinaryData.fromString("{\"source\":\"None\"}").toObject(DbSystemUpdateProperties.class);
+        Assertions.assertEquals(DbSystemSourceType.NONE, model.source());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        DbSystemUpdateProperties model = new DbSystemUpdateProperties().withSource(DbSystemSourceType.NONE);
+        model = BinaryData.fromObject(model).toObject(DbSystemUpdateProperties.class);
+        Assertions.assertEquals(DbSystemSourceType.NONE, model.source());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemUpdateTests.java
new file mode 100644
index 000000000000..9a3d46cf9bfa
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbSystemUpdateTests.java
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemSourceType;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdate;
+import com.azure.resourcemanager.oracledatabase.models.DbSystemUpdateProperties;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+
+public final class DbSystemUpdateTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DbSystemUpdate model = BinaryData.fromString(
+            "{\"zones\":[\"fbkgozxwopdby\",\"p\",\"zqaclna\"],\"tags\":{\"xuuyilflqoiquvr\":\"iygnugjknfsmfctt\",\"tczytqjtwh\":\"hmrnjhvsuj\",\"pddouifamowaziyn\":\"uunfprnjletlxsm\",\"szdtmaajquh\":\"nlqwzdvpiwhx\"},\"properties\":{\"source\":\"None\"}}")
+            .toObject(DbSystemUpdate.class);
+        Assertions.assertEquals("fbkgozxwopdby", model.zones().get(0));
+        Assertions.assertEquals("iygnugjknfsmfctt", model.tags().get("xuuyilflqoiquvr"));
+        Assertions.assertEquals(DbSystemSourceType.NONE, model.properties().source());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        DbSystemUpdate model = new DbSystemUpdate().withZones(Arrays.asList("fbkgozxwopdby", "p", "zqaclna"))
+            .withTags(mapOf("xuuyilflqoiquvr", "iygnugjknfsmfctt", "tczytqjtwh", "hmrnjhvsuj", "pddouifamowaziyn",
+                "uunfprnjletlxsm", "szdtmaajquh", "nlqwzdvpiwhx"))
+            .withProperties(new DbSystemUpdateProperties().withSource(DbSystemSourceType.NONE));
+        model = BinaryData.fromObject(model).toObject(DbSystemUpdate.class);
+        Assertions.assertEquals("fbkgozxwopdby", model.zones().get(0));
+        Assertions.assertEquals("iygnugjknfsmfctt", model.tags().get("xuuyilflqoiquvr"));
+        Assertions.assertEquals(DbSystemSourceType.NONE, model.properties().source());
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionInnerTests.java
new file mode 100644
index 000000000000..03f5bbb01b6b
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionInnerTests.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.fluent.models.DbVersionInner;
+import org.junit.jupiter.api.Assertions;
+
+public final class DbVersionInnerTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DbVersionInner model = BinaryData.fromString(
+            "{\"properties\":{\"version\":\"m\",\"isLatestForMajorVersion\":false,\"isPreviewDbVersion\":true,\"isUpgradeSupported\":false,\"supportsPdb\":true},\"id\":\"ps\",\"name\":\"shck\",\"type\":\"kyjpmspbps\"}")
+            .toObject(DbVersionInner.class);
+        Assertions.assertEquals("m", model.properties().version());
+        Assertions.assertFalse(model.properties().isLatestForMajorVersion());
+        Assertions.assertTrue(model.properties().isPreviewDbVersion());
+        Assertions.assertFalse(model.properties().isUpgradeSupported());
+        Assertions.assertTrue(model.properties().supportsPdb());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionListResultTests.java
new file mode 100644
index 000000000000..506165c440e3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionListResultTests.java
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.implementation.models.DbVersionListResult;
+import org.junit.jupiter.api.Assertions;
+
+public final class DbVersionListResultTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DbVersionListResult model = BinaryData.fromString(
+            "{\"value\":[{\"properties\":{\"version\":\"tvczkcnyxr\",\"isLatestForMajorVersion\":false,\"isPreviewDbVersion\":true,\"isUpgradeSupported\":true,\"supportsPdb\":true},\"id\":\"nkvxlxpaglqi\",\"name\":\"bgkc\",\"type\":\"khpzvuqdflv\"}],\"nextLink\":\"iypfp\"}")
+            .toObject(DbVersionListResult.class);
+        Assertions.assertEquals("tvczkcnyxr", model.value().get(0).properties().version());
+        Assertions.assertFalse(model.value().get(0).properties().isLatestForMajorVersion());
+        Assertions.assertTrue(model.value().get(0).properties().isPreviewDbVersion());
+        Assertions.assertTrue(model.value().get(0).properties().isUpgradeSupported());
+        Assertions.assertTrue(model.value().get(0).properties().supportsPdb());
+        Assertions.assertEquals("iypfp", model.nextLink());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionPropertiesTests.java
new file mode 100644
index 000000000000..a0b8cd5c1fd2
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionPropertiesTests.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.DbVersionProperties;
+import org.junit.jupiter.api.Assertions;
+
+public final class DbVersionPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DbVersionProperties model = BinaryData.fromString(
+            "{\"version\":\"df\",\"isLatestForMajorVersion\":true,\"isPreviewDbVersion\":false,\"isUpgradeSupported\":false,\"supportsPdb\":true}")
+            .toObject(DbVersionProperties.class);
+        Assertions.assertEquals("df", model.version());
+        Assertions.assertTrue(model.isLatestForMajorVersion());
+        Assertions.assertFalse(model.isPreviewDbVersion());
+        Assertions.assertFalse(model.isUpgradeSupported());
+        Assertions.assertTrue(model.supportsPdb());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsGetWithResponseMockTests.java
new file mode 100644
index 000000000000..83b2d1bc6d7e
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsGetWithResponseMockTests.java
@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.DbVersion;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class DbVersionsGetWithResponseMockTests {
+    @Test
+    public void testGetWithResponse() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"version\":\"bfe\",\"isLatestForMajorVersion\":true,\"isPreviewDbVersion\":true,\"isUpgradeSupported\":true,\"supportsPdb\":false},\"id\":\"qlmfaewz\",\"name\":\"iudjp\",\"type\":\"pqht\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        DbVersion response
+            = manager.dbVersions().getWithResponse("x", "qvn", com.azure.core.util.Context.NONE).getValue();
+
+        Assertions.assertEquals("bfe", response.properties().version());
+        Assertions.assertTrue(response.properties().isLatestForMajorVersion());
+        Assertions.assertTrue(response.properties().isPreviewDbVersion());
+        Assertions.assertTrue(response.properties().isUpgradeSupported());
+        Assertions.assertFalse(response.properties().supportsPdb());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsListByLocationMockTests.java
new file mode 100644
index 000000000000..af212b19ae4e
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DbVersionsListByLocationMockTests.java
@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.BaseDbSystemShapes;
+import com.azure.resourcemanager.oracledatabase.models.DbVersion;
+import com.azure.resourcemanager.oracledatabase.models.ShapeFamilyType;
+import com.azure.resourcemanager.oracledatabase.models.StorageManagementType;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class DbVersionsListByLocationMockTests {
+    @Test
+    public void testListByLocation() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"version\":\"m\",\"isLatestForMajorVersion\":false,\"isPreviewDbVersion\":false,\"isUpgradeSupported\":false,\"supportsPdb\":false},\"id\":\"zfbmjxuv\",\"name\":\"ipfdvhaxdvwzaehp\",\"type\":\"hthdklmvetatlakf\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<DbVersion> response = manager.dbVersions()
+            .listByLocation("qhnmhk", BaseDbSystemShapes.VMSTANDARD_X86, "zsdsuxheqdgcrux", StorageManagementType.LVM,
+                true, true, ShapeFamilyType.SINGLE_NODE, com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("m", response.iterator().next().properties().version());
+        Assertions.assertFalse(response.iterator().next().properties().isLatestForMajorVersion());
+        Assertions.assertFalse(response.iterator().next().properties().isPreviewDbVersion());
+        Assertions.assertFalse(response.iterator().next().properties().isUpgradeSupported());
+        Assertions.assertFalse(response.iterator().next().properties().supportsPdb());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DefinedFileSystemConfigurationTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DefinedFileSystemConfigurationTests.java
index ce55638508bc..1e97f507569e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DefinedFileSystemConfigurationTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DefinedFileSystemConfigurationTests.java
@@ -11,13 +11,12 @@
 public final class DefinedFileSystemConfigurationTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        DefinedFileSystemConfiguration model = BinaryData
-            .fromString(
-                "{\"isBackupPartition\":false,\"isResizable\":true,\"minSizeGb\":830818996,\"mountPoint\":\"rvjx\"}")
+        DefinedFileSystemConfiguration model = BinaryData.fromString(
+            "{\"isBackupPartition\":true,\"isResizable\":true,\"minSizeGb\":1729684503,\"mountPoint\":\"qvyxlwhzlsicoho\"}")
             .toObject(DefinedFileSystemConfiguration.class);
-        Assertions.assertFalse(model.isBackupPartition());
+        Assertions.assertTrue(model.isBackupPartition());
         Assertions.assertTrue(model.isResizable());
-        Assertions.assertEquals(830818996, model.minSizeGb());
-        Assertions.assertEquals("rvjx", model.mountPoint());
+        Assertions.assertEquals(1729684503, model.minSizeGb());
+        Assertions.assertEquals("qvyxlwhzlsicoho", model.mountPoint());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DisasterRecoveryConfigurationDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DisasterRecoveryConfigurationDetailsTests.java
index dfb0beae8504..4848bb5ce39c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DisasterRecoveryConfigurationDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DisasterRecoveryConfigurationDetailsTests.java
@@ -14,10 +14,10 @@ public final class DisasterRecoveryConfigurationDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DisasterRecoveryConfigurationDetails model = BinaryData.fromString(
-            "{\"disasterRecoveryType\":\"BackupBased\",\"timeSnapshotStandbyEnabledTill\":\"2021-03-12T17:23:33Z\",\"isSnapshotStandby\":false,\"isReplicateAutomaticBackups\":true}")
+            "{\"disasterRecoveryType\":\"BackupBased\",\"timeSnapshotStandbyEnabledTill\":\"2021-09-06T21:17:56Z\",\"isSnapshotStandby\":false,\"isReplicateAutomaticBackups\":true}")
             .toObject(DisasterRecoveryConfigurationDetails.class);
         Assertions.assertEquals(DisasterRecoveryType.BACKUP_BASED, model.disasterRecoveryType());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-12T17:23:33Z"), model.timeSnapshotStandbyEnabledTill());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-06T21:17:56Z"), model.timeSnapshotStandbyEnabledTill());
         Assertions.assertFalse(model.isSnapshotStandby());
         Assertions.assertTrue(model.isReplicateAutomaticBackups());
     }
@@ -26,12 +26,12 @@ public void testDeserialize() throws Exception {
     public void testSerialize() throws Exception {
         DisasterRecoveryConfigurationDetails model
             = new DisasterRecoveryConfigurationDetails().withDisasterRecoveryType(DisasterRecoveryType.BACKUP_BASED)
-                .withTimeSnapshotStandbyEnabledTill(OffsetDateTime.parse("2021-03-12T17:23:33Z"))
+                .withTimeSnapshotStandbyEnabledTill(OffsetDateTime.parse("2021-09-06T21:17:56Z"))
                 .withIsSnapshotStandby(false)
                 .withIsReplicateAutomaticBackups(true);
         model = BinaryData.fromObject(model).toObject(DisasterRecoveryConfigurationDetails.class);
         Assertions.assertEquals(DisasterRecoveryType.BACKUP_BASED, model.disasterRecoveryType());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-12T17:23:33Z"), model.timeSnapshotStandbyEnabledTill());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-06T21:17:56Z"), model.timeSnapshotStandbyEnabledTill());
         Assertions.assertFalse(model.isSnapshotStandby());
         Assertions.assertTrue(model.isReplicateAutomaticBackups());
     }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsForwardingRuleTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsForwardingRuleTests.java
new file mode 100644
index 000000000000..382738fed3b5
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsForwardingRuleTests.java
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule;
+import org.junit.jupiter.api.Assertions;
+
+public final class DnsForwardingRuleTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        DnsForwardingRule model
+            = BinaryData.fromString("{\"domainNames\":\"jqepqwhi\",\"forwardingIpAddress\":\"monstshiyxgve\"}")
+                .toObject(DnsForwardingRule.class);
+        Assertions.assertEquals("jqepqwhi", model.domainNames());
+        Assertions.assertEquals("monstshiyxgve", model.forwardingIpAddress());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        DnsForwardingRule model
+            = new DnsForwardingRule().withDomainNames("jqepqwhi").withForwardingIpAddress("monstshiyxgve");
+        model = BinaryData.fromObject(model).toObject(DnsForwardingRule.class);
+        Assertions.assertEquals("jqepqwhi", model.domainNames());
+        Assertions.assertEquals("monstshiyxgve", model.forwardingIpAddress());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewInnerTests.java
index 276212e4876f..ebb99fc53bf0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewInnerTests.java
@@ -14,14 +14,14 @@ public final class DnsPrivateViewInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DnsPrivateViewInner model = BinaryData.fromString(
-            "{\"properties\":{\"ocid\":\"kwpjgwwspughftqs\",\"displayName\":\"hqxujxukndxdi\",\"isProtected\":true,\"lifecycleState\":\"Deleted\",\"self\":\"guufzd\",\"timeCreated\":\"2021-05-17T16:17:48Z\",\"timeUpdated\":\"2021-04-01T21:46:18Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"ihwhbotzingamvpp\",\"name\":\"o\",\"type\":\"zqzudph\"}")
+            "{\"properties\":{\"ocid\":\"htjsying\",\"displayName\":\"fq\",\"isProtected\":true,\"lifecycleState\":\"Active\",\"self\":\"tdhtmdvyp\",\"timeCreated\":\"2021-01-15T06:50:48Z\",\"timeUpdated\":\"2021-01-21T23:13:20Z\",\"provisioningState\":\"Canceled\"},\"id\":\"zywkb\",\"name\":\"rryuzhlhkjo\",\"type\":\"rvqqaatj\"}")
             .toObject(DnsPrivateViewInner.class);
-        Assertions.assertEquals("kwpjgwwspughftqs", model.properties().ocid());
-        Assertions.assertEquals("hqxujxukndxdi", model.properties().displayName());
+        Assertions.assertEquals("htjsying", model.properties().ocid());
+        Assertions.assertEquals("fq", model.properties().displayName());
         Assertions.assertTrue(model.properties().isProtected());
-        Assertions.assertEquals(DnsPrivateViewsLifecycleState.DELETED, model.properties().lifecycleState());
-        Assertions.assertEquals("guufzd", model.properties().self());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-17T16:17:48Z"), model.properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-04-01T21:46:18Z"), model.properties().timeUpdated());
+        Assertions.assertEquals(DnsPrivateViewsLifecycleState.ACTIVE, model.properties().lifecycleState());
+        Assertions.assertEquals("tdhtmdvyp", model.properties().self());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-15T06:50:48Z"), model.properties().timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-01-21T23:13:20Z"), model.properties().timeUpdated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewListResultTests.java
index 4e25339d3d04..f5cf093766a7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewListResultTests.java
@@ -14,18 +14,18 @@ public final class DnsPrivateViewListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DnsPrivateViewListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"ocid\":\"ajguqf\",\"displayName\":\"wygzlvdnkfxusem\",\"isProtected\":false,\"lifecycleState\":\"Updating\",\"self\":\"rmuhapfcq\",\"timeCreated\":\"2021-12-08T21:08:33Z\",\"timeUpdated\":\"2021-11-26T12:11:57Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"vpsvuoymgcce\",\"name\":\"vezrypqlmfeo\",\"type\":\"erqwkyhkobopg\"},{\"properties\":{\"ocid\":\"dkow\",\"displayName\":\"pbqpcrfkbwccsn\",\"isProtected\":true,\"lifecycleState\":\"Deleted\",\"self\":\"dw\",\"timeCreated\":\"2021-06-07T08:17:55Z\",\"timeUpdated\":\"2021-03-25T16:45:49Z\",\"provisioningState\":\"Canceled\"},\"id\":\"ftnkhtj\",\"name\":\"y\",\"type\":\"ngwfqatm\"}],\"nextLink\":\"htmdvy\"}")
+            "{\"value\":[{\"properties\":{\"ocid\":\"vvyhg\",\"displayName\":\"opbyrqufegxu\",\"isProtected\":false,\"lifecycleState\":\"Active\",\"self\":\"fbn\",\"timeCreated\":\"2021-09-27T14:47:09Z\",\"timeUpdated\":\"2021-08-15T03:14:49Z\",\"provisioningState\":\"Canceled\"},\"id\":\"p\",\"name\":\"ngitvgbmhrixkwm\",\"type\":\"ijejvegrhbpn\"},{\"properties\":{\"ocid\":\"xexccbdreaxhcexd\",\"displayName\":\"rvqahqkghtpwi\",\"isProtected\":false,\"lifecycleState\":\"Deleting\",\"self\":\"yjsvfyc\",\"timeCreated\":\"2021-05-05T00:18:03Z\",\"timeUpdated\":\"2021-07-22T08:07:37Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"owvrvmtgjqppyos\",\"name\":\"ronzmyhgfip\",\"type\":\"sxkm\"}],\"nextLink\":\"a\"}")
             .toObject(DnsPrivateViewListResult.class);
-        Assertions.assertEquals("ajguqf", model.value().get(0).properties().ocid());
-        Assertions.assertEquals("wygzlvdnkfxusem", model.value().get(0).properties().displayName());
+        Assertions.assertEquals("vvyhg", model.value().get(0).properties().ocid());
+        Assertions.assertEquals("opbyrqufegxu", model.value().get(0).properties().displayName());
         Assertions.assertFalse(model.value().get(0).properties().isProtected());
-        Assertions.assertEquals(DnsPrivateViewsLifecycleState.UPDATING,
+        Assertions.assertEquals(DnsPrivateViewsLifecycleState.ACTIVE,
             model.value().get(0).properties().lifecycleState());
-        Assertions.assertEquals("rmuhapfcq", model.value().get(0).properties().self());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-12-08T21:08:33Z"),
+        Assertions.assertEquals("fbn", model.value().get(0).properties().self());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-27T14:47:09Z"),
             model.value().get(0).properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-26T12:11:57Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-15T03:14:49Z"),
             model.value().get(0).properties().timeUpdated());
-        Assertions.assertEquals("htmdvy", model.nextLink());
+        Assertions.assertEquals("a", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewPropertiesTests.java
index e06ea1511690..2e9011e3e7ad 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewPropertiesTests.java
@@ -14,14 +14,14 @@ public final class DnsPrivateViewPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DnsPrivateViewProperties model = BinaryData.fromString(
-            "{\"ocid\":\"amvdkfwynwcvtbv\",\"displayName\":\"ayhmtnvyqiatkz\",\"isProtected\":false,\"lifecycleState\":\"Updating\",\"self\":\"npwzcjaes\",\"timeCreated\":\"2021-02-13T02:39:36Z\",\"timeUpdated\":\"2021-09-24T01:03:33Z\",\"provisioningState\":\"Canceled\"}")
+            "{\"ocid\":\"nrvgoupmfiibfgg\",\"displayName\":\"ioolvrwxkvtkkgll\",\"isProtected\":true,\"lifecycleState\":\"Deleting\",\"self\":\"ygvjayvblmh\",\"timeCreated\":\"2021-03-17T12:51:03Z\",\"timeUpdated\":\"2021-07-26T11:14:50Z\",\"provisioningState\":\"Succeeded\"}")
             .toObject(DnsPrivateViewProperties.class);
-        Assertions.assertEquals("amvdkfwynwcvtbv", model.ocid());
-        Assertions.assertEquals("ayhmtnvyqiatkz", model.displayName());
-        Assertions.assertFalse(model.isProtected());
-        Assertions.assertEquals(DnsPrivateViewsLifecycleState.UPDATING, model.lifecycleState());
-        Assertions.assertEquals("npwzcjaes", model.self());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-02-13T02:39:36Z"), model.timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-24T01:03:33Z"), model.timeUpdated());
+        Assertions.assertEquals("nrvgoupmfiibfgg", model.ocid());
+        Assertions.assertEquals("ioolvrwxkvtkkgll", model.displayName());
+        Assertions.assertTrue(model.isProtected());
+        Assertions.assertEquals(DnsPrivateViewsLifecycleState.DELETING, model.lifecycleState());
+        Assertions.assertEquals("ygvjayvblmh", model.self());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-03-17T12:51:03Z"), model.timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-26T11:14:50Z"), model.timeUpdated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetWithResponseMockTests.java
index fd9ab26d5cd8..8da3c09349cb 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class DnsPrivateViewsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ocid\":\"czezkhhlt\",\"displayName\":\"jadhqoawj\",\"isProtected\":true,\"lifecycleState\":\"Deleting\",\"self\":\"ueayfbpcmsplb\",\"timeCreated\":\"2021-05-18T23:27:10Z\",\"timeUpdated\":\"2021-05-11T05:49:59Z\",\"provisioningState\":\"Canceled\"},\"id\":\"thwmgnmbsc\",\"name\":\"bxigdhxiidlo\",\"type\":\"edbw\"}";
+            = "{\"properties\":{\"ocid\":\"labnsmjkwynq\",\"displayName\":\"aekqsykvwj\",\"isProtected\":true,\"lifecycleState\":\"Deleted\",\"self\":\"kev\",\"timeCreated\":\"2021-06-30T20:04:20Z\",\"timeUpdated\":\"2021-09-09T16:32:42Z\",\"provisioningState\":\"Canceled\"},\"id\":\"rspxklur\",\"name\":\"clf\",\"type\":\"xa\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,15 +32,15 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         DnsPrivateView response = manager.dnsPrivateViews()
-            .getWithResponse("qagwwrxaomz", "sgl", com.azure.core.util.Context.NONE)
+            .getWithResponse("gzdyimsfayorp", "avkjog", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("czezkhhlt", response.properties().ocid());
-        Assertions.assertEquals("jadhqoawj", response.properties().displayName());
+        Assertions.assertEquals("labnsmjkwynq", response.properties().ocid());
+        Assertions.assertEquals("aekqsykvwj", response.properties().displayName());
         Assertions.assertTrue(response.properties().isProtected());
-        Assertions.assertEquals(DnsPrivateViewsLifecycleState.DELETING, response.properties().lifecycleState());
-        Assertions.assertEquals("ueayfbpcmsplb", response.properties().self());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-18T23:27:10Z"), response.properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-05-11T05:49:59Z"), response.properties().timeUpdated());
+        Assertions.assertEquals(DnsPrivateViewsLifecycleState.DELETED, response.properties().lifecycleState());
+        Assertions.assertEquals("kev", response.properties().self());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-30T20:04:20Z"), response.properties().timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-09T16:32:42Z"), response.properties().timeUpdated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationMockTests.java
index 0c3271244335..24ba6fe7d237 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateViewsListByLocationMockTests.java
@@ -23,7 +23,7 @@ public final class DnsPrivateViewsListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"ocid\":\"xubmdnafcbqw\",\"displayName\":\"e\",\"isProtected\":true,\"lifecycleState\":\"Active\",\"self\":\"laqacigele\",\"timeCreated\":\"2021-11-13T22:21:28Z\",\"timeUpdated\":\"2021-10-21T16:22:49Z\",\"provisioningState\":\"Canceled\"},\"id\":\"vwzkj\",\"name\":\"pwbeonr\",\"type\":\"kwzdqybxcea\"}]}";
+            = "{\"value\":[{\"properties\":{\"ocid\":\"ytzpo\",\"displayName\":\"ewxigpxvk\",\"isProtected\":false,\"lifecycleState\":\"Deleted\",\"self\":\"upxvpifd\",\"timeCreated\":\"2021-06-19T22:08:59Z\",\"timeUpdated\":\"2021-10-06T15:52:18Z\",\"provisioningState\":\"Failed\"},\"id\":\"yzeyuubeid\",\"name\":\"zlfytoit\",\"type\":\"gygvfltgvdiho\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,17 +33,17 @@ public void testListByLocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<DnsPrivateView> response
-            = manager.dnsPrivateViews().listByLocation("pyqy", com.azure.core.util.Context.NONE);
+            = manager.dnsPrivateViews().listByLocation("n", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("xubmdnafcbqw", response.iterator().next().properties().ocid());
-        Assertions.assertEquals("e", response.iterator().next().properties().displayName());
-        Assertions.assertTrue(response.iterator().next().properties().isProtected());
-        Assertions.assertEquals(DnsPrivateViewsLifecycleState.ACTIVE,
+        Assertions.assertEquals("ytzpo", response.iterator().next().properties().ocid());
+        Assertions.assertEquals("ewxigpxvk", response.iterator().next().properties().displayName());
+        Assertions.assertFalse(response.iterator().next().properties().isProtected());
+        Assertions.assertEquals(DnsPrivateViewsLifecycleState.DELETED,
             response.iterator().next().properties().lifecycleState());
-        Assertions.assertEquals("laqacigele", response.iterator().next().properties().self());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-11-13T22:21:28Z"),
+        Assertions.assertEquals("upxvpifd", response.iterator().next().properties().self());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-19T22:08:59Z"),
             response.iterator().next().properties().timeCreated());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-21T16:22:49Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-10-06T15:52:18Z"),
             response.iterator().next().properties().timeUpdated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneInnerTests.java
index 8c50eedab5f2..f5f8468d3b3e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneInnerTests.java
@@ -15,16 +15,16 @@ public final class DnsPrivateZoneInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DnsPrivateZoneInner model = BinaryData.fromString(
-            "{\"properties\":{\"ocid\":\"ikdgszywkbir\",\"isProtected\":true,\"lifecycleState\":\"Active\",\"self\":\"zh\",\"serial\":1361399231,\"version\":\"kj\",\"viewId\":\"rvqqaatj\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-02-19T03:34:17Z\",\"provisioningState\":\"Canceled\"},\"id\":\"upmfiibfg\",\"name\":\"jioolvrwxk\",\"type\":\"tkkgllqwjy\"}")
+            "{\"properties\":{\"ocid\":\"rrjreafxtsgu\",\"isProtected\":false,\"lifecycleState\":\"Updating\",\"self\":\"glikkxwslolb\",\"serial\":1671943968,\"version\":\"vuzlm\",\"viewId\":\"elfk\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-02-21T20:32:58Z\",\"provisioningState\":\"Failed\"},\"id\":\"pwjxezn\",\"name\":\"igbrnjw\",\"type\":\"wkpnbsaz\"}")
             .toObject(DnsPrivateZoneInner.class);
-        Assertions.assertEquals("ikdgszywkbir", model.properties().ocid());
-        Assertions.assertTrue(model.properties().isProtected());
-        Assertions.assertEquals(DnsPrivateZonesLifecycleState.ACTIVE, model.properties().lifecycleState());
-        Assertions.assertEquals("zh", model.properties().self());
-        Assertions.assertEquals(1361399231, model.properties().serial());
-        Assertions.assertEquals("kj", model.properties().version());
-        Assertions.assertEquals("rvqqaatj", model.properties().viewId());
+        Assertions.assertEquals("rrjreafxtsgu", model.properties().ocid());
+        Assertions.assertFalse(model.properties().isProtected());
+        Assertions.assertEquals(DnsPrivateZonesLifecycleState.UPDATING, model.properties().lifecycleState());
+        Assertions.assertEquals("glikkxwslolb", model.properties().self());
+        Assertions.assertEquals(1671943968, model.properties().serial());
+        Assertions.assertEquals("vuzlm", model.properties().version());
+        Assertions.assertEquals("elfk", model.properties().viewId());
         Assertions.assertEquals(ZoneType.SECONDARY, model.properties().zoneType());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-02-19T03:34:17Z"), model.properties().timeCreated());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-02-21T20:32:58Z"), model.properties().timeCreated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneListResultTests.java
index f7234853eaa4..42d0545dcb33 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZoneListResultTests.java
@@ -15,19 +15,19 @@ public final class DnsPrivateZoneListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DnsPrivateZoneListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"ocid\":\"dn\",\"isProtected\":true,\"lifecycleState\":\"Updating\",\"self\":\"vgbmhr\",\"serial\":731430664,\"version\":\"kw\",\"viewId\":\"ijejvegrhbpn\",\"zoneType\":\"Primary\",\"timeCreated\":\"2020-12-21T03:38:52Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"cbdreaxhcexd\",\"name\":\"rvqahqkghtpwi\",\"type\":\"nhyjsv\"}],\"nextLink\":\"cxzbfvoowvr\"}")
+            "{\"value\":[{\"properties\":{\"ocid\":\"bre\",\"isProtected\":true,\"lifecycleState\":\"Deleted\",\"self\":\"aysjkixqtnqttez\",\"serial\":880648467,\"version\":\"fffiak\",\"viewId\":\"pqqmted\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-09-01T21:15:43Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"hyeozphvwau\",\"name\":\"qncygupkvi\",\"type\":\"mdscwxqupev\"},{\"properties\":{\"ocid\":\"f\",\"isProtected\":true,\"lifecycleState\":\"Updating\",\"self\":\"txhojujb\",\"serial\":1872993536,\"version\":\"elmcuvhixbjxyfw\",\"viewId\":\"lrcoolsttpki\",\"zoneType\":\"Primary\",\"timeCreated\":\"2021-07-11T18:43:52Z\",\"provisioningState\":\"Failed\"},\"id\":\"jrywvtylbfpnc\",\"name\":\"rd\",\"type\":\"iwii\"},{\"properties\":{\"ocid\":\"tywubxcbihwq\",\"isProtected\":false,\"lifecycleState\":\"Active\",\"self\":\"dntwjchrdgo\",\"serial\":916840280,\"version\":\"xum\",\"viewId\":\"ton\",\"zoneType\":\"Primary\",\"timeCreated\":\"2021-01-26T20:44:07Z\",\"provisioningState\":\"Canceled\"},\"id\":\"dfdlwggyts\",\"name\":\"wtovvtgsein\",\"type\":\"fiufx\"},{\"properties\":{\"ocid\":\"npirgnepttw\",\"isProtected\":false,\"lifecycleState\":\"Deleting\",\"self\":\"niffcdmqnroj\",\"serial\":803649154,\"version\":\"ijnkrxfrdd\",\"viewId\":\"ratiz\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-06-27T16:40:41Z\",\"provisioningState\":\"Canceled\"},\"id\":\"xi\",\"name\":\"tozqyzhftwesgo\",\"type\":\"czhonnxkr\"}],\"nextLink\":\"nyhmossxkkgthr\"}")
             .toObject(DnsPrivateZoneListResult.class);
-        Assertions.assertEquals("dn", model.value().get(0).properties().ocid());
+        Assertions.assertEquals("bre", model.value().get(0).properties().ocid());
         Assertions.assertTrue(model.value().get(0).properties().isProtected());
-        Assertions.assertEquals(DnsPrivateZonesLifecycleState.UPDATING,
+        Assertions.assertEquals(DnsPrivateZonesLifecycleState.DELETED,
             model.value().get(0).properties().lifecycleState());
-        Assertions.assertEquals("vgbmhr", model.value().get(0).properties().self());
-        Assertions.assertEquals(731430664, model.value().get(0).properties().serial());
-        Assertions.assertEquals("kw", model.value().get(0).properties().version());
-        Assertions.assertEquals("ijejvegrhbpn", model.value().get(0).properties().viewId());
-        Assertions.assertEquals(ZoneType.PRIMARY, model.value().get(0).properties().zoneType());
-        Assertions.assertEquals(OffsetDateTime.parse("2020-12-21T03:38:52Z"),
+        Assertions.assertEquals("aysjkixqtnqttez", model.value().get(0).properties().self());
+        Assertions.assertEquals(880648467, model.value().get(0).properties().serial());
+        Assertions.assertEquals("fffiak", model.value().get(0).properties().version());
+        Assertions.assertEquals("pqqmted", model.value().get(0).properties().viewId());
+        Assertions.assertEquals(ZoneType.SECONDARY, model.value().get(0).properties().zoneType());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-01T21:15:43Z"),
             model.value().get(0).properties().timeCreated());
-        Assertions.assertEquals("cxzbfvoowvr", model.nextLink());
+        Assertions.assertEquals("nyhmossxkkgthr", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonePropertiesTests.java
index 538351b7f3ff..dba87af67818 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonePropertiesTests.java
@@ -15,16 +15,16 @@ public final class DnsPrivateZonePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DnsPrivateZoneProperties model = BinaryData.fromString(
-            "{\"ocid\":\"vjayvblmhvkzu\",\"isProtected\":false,\"lifecycleState\":\"Active\",\"self\":\"vvyhg\",\"serial\":954108232,\"version\":\"pbyrqufegxu\",\"viewId\":\"zfbn\",\"zoneType\":\"Primary\",\"timeCreated\":\"2021-08-15T03:14:49Z\",\"provisioningState\":\"Canceled\"}")
+            "{\"ocid\":\"jjoqkagf\",\"isProtected\":false,\"lifecycleState\":\"Active\",\"self\":\"ttaugzxnfaazp\",\"serial\":2103578354,\"version\":\"tnkdmkqj\",\"viewId\":\"wuenvr\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-03-08T18:35:57Z\",\"provisioningState\":\"Canceled\"}")
             .toObject(DnsPrivateZoneProperties.class);
-        Assertions.assertEquals("vjayvblmhvkzu", model.ocid());
+        Assertions.assertEquals("jjoqkagf", model.ocid());
         Assertions.assertFalse(model.isProtected());
         Assertions.assertEquals(DnsPrivateZonesLifecycleState.ACTIVE, model.lifecycleState());
-        Assertions.assertEquals("vvyhg", model.self());
-        Assertions.assertEquals(954108232, model.serial());
-        Assertions.assertEquals("pbyrqufegxu", model.version());
-        Assertions.assertEquals("zfbn", model.viewId());
-        Assertions.assertEquals(ZoneType.PRIMARY, model.zoneType());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-08-15T03:14:49Z"), model.timeCreated());
+        Assertions.assertEquals("ttaugzxnfaazp", model.self());
+        Assertions.assertEquals(2103578354, model.serial());
+        Assertions.assertEquals("tnkdmkqj", model.version());
+        Assertions.assertEquals("wuenvr", model.viewId());
+        Assertions.assertEquals(ZoneType.SECONDARY, model.zoneType());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-03-08T18:35:57Z"), model.timeCreated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetWithResponseMockTests.java
index df1f3e4de117..705256fd819b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesGetWithResponseMockTests.java
@@ -23,7 +23,7 @@ public final class DnsPrivateZonesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ocid\":\"azisgyk\",\"isProtected\":false,\"lifecycleState\":\"Updating\",\"self\":\"mvanbwzo\",\"serial\":717470407,\"version\":\"nrxxbsojklin\",\"viewId\":\"dptysprqs\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-03-17T04:51:43Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"pslsvjg\",\"name\":\"liufiqwoyxq\",\"type\":\"apcohhouc\"}";
+            = "{\"properties\":{\"ocid\":\"naie\",\"isProtected\":false,\"lifecycleState\":\"Deleted\",\"self\":\"h\",\"serial\":668159944,\"version\":\"ndnelqkaadlknw\",\"viewId\":\"anniyopetxivcnr\",\"zoneType\":\"Primary\",\"timeCreated\":\"2021-06-10T00:54:20Z\",\"provisioningState\":\"Succeeded\"},\"id\":\"aephblkw\",\"name\":\"pat\",\"type\":\"bqsdtcjbctvi\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,17 +33,17 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         DnsPrivateZone response = manager.dnsPrivateZones()
-            .getWithResponse("xcptsoqfyiaseqc", "krtt", com.azure.core.util.Context.NONE)
+            .getWithResponse("nkrxwetwkdrcy", "ucpcunnuzdqumoen", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("azisgyk", response.properties().ocid());
+        Assertions.assertEquals("naie", response.properties().ocid());
         Assertions.assertFalse(response.properties().isProtected());
-        Assertions.assertEquals(DnsPrivateZonesLifecycleState.UPDATING, response.properties().lifecycleState());
-        Assertions.assertEquals("mvanbwzo", response.properties().self());
-        Assertions.assertEquals(717470407, response.properties().serial());
-        Assertions.assertEquals("nrxxbsojklin", response.properties().version());
-        Assertions.assertEquals("dptysprqs", response.properties().viewId());
-        Assertions.assertEquals(ZoneType.SECONDARY, response.properties().zoneType());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-17T04:51:43Z"), response.properties().timeCreated());
+        Assertions.assertEquals(DnsPrivateZonesLifecycleState.DELETED, response.properties().lifecycleState());
+        Assertions.assertEquals("h", response.properties().self());
+        Assertions.assertEquals(668159944, response.properties().serial());
+        Assertions.assertEquals("ndnelqkaadlknw", response.properties().version());
+        Assertions.assertEquals("anniyopetxivcnr", response.properties().viewId());
+        Assertions.assertEquals(ZoneType.PRIMARY, response.properties().zoneType());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-10T00:54:20Z"), response.properties().timeCreated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationMockTests.java
index 18086ee6aa5c..fb67fb273a40 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/DnsPrivateZonesListByLocationMockTests.java
@@ -24,7 +24,7 @@ public final class DnsPrivateZonesListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"ocid\":\"zdcgdzbenr\",\"isProtected\":false,\"lifecycleState\":\"Creating\",\"self\":\"awetzq\",\"serial\":1254127143,\"version\":\"tjwfljhznamtua\",\"viewId\":\"zwcjjncqtj\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-03-13T06:57:20Z\",\"provisioningState\":\"Failed\"},\"id\":\"bgatzu\",\"name\":\"vbxngr\",\"type\":\"bwggahtt\"}]}";
+            = "{\"value\":[{\"properties\":{\"ocid\":\"it\",\"isProtected\":false,\"lifecycleState\":\"Creating\",\"self\":\"zvbrzcdbanfzndsc\",\"serial\":1628332910,\"version\":\"xeatkd\",\"viewId\":\"wnrdjyibqbnaom\",\"zoneType\":\"Secondary\",\"timeCreated\":\"2021-05-24T04:18:25Z\",\"provisioningState\":\"Canceled\"},\"id\":\"hmaxljalfi\",\"name\":\"cjmobcanc\",\"type\":\"exxqcwg\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,18 +34,18 @@ public void testListByLocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<DnsPrivateZone> response
-            = manager.dnsPrivateZones().listByLocation("pqojxcx", com.azure.core.util.Context.NONE);
+            = manager.dnsPrivateZones().listByLocation("uzqymtuowog", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("zdcgdzbenr", response.iterator().next().properties().ocid());
+        Assertions.assertEquals("it", response.iterator().next().properties().ocid());
         Assertions.assertFalse(response.iterator().next().properties().isProtected());
         Assertions.assertEquals(DnsPrivateZonesLifecycleState.CREATING,
             response.iterator().next().properties().lifecycleState());
-        Assertions.assertEquals("awetzq", response.iterator().next().properties().self());
-        Assertions.assertEquals(1254127143, response.iterator().next().properties().serial());
-        Assertions.assertEquals("tjwfljhznamtua", response.iterator().next().properties().version());
-        Assertions.assertEquals("zwcjjncqtj", response.iterator().next().properties().viewId());
+        Assertions.assertEquals("zvbrzcdbanfzndsc", response.iterator().next().properties().self());
+        Assertions.assertEquals(1628332910, response.iterator().next().properties().serial());
+        Assertions.assertEquals("xeatkd", response.iterator().next().properties().version());
+        Assertions.assertEquals("wnrdjyibqbnaom", response.iterator().next().properties().viewId());
         Assertions.assertEquals(ZoneType.SECONDARY, response.iterator().next().properties().zoneType());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-13T06:57:20Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-05-24T04:18:25Z"),
             response.iterator().next().properties().timeCreated());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/EstimatedPatchingTimeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/EstimatedPatchingTimeTests.java
index 7034863f8139..1612bd222db0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/EstimatedPatchingTimeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/EstimatedPatchingTimeTests.java
@@ -11,7 +11,7 @@ public final class EstimatedPatchingTimeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         EstimatedPatchingTime model = BinaryData.fromString(
-            "{\"estimatedDbServerPatchingTime\":626726522,\"estimatedNetworkSwitchesPatchingTime\":1997522468,\"estimatedStorageServerPatchingTime\":523665642,\"totalEstimatedPatchingTime\":665345383}")
+            "{\"estimatedDbServerPatchingTime\":1536043390,\"estimatedNetworkSwitchesPatchingTime\":1474551833,\"estimatedStorageServerPatchingTime\":1609170177,\"totalEstimatedPatchingTime\":489125368}")
             .toObject(EstimatedPatchingTime.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadataIormConfigTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadataIormConfigTests.java
index 36fb17beddb1..77d0035f37c8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadataIormConfigTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadataIormConfigTests.java
@@ -14,13 +14,13 @@ public final class ExadataIormConfigTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExadataIormConfig model = BinaryData.fromString(
-            "{\"dbPlans\":[{\"dbName\":\"t\",\"flashCacheLimit\":\"gbkdmoizpos\",\"share\":1176728044}],\"lifecycleDetails\":\"cfbu\",\"lifecycleState\":\"BootStrapping\",\"objective\":\"HighThroughput\"}")
+            "{\"dbPlans\":[{\"dbName\":\"zznfqqnvwpmqta\",\"flashCacheLimit\":\"oujmkcjhwqytj\",\"share\":778428037},{\"dbName\":\"wj\",\"flashCacheLimit\":\"gdrjervnaenqpe\",\"share\":1632259296},{\"dbName\":\"oygmift\",\"flashCacheLimit\":\"zdnds\",\"share\":1279542640}],\"lifecycleDetails\":\"yq\",\"lifecycleState\":\"Failed\",\"objective\":\"LowLatency\"}")
             .toObject(ExadataIormConfig.class);
-        Assertions.assertEquals("t", model.dbPlans().get(0).dbName());
-        Assertions.assertEquals("gbkdmoizpos", model.dbPlans().get(0).flashCacheLimit());
-        Assertions.assertEquals(1176728044, model.dbPlans().get(0).share());
-        Assertions.assertEquals("cfbu", model.lifecycleDetails());
-        Assertions.assertEquals(IormLifecycleState.BOOT_STRAPPING, model.lifecycleState());
-        Assertions.assertEquals(Objective.HIGH_THROUGHPUT, model.objective());
+        Assertions.assertEquals("zznfqqnvwpmqta", model.dbPlans().get(0).dbName());
+        Assertions.assertEquals("oujmkcjhwqytj", model.dbPlans().get(0).flashCacheLimit());
+        Assertions.assertEquals(778428037, model.dbPlans().get(0).share());
+        Assertions.assertEquals("yq", model.lifecycleDetails());
+        Assertions.assertEquals(IormLifecycleState.FAILED, model.lifecycleState());
+        Assertions.assertEquals(Objective.LOW_LATENCY, model.objective());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterStorageDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterStorageDetailsTests.java
index 2b7b56d617bd..ece09bfe58b9 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterStorageDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterStorageDetailsTests.java
@@ -12,14 +12,14 @@ public final class ExadbVmClusterStorageDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExadbVmClusterStorageDetails model
-            = BinaryData.fromString("{\"totalSizeInGbs\":780958650}").toObject(ExadbVmClusterStorageDetails.class);
-        Assertions.assertEquals(780958650, model.totalSizeInGbs());
+            = BinaryData.fromString("{\"totalSizeInGbs\":852372521}").toObject(ExadbVmClusterStorageDetails.class);
+        Assertions.assertEquals(852372521, model.totalSizeInGbs());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExadbVmClusterStorageDetails model = new ExadbVmClusterStorageDetails().withTotalSizeInGbs(780958650);
+        ExadbVmClusterStorageDetails model = new ExadbVmClusterStorageDetails().withTotalSizeInGbs(852372521);
         model = BinaryData.fromObject(model).toObject(ExadbVmClusterStorageDetails.class);
-        Assertions.assertEquals(780958650, model.totalSizeInGbs());
+        Assertions.assertEquals(852372521, model.totalSizeInGbs());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdatePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdatePropertiesTests.java
index 891763c6ce19..53d9f7cad445 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdatePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdatePropertiesTests.java
@@ -12,14 +12,14 @@ public final class ExadbVmClusterUpdatePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExadbVmClusterUpdateProperties model
-            = BinaryData.fromString("{\"nodeCount\":1897689605}").toObject(ExadbVmClusterUpdateProperties.class);
-        Assertions.assertEquals(1897689605, model.nodeCount());
+            = BinaryData.fromString("{\"nodeCount\":38344578}").toObject(ExadbVmClusterUpdateProperties.class);
+        Assertions.assertEquals(38344578, model.nodeCount());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExadbVmClusterUpdateProperties model = new ExadbVmClusterUpdateProperties().withNodeCount(1897689605);
+        ExadbVmClusterUpdateProperties model = new ExadbVmClusterUpdateProperties().withNodeCount(38344578);
         model = BinaryData.fromObject(model).toObject(ExadbVmClusterUpdateProperties.class);
-        Assertions.assertEquals(1897689605, model.nodeCount());
+        Assertions.assertEquals(38344578, model.nodeCount());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdateTests.java
index 9968f05690b5..8336ad02dbc6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdateTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExadbVmClusterUpdateTests.java
@@ -16,24 +16,23 @@ public final class ExadbVmClusterUpdateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExadbVmClusterUpdate model = BinaryData.fromString(
-            "{\"zones\":[\"slhvnhlab\",\"q\",\"kkzjcjbtrga\",\"hvv\"],\"tags\":{\"oqbeitpkxzt\":\"xjjs\",\"pimaqxzhemjyh\":\"oobklftidgfcwq\",\"bawpfajnjwltlwt\":\"hujswtwkozzwcul\",\"uktalhsnvkcdmxz\":\"j\"},\"properties\":{\"nodeCount\":596889388}}")
+            "{\"zones\":[\"cact\",\"mwotey\"],\"tags\":{\"ouwifzmpjw\":\"luqovekqvg\",\"sphuagrttikteus\":\"ivqikfxcvhr\",\"kvyklxubyjaffmm\":\"c\",\"qcuubgqibrta\":\"bl\"},\"properties\":{\"nodeCount\":1066879045}}")
             .toObject(ExadbVmClusterUpdate.class);
-        Assertions.assertEquals("slhvnhlab", model.zones().get(0));
-        Assertions.assertEquals("xjjs", model.tags().get("oqbeitpkxzt"));
-        Assertions.assertEquals(596889388, model.properties().nodeCount());
+        Assertions.assertEquals("cact", model.zones().get(0));
+        Assertions.assertEquals("luqovekqvg", model.tags().get("ouwifzmpjw"));
+        Assertions.assertEquals(1066879045, model.properties().nodeCount());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExadbVmClusterUpdate model
-            = new ExadbVmClusterUpdate().withZones(Arrays.asList("slhvnhlab", "q", "kkzjcjbtrga", "hvv"))
-                .withTags(mapOf("oqbeitpkxzt", "xjjs", "pimaqxzhemjyh", "oobklftidgfcwq", "bawpfajnjwltlwt",
-                    "hujswtwkozzwcul", "uktalhsnvkcdmxz", "j"))
-                .withProperties(new ExadbVmClusterUpdateProperties().withNodeCount(596889388));
+        ExadbVmClusterUpdate model = new ExadbVmClusterUpdate().withZones(Arrays.asList("cact", "mwotey"))
+            .withTags(mapOf("ouwifzmpjw", "luqovekqvg", "sphuagrttikteus", "ivqikfxcvhr", "kvyklxubyjaffmm", "c",
+                "qcuubgqibrta", "bl"))
+            .withProperties(new ExadbVmClusterUpdateProperties().withNodeCount(1066879045));
         model = BinaryData.fromObject(model).toObject(ExadbVmClusterUpdate.class);
-        Assertions.assertEquals("slhvnhlab", model.zones().get(0));
-        Assertions.assertEquals("xjjs", model.tags().get("oqbeitpkxzt"));
-        Assertions.assertEquals(596889388, model.properties().nodeCount());
+        Assertions.assertEquals("cact", model.zones().get(0));
+        Assertions.assertEquals("luqovekqvg", model.tags().get("ouwifzmpjw"));
+        Assertions.assertEquals(1066879045, model.properties().nodeCount());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleConfigDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleConfigDetailsTests.java
new file mode 100644
index 000000000000..68f5ca2c658f
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleConfigDetailsTests.java
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.ExascaleConfigDetails;
+import org.junit.jupiter.api.Assertions;
+
+public final class ExascaleConfigDetailsTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ExascaleConfigDetails model
+            = BinaryData.fromString("{\"totalStorageInGbs\":731084227,\"availableStorageInGbs\":868316225}")
+                .toObject(ExascaleConfigDetails.class);
+        Assertions.assertEquals(731084227, model.totalStorageInGbs());
+        Assertions.assertEquals(868316225, model.availableStorageInGbs());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeInnerTests.java
index 241e50407773..d911de001968 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeInnerTests.java
@@ -14,22 +14,22 @@ public final class ExascaleDbNodeInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbNodeInner model = BinaryData.fromString(
-            "{\"properties\":{\"ocid\":\"usnfepgfewet\",\"additionalDetails\":\"yxgncxykxhdjhli\",\"cpuCoreCount\":926197609,\"dbNodeStorageSizeInGbs\":122728116,\"faultDomain\":\"h\",\"hostname\":\"po\",\"lifecycleState\":\"Starting\",\"maintenanceType\":\"cjzhqi\",\"memorySizeInGbs\":1212582847,\"softwareStorageSizeInGb\":1356255115,\"timeMaintenanceWindowEnd\":\"2021-01-04T20:39:53Z\",\"timeMaintenanceWindowStart\":\"2021-03-07T05:50:04Z\",\"totalCpuCoreCount\":612006389},\"id\":\"vftjuhd\",\"name\":\"azkmtgguwp\",\"type\":\"jrajcivm\"}")
+            "{\"properties\":{\"ocid\":\"rpetogebjoxsl\",\"additionalDetails\":\"nhl\",\"cpuCoreCount\":1064191938,\"dbNodeStorageSizeInGbs\":413797833,\"faultDomain\":\"kzjcjbtrgae\",\"hostname\":\"vibr\",\"lifecycleState\":\"Terminated\",\"maintenanceType\":\"toqbeitpkxztmoob\",\"memorySizeInGbs\":358908286,\"softwareStorageSizeInGb\":1257381047,\"timeMaintenanceWindowEnd\":\"2021-09-03T03:39:31Z\",\"timeMaintenanceWindowStart\":\"2020-12-22T14:36:49Z\",\"totalCpuCoreCount\":913661496},\"id\":\"pimaqxzhemjyh\",\"name\":\"hujswtwkozzwcul\",\"type\":\"bawpfajnjwltlwt\"}")
             .toObject(ExascaleDbNodeInner.class);
-        Assertions.assertEquals("usnfepgfewet", model.properties().ocid());
-        Assertions.assertEquals("yxgncxykxhdjhli", model.properties().additionalDetails());
-        Assertions.assertEquals(926197609, model.properties().cpuCoreCount());
-        Assertions.assertEquals(122728116, model.properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("h", model.properties().faultDomain());
-        Assertions.assertEquals("po", model.properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.STARTING, model.properties().lifecycleState());
-        Assertions.assertEquals("cjzhqi", model.properties().maintenanceType());
-        Assertions.assertEquals(1212582847, model.properties().memorySizeInGbs());
-        Assertions.assertEquals(1356255115, model.properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-01-04T20:39:53Z"),
+        Assertions.assertEquals("rpetogebjoxsl", model.properties().ocid());
+        Assertions.assertEquals("nhl", model.properties().additionalDetails());
+        Assertions.assertEquals(1064191938, model.properties().cpuCoreCount());
+        Assertions.assertEquals(413797833, model.properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("kzjcjbtrgae", model.properties().faultDomain());
+        Assertions.assertEquals("vibr", model.properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.TERMINATED, model.properties().lifecycleState());
+        Assertions.assertEquals("toqbeitpkxztmoob", model.properties().maintenanceType());
+        Assertions.assertEquals(358908286, model.properties().memorySizeInGbs());
+        Assertions.assertEquals(1257381047, model.properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-09-03T03:39:31Z"),
             model.properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-07T05:50:04Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2020-12-22T14:36:49Z"),
             model.properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals(612006389, model.properties().totalCpuCoreCount());
+        Assertions.assertEquals(913661496, model.properties().totalCpuCoreCount());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeListResultTests.java
index 9bea2c636c37..1850be4d0bcd 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodeListResultTests.java
@@ -14,23 +14,23 @@ public final class ExascaleDbNodeListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbNodeListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"ocid\":\"wsdtutnwl\",\"additionalDetails\":\"ycvuzhyrmewipmv\",\"cpuCoreCount\":1907167908,\"dbNodeStorageSizeInGbs\":1623047135,\"faultDomain\":\"uqgsj\",\"hostname\":\"undxgketw\",\"lifecycleState\":\"Failed\",\"maintenanceType\":\"jhfjmhvvmuvgpm\",\"memorySizeInGbs\":1059094634,\"softwareStorageSizeInGb\":425841292,\"timeMaintenanceWindowEnd\":\"2021-08-12T15:03:25Z\",\"timeMaintenanceWindowStart\":\"2020-12-27T00:07:16Z\",\"totalCpuCoreCount\":1810065983},\"id\":\"zjyi\",\"name\":\"sasbhu\",\"type\":\"ypoh\"}],\"nextLink\":\"emslynsqyrp\"}")
+            "{\"value\":[{\"properties\":{\"ocid\":\"gncxykxhdj\",\"additionalDetails\":\"immbcx\",\"cpuCoreCount\":1970187431,\"dbNodeStorageSizeInGbs\":331049008,\"faultDomain\":\"rxvxcjzh\",\"hostname\":\"zxfpxtgqsc\",\"lifecycleState\":\"Updating\",\"maintenanceType\":\"t\",\"memorySizeInGbs\":1148519076,\"softwareStorageSizeInGb\":562191246,\"timeMaintenanceWindowEnd\":\"2021-06-22T03:40:10Z\",\"timeMaintenanceWindowStart\":\"2021-07-19T17:26:58Z\",\"totalCpuCoreCount\":308398935},\"id\":\"uwpijr\",\"name\":\"jcivmmg\",\"type\":\"f\"},{\"properties\":{\"ocid\":\"iwrxgkn\",\"additionalDetails\":\"vyi\",\"cpuCoreCount\":1482773915,\"dbNodeStorageSizeInGbs\":1114052241,\"faultDomain\":\"vpgshoxgsgbp\",\"hostname\":\"zdjtxvzflbqv\",\"lifecycleState\":\"Available\",\"maintenanceType\":\"lgafcqusrdve\",\"memorySizeInGbs\":203429878,\"softwareStorageSizeInGb\":89870573,\"timeMaintenanceWindowEnd\":\"2021-07-31T00:34:25Z\",\"timeMaintenanceWindowStart\":\"2021-10-25T02:19:11Z\",\"totalCpuCoreCount\":1456659976},\"id\":\"uycvuzhyrmewip\",\"name\":\"vekdxukuqgsjjxu\",\"type\":\"dxgketwzhhzjhfj\"},{\"properties\":{\"ocid\":\"vvmu\",\"additionalDetails\":\"pmuneqsx\",\"cpuCoreCount\":2036869225,\"dbNodeStorageSizeInGbs\":1810065983,\"faultDomain\":\"zjyi\",\"hostname\":\"as\",\"lifecycleState\":\"Starting\",\"maintenanceType\":\"ypoh\",\"memorySizeInGbs\":651460177,\"softwareStorageSizeInGb\":840782124,\"timeMaintenanceWindowEnd\":\"2021-06-30T16:11:27Z\",\"timeMaintenanceWindowStart\":\"2021-08-05T10:43:49Z\",\"totalCpuCoreCount\":1736197328},\"id\":\"pfoobr\",\"name\":\"ttymsjny\",\"type\":\"qdnfwqzdz\"},{\"properties\":{\"ocid\":\"ilaxhn\",\"additionalDetails\":\"qlyvijo\",\"cpuCoreCount\":316735321,\"dbNodeStorageSizeInGbs\":1057579035,\"faultDomain\":\"oyzunbixxr\",\"hostname\":\"kvcpwpgclr\",\"lifecycleState\":\"Stopped\",\"maintenanceType\":\"soxfrken\",\"memorySizeInGbs\":27132642,\"softwareStorageSizeInGb\":1600333305,\"timeMaintenanceWindowEnd\":\"2021-09-18T14:40:44Z\",\"timeMaintenanceWindowStart\":\"2021-03-30T12:42:21Z\",\"totalCpuCoreCount\":2052756160},\"id\":\"nqqs\",\"name\":\"awaoqvmmbnpqfrt\",\"type\":\"lkzmegnitgvkxl\"}],\"nextLink\":\"qdrfegcealzxwhc\"}")
             .toObject(ExascaleDbNodeListResult.class);
-        Assertions.assertEquals("wsdtutnwl", model.value().get(0).properties().ocid());
-        Assertions.assertEquals("ycvuzhyrmewipmv", model.value().get(0).properties().additionalDetails());
-        Assertions.assertEquals(1907167908, model.value().get(0).properties().cpuCoreCount());
-        Assertions.assertEquals(1623047135, model.value().get(0).properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("uqgsj", model.value().get(0).properties().faultDomain());
-        Assertions.assertEquals("undxgketw", model.value().get(0).properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.FAILED, model.value().get(0).properties().lifecycleState());
-        Assertions.assertEquals("jhfjmhvvmuvgpm", model.value().get(0).properties().maintenanceType());
-        Assertions.assertEquals(1059094634, model.value().get(0).properties().memorySizeInGbs());
-        Assertions.assertEquals(425841292, model.value().get(0).properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-08-12T15:03:25Z"),
+        Assertions.assertEquals("gncxykxhdj", model.value().get(0).properties().ocid());
+        Assertions.assertEquals("immbcx", model.value().get(0).properties().additionalDetails());
+        Assertions.assertEquals(1970187431, model.value().get(0).properties().cpuCoreCount());
+        Assertions.assertEquals(331049008, model.value().get(0).properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("rxvxcjzh", model.value().get(0).properties().faultDomain());
+        Assertions.assertEquals("zxfpxtgqsc", model.value().get(0).properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.UPDATING, model.value().get(0).properties().lifecycleState());
+        Assertions.assertEquals("t", model.value().get(0).properties().maintenanceType());
+        Assertions.assertEquals(1148519076, model.value().get(0).properties().memorySizeInGbs());
+        Assertions.assertEquals(562191246, model.value().get(0).properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-22T03:40:10Z"),
             model.value().get(0).properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2020-12-27T00:07:16Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-19T17:26:58Z"),
             model.value().get(0).properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals(1810065983, model.value().get(0).properties().totalCpuCoreCount());
-        Assertions.assertEquals("emslynsqyrp", model.nextLink());
+        Assertions.assertEquals(308398935, model.value().get(0).properties().totalCpuCoreCount());
+        Assertions.assertEquals("qdrfegcealzxwhc", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodePropertiesTests.java
index ea3ce5355cdc..43e101a98064 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodePropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodePropertiesTests.java
@@ -14,20 +14,20 @@ public final class ExascaleDbNodePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbNodeProperties model = BinaryData.fromString(
-            "{\"ocid\":\"ghfcfiwrxgkneuvy\",\"additionalDetails\":\"zqodfvpgshox\",\"cpuCoreCount\":1464203297,\"dbNodeStorageSizeInGbs\":243452563,\"faultDomain\":\"gzdjtxvzf\",\"hostname\":\"q\",\"lifecycleState\":\"Failed\",\"maintenanceType\":\"vl\",\"memorySizeInGbs\":617486740,\"softwareStorageSizeInGb\":593802124,\"timeMaintenanceWindowEnd\":\"2021-02-21T01:21:42Z\",\"timeMaintenanceWindowStart\":\"2021-03-05T03:27:21Z\",\"totalCpuCoreCount\":673220982}")
+            "{\"ocid\":\"j\",\"additionalDetails\":\"ktalhsnvkcdmxz\",\"cpuCoreCount\":1745804403,\"dbNodeStorageSizeInGbs\":1098344029,\"faultDomain\":\"lnwiaaomylwe\",\"hostname\":\"ulcsethwwnpj\",\"lifecycleState\":\"Updating\",\"maintenanceType\":\"swpchwahfbousn\",\"memorySizeInGbs\":793996513,\"softwareStorageSizeInGb\":1108210781,\"timeMaintenanceWindowEnd\":\"2021-10-02T20:52:54Z\",\"timeMaintenanceWindowStart\":\"2021-11-29T06:33:52Z\",\"totalCpuCoreCount\":160673961}")
             .toObject(ExascaleDbNodeProperties.class);
-        Assertions.assertEquals("ghfcfiwrxgkneuvy", model.ocid());
-        Assertions.assertEquals("zqodfvpgshox", model.additionalDetails());
-        Assertions.assertEquals(1464203297, model.cpuCoreCount());
-        Assertions.assertEquals(243452563, model.dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("gzdjtxvzf", model.faultDomain());
-        Assertions.assertEquals("q", model.hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.FAILED, model.lifecycleState());
-        Assertions.assertEquals("vl", model.maintenanceType());
-        Assertions.assertEquals(617486740, model.memorySizeInGbs());
-        Assertions.assertEquals(593802124, model.softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-02-21T01:21:42Z"), model.timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-05T03:27:21Z"), model.timeMaintenanceWindowStart());
-        Assertions.assertEquals(673220982, model.totalCpuCoreCount());
+        Assertions.assertEquals("j", model.ocid());
+        Assertions.assertEquals("ktalhsnvkcdmxz", model.additionalDetails());
+        Assertions.assertEquals(1745804403, model.cpuCoreCount());
+        Assertions.assertEquals(1098344029, model.dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("lnwiaaomylwe", model.faultDomain());
+        Assertions.assertEquals("ulcsethwwnpj", model.hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.UPDATING, model.lifecycleState());
+        Assertions.assertEquals("swpchwahfbousn", model.maintenanceType());
+        Assertions.assertEquals(793996513, model.memorySizeInGbs());
+        Assertions.assertEquals(1108210781, model.softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-10-02T20:52:54Z"), model.timeMaintenanceWindowEnd());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-11-29T06:33:52Z"), model.timeMaintenanceWindowStart());
+        Assertions.assertEquals(160673961, model.totalCpuCoreCount());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionMockTests.java
index f3d85710ef4b..9c6295522bad 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesActionMockTests.java
@@ -23,7 +23,7 @@
 public final class ExascaleDbNodesActionMockTests {
     @Test
     public void testAction() throws Exception {
-        String responseStr = "{\"provisioningState\":\"Canceled\"}";
+        String responseStr = "{\"provisioningState\":\"Provisioning\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,9 +33,9 @@ public void testAction() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         DbActionResponse response = manager.exascaleDbNodes()
-            .action("ooxf", "i", "hx", new DbNodeAction().withAction(DbNodeActionEnum.RESET),
-                com.azure.core.util.Context.NONE);
+            .action("haokgkskjiv", "sshajqfukpee", "pgeumilh",
+                new DbNodeAction().withAction(DbNodeActionEnum.SOFT_RESET), com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals(AzureResourceProvisioningState.CANCELED, response.provisioningState());
+        Assertions.assertEquals(AzureResourceProvisioningState.PROVISIONING, response.provisioningState());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetWithResponseMockTests.java
index c62c6cdc56a3..83b4ddcadfcf 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class ExascaleDbNodesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ocid\":\"e\",\"additionalDetails\":\"ej\",\"cpuCoreCount\":1797904663,\"dbNodeStorageSizeInGbs\":544161528,\"faultDomain\":\"gthortudaw\",\"hostname\":\"jfel\",\"lifecycleState\":\"Provisioning\",\"maintenanceType\":\"ptcbgqnzmnh\",\"memorySizeInGbs\":2129723537,\"softwareStorageSizeInGb\":282961321,\"timeMaintenanceWindowEnd\":\"2021-03-10T17:13:37Z\",\"timeMaintenanceWindowStart\":\"2021-09-02T05:25:42Z\",\"totalCpuCoreCount\":1452234120},\"id\":\"bbcccgz\",\"name\":\"raoxnyuff\",\"type\":\"tsgftipwcxbyubh\"}";
+            = "{\"properties\":{\"ocid\":\"hllxricctkw\",\"additionalDetails\":\"qqoajxeiyglesrw\",\"cpuCoreCount\":601519517,\"dbNodeStorageSizeInGbs\":147788598,\"faultDomain\":\"ctrceqnkbr\",\"hostname\":\"obehdmljz\",\"lifecycleState\":\"Stopped\",\"maintenanceType\":\"me\",\"memorySizeInGbs\":1117408258,\"softwareStorageSizeInGb\":1106054303,\"timeMaintenanceWindowEnd\":\"2021-02-04T02:09:01Z\",\"timeMaintenanceWindowStart\":\"2021-07-09T06:00:41Z\",\"totalCpuCoreCount\":631713450},\"id\":\"pife\",\"name\":\"leqirccjclykcgxv\",\"type\":\"pjlvczuoda\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,23 +32,23 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ExascaleDbNode response = manager.exascaleDbNodes()
-            .getWithResponse("ejkm", "bizt", "ofqcvovjufycsjm", com.azure.core.util.Context.NONE)
+            .getWithResponse("dmbi", "psnaww", "qkzn", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("e", response.properties().ocid());
-        Assertions.assertEquals("ej", response.properties().additionalDetails());
-        Assertions.assertEquals(1797904663, response.properties().cpuCoreCount());
-        Assertions.assertEquals(544161528, response.properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("gthortudaw", response.properties().faultDomain());
-        Assertions.assertEquals("jfel", response.properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.PROVISIONING, response.properties().lifecycleState());
-        Assertions.assertEquals("ptcbgqnzmnh", response.properties().maintenanceType());
-        Assertions.assertEquals(2129723537, response.properties().memorySizeInGbs());
-        Assertions.assertEquals(282961321, response.properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-03-10T17:13:37Z"),
+        Assertions.assertEquals("hllxricctkw", response.properties().ocid());
+        Assertions.assertEquals("qqoajxeiyglesrw", response.properties().additionalDetails());
+        Assertions.assertEquals(601519517, response.properties().cpuCoreCount());
+        Assertions.assertEquals(147788598, response.properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("ctrceqnkbr", response.properties().faultDomain());
+        Assertions.assertEquals("obehdmljz", response.properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.STOPPED, response.properties().lifecycleState());
+        Assertions.assertEquals("me", response.properties().maintenanceType());
+        Assertions.assertEquals(1117408258, response.properties().memorySizeInGbs());
+        Assertions.assertEquals(1106054303, response.properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-02-04T02:09:01Z"),
             response.properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-02T05:25:42Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-07-09T06:00:41Z"),
             response.properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals(1452234120, response.properties().totalCpuCoreCount());
+        Assertions.assertEquals(631713450, response.properties().totalCpuCoreCount());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentMockTests.java
index 8ac0f1f117c7..6b7ae73c55e1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbNodesListByParentMockTests.java
@@ -23,7 +23,7 @@ public final class ExascaleDbNodesListByParentMockTests {
     @Test
     public void testListByParent() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"ocid\":\"lfbcgwgcl\",\"additionalDetails\":\"oebqinjipn\",\"cpuCoreCount\":296049099,\"dbNodeStorageSizeInGbs\":1159366069,\"faultDomain\":\"lafcbahh\",\"hostname\":\"pofoi\",\"lifecycleState\":\"Failed\",\"maintenanceType\":\"filkmkkholv\",\"memorySizeInGbs\":1953002350,\"softwareStorageSizeInGb\":1032384879,\"timeMaintenanceWindowEnd\":\"2021-09-08T17:52:36Z\",\"timeMaintenanceWindowStart\":\"2021-04-29T02:09:30Z\",\"totalCpuCoreCount\":1485385595},\"id\":\"artvti\",\"name\":\"kyefchnmnahmnxhk\",\"type\":\"jqirwrw\"}]}";
+            = "{\"value\":[{\"properties\":{\"ocid\":\"ewsedveskwxe\",\"additionalDetails\":\"phrgfnzhctm\",\"cpuCoreCount\":1793592127,\"dbNodeStorageSizeInGbs\":347777936,\"faultDomain\":\"bcbcpz\",\"hostname\":\"pzeqacdldtz\",\"lifecycleState\":\"Terminating\",\"maintenanceType\":\"efcpczshn\",\"memorySizeInGbs\":731388560,\"softwareStorageSizeInGb\":830792514,\"timeMaintenanceWindowEnd\":\"2021-08-28T14:05:20Z\",\"timeMaintenanceWindowStart\":\"2021-08-28T22:37:58Z\",\"totalCpuCoreCount\":497278194},\"id\":\"uytuszxhmtvtv\",\"name\":\"gw\",\"type\":\"iukvzwydwt\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,23 +33,23 @@ public void testListByParent() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<ExascaleDbNode> response
-            = manager.exascaleDbNodes().listByParent("kmqp", "o", com.azure.core.util.Context.NONE);
+            = manager.exascaleDbNodes().listByParent("punettepdjxq", "skoynuiylpc", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("lfbcgwgcl", response.iterator().next().properties().ocid());
-        Assertions.assertEquals("oebqinjipn", response.iterator().next().properties().additionalDetails());
-        Assertions.assertEquals(296049099, response.iterator().next().properties().cpuCoreCount());
-        Assertions.assertEquals(1159366069, response.iterator().next().properties().dbNodeStorageSizeInGbs());
-        Assertions.assertEquals("lafcbahh", response.iterator().next().properties().faultDomain());
-        Assertions.assertEquals("pofoi", response.iterator().next().properties().hostname());
-        Assertions.assertEquals(DbNodeProvisioningState.FAILED,
+        Assertions.assertEquals("ewsedveskwxe", response.iterator().next().properties().ocid());
+        Assertions.assertEquals("phrgfnzhctm", response.iterator().next().properties().additionalDetails());
+        Assertions.assertEquals(1793592127, response.iterator().next().properties().cpuCoreCount());
+        Assertions.assertEquals(347777936, response.iterator().next().properties().dbNodeStorageSizeInGbs());
+        Assertions.assertEquals("bcbcpz", response.iterator().next().properties().faultDomain());
+        Assertions.assertEquals("pzeqacdldtz", response.iterator().next().properties().hostname());
+        Assertions.assertEquals(DbNodeProvisioningState.TERMINATING,
             response.iterator().next().properties().lifecycleState());
-        Assertions.assertEquals("filkmkkholv", response.iterator().next().properties().maintenanceType());
-        Assertions.assertEquals(1953002350, response.iterator().next().properties().memorySizeInGbs());
-        Assertions.assertEquals(1032384879, response.iterator().next().properties().softwareStorageSizeInGb());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-09-08T17:52:36Z"),
+        Assertions.assertEquals("efcpczshn", response.iterator().next().properties().maintenanceType());
+        Assertions.assertEquals(731388560, response.iterator().next().properties().memorySizeInGbs());
+        Assertions.assertEquals(830792514, response.iterator().next().properties().softwareStorageSizeInGb());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-28T14:05:20Z"),
             response.iterator().next().properties().timeMaintenanceWindowEnd());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-04-29T02:09:30Z"),
+        Assertions.assertEquals(OffsetDateTime.parse("2021-08-28T22:37:58Z"),
             response.iterator().next().properties().timeMaintenanceWindowStart());
-        Assertions.assertEquals(1485385595, response.iterator().next().properties().totalCpuCoreCount());
+        Assertions.assertEquals(497278194, response.iterator().next().properties().totalCpuCoreCount());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageDetailsTests.java
index 97bf09ad9399..ecf284219c96 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageDetailsTests.java
@@ -12,9 +12,9 @@ public final class ExascaleDbStorageDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbStorageDetails model
-            = BinaryData.fromString("{\"availableSizeInGbs\":2049829405,\"totalSizeInGbs\":481036102}")
+            = BinaryData.fromString("{\"availableSizeInGbs\":287245464,\"totalSizeInGbs\":1670865281}")
                 .toObject(ExascaleDbStorageDetails.class);
-        Assertions.assertEquals(2049829405, model.availableSizeInGbs());
-        Assertions.assertEquals(481036102, model.totalSizeInGbs());
+        Assertions.assertEquals(287245464, model.availableSizeInGbs());
+        Assertions.assertEquals(1670865281, model.totalSizeInGbs());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageInputDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageInputDetailsTests.java
index 3b91d904eba9..546284547724 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageInputDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageInputDetailsTests.java
@@ -12,14 +12,14 @@ public final class ExascaleDbStorageInputDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbStorageInputDetails model
-            = BinaryData.fromString("{\"totalSizeInGbs\":1761289407}").toObject(ExascaleDbStorageInputDetails.class);
-        Assertions.assertEquals(1761289407, model.totalSizeInGbs());
+            = BinaryData.fromString("{\"totalSizeInGbs\":1638767964}").toObject(ExascaleDbStorageInputDetails.class);
+        Assertions.assertEquals(1638767964, model.totalSizeInGbs());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExascaleDbStorageInputDetails model = new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1761289407);
+        ExascaleDbStorageInputDetails model = new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1638767964);
         model = BinaryData.fromObject(model).toObject(ExascaleDbStorageInputDetails.class);
-        Assertions.assertEquals(1761289407, model.totalSizeInGbs());
+        Assertions.assertEquals(1638767964, model.totalSizeInGbs());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultInnerTests.java
index 542f9303b565..56db9dcbd7d2 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultInnerTests.java
@@ -17,38 +17,41 @@ public final class ExascaleDbStorageVaultInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbStorageVaultInner model = BinaryData.fromString(
-            "{\"properties\":{\"additionalFlashCacheInPercent\":2084317491,\"description\":\"tyms\",\"displayName\":\"nygq\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1753734199},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":986277752,\"totalSizeInGbs\":1579295950},\"timeZone\":\"gtilax\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"yvi\",\"vmClusterCount\":2065118929,\"ocid\":\"iv\",\"ociUrl\":\"oyzunbixxr\"},\"zones\":[\"vcpwpgclrc\",\"vtsoxf\",\"kenx\"],\"location\":\"yyefrpmpdnqqs\",\"tags\":{\"vmm\":\"ao\",\"itgvkx\":\"npqfrtqlkzmeg\"},\"id\":\"zyqdrfegcealzx\",\"name\":\"hcans\",\"type\":\"moy\"}")
+            "{\"properties\":{\"additionalFlashCacheInPercent\":1923836224,\"description\":\"qhlwigdivbkbxgo\",\"displayName\":\"fajuwas\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1426574768},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":37361117,\"totalSizeInGbs\":13307941},\"timeZone\":\"uxakjsqzhzbezk\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Updating\",\"lifecycleDetails\":\"xasicddyvvjskg\",\"vmClusterCount\":1236254057,\"ocid\":\"wa\",\"ociUrl\":\"qgatjeaahhvjhhn\",\"exadataInfrastructureId\":\"zybbj\",\"attachedShapeAttributes\":[\"SMART_STORAGE\"]},\"zones\":[\"yxkyxvx\",\"vblbjednljlageua\",\"lxunsmjbnkppxy\",\"enlsvxeizzgwkln\"],\"location\":\"mffeycxcktpi\",\"tags\":{\"qiekkkzddrt\":\"rteeamm\",\"ojbmxv\":\"g\",\"cuijpxt\":\"vrefdeesv\",\"wprtu\":\"s\"},\"id\":\"wsawddjibabxvi\",\"name\":\"itvtzeexavo\",\"type\":\"tfgle\"}")
             .toObject(ExascaleDbStorageVaultInner.class);
-        Assertions.assertEquals("yyefrpmpdnqqs", model.location());
-        Assertions.assertEquals("ao", model.tags().get("vmm"));
-        Assertions.assertEquals(2084317491, model.properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("tyms", model.properties().description());
-        Assertions.assertEquals("nygq", model.properties().displayName());
-        Assertions.assertEquals(1753734199, model.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("gtilax", model.properties().timeZone());
-        Assertions.assertEquals("vcpwpgclrc", model.zones().get(0));
+        Assertions.assertEquals("mffeycxcktpi", model.location());
+        Assertions.assertEquals("rteeamm", model.tags().get("qiekkkzddrt"));
+        Assertions.assertEquals(1923836224, model.properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("qhlwigdivbkbxgo", model.properties().description());
+        Assertions.assertEquals("fajuwas", model.properties().displayName());
+        Assertions.assertEquals(1426574768, model.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
+        Assertions.assertEquals("uxakjsqzhzbezk", model.properties().timeZone());
+        Assertions.assertEquals("zybbj", model.properties().exadataInfrastructureId());
+        Assertions.assertEquals("yxkyxvx", model.zones().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExascaleDbStorageVaultInner model = new ExascaleDbStorageVaultInner().withLocation("yyefrpmpdnqqs")
-            .withTags(mapOf("vmm", "ao", "itgvkx", "npqfrtqlkzmeg"))
-            .withProperties(new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(2084317491)
-                .withDescription("tyms")
-                .withDisplayName("nygq")
+        ExascaleDbStorageVaultInner model = new ExascaleDbStorageVaultInner().withLocation("mffeycxcktpi")
+            .withTags(mapOf("qiekkkzddrt", "rteeamm", "ojbmxv", "g", "cuijpxt", "vrefdeesv", "wprtu", "s"))
+            .withProperties(new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(1923836224)
+                .withDescription("qhlwigdivbkbxgo")
+                .withDisplayName("fajuwas")
                 .withHighCapacityDatabaseStorageInput(
-                    new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1753734199))
-                .withTimeZone("gtilax"))
-            .withZones(Arrays.asList("vcpwpgclrc", "vtsoxf", "kenx"));
+                    new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1426574768))
+                .withTimeZone("uxakjsqzhzbezk")
+                .withExadataInfrastructureId("zybbj"))
+            .withZones(Arrays.asList("yxkyxvx", "vblbjednljlageua", "lxunsmjbnkppxy", "enlsvxeizzgwkln"));
         model = BinaryData.fromObject(model).toObject(ExascaleDbStorageVaultInner.class);
-        Assertions.assertEquals("yyefrpmpdnqqs", model.location());
-        Assertions.assertEquals("ao", model.tags().get("vmm"));
-        Assertions.assertEquals(2084317491, model.properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("tyms", model.properties().description());
-        Assertions.assertEquals("nygq", model.properties().displayName());
-        Assertions.assertEquals(1753734199, model.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("gtilax", model.properties().timeZone());
-        Assertions.assertEquals("vcpwpgclrc", model.zones().get(0));
+        Assertions.assertEquals("mffeycxcktpi", model.location());
+        Assertions.assertEquals("rteeamm", model.tags().get("qiekkkzddrt"));
+        Assertions.assertEquals(1923836224, model.properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("qhlwigdivbkbxgo", model.properties().description());
+        Assertions.assertEquals("fajuwas", model.properties().displayName());
+        Assertions.assertEquals(1426574768, model.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
+        Assertions.assertEquals("uxakjsqzhzbezk", model.properties().timeZone());
+        Assertions.assertEquals("zybbj", model.properties().exadataInfrastructureId());
+        Assertions.assertEquals("yxkyxvx", model.zones().get(0));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultListResultTests.java
index e5a1399f1a96..15119a6925d0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultListResultTests.java
@@ -12,17 +12,18 @@ public final class ExascaleDbStorageVaultListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbStorageVaultListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"additionalFlashCacheInPercent\":1964670338,\"description\":\"yxkyxvx\",\"displayName\":\"vblbjednljlageua\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1383886156},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1495759737,\"totalSizeInGbs\":1081327817},\"timeZone\":\"bn\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Available\",\"lifecycleDetails\":\"enlsvxeizzgwkln\",\"vmClusterCount\":980138235,\"ocid\":\"feycxcktp\",\"ociUrl\":\"merteeammxqiek\"},\"zones\":[\"ddrtkgdojb\",\"xv\"],\"location\":\"refdee\",\"tags\":{\"s\":\"cuijpxt\",\"wsawddjibabxvi\":\"wprtu\",\"tfgle\":\"itvtzeexavo\"},\"id\":\"dmdqb\",\"name\":\"pypqtgsfj\",\"type\":\"cbslhhx\"},{\"properties\":{\"additionalFlashCacheInPercent\":467835815,\"description\":\"odhtnsirudhzm\",\"displayName\":\"es\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1080480185},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1975861158,\"totalSizeInGbs\":2124776241},\"timeZone\":\"rcxfailcfxwmdb\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Available\",\"lifecycleDetails\":\"ft\",\"vmClusterCount\":1025084643,\"ocid\":\"brjlnacgcckknhxk\",\"ociUrl\":\"v\"},\"zones\":[\"rzvul\",\"r\",\"aeranokqgukkjqnv\"],\"location\":\"oylaxxul\",\"tags\":{\"hryvy\":\"sdosfjbjsvgjr\",\"xgccknfnw\":\"ytdc\"},\"id\":\"btmvpdvjdhttza\",\"name\":\"fedxihchrphkm\",\"type\":\"rjdqnsdfzp\"}],\"nextLink\":\"tg\"}")
+            "{\"value\":[{\"properties\":{\"additionalFlashCacheInPercent\":1023796809,\"description\":\"nok\",\"displayName\":\"gukkjqnvbroy\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":86171978},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":271109823,\"totalSizeInGbs\":1120271954},\"timeZone\":\"isdos\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"lifecycleDetails\":\"g\",\"vmClusterCount\":1047902295,\"ocid\":\"r\",\"ociUrl\":\"ycy\",\"exadataInfrastructureId\":\"c\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\"]},\"zones\":[\"nfnw\",\"btmvpdvjdhttza\",\"fedxihchrphkm\",\"rjdqnsdfzp\"],\"location\":\"tg\",\"tags\":{\"z\":\"kdghrjeuutlwx\",\"qlgehg\":\"zhokvbwnhh\"},\"id\":\"pipifh\",\"name\":\"f\",\"type\":\"oajvgcxtxjcs\"},{\"properties\":{\"additionalFlashCacheInPercent\":1665237289,\"description\":\"dltug\",\"displayName\":\"resmkssjhoiftxfk\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1606818470},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":49827324,\"totalSizeInGbs\":713923946},\"timeZone\":\"tillucbiqtg\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"wsldrizetpwbr\",\"vmClusterCount\":1596471966,\"ocid\":\"ibph\",\"ociUrl\":\"zmizakakan\",\"exadataInfrastructureId\":\"p\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\",\"SMART_STORAGE\"]},\"zones\":[\"oylhjlmuoyxprimr\",\"opteecj\"],\"location\":\"islstv\",\"tags\":{\"eoohguufuzboyj\":\"lwxdzaum\"},\"id\":\"thwtzol\",\"name\":\"a\",\"type\":\"mwmdxmebwjscjpa\"},{\"properties\":{\"additionalFlashCacheInPercent\":1860405842,\"description\":\"a\",\"displayName\":\"f\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1913750704},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1695920381,\"totalSizeInGbs\":1009857472},\"timeZone\":\"ibxyijddtvqc\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"aeukm\",\"vmClusterCount\":360387676,\"ocid\":\"ekpndzaapmudq\",\"ociUrl\":\"qwigpibudqwyxe\",\"exadataInfrastructureId\":\"ybpmzznrtffyaq\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\"]},\"zones\":[\"ioqaqhvs\",\"ufuqyrx\",\"dlcgqlsismjqfr\"],\"location\":\"gamquhiosrsjui\",\"tags\":{\"czexrxzbujrtrhqv\":\"disyirnxz\",\"zlrpiqywncvj\":\"revkhgnlnzo\"},\"id\":\"szcofizeht\",\"name\":\"hgbjkvrelje\",\"type\":\"murvzm\"},{\"properties\":{\"additionalFlashCacheInPercent\":378498503,\"description\":\"nashcxlp\",\"displayName\":\"jerbdkelvidizozs\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1027236790},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1441551440,\"totalSizeInGbs\":1920486563},\"timeZone\":\"nfdgn\",\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Provisioning\",\"lifecycleDetails\":\"uwwltvuqjctz\",\"vmClusterCount\":1164952050,\"ocid\":\"if\",\"ociUrl\":\"hmkdasvfl\",\"exadataInfrastructureId\":\"bxcudchx\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\"]},\"zones\":[\"d\",\"or\",\"bwjl\"],\"location\":\"zbfhfovvac\",\"tags\":{\"muaslzkw\":\"tuodxeszabbelaw\",\"hnomdrkywuh\":\"rwoycqucwyh\",\"lniexz\":\"svfuurutlwexxwl\",\"tybbwwpgda\":\"rzpgep\"},\"id\":\"chzyvlixqnrk\",\"name\":\"xkjibnxmy\",\"type\":\"uxswqrntvl\"}],\"nextLink\":\"jpsttexoq\"}")
             .toObject(ExascaleDbStorageVaultListResult.class);
-        Assertions.assertEquals("refdee", model.value().get(0).location());
-        Assertions.assertEquals("cuijpxt", model.value().get(0).tags().get("s"));
-        Assertions.assertEquals(1964670338, model.value().get(0).properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("yxkyxvx", model.value().get(0).properties().description());
-        Assertions.assertEquals("vblbjednljlageua", model.value().get(0).properties().displayName());
-        Assertions.assertEquals(1383886156,
+        Assertions.assertEquals("tg", model.value().get(0).location());
+        Assertions.assertEquals("kdghrjeuutlwx", model.value().get(0).tags().get("z"));
+        Assertions.assertEquals(1023796809, model.value().get(0).properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("nok", model.value().get(0).properties().description());
+        Assertions.assertEquals("gukkjqnvbroy", model.value().get(0).properties().displayName());
+        Assertions.assertEquals(86171978,
             model.value().get(0).properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("bn", model.value().get(0).properties().timeZone());
-        Assertions.assertEquals("ddrtkgdojb", model.value().get(0).zones().get(0));
-        Assertions.assertEquals("tg", model.nextLink());
+        Assertions.assertEquals("isdos", model.value().get(0).properties().timeZone());
+        Assertions.assertEquals("c", model.value().get(0).properties().exadataInfrastructureId());
+        Assertions.assertEquals("nfnw", model.value().get(0).zones().get(0));
+        Assertions.assertEquals("jpsttexoq", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultPropertiesTests.java
index 68e4d645fef5..bbe957ed822d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultPropertiesTests.java
@@ -13,29 +13,31 @@ public final class ExascaleDbStorageVaultPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExascaleDbStorageVaultProperties model = BinaryData.fromString(
-            "{\"additionalFlashCacheInPercent\":771137006,\"description\":\"igdivbkbxg\",\"displayName\":\"mf\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":2081513021},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1308923921,\"totalSizeInGbs\":1690246024},\"timeZone\":\"daeyygux\",\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Terminated\",\"lifecycleDetails\":\"hzbezkgi\",\"vmClusterCount\":1082466616,\"ocid\":\"xasicddyvvjskg\",\"ociUrl\":\"ocwah\"}")
+            "{\"additionalFlashCacheInPercent\":36693026,\"description\":\"qbw\",\"displayName\":\"ypq\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1413070711},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1969231562,\"totalSizeInGbs\":1790951604},\"timeZone\":\"slhhxudbxv\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"irudh\",\"vmClusterCount\":593896600,\"ocid\":\"sckdlp\",\"ociUrl\":\"zrcxfailcfxwmdbo\",\"exadataInfrastructureId\":\"fgsftufqob\",\"attachedShapeAttributes\":[\"SMART_STORAGE\",\"BLOCK_STORAGE\"]}")
             .toObject(ExascaleDbStorageVaultProperties.class);
-        Assertions.assertEquals(771137006, model.additionalFlashCacheInPercent());
-        Assertions.assertEquals("igdivbkbxg", model.description());
-        Assertions.assertEquals("mf", model.displayName());
-        Assertions.assertEquals(2081513021, model.highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("daeyygux", model.timeZone());
+        Assertions.assertEquals(36693026, model.additionalFlashCacheInPercent());
+        Assertions.assertEquals("qbw", model.description());
+        Assertions.assertEquals("ypq", model.displayName());
+        Assertions.assertEquals(1413070711, model.highCapacityDatabaseStorageInput().totalSizeInGbs());
+        Assertions.assertEquals("slhhxudbxv", model.timeZone());
+        Assertions.assertEquals("fgsftufqob", model.exadataInfrastructureId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExascaleDbStorageVaultProperties model
-            = new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(771137006)
-                .withDescription("igdivbkbxg")
-                .withDisplayName("mf")
-                .withHighCapacityDatabaseStorageInput(
-                    new ExascaleDbStorageInputDetails().withTotalSizeInGbs(2081513021))
-                .withTimeZone("daeyygux");
+        ExascaleDbStorageVaultProperties model = new ExascaleDbStorageVaultProperties()
+            .withAdditionalFlashCacheInPercent(36693026)
+            .withDescription("qbw")
+            .withDisplayName("ypq")
+            .withHighCapacityDatabaseStorageInput(new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1413070711))
+            .withTimeZone("slhhxudbxv")
+            .withExadataInfrastructureId("fgsftufqob");
         model = BinaryData.fromObject(model).toObject(ExascaleDbStorageVaultProperties.class);
-        Assertions.assertEquals(771137006, model.additionalFlashCacheInPercent());
-        Assertions.assertEquals("igdivbkbxg", model.description());
-        Assertions.assertEquals("mf", model.displayName());
-        Assertions.assertEquals(2081513021, model.highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("daeyygux", model.timeZone());
+        Assertions.assertEquals(36693026, model.additionalFlashCacheInPercent());
+        Assertions.assertEquals("qbw", model.description());
+        Assertions.assertEquals("ypq", model.displayName());
+        Assertions.assertEquals(1413070711, model.highCapacityDatabaseStorageInput().totalSizeInGbs());
+        Assertions.assertEquals("slhhxudbxv", model.timeZone());
+        Assertions.assertEquals("fgsftufqob", model.exadataInfrastructureId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultTagsUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultTagsUpdateTests.java
index 83259659903d..3827ccfceade 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultTagsUpdateTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultTagsUpdateTests.java
@@ -13,17 +13,17 @@
 public final class ExascaleDbStorageVaultTagsUpdateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ExascaleDbStorageVaultTagsUpdate model = BinaryData.fromString("{\"tags\":{\"zybbj\":\"ahhvjhhna\"}}")
+        ExascaleDbStorageVaultTagsUpdate model = BinaryData.fromString("{\"tags\":{\"lj\":\"hxkizvytnrzv\"}}")
             .toObject(ExascaleDbStorageVaultTagsUpdate.class);
-        Assertions.assertEquals("ahhvjhhna", model.tags().get("zybbj"));
+        Assertions.assertEquals("hxkizvytnrzv", model.tags().get("lj"));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ExascaleDbStorageVaultTagsUpdate model
-            = new ExascaleDbStorageVaultTagsUpdate().withTags(mapOf("zybbj", "ahhvjhhna"));
+            = new ExascaleDbStorageVaultTagsUpdate().withTags(mapOf("lj", "hxkizvytnrzv"));
         model = BinaryData.fromObject(model).toObject(ExascaleDbStorageVaultTagsUpdate.class);
-        Assertions.assertEquals("ahhvjhhna", model.tags().get("zybbj"));
+        Assertions.assertEquals("hxkizvytnrzv", model.tags().get("lj"));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateMockTests.java
index 42035f4ad1aa..c60b9149f958 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsCreateMockTests.java
@@ -26,7 +26,7 @@ public final class ExascaleDbStorageVaultsCreateMockTests {
     @Test
     public void testCreate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"additionalFlashCacheInPercent\":64736512,\"description\":\"edev\",\"displayName\":\"bo\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":222208753},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":112594464,\"totalSizeInGbs\":9633412},\"timeZone\":\"kkhminqcymczngn\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"unin\",\"vmClusterCount\":290904524,\"ocid\":\"chaqdtvqec\",\"ociUrl\":\"ct\"},\"zones\":[\"dtddmflh\",\"ytxzvtznapxbanno\",\"voxczytpr\",\"nwvroevytlyokrr\"],\"location\":\"uuxvnsasbcry\",\"tags\":{\"xnazpmkml\":\"izrxklob\"},\"id\":\"vevfxz\",\"name\":\"pj\",\"type\":\"bzxliohrdddtfgxq\"}";
+            = "{\"properties\":{\"additionalFlashCacheInPercent\":1718713775,\"description\":\"fkg\",\"displayName\":\"syaowuzowp\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":586601408},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":308046550,\"totalSizeInGbs\":1455618872},\"timeZone\":\"gukxrztiochluti\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"jizcbfzmcrunfhiu\",\"vmClusterCount\":1201337958,\"ocid\":\"bcpaqktkrumzued\",\"ociUrl\":\"zbfvxovqkxiu\",\"exadataInfrastructureId\":\"ggvqrnhyhlwcjs\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\",\"SMART_STORAGE\"]},\"zones\":[\"bxrqrkijp\"],\"location\":\"qlsdxeqztvxwmw\",\"tags\":{\"ecleqioulndhzyo\":\"swenawwa\",\"idmytzln\":\"ojhtollhs\"},\"id\":\"lxpnovyoanf\",\"name\":\"cswqa\",\"type\":\"ywv\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -36,27 +36,29 @@ public void testCreate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ExascaleDbStorageVault response = manager.exascaleDbStorageVaults()
-            .define("uuuybnchrsziz")
-            .withRegion("bvqt")
-            .withExistingResourceGroup("sjgqrsxyp")
-            .withTags(mapOf("ukhpyrneizjcp", "rfdl", "uxddbhfh", "ogkhnmgbr", "lontacnpq", "fpazjzoywjxhpd", "xh",
-                "tehtuevrhrljyoog"))
-            .withProperties(new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(327117456)
-                .withDescription("yetnd")
-                .withDisplayName("bf")
-                .withHighCapacityDatabaseStorageInput(new ExascaleDbStorageInputDetails().withTotalSizeInGbs(834158684))
-                .withTimeZone("nlgmtrwahzjmu"))
-            .withZones(Arrays.asList("hjnhgwydyynfsvk"))
+            .define("r")
+            .withRegion("tlpqagynoi")
+            .withExistingResourceGroup("wiyjvzuko")
+            .withTags(mapOf("zxaqzibm", "zcalincryq"))
+            .withProperties(new ExascaleDbStorageVaultProperties().withAdditionalFlashCacheInPercent(925456345)
+                .withDescription("zm")
+                .withDisplayName("n")
+                .withHighCapacityDatabaseStorageInput(
+                    new ExascaleDbStorageInputDetails().withTotalSizeInGbs(1850274865))
+                .withTimeZone("abjqqaxuyvymcnud")
+                .withExadataInfrastructureId("kldgrcwfcmfc"))
+            .withZones(Arrays.asList("txjtielnzqgx", "gfb"))
             .create();
 
-        Assertions.assertEquals("uuxvnsasbcry", response.location());
-        Assertions.assertEquals("izrxklob", response.tags().get("xnazpmkml"));
-        Assertions.assertEquals(64736512, response.properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("edev", response.properties().description());
-        Assertions.assertEquals("bo", response.properties().displayName());
-        Assertions.assertEquals(222208753, response.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("kkhminqcymczngn", response.properties().timeZone());
-        Assertions.assertEquals("dtddmflh", response.zones().get(0));
+        Assertions.assertEquals("qlsdxeqztvxwmw", response.location());
+        Assertions.assertEquals("swenawwa", response.tags().get("ecleqioulndhzyo"));
+        Assertions.assertEquals(1718713775, response.properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("fkg", response.properties().description());
+        Assertions.assertEquals("syaowuzowp", response.properties().displayName());
+        Assertions.assertEquals(586601408, response.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
+        Assertions.assertEquals("gukxrztiochluti", response.properties().timeZone());
+        Assertions.assertEquals("ggvqrnhyhlwcjs", response.properties().exadataInfrastructureId());
+        Assertions.assertEquals("bxrqrkijp", response.zones().get(0));
     }
 
     // Use "Map.of" if available
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupWithResponseMockTests.java
index cba26eee585f..6a849f727963 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsGetByResourceGroupWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class ExascaleDbStorageVaultsGetByResourceGroupWithResponseMockTest
     @Test
     public void testGetByResourceGroupWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"additionalFlashCacheInPercent\":626371863,\"description\":\"o\",\"displayName\":\"dvmfqhppub\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":140837037},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1747875725,\"totalSizeInGbs\":475630723},\"timeZone\":\"kmtdher\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"uahokq\",\"vmClusterCount\":833975977,\"ocid\":\"auxofshfph\",\"ociUrl\":\"nulaiywzejywhsl\"},\"zones\":[\"jpllndnpdwrpq\",\"fgf\",\"gsnnf\",\"yetefyp\"],\"location\":\"octfjgtixrjvzuyt\",\"tags\":{\"bauiropi\":\"lmuowo\",\"n\":\"nszonwpngaj\"},\"id\":\"ixjawrtm\",\"name\":\"fjmyccxlzhco\",\"type\":\"ovne\"}";
+            = "{\"properties\":{\"additionalFlashCacheInPercent\":1883901064,\"description\":\"qrs\",\"displayName\":\"pcbbprtugav\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":2066287030},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1675076969,\"totalSizeInGbs\":1865251645},\"timeZone\":\"vm\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Available\",\"lifecycleDetails\":\"bfcmkrfts\",\"vmClusterCount\":1717750584,\"ocid\":\"jxsgmbawvifdxke\",\"ociUrl\":\"fho\",\"exadataInfrastructureId\":\"xwklooz\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\",\"SMART_STORAGE\"]},\"zones\":[\"uf\",\"nlcpxxviry\"],\"location\":\"ngjgvrquvpyg\",\"tags\":{\"jt\":\"mcrdcue\",\"q\":\"ahxm\",\"yspthzod\":\"yarvsxzqbglcjk\"},\"id\":\"btl\",\"name\":\"jtgblios\",\"type\":\"kfmkmfdjxyxgbk\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,16 +31,17 @@ public void testGetByResourceGroupWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         ExascaleDbStorageVault response = manager.exascaleDbStorageVaults()
-            .getByResourceGroupWithResponse("ewmozqvbu", "qmamhsycxhxzga", com.azure.core.util.Context.NONE)
+            .getByResourceGroupWithResponse("rdexyio", "ofninbdbz", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("octfjgtixrjvzuyt", response.location());
-        Assertions.assertEquals("lmuowo", response.tags().get("bauiropi"));
-        Assertions.assertEquals(626371863, response.properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("o", response.properties().description());
-        Assertions.assertEquals("dvmfqhppub", response.properties().displayName());
-        Assertions.assertEquals(140837037, response.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("kmtdher", response.properties().timeZone());
-        Assertions.assertEquals("jpllndnpdwrpq", response.zones().get(0));
+        Assertions.assertEquals("ngjgvrquvpyg", response.location());
+        Assertions.assertEquals("mcrdcue", response.tags().get("jt"));
+        Assertions.assertEquals(1883901064, response.properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("qrs", response.properties().description());
+        Assertions.assertEquals("pcbbprtugav", response.properties().displayName());
+        Assertions.assertEquals(2066287030, response.properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
+        Assertions.assertEquals("vm", response.properties().timeZone());
+        Assertions.assertEquals("xwklooz", response.properties().exadataInfrastructureId());
+        Assertions.assertEquals("uf", response.zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupMockTests.java
index a3c6bb76c518..b97da1ff9a1e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListByResourceGroupMockTests.java
@@ -22,7 +22,7 @@ public final class ExascaleDbStorageVaultsListByResourceGroupMockTests {
     @Test
     public void testListByResourceGroup() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"additionalFlashCacheInPercent\":1290692047,\"description\":\"xrdcqtj\",\"displayName\":\"idttgepus\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1721166118},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":466292702,\"totalSizeInGbs\":1896192461},\"timeZone\":\"wkasiziesf\",\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Available\",\"lifecycleDetails\":\"qfecjxeygtuhx\",\"vmClusterCount\":1670662701,\"ocid\":\"uewmrswnjlxuzrhw\",\"ociUrl\":\"sxjb\"},\"zones\":[\"hgpdohzj\",\"atucoigebxncn\",\"fepbnwgfmxjgc\",\"bjb\"],\"location\":\"lfgtdysnaquflqbc\",\"tags\":{\"rwd\":\"amz\",\"antkwcegyamlbns\":\"qzeqyjleziunjxdf\",\"jjvpilguooqja\":\"qa\"},\"id\":\"m\",\"name\":\"itgueiookjbs\",\"type\":\"hrtdtpdelq\"}]}";
+            = "{\"value\":[{\"properties\":{\"additionalFlashCacheInPercent\":1465620035,\"description\":\"skkzpxvjnzdpvo\",\"displayName\":\"ojhpcnabxzfsn\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":983101769},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":104765582,\"totalSizeInGbs\":2107917494},\"timeZone\":\"ilmhivzkwwwnc\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Terminating\",\"lifecycleDetails\":\"jlskzptjxulweu\",\"vmClusterCount\":585553981,\"ocid\":\"hxqlehmcgcjeinue\",\"ociUrl\":\"kamvfe\",\"exadataInfrastructureId\":\"qnttmbq\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\",\"SMART_STORAGE\"]},\"zones\":[\"fokpysthhzagjfw\",\"yrl\",\"g\",\"nuzejgvkveb\"],\"location\":\"szllrzlsmmdqgmi\",\"tags\":{\"xtminklogxsvtzar\":\"imcqrh\",\"lpky\":\"zvqnsqktcmbjwzzo\"},\"id\":\"tglwkzpgajsqjc\",\"name\":\"mqbmfuvqarwz\",\"type\":\"uqrebluimmbwx\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,16 +32,17 @@ public void testListByResourceGroup() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<ExascaleDbStorageVault> response
-            = manager.exascaleDbStorageVaults().listByResourceGroup("henlusfnr", com.azure.core.util.Context.NONE);
+            = manager.exascaleDbStorageVaults().listByResourceGroup("qvjcteoe", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("lfgtdysnaquflqbc", response.iterator().next().location());
-        Assertions.assertEquals("amz", response.iterator().next().tags().get("rwd"));
-        Assertions.assertEquals(1290692047, response.iterator().next().properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("xrdcqtj", response.iterator().next().properties().description());
-        Assertions.assertEquals("idttgepus", response.iterator().next().properties().displayName());
-        Assertions.assertEquals(1721166118,
+        Assertions.assertEquals("szllrzlsmmdqgmi", response.iterator().next().location());
+        Assertions.assertEquals("imcqrh", response.iterator().next().tags().get("xtminklogxsvtzar"));
+        Assertions.assertEquals(1465620035, response.iterator().next().properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("skkzpxvjnzdpvo", response.iterator().next().properties().description());
+        Assertions.assertEquals("ojhpcnabxzfsn", response.iterator().next().properties().displayName());
+        Assertions.assertEquals(983101769,
             response.iterator().next().properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("wkasiziesf", response.iterator().next().properties().timeZone());
-        Assertions.assertEquals("hgpdohzj", response.iterator().next().zones().get(0));
+        Assertions.assertEquals("ilmhivzkwwwnc", response.iterator().next().properties().timeZone());
+        Assertions.assertEquals("qnttmbq", response.iterator().next().properties().exadataInfrastructureId());
+        Assertions.assertEquals("fokpysthhzagjfw", response.iterator().next().zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListMockTests.java
index dd2e2e2f43da..2dfadc95234d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ExascaleDbStorageVaultsListMockTests.java
@@ -22,7 +22,7 @@ public final class ExascaleDbStorageVaultsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"additionalFlashCacheInPercent\":1648756577,\"description\":\"otoebnfxofv\",\"displayName\":\"jkgd\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1994571012},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":215390603,\"totalSizeInGbs\":811935890},\"timeZone\":\"jwabmd\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Terminated\",\"lifecycleDetails\":\"op\",\"vmClusterCount\":206055715,\"ocid\":\"jurbuhhlkyqltqsr\",\"ociUrl\":\"tuwkffdj\"},\"zones\":[\"ysidfvclgl\",\"n\",\"uijtkbu\",\"qogsfikayian\"],\"location\":\"arujt\",\"tags\":{\"j\":\"xfz\",\"penuy\":\"ttvwkpqh\",\"guaucmfdjwnla\":\"bqeqqekewvnqvcd\"},\"id\":\"punj\",\"name\":\"ikczvvitacgxmf\",\"type\":\"sserxhtvsoxhlwn\"}]}";
+            = "{\"value\":[{\"properties\":{\"additionalFlashCacheInPercent\":394613556,\"description\":\"mbvx\",\"displayName\":\"kraokq\",\"highCapacityDatabaseStorageInput\":{\"totalSizeInGbs\":1232558880},\"highCapacityDatabaseStorage\":{\"availableSizeInGbs\":1035181790,\"totalSizeInGbs\":818793523},\"timeZone\":\"okbavlyttaak\",\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Failed\",\"lifecycleDetails\":\"bsmhpdujdiga\",\"vmClusterCount\":1236887032,\"ocid\":\"ksc\",\"ociUrl\":\"tnanqimwb\",\"exadataInfrastructureId\":\"pdcldpka\",\"attachedShapeAttributes\":[\"BLOCK_STORAGE\",\"BLOCK_STORAGE\",\"BLOCK_STORAGE\"]},\"zones\":[\"o\",\"xwksq\",\"udmfcoibiczius\",\"s\"],\"location\":\"rk\",\"tags\":{\"yfscyrfwbivqvo\":\"jhbtqq\",\"wvbhlimbyq\":\"fuy\"},\"id\":\"crood\",\"name\":\"ikcdrdaasax\",\"type\":\"obsmf\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -34,14 +34,15 @@ public void testList() throws Exception {
         PagedIterable<ExascaleDbStorageVault> response
             = manager.exascaleDbStorageVaults().list(com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("arujt", response.iterator().next().location());
-        Assertions.assertEquals("xfz", response.iterator().next().tags().get("j"));
-        Assertions.assertEquals(1648756577, response.iterator().next().properties().additionalFlashCacheInPercent());
-        Assertions.assertEquals("otoebnfxofv", response.iterator().next().properties().description());
-        Assertions.assertEquals("jkgd", response.iterator().next().properties().displayName());
-        Assertions.assertEquals(1994571012,
+        Assertions.assertEquals("rk", response.iterator().next().location());
+        Assertions.assertEquals("jhbtqq", response.iterator().next().tags().get("yfscyrfwbivqvo"));
+        Assertions.assertEquals(394613556, response.iterator().next().properties().additionalFlashCacheInPercent());
+        Assertions.assertEquals("mbvx", response.iterator().next().properties().description());
+        Assertions.assertEquals("kraokq", response.iterator().next().properties().displayName());
+        Assertions.assertEquals(1232558880,
             response.iterator().next().properties().highCapacityDatabaseStorageInput().totalSizeInGbs());
-        Assertions.assertEquals("jwabmd", response.iterator().next().properties().timeZone());
-        Assertions.assertEquals("ysidfvclgl", response.iterator().next().zones().get(0));
+        Assertions.assertEquals("okbavlyttaak", response.iterator().next().properties().timeZone());
+        Assertions.assertEquals("pdcldpka", response.iterator().next().properties().exadataInfrastructureId());
+        Assertions.assertEquals("o", response.iterator().next().zones().get(0));
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FileSystemConfigurationDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FileSystemConfigurationDetailsTests.java
index a06087ae0f8b..fd04fe36d9b6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FileSystemConfigurationDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FileSystemConfigurationDetailsTests.java
@@ -12,18 +12,18 @@ public final class FileSystemConfigurationDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         FileSystemConfigurationDetails model
-            = BinaryData.fromString("{\"mountPoint\":\"ygpfqb\",\"fileSystemSizeGb\":1732351428}")
+            = BinaryData.fromString("{\"mountPoint\":\"jbi\",\"fileSystemSizeGb\":532379819}")
                 .toObject(FileSystemConfigurationDetails.class);
-        Assertions.assertEquals("ygpfqb", model.mountPoint());
-        Assertions.assertEquals(1732351428, model.fileSystemSizeGb());
+        Assertions.assertEquals("jbi", model.mountPoint());
+        Assertions.assertEquals(532379819, model.fileSystemSizeGb());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         FileSystemConfigurationDetails model
-            = new FileSystemConfigurationDetails().withMountPoint("ygpfqb").withFileSystemSizeGb(1732351428);
+            = new FileSystemConfigurationDetails().withMountPoint("jbi").withFileSystemSizeGb(532379819);
         model = BinaryData.fromObject(model).toObject(FileSystemConfigurationDetails.class);
-        Assertions.assertEquals("ygpfqb", model.mountPoint());
-        Assertions.assertEquals(1732351428, model.fileSystemSizeGb());
+        Assertions.assertEquals("jbi", model.mountPoint());
+        Assertions.assertEquals(532379819, model.fileSystemSizeGb());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentInnerTests.java
index 815811e0d5fd..050103ed8b2c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentInnerTests.java
@@ -11,7 +11,7 @@ public final class FlexComponentInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         FlexComponentInner model = BinaryData.fromString(
-            "{\"properties\":{\"minimumCoreCount\":1441436450,\"availableCoreCount\":312657559,\"availableDbStorageInGbs\":1646867307,\"runtimeMinimumCoreCount\":1846844477,\"shape\":\"tronzmyhgfi\",\"availableMemoryInGbs\":884290238,\"availableLocalStorageInGbs\":1762342215,\"computeModel\":\"cwaekrrjre\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"sgumhjglikkxwsl\"},\"id\":\"bq\",\"name\":\"vuzlm\",\"type\":\"felfktg\"}")
+            "{\"properties\":{\"minimumCoreCount\":712320662,\"availableCoreCount\":270818491,\"availableDbStorageInGbs\":2069063654,\"runtimeMinimumCoreCount\":2131974737,\"shape\":\"cx\",\"availableMemoryInGbs\":1392453410,\"availableLocalStorageInGbs\":469495787,\"computeModel\":\"ofbshr\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"uswdv\"},\"id\":\"ybycnunvj\",\"name\":\"rtkfawnopq\",\"type\":\"ikyzirtxdy\"}")
             .toObject(FlexComponentInner.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentListResultTests.java
index 9733728334aa..6feb3e170382 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentListResultTests.java
@@ -12,8 +12,8 @@ public final class FlexComponentListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         FlexComponentListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"minimumCoreCount\":1784311457,\"availableCoreCount\":953269937,\"availableDbStorageInGbs\":1886433502,\"runtimeMinimumCoreCount\":1615411821,\"shape\":\"ou\",\"availableMemoryInGbs\":583930793,\"availableLocalStorageInGbs\":1629176755,\"computeModel\":\"qaaysjkixqt\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"ezl\"},\"id\":\"ffiakp\",\"name\":\"pqqmted\",\"type\":\"tmmjihyeozph\"},{\"properties\":{\"minimumCoreCount\":1760801565,\"availableCoreCount\":404997188,\"availableDbStorageInGbs\":84771050,\"runtimeMinimumCoreCount\":1385853585,\"shape\":\"p\",\"availableMemoryInGbs\":2023825690,\"availableLocalStorageInGbs\":587818822,\"computeModel\":\"scw\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"evzhfsto\"},\"id\":\"hojujbypelmcuv\",\"name\":\"ixbjx\",\"type\":\"fw\"},{\"properties\":{\"minimumCoreCount\":156258046,\"availableCoreCount\":729990408,\"availableDbStorageInGbs\":1448571025,\"runtimeMinimumCoreCount\":1926666832,\"shape\":\"p\",\"availableMemoryInGbs\":156092628,\"availableLocalStorageInGbs\":1511616464,\"computeModel\":\"nujrywvtyl\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"curdoiwiitht\"},\"id\":\"ubxcbihw\",\"name\":\"knfd\",\"type\":\"twjchrdg\"}],\"nextLink\":\"hxumwctondzj\"}")
+            "{\"value\":[{\"properties\":{\"minimumCoreCount\":1224652239,\"availableCoreCount\":779819591,\"availableDbStorageInGbs\":1575038550,\"runtimeMinimumCoreCount\":938334267,\"shape\":\"mv\",\"availableMemoryInGbs\":1791682028,\"availableLocalStorageInGbs\":276592669,\"computeModel\":\"vwxnbkfe\",\"hardwareType\":\"CELL\",\"descriptionSummary\":\"cy\"},\"id\":\"zdgiruj\",\"name\":\"zbomvzzbtdcqvpni\",\"type\":\"ujviylwdshfs\"}],\"nextLink\":\"rbgyefry\"}")
             .toObject(FlexComponentListResult.class);
-        Assertions.assertEquals("hxumwctondzj", model.nextLink());
+        Assertions.assertEquals("rbgyefry", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentPropertiesTests.java
index f451ca3957e2..7a89206173ad 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentPropertiesTests.java
@@ -11,7 +11,7 @@ public final class FlexComponentPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         FlexComponentProperties model = BinaryData.fromString(
-            "{\"minimumCoreCount\":957829467,\"availableCoreCount\":1827941579,\"availableDbStorageInGbs\":1811629321,\"runtimeMinimumCoreCount\":1534218395,\"shape\":\"noigbrnjwmwk\",\"availableMemoryInGbs\":703556051,\"availableLocalStorageInGbs\":808609813,\"computeModel\":\"ejjoqkagfhsxtta\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"nfaazpxdtnkdmkq\"}")
+            "{\"minimumCoreCount\":1631335830,\"availableCoreCount\":1444158285,\"availableDbStorageInGbs\":1189473402,\"runtimeMinimumCoreCount\":902595467,\"shape\":\"wgioilqukry\",\"availableMemoryInGbs\":1625650098,\"availableLocalStorageInGbs\":599402344,\"computeModel\":\"eoxorggufhyao\",\"hardwareType\":\"CELL\",\"descriptionSummary\":\"hhavgrvkffovjz\"}")
             .toObject(FlexComponentProperties.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetWithResponseMockTests.java
index 45c681ea6052..2c481182a08d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsGetWithResponseMockTests.java
@@ -20,7 +20,7 @@ public final class FlexComponentsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"minimumCoreCount\":1667275200,\"availableCoreCount\":1141313452,\"availableDbStorageInGbs\":2082373615,\"runtimeMinimumCoreCount\":735394972,\"shape\":\"ykggnoxuztrksx\",\"availableMemoryInGbs\":1615864463,\"availableLocalStorageInGbs\":29504887,\"computeModel\":\"pfnznthjtwkj\",\"hardwareType\":\"CELL\",\"descriptionSummary\":\"xuzvoamktcqi\"},\"id\":\"mgbzahgxqdlyrtl\",\"name\":\"laprlt\",\"type\":\"katbhjm\"}";
+            = "{\"properties\":{\"minimumCoreCount\":1354484922,\"availableCoreCount\":1345768053,\"availableDbStorageInGbs\":220853463,\"runtimeMinimumCoreCount\":1307566390,\"shape\":\"fytpqsixymmpuji\",\"availableMemoryInGbs\":1474208160,\"availableLocalStorageInGbs\":1164095786,\"computeModel\":\"uvsmbms\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"ovwzdbpqvybefg\"},\"id\":\"x\",\"name\":\"okcvtlubses\",\"type\":\"vcuartrhun\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -29,9 +29,8 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        FlexComponent response = manager.flexComponents()
-            .getWithResponse("hmipgawtxxpkyjc", "cjxgrytf", com.azure.core.util.Context.NONE)
-            .getValue();
+        FlexComponent response
+            = manager.flexComponents().getWithResponse("xf", "vaknokzwjj", com.azure.core.util.Context.NONE).getValue();
 
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentMockTests.java
index cb019fafbc80..6d125c3ec810 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/FlexComponentsListByParentMockTests.java
@@ -22,7 +22,7 @@ public final class FlexComponentsListByParentMockTests {
     @Test
     public void testListByParent() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"minimumCoreCount\":1340564567,\"availableCoreCount\":1515346381,\"availableDbStorageInGbs\":226736084,\"runtimeMinimumCoreCount\":2138595682,\"shape\":\"febwlnbmhyreeudz\",\"availableMemoryInGbs\":1880601088,\"availableLocalStorageInGbs\":2042624094,\"computeModel\":\"qmjxlyyzglgouwtl\",\"hardwareType\":\"CELL\",\"descriptionSummary\":\"uojqt\"},\"id\":\"axkjeytunlbfjk\",\"name\":\"rusnk\",\"type\":\"bhsy\"}]}";
+            = "{\"value\":[{\"properties\":{\"minimumCoreCount\":1830038305,\"availableCoreCount\":461124348,\"availableDbStorageInGbs\":740556470,\"runtimeMinimumCoreCount\":2036757634,\"shape\":\"gltbxoeeo\",\"availableMemoryInGbs\":558021080,\"availableLocalStorageInGbs\":1794310518,\"computeModel\":\"myymvqdbpbhfckdv\",\"hardwareType\":\"COMPUTE\",\"descriptionSummary\":\"cssbzhddu\"},\"id\":\"nqfblhkalehpava\",\"name\":\"ugiqjtiogqg\",\"type\":\"minict\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,7 +32,7 @@ public void testListByParent() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<FlexComponent> response = manager.flexComponents()
-            .listByParent("nnbsoqeqa", SystemShapes.EXA_DB_XS, com.azure.core.util.Context.NONE);
+            .listByParent("pirykycndzfqiv", SystemShapes.EXA_DB_XS, com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionInnerTests.java
index 04450bbf364d..ccb455d3d510 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionInnerTests.java
@@ -12,9 +12,9 @@ public final class GiMinorVersionInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GiMinorVersionInner model = BinaryData.fromString(
-            "{\"properties\":{\"version\":\"ytguslf\",\"gridImageOcid\":\"dcygqukyhejhz\"},\"id\":\"xgfpelolppv\",\"name\":\"srp\",\"type\":\"vu\"}")
+            "{\"properties\":{\"version\":\"khevxccedc\",\"gridImageOcid\":\"md\"},\"id\":\"dnwzxltjcvnhltiu\",\"name\":\"cxnavv\",\"type\":\"xqi\"}")
             .toObject(GiMinorVersionInner.class);
-        Assertions.assertEquals("ytguslf", model.properties().version());
-        Assertions.assertEquals("dcygqukyhejhz", model.properties().gridImageOcid());
+        Assertions.assertEquals("khevxccedc", model.properties().version());
+        Assertions.assertEquals("md", model.properties().gridImageOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionListResultTests.java
index 5bca411403e3..131fb15d68fc 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionListResultTests.java
@@ -12,10 +12,10 @@ public final class GiMinorVersionListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GiMinorVersionListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"version\":\"oluhczbwemh\",\"gridImageOcid\":\"rsbrgzdwm\"},\"id\":\"eypqwdxggicccn\",\"name\":\"qhuexm\",\"type\":\"ttlstvlzywemhz\"}],\"nextLink\":\"csdtclusiypbs\"}")
+            "{\"value\":[{\"properties\":{\"version\":\"woluhczbwemhair\",\"gridImageOcid\":\"rgzdwmsweyp\"},\"id\":\"dxggicccnxqhuexm\",\"name\":\"ttlstvlzywemhz\",\"type\":\"ncsdtclusiyp\"},{\"properties\":{\"version\":\"fgytguslfeadcyg\",\"gridImageOcid\":\"kyhejhzisxgf\"},\"id\":\"lolp\",\"name\":\"vk\",\"type\":\"r\"},{\"properties\":{\"version\":\"vu\",\"gridImageOcid\":\"raehtwdwrft\"},\"id\":\"iby\",\"name\":\"cdl\",\"type\":\"h\"}],\"nextLink\":\"fwpracstwi\"}")
             .toObject(GiMinorVersionListResult.class);
-        Assertions.assertEquals("oluhczbwemh", model.value().get(0).properties().version());
-        Assertions.assertEquals("rsbrgzdwm", model.value().get(0).properties().gridImageOcid());
-        Assertions.assertEquals("csdtclusiypbs", model.nextLink());
+        Assertions.assertEquals("woluhczbwemhair", model.value().get(0).properties().version());
+        Assertions.assertEquals("rgzdwmsweyp", model.value().get(0).properties().gridImageOcid());
+        Assertions.assertEquals("fwpracstwi", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionPropertiesTests.java
index 863cd0335c77..96bd7b3f76e4 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionPropertiesTests.java
@@ -12,9 +12,9 @@ public final class GiMinorVersionPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GiMinorVersionProperties model
-            = BinaryData.fromString("{\"version\":\"zraehtwd\",\"gridImageOcid\":\"ftswibyrcdlbhsh\"}")
+            = BinaryData.fromString("{\"version\":\"y\",\"gridImageOcid\":\"nyowxwlmdjrkvfg\"}")
                 .toObject(GiMinorVersionProperties.class);
-        Assertions.assertEquals("zraehtwd", model.version());
-        Assertions.assertEquals("ftswibyrcdlbhsh", model.gridImageOcid());
+        Assertions.assertEquals("y", model.version());
+        Assertions.assertEquals("nyowxwlmdjrkvfg", model.gridImageOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetWithResponseMockTests.java
index 1b0eb1a10c7d..e8a319bb6577 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class GiMinorVersionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"version\":\"iegstm\",\"gridImageOcid\":\"nwjizcilnghgshej\"},\"id\":\"bxqmu\",\"name\":\"uxlxqzvners\",\"type\":\"ycucrwnamikzeb\"}";
+            = "{\"properties\":{\"version\":\"xitp\",\"gridImageOcid\":\"nzcpdltkr\"},\"id\":\"jmtbd\",\"name\":\"vcqguefzh\",\"type\":\"mpheqdur\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         GiMinorVersion response = manager.giMinorVersions()
-            .getWithResponse("cb", "rds", "uwc", com.azure.core.util.Context.NONE)
+            .getWithResponse("zmwntopagt", "mvmmagoaqylkjz", "jiuazjc", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("iegstm", response.properties().version());
-        Assertions.assertEquals("nwjizcilnghgshej", response.properties().gridImageOcid());
+        Assertions.assertEquals("xitp", response.properties().version());
+        Assertions.assertEquals("nzcpdltkr", response.properties().gridImageOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentMockTests.java
index ca40c2606008..0e012a5688bd 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiMinorVersionsListByParentMockTests.java
@@ -23,7 +23,7 @@ public final class GiMinorVersionsListByParentMockTests {
     @Test
     public void testListByParent() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"version\":\"ixokffqyin\",\"gridImageOcid\":\"qepqwhixmon\"},\"id\":\"shiy\",\"name\":\"gvelfc\",\"type\":\"du\"}]}";
+            = "{\"value\":[{\"properties\":{\"version\":\"atvcrkdlbnbq\",\"gridImageOcid\":\"h\"},\"id\":\"yhzlwxaeaovurexd\",\"name\":\"d\",\"type\":\"bdweade\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,9 +33,10 @@ public void testListByParent() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<GiMinorVersion> response = manager.giMinorVersions()
-            .listByParent("nz", "jgehkf", ShapeFamily.EXADATA, "m", com.azure.core.util.Context.NONE);
+            .listByParent("byubhiqdxyurnpn", "hza", ShapeFamily.EXADATA, "cnuhiigbylbuigv",
+                com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("ixokffqyin", response.iterator().next().properties().version());
-        Assertions.assertEquals("qepqwhixmon", response.iterator().next().properties().gridImageOcid());
+        Assertions.assertEquals("atvcrkdlbnbq", response.iterator().next().properties().version());
+        Assertions.assertEquals("h", response.iterator().next().properties().gridImageOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionInnerTests.java
index 059276f23e94..b1d344587ff6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionInnerTests.java
@@ -12,8 +12,8 @@ public final class GiVersionInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GiVersionInner model = BinaryData.fromString(
-            "{\"properties\":{\"version\":\"pusdstt\"},\"id\":\"ogvbbejdcngq\",\"name\":\"m\",\"type\":\"akufgmjz\"}")
+            "{\"properties\":{\"version\":\"lmnguxaw\"},\"id\":\"ldsyuuximerqfob\",\"name\":\"yznkby\",\"type\":\"utwpfhp\"}")
             .toObject(GiVersionInner.class);
-        Assertions.assertEquals("pusdstt", model.properties().version());
+        Assertions.assertEquals("lmnguxaw", model.properties().version());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionListResultTests.java
index be02ec1680fd..a9aaeed189c0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionListResultTests.java
@@ -12,9 +12,9 @@ public final class GiVersionListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         GiVersionListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"version\":\"twaenuuzko\"},\"id\":\"minrfdw\",\"name\":\"yuhhziu\",\"type\":\"efozbhdms\"},{\"properties\":{\"version\":\"mzqhoftrmaequi\"},\"id\":\"xicslfao\",\"name\":\"z\",\"type\":\"iyylhalnswhccsp\"}],\"nextLink\":\"aivwitqscywu\"}")
+            "{\"value\":[{\"properties\":{\"version\":\"lmkk\"},\"id\":\"vdlhewpusdsttwv\",\"name\":\"gvbbejdcng\",\"type\":\"qmoa\"},{\"properties\":{\"version\":\"fgmjzrwrdgrt\"},\"id\":\"enuuzkopbm\",\"name\":\"nrfdw\",\"type\":\"yuhhziu\"},{\"properties\":{\"version\":\"fozbhdmsmlmzqhof\"},\"id\":\"maequiahxicslfa\",\"name\":\"qzpiyyl\",\"type\":\"alnswhccsphk\"}],\"nextLink\":\"vwitqscyw\"}")
             .toObject(GiVersionListResult.class);
-        Assertions.assertEquals("twaenuuzko", model.value().get(0).properties().version());
-        Assertions.assertEquals("aivwitqscywu", model.nextLink());
+        Assertions.assertEquals("lmkk", model.value().get(0).properties().version());
+        Assertions.assertEquals("vwitqscyw", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionPropertiesTests.java
index d0f6339c6f6b..12528049be68 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionPropertiesTests.java
@@ -11,7 +11,8 @@
 public final class GiVersionPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        GiVersionProperties model = BinaryData.fromString("{\"version\":\"wr\"}").toObject(GiVersionProperties.class);
-        Assertions.assertEquals("wr", model.version());
+        GiVersionProperties model
+            = BinaryData.fromString("{\"version\":\"gmhrskdsnfdsdoak\"}").toObject(GiVersionProperties.class);
+        Assertions.assertEquals("gmhrskdsnfdsdoak", model.version());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetWithResponseMockTests.java
index c4f7294ac3d1..75987bfd83d8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class GiVersionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"version\":\"totiowlxteqdptjg\"},\"id\":\"tgukranblwphql\",\"name\":\"ccuzgygq\",\"type\":\"ahoiulwgni\"}";
+            = "{\"properties\":{\"version\":\"tjo\"},\"id\":\"cvovjufyc\",\"name\":\"jmlbemyejiriux\",\"type\":\"gthortudaw\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,9 +30,10 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        GiVersion response
-            = manager.giVersions().getWithResponse("sl", "iiiovgqcgxuugq", com.azure.core.util.Context.NONE).getValue();
+        GiVersion response = manager.giVersions()
+            .getWithResponse("yltcoqcuj", "dsxzakuejkmvb", com.azure.core.util.Context.NONE)
+            .getValue();
 
-        Assertions.assertEquals("totiowlxteqdptjg", response.properties().version());
+        Assertions.assertEquals("tjo", response.properties().version());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationMockTests.java
index 2265f339bca5..471471dae8c1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/GiVersionsListByLocationMockTests.java
@@ -23,7 +23,7 @@ public final class GiVersionsListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"version\":\"nptfujgi\"},\"id\":\"aaoepttaqut\",\"name\":\"ewemxs\",\"type\":\"vru\"}]}";
+            = "{\"value\":[{\"properties\":{\"version\":\"h\"},\"id\":\"lialwcjgckbbcccg\",\"name\":\"praoxn\",\"type\":\"uffatsgftipwc\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,8 +33,8 @@ public void testListByLocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<GiVersion> response = manager.giVersions()
-            .listByLocation("ffmbmxzjrg", SystemShapes.EXADATA_X11M, "wpgj", com.azure.core.util.Context.NONE);
+            .listByLocation("pjfe", SystemShapes.EXADATA_X9M, "erppt", "bgqnz", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("nptfujgi", response.iterator().next().properties().version());
+        Assertions.assertEquals("h", response.iterator().next().properties().version());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/LongTermBackUpScheduleDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/LongTermBackUpScheduleDetailsTests.java
index 230a7bf79712..ba0283411ed7 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/LongTermBackUpScheduleDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/LongTermBackUpScheduleDetailsTests.java
@@ -14,25 +14,25 @@ public final class LongTermBackUpScheduleDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         LongTermBackUpScheduleDetails model = BinaryData.fromString(
-            "{\"repeatCadence\":\"OneTime\",\"timeOfBackup\":\"2021-10-09T00:59:13Z\",\"retentionPeriodInDays\":98859103,\"isDisabled\":true}")
+            "{\"repeatCadence\":\"Monthly\",\"timeOfBackup\":\"2021-06-03T05:33:27Z\",\"retentionPeriodInDays\":275372238,\"isDisabled\":false}")
             .toObject(LongTermBackUpScheduleDetails.class);
-        Assertions.assertEquals(RepeatCadenceType.ONE_TIME, model.repeatCadence());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-09T00:59:13Z"), model.timeOfBackup());
-        Assertions.assertEquals(98859103, model.retentionPeriodInDays());
-        Assertions.assertTrue(model.isDisabled());
+        Assertions.assertEquals(RepeatCadenceType.MONTHLY, model.repeatCadence());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-03T05:33:27Z"), model.timeOfBackup());
+        Assertions.assertEquals(275372238, model.retentionPeriodInDays());
+        Assertions.assertFalse(model.isDisabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         LongTermBackUpScheduleDetails model
-            = new LongTermBackUpScheduleDetails().withRepeatCadence(RepeatCadenceType.ONE_TIME)
-                .withTimeOfBackup(OffsetDateTime.parse("2021-10-09T00:59:13Z"))
-                .withRetentionPeriodInDays(98859103)
-                .withIsDisabled(true);
+            = new LongTermBackUpScheduleDetails().withRepeatCadence(RepeatCadenceType.MONTHLY)
+                .withTimeOfBackup(OffsetDateTime.parse("2021-06-03T05:33:27Z"))
+                .withRetentionPeriodInDays(275372238)
+                .withIsDisabled(false);
         model = BinaryData.fromObject(model).toObject(LongTermBackUpScheduleDetails.class);
-        Assertions.assertEquals(RepeatCadenceType.ONE_TIME, model.repeatCadence());
-        Assertions.assertEquals(OffsetDateTime.parse("2021-10-09T00:59:13Z"), model.timeOfBackup());
-        Assertions.assertEquals(98859103, model.retentionPeriodInDays());
-        Assertions.assertTrue(model.isDisabled());
+        Assertions.assertEquals(RepeatCadenceType.MONTHLY, model.repeatCadence());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-06-03T05:33:27Z"), model.timeOfBackup());
+        Assertions.assertEquals(275372238, model.retentionPeriodInDays());
+        Assertions.assertFalse(model.isDisabled());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MaintenanceWindowTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MaintenanceWindowTests.java
index b774e51fe2c8..63f66129d4c0 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MaintenanceWindowTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MaintenanceWindowTests.java
@@ -19,43 +19,43 @@ public final class MaintenanceWindowTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         MaintenanceWindow model = BinaryData.fromString(
-            "{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"June\"},{\"name\":\"March\"}],\"weeksOfMonth\":[970666878],\"daysOfWeek\":[{\"name\":\"Friday\"},{\"name\":\"Friday\"},{\"name\":\"Monday\"}],\"hoursOfDay\":[333094369,1110747875,73605186],\"leadTimeInWeeks\":124550903,\"patchingMode\":\"NonRolling\",\"customActionTimeoutInMins\":1340454664,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":true}")
+            "{\"preference\":\"CustomPreference\",\"months\":[{\"name\":\"August\"},{\"name\":\"October\"},{\"name\":\"April\"},{\"name\":\"March\"}],\"weeksOfMonth\":[866198392],\"daysOfWeek\":[{\"name\":\"Saturday\"}],\"hoursOfDay\":[1346564492,1861834573,375848936,1220710831],\"leadTimeInWeeks\":956878361,\"patchingMode\":\"Rolling\",\"customActionTimeoutInMins\":722307224,\"isCustomActionTimeoutEnabled\":true,\"isMonthlyPatchingEnabled\":false}")
             .toObject(MaintenanceWindow.class);
         Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.preference());
-        Assertions.assertEquals(MonthName.JUNE, model.months().get(0).name());
-        Assertions.assertEquals(970666878, model.weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.FRIDAY, model.daysOfWeek().get(0).name());
-        Assertions.assertEquals(333094369, model.hoursOfDay().get(0));
-        Assertions.assertEquals(124550903, model.leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.NON_ROLLING, model.patchingMode());
-        Assertions.assertEquals(1340454664, model.customActionTimeoutInMins());
+        Assertions.assertEquals(MonthName.AUGUST, model.months().get(0).name());
+        Assertions.assertEquals(866198392, model.weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.SATURDAY, model.daysOfWeek().get(0).name());
+        Assertions.assertEquals(1346564492, model.hoursOfDay().get(0));
+        Assertions.assertEquals(956878361, model.leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.ROLLING, model.patchingMode());
+        Assertions.assertEquals(722307224, model.customActionTimeoutInMins());
         Assertions.assertTrue(model.isCustomActionTimeoutEnabled());
-        Assertions.assertTrue(model.isMonthlyPatchingEnabled());
+        Assertions.assertFalse(model.isMonthlyPatchingEnabled());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         MaintenanceWindow model = new MaintenanceWindow().withPreference(Preference.CUSTOM_PREFERENCE)
-            .withMonths(Arrays.asList(new Month().withName(MonthName.JUNE), new Month().withName(MonthName.MARCH)))
-            .withWeeksOfMonth(Arrays.asList(970666878))
-            .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.FRIDAY),
-                new DayOfWeek().withName(DayOfWeekName.FRIDAY), new DayOfWeek().withName(DayOfWeekName.MONDAY)))
-            .withHoursOfDay(Arrays.asList(333094369, 1110747875, 73605186))
-            .withLeadTimeInWeeks(124550903)
-            .withPatchingMode(PatchingMode.NON_ROLLING)
-            .withCustomActionTimeoutInMins(1340454664)
+            .withMonths(Arrays.asList(new Month().withName(MonthName.AUGUST), new Month().withName(MonthName.OCTOBER),
+                new Month().withName(MonthName.APRIL), new Month().withName(MonthName.MARCH)))
+            .withWeeksOfMonth(Arrays.asList(866198392))
+            .withDaysOfWeek(Arrays.asList(new DayOfWeek().withName(DayOfWeekName.SATURDAY)))
+            .withHoursOfDay(Arrays.asList(1346564492, 1861834573, 375848936, 1220710831))
+            .withLeadTimeInWeeks(956878361)
+            .withPatchingMode(PatchingMode.ROLLING)
+            .withCustomActionTimeoutInMins(722307224)
             .withIsCustomActionTimeoutEnabled(true)
-            .withIsMonthlyPatchingEnabled(true);
+            .withIsMonthlyPatchingEnabled(false);
         model = BinaryData.fromObject(model).toObject(MaintenanceWindow.class);
         Assertions.assertEquals(Preference.CUSTOM_PREFERENCE, model.preference());
-        Assertions.assertEquals(MonthName.JUNE, model.months().get(0).name());
-        Assertions.assertEquals(970666878, model.weeksOfMonth().get(0));
-        Assertions.assertEquals(DayOfWeekName.FRIDAY, model.daysOfWeek().get(0).name());
-        Assertions.assertEquals(333094369, model.hoursOfDay().get(0));
-        Assertions.assertEquals(124550903, model.leadTimeInWeeks());
-        Assertions.assertEquals(PatchingMode.NON_ROLLING, model.patchingMode());
-        Assertions.assertEquals(1340454664, model.customActionTimeoutInMins());
+        Assertions.assertEquals(MonthName.AUGUST, model.months().get(0).name());
+        Assertions.assertEquals(866198392, model.weeksOfMonth().get(0));
+        Assertions.assertEquals(DayOfWeekName.SATURDAY, model.daysOfWeek().get(0).name());
+        Assertions.assertEquals(1346564492, model.hoursOfDay().get(0));
+        Assertions.assertEquals(956878361, model.leadTimeInWeeks());
+        Assertions.assertEquals(PatchingMode.ROLLING, model.patchingMode());
+        Assertions.assertEquals(722307224, model.customActionTimeoutInMins());
         Assertions.assertTrue(model.isCustomActionTimeoutEnabled());
-        Assertions.assertTrue(model.isMonthlyPatchingEnabled());
+        Assertions.assertFalse(model.isMonthlyPatchingEnabled());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MonthTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MonthTests.java
index a3f7da52219a..ed77c9b6a3f1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MonthTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/MonthTests.java
@@ -12,14 +12,14 @@
 public final class MonthTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        Month model = BinaryData.fromString("{\"name\":\"April\"}").toObject(Month.class);
-        Assertions.assertEquals(MonthName.APRIL, model.name());
+        Month model = BinaryData.fromString("{\"name\":\"September\"}").toObject(Month.class);
+        Assertions.assertEquals(MonthName.SEPTEMBER, model.name());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        Month model = new Month().withName(MonthName.APRIL);
+        Month model = new Month().withName(MonthName.SEPTEMBER);
         model = BinaryData.fromObject(model).toObject(Month.class);
-        Assertions.assertEquals(MonthName.APRIL, model.name());
+        Assertions.assertEquals(MonthName.SEPTEMBER, model.name());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorInnerTests.java
new file mode 100644
index 000000000000..481ebc1511ab
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorInnerTests.java
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.fluent.models.NetworkAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+
+public final class NetworkAnchorInnerTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        NetworkAnchorInner model = BinaryData.fromString(
+            "{\"properties\":{\"resourceAnchorId\":\"mxelnwcltyjed\",\"provisioningState\":\"Succeeded\",\"vnetId\":\"lfmk\",\"subnetId\":\"scazuawxtzxpu\",\"cidrBlock\":\"wabzxrvxcushsp\",\"ociVcnId\":\"ivmxyasfl\",\"ociVcnDnsLabel\":\"sgzwywakoihknsm\",\"ociSubnetId\":\"lmljhlnymzotq\",\"ociBackupCidrBlock\":\"yuzcbmqqvxmvw\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":false,\"isOracleDnsForwardingEndpointEnabled\":true,\"dnsForwardingRules\":[{\"domainNames\":\"upeujlzqnhcvsq\",\"forwardingIpAddress\":\"tnzoibgsxgnxfy\"}],\"dnsListeningEndpointAllowedCidrs\":\"nmpqoxwdofdb\",\"dnsListeningEndpointIpAddress\":\"qxeiiqbimhtmwwi\",\"dnsForwardingEndpointIpAddress\":\"ehfqpofvwbc\",\"dnsForwardingRulesUrl\":\"embnkbw\",\"dnsListeningEndpointNsgRulesUrl\":\"vxkdivqihebwtswb\",\"dnsForwardingEndpointNsgRulesUrl\":\"wfmdurage\"},\"zones\":[\"vcjfelisdjubggb\",\"igkxkbsazga\",\"gacyrcmjdmspo\",\"apvu\"],\"location\":\"ylnio\",\"tags\":{\"l\":\"gbzjedmstkv\"},\"id\":\"xbcuiiznkt\",\"name\":\"f\",\"type\":\"nsnvpd\"}")
+            .toObject(NetworkAnchorInner.class);
+        Assertions.assertEquals("ylnio", model.location());
+        Assertions.assertEquals("gbzjedmstkv", model.tags().get("l"));
+        Assertions.assertEquals("mxelnwcltyjed", model.properties().resourceAnchorId());
+        Assertions.assertEquals("scazuawxtzxpu", model.properties().subnetId());
+        Assertions.assertEquals("sgzwywakoihknsm", model.properties().ociVcnDnsLabel());
+        Assertions.assertEquals("yuzcbmqqvxmvw", model.properties().ociBackupCidrBlock());
+        Assertions.assertFalse(model.properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertFalse(model.properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertTrue(model.properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("upeujlzqnhcvsq", model.properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("tnzoibgsxgnxfy", model.properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("nmpqoxwdofdb", model.properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("vcjfelisdjubggb", model.zones().get(0));
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        NetworkAnchorInner model = new NetworkAnchorInner().withLocation("ylnio")
+            .withTags(mapOf("l", "gbzjedmstkv"))
+            .withProperties(new NetworkAnchorProperties().withResourceAnchorId("mxelnwcltyjed")
+                .withSubnetId("scazuawxtzxpu")
+                .withOciVcnDnsLabel("sgzwywakoihknsm")
+                .withOciBackupCidrBlock("yuzcbmqqvxmvw")
+                .withIsOracleToAzureDnsZoneSyncEnabled(false)
+                .withIsOracleDnsListeningEndpointEnabled(false)
+                .withIsOracleDnsForwardingEndpointEnabled(true)
+                .withDnsForwardingRules(Arrays.asList(new DnsForwardingRule().withDomainNames("upeujlzqnhcvsq")
+                    .withForwardingIpAddress("tnzoibgsxgnxfy")))
+                .withDnsListeningEndpointAllowedCidrs("nmpqoxwdofdb"))
+            .withZones(Arrays.asList("vcjfelisdjubggb", "igkxkbsazga", "gacyrcmjdmspo", "apvu"));
+        model = BinaryData.fromObject(model).toObject(NetworkAnchorInner.class);
+        Assertions.assertEquals("ylnio", model.location());
+        Assertions.assertEquals("gbzjedmstkv", model.tags().get("l"));
+        Assertions.assertEquals("mxelnwcltyjed", model.properties().resourceAnchorId());
+        Assertions.assertEquals("scazuawxtzxpu", model.properties().subnetId());
+        Assertions.assertEquals("sgzwywakoihknsm", model.properties().ociVcnDnsLabel());
+        Assertions.assertEquals("yuzcbmqqvxmvw", model.properties().ociBackupCidrBlock());
+        Assertions.assertFalse(model.properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertFalse(model.properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertTrue(model.properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("upeujlzqnhcvsq", model.properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("tnzoibgsxgnxfy", model.properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("nmpqoxwdofdb", model.properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("vcjfelisdjubggb", model.zones().get(0));
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorListResultTests.java
new file mode 100644
index 000000000000..5449070720fe
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorListResultTests.java
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.implementation.models.NetworkAnchorListResult;
+import org.junit.jupiter.api.Assertions;
+
+public final class NetworkAnchorListResultTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        NetworkAnchorListResult model = BinaryData.fromString(
+            "{\"value\":[{\"properties\":{\"resourceAnchorId\":\"cyyufmh\",\"provisioningState\":\"Succeeded\",\"vnetId\":\"uwm\",\"subnetId\":\"spkcdqzh\",\"cidrBlock\":\"tddunqnd\",\"ociVcnId\":\"pchrqbn\",\"ociVcnDnsLabel\":\"rcgegydcwboxjum\",\"ociSubnetId\":\"qoli\",\"ociBackupCidrBlock\":\"raiouaubrjtl\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":true,\"isOracleDnsForwardingEndpointEnabled\":false,\"dnsForwardingRules\":[{\"domainNames\":\"giflrzpasccbiu\",\"forwardingIpAddress\":\"mzdlyjdfqwmkyo\"},{\"domainNames\":\"ufdvruz\",\"forwardingIpAddress\":\"lzo\"},{\"domainNames\":\"hpc\",\"forwardingIpAddress\":\"fnmdxotn\"},{\"domainNames\":\"fdgugeyzi\",\"forwardingIpAddress\":\"grkyuizabsnmfpph\"}],\"dnsListeningEndpointAllowedCidrs\":\"eevy\",\"dnsListeningEndpointIpAddress\":\"hsgz\",\"dnsForwardingEndpointIpAddress\":\"zbgomfgbeg\",\"dnsForwardingRulesUrl\":\"gleohi\",\"dnsListeningEndpointNsgRulesUrl\":\"tnluankrr\",\"dnsForwardingEndpointNsgRulesUrl\":\"eeebtijvacv\"},\"zones\":[\"z\",\"qqxlajr\",\"wxacevehj\",\"uyxoaf\"],\"location\":\"oqltfae\",\"tags\":{\"gv\":\"nm\",\"qhykprlpyzn\":\"irpghriypoqeyh\",\"iitdfuxt\":\"ciqdsme\"},\"id\":\"asiibmiybnnust\",\"name\":\"nlj\",\"type\":\"nmgixh\"},{\"properties\":{\"resourceAnchorId\":\"avmqfoudor\",\"provisioningState\":\"Canceled\",\"vnetId\":\"yprotwyp\",\"subnetId\":\"ndm\",\"cidrBlock\":\"hu\",\"ociVcnId\":\"mjkavlgorbmft\",\"ociVcnDnsLabel\":\"dtzfjltfvnzcy\",\"ociSubnetId\":\"otp\",\"ociBackupCidrBlock\":\"pvpbdbzqgqqiheds\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":false,\"isOracleDnsForwardingEndpointEnabled\":false,\"dnsForwardingRules\":[{\"domainNames\":\"bcysih\",\"forwardingIpAddress\":\"gqcwdhohsdtmc\"},{\"domainNames\":\"zsu\",\"forwardingIpAddress\":\"cohdx\"},{\"domainNames\":\"zlmcmuapcvhdb\",\"forwardingIpAddress\":\"v\"}],\"dnsListeningEndpointAllowedCidrs\":\"qxeysko\",\"dnsListeningEndpointIpAddress\":\"zinkfkbgbzbowxeq\",\"dnsForwardingEndpointIpAddress\":\"ljmygvkzqkjjeokb\",\"dnsForwardingRulesUrl\":\"fezrx\",\"dnsListeningEndpointNsgRulesUrl\":\"zurtleipqxbkwvz\",\"dnsForwardingEndpointNsgRulesUrl\":\"zvd\"},\"zones\":[\"d\"],\"location\":\"zmqpnodawopqhewj\",\"tags\":{\"eln\":\"cgsbost\",\"utmzlbiojlvfhrbb\":\"la\",\"hppr\":\"neqvcwwyyurmo\",\"k\":\"rsnm\"},\"id\":\"yzejnhlbk\",\"name\":\"bzpcpiljhahzvec\",\"type\":\"ndbnwieh\"},{\"properties\":{\"resourceAnchorId\":\"ewjwiuubw\",\"provisioningState\":\"Failed\",\"vnetId\":\"fapaqtfer\",\"subnetId\":\"q\",\"cidrBlock\":\"x\",\"ociVcnId\":\"mfxapjwogqqno\",\"ociVcnDnsLabel\":\"udcdabtqwpwyawb\",\"ociSubnetId\":\"sqbuc\",\"ociBackupCidrBlock\":\"gkyexaoguy\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":true,\"isOracleDnsForwardingEndpointEnabled\":true,\"dnsForwardingRules\":[{\"domainNames\":\"ltxijjumfqwazln\",\"forwardingIpAddress\":\"nm\"},{\"domainNames\":\"jng\",\"forwardingIpAddress\":\"qdqx\"},{\"domainNames\":\"bjwgnyfus\",\"forwardingIpAddress\":\"zsvtuikzhajqgl\"}],\"dnsListeningEndpointAllowedCidrs\":\"hm\",\"dnsListeningEndpointIpAddress\":\"qryxyn\",\"dnsForwardingEndpointIpAddress\":\"zrdpsovwxznptgoe\",\"dnsForwardingRulesUrl\":\"bbabp\",\"dnsListeningEndpointNsgRulesUrl\":\"vf\",\"dnsForwardingEndpointNsgRulesUrl\":\"kvntjlrigjkskyri\"},\"zones\":[\"zid\",\"xwaabzmifrygznmm\",\"xrizkzobgop\"],\"location\":\"hsln\",\"tags\":{\"wcrojphslhcaw\":\"ieixynllxe\",\"i\":\"u\",\"tzh\":\"dwfmvigorqjb\"},\"id\":\"aglkafhon\",\"name\":\"juj\",\"type\":\"ickpz\"}],\"nextLink\":\"p\"}")
+            .toObject(NetworkAnchorListResult.class);
+        Assertions.assertEquals("oqltfae", model.value().get(0).location());
+        Assertions.assertEquals("nm", model.value().get(0).tags().get("gv"));
+        Assertions.assertEquals("cyyufmh", model.value().get(0).properties().resourceAnchorId());
+        Assertions.assertEquals("spkcdqzh", model.value().get(0).properties().subnetId());
+        Assertions.assertEquals("rcgegydcwboxjum", model.value().get(0).properties().ociVcnDnsLabel());
+        Assertions.assertEquals("raiouaubrjtl", model.value().get(0).properties().ociBackupCidrBlock());
+        Assertions.assertFalse(model.value().get(0).properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.value().get(0).properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(model.value().get(0).properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("giflrzpasccbiu",
+            model.value().get(0).properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("mzdlyjdfqwmkyo",
+            model.value().get(0).properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("eevy", model.value().get(0).properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("z", model.value().get(0).zones().get(0));
+        Assertions.assertEquals("p", model.nextLink());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorPropertiesTests.java
new file mode 100644
index 000000000000..545f99f9465a
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorPropertiesTests.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties;
+import java.util.Arrays;
+import org.junit.jupiter.api.Assertions;
+
+public final class NetworkAnchorPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        NetworkAnchorProperties model = BinaryData.fromString(
+            "{\"resourceAnchorId\":\"bmikost\",\"provisioningState\":\"Succeeded\",\"vnetId\":\"iwbuqny\",\"subnetId\":\"phzfylsgcrp\",\"cidrBlock\":\"cunezzcezelfw\",\"ociVcnId\":\"wl\",\"ociVcnDnsLabel\":\"jwetnpsihcla\",\"ociSubnetId\":\"va\",\"ociBackupCidrBlock\":\"pt\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":true,\"isOracleDnsForwardingEndpointEnabled\":true,\"dnsForwardingRules\":[{\"domainNames\":\"w\",\"forwardingIpAddress\":\"kchcxwa\"},{\"domainNames\":\"fewz\",\"forwardingIpAddress\":\"kjexfdeqvhp\"},{\"domainNames\":\"ylkkshkbffmbm\",\"forwardingIpAddress\":\"zjrgyww\"}],\"dnsListeningEndpointAllowedCidrs\":\"jx\",\"dnsListeningEndpointIpAddress\":\"ptfujgicgaaoept\",\"dnsForwardingEndpointIpAddress\":\"qutdewemxs\",\"dnsForwardingRulesUrl\":\"ruunzzjgehkf\",\"dnsListeningEndpointNsgRulesUrl\":\"m\",\"dnsForwardingEndpointNsgRulesUrl\":\"ixokffqyin\"}")
+            .toObject(NetworkAnchorProperties.class);
+        Assertions.assertEquals("bmikost", model.resourceAnchorId());
+        Assertions.assertEquals("phzfylsgcrp", model.subnetId());
+        Assertions.assertEquals("jwetnpsihcla", model.ociVcnDnsLabel());
+        Assertions.assertEquals("pt", model.ociBackupCidrBlock());
+        Assertions.assertFalse(model.isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.isOracleDnsListeningEndpointEnabled());
+        Assertions.assertTrue(model.isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("w", model.dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("kchcxwa", model.dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("jx", model.dnsListeningEndpointAllowedCidrs());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        NetworkAnchorProperties model = new NetworkAnchorProperties().withResourceAnchorId("bmikost")
+            .withSubnetId("phzfylsgcrp")
+            .withOciVcnDnsLabel("jwetnpsihcla")
+            .withOciBackupCidrBlock("pt")
+            .withIsOracleToAzureDnsZoneSyncEnabled(false)
+            .withIsOracleDnsListeningEndpointEnabled(true)
+            .withIsOracleDnsForwardingEndpointEnabled(true)
+            .withDnsForwardingRules(
+                Arrays.asList(new DnsForwardingRule().withDomainNames("w").withForwardingIpAddress("kchcxwa"),
+                    new DnsForwardingRule().withDomainNames("fewz").withForwardingIpAddress("kjexfdeqvhp"),
+                    new DnsForwardingRule().withDomainNames("ylkkshkbffmbm").withForwardingIpAddress("zjrgyww")))
+            .withDnsListeningEndpointAllowedCidrs("jx");
+        model = BinaryData.fromObject(model).toObject(NetworkAnchorProperties.class);
+        Assertions.assertEquals("bmikost", model.resourceAnchorId());
+        Assertions.assertEquals("phzfylsgcrp", model.subnetId());
+        Assertions.assertEquals("jwetnpsihcla", model.ociVcnDnsLabel());
+        Assertions.assertEquals("pt", model.ociBackupCidrBlock());
+        Assertions.assertFalse(model.isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.isOracleDnsListeningEndpointEnabled());
+        Assertions.assertTrue(model.isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("w", model.dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("kchcxwa", model.dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("jx", model.dnsListeningEndpointAllowedCidrs());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorUpdatePropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorUpdatePropertiesTests.java
new file mode 100644
index 000000000000..e39d1c92e834
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorUpdatePropertiesTests.java
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdateProperties;
+import org.junit.jupiter.api.Assertions;
+
+public final class NetworkAnchorUpdatePropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        NetworkAnchorUpdateProperties model = BinaryData.fromString(
+            "{\"ociBackupCidrBlock\":\"amikzebrqbsm\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":true,\"isOracleDnsForwardingEndpointEnabled\":false}")
+            .toObject(NetworkAnchorUpdateProperties.class);
+        Assertions.assertEquals("amikzebrqbsm", model.ociBackupCidrBlock());
+        Assertions.assertFalse(model.isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(model.isOracleDnsForwardingEndpointEnabled());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        NetworkAnchorUpdateProperties model = new NetworkAnchorUpdateProperties().withOciBackupCidrBlock("amikzebrqbsm")
+            .withIsOracleToAzureDnsZoneSyncEnabled(false)
+            .withIsOracleDnsListeningEndpointEnabled(true)
+            .withIsOracleDnsForwardingEndpointEnabled(false);
+        model = BinaryData.fromObject(model).toObject(NetworkAnchorUpdateProperties.class);
+        Assertions.assertEquals("amikzebrqbsm", model.ociBackupCidrBlock());
+        Assertions.assertFalse(model.isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(model.isOracleDnsForwardingEndpointEnabled());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorUpdateTests.java
new file mode 100644
index 000000000000..608fe628ac77
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorUpdateTests.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdate;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorUpdateProperties;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+
+public final class NetworkAnchorUpdateTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        NetworkAnchorUpdate model = BinaryData.fromString(
+            "{\"zones\":[\"lduccbi\",\"ds\"],\"tags\":{\"i\":\"cobiegstmninwjiz\",\"tbxqmuluxlxq\":\"nghgshej\"},\"properties\":{\"ociBackupCidrBlock\":\"ers\",\"isOracleToAzureDnsZoneSyncEnabled\":true,\"isOracleDnsListeningEndpointEnabled\":true,\"isOracleDnsForwardingEndpointEnabled\":false}}")
+            .toObject(NetworkAnchorUpdate.class);
+        Assertions.assertEquals("lduccbi", model.zones().get(0));
+        Assertions.assertEquals("cobiegstmninwjiz", model.tags().get("i"));
+        Assertions.assertEquals("ers", model.properties().ociBackupCidrBlock());
+        Assertions.assertTrue(model.properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(model.properties().isOracleDnsForwardingEndpointEnabled());
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        NetworkAnchorUpdate model = new NetworkAnchorUpdate().withZones(Arrays.asList("lduccbi", "ds"))
+            .withTags(mapOf("i", "cobiegstmninwjiz", "tbxqmuluxlxq", "nghgshej"))
+            .withProperties(new NetworkAnchorUpdateProperties().withOciBackupCidrBlock("ers")
+                .withIsOracleToAzureDnsZoneSyncEnabled(true)
+                .withIsOracleDnsListeningEndpointEnabled(true)
+                .withIsOracleDnsForwardingEndpointEnabled(false));
+        model = BinaryData.fromObject(model).toObject(NetworkAnchorUpdate.class);
+        Assertions.assertEquals("lduccbi", model.zones().get(0));
+        Assertions.assertEquals("cobiegstmninwjiz", model.tags().get("i"));
+        Assertions.assertEquals("ers", model.properties().ociBackupCidrBlock());
+        Assertions.assertTrue(model.properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(model.properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(model.properties().isOracleDnsForwardingEndpointEnabled());
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsCreateOrUpdateMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsCreateOrUpdateMockTests.java
new file mode 100644
index 000000000000..b4ee5450f5c3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsCreateOrUpdateMockTests.java
@@ -0,0 +1,83 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.DnsForwardingRule;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchorProperties;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class NetworkAnchorsCreateOrUpdateMockTests {
+    @Test
+    public void testCreateOrUpdate() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"resourceAnchorId\":\"to\",\"provisioningState\":\"Succeeded\",\"vnetId\":\"quvwsxbgn\",\"subnetId\":\"kerv\",\"cidrBlock\":\"hoadhrsxqvzv\",\"ociVcnId\":\"abdsr\",\"ociVcnDnsLabel\":\"ajglzrsubklr\",\"ociSubnetId\":\"jnltcetjdvqydi\",\"ociBackupCidrBlock\":\"qkwaruwd\",\"isOracleToAzureDnsZoneSyncEnabled\":true,\"isOracleDnsListeningEndpointEnabled\":false,\"isOracleDnsForwardingEndpointEnabled\":false,\"dnsForwardingRules\":[{\"domainNames\":\"gjxb\",\"forwardingIpAddress\":\"banbaupwtzv\"}],\"dnsListeningEndpointAllowedCidrs\":\"klozkxbz\",\"dnsListeningEndpointIpAddress\":\"ejpl\",\"dnsForwardingEndpointIpAddress\":\"anbtttkgsu\",\"dnsForwardingRulesUrl\":\"nrswgkpjhboyik\",\"dnsListeningEndpointNsgRulesUrl\":\"huhkslgwlok\",\"dnsForwardingEndpointNsgRulesUrl\":\"eoijyzcqypzqzufg\"},\"zones\":[\"ej\",\"vdwtfxptpqayamk\",\"cf\",\"ybmx\"],\"location\":\"xocuullojkpoyhgw\",\"tags\":{\"sgzlrqhb\":\"uxdbdljzgdyrcvuq\"},\"id\":\"nq\",\"name\":\"gdxwbsfpyxx\",\"type\":\"jlf\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        NetworkAnchor response = manager.networkAnchors()
+            .define("pqadagrhrdicxdwy")
+            .withRegion("vzipbwxgo")
+            .withExistingResourceGroup("gmsfepxyi")
+            .withTags(mapOf("admskx", "zp"))
+            .withProperties(new NetworkAnchorProperties().withResourceAnchorId("owxwyovcxjsgbip")
+                .withSubnetId("crdpibfdyjduss")
+                .withOciVcnDnsLabel("rnuybffljfii")
+                .withOciBackupCidrBlock("usrexxf")
+                .withIsOracleToAzureDnsZoneSyncEnabled(true)
+                .withIsOracleDnsListeningEndpointEnabled(true)
+                .withIsOracleDnsForwardingEndpointEnabled(false)
+                .withDnsForwardingRules(Arrays.asList(
+                    new DnsForwardingRule().withDomainNames("zilfmnlikps").withForwardingIpAddress("msfeypofqpm"),
+                    new DnsForwardingRule().withDomainNames("hyqgsdrmmttjx").withForwardingIpAddress("phgerhsmvgoh")))
+                .withDnsListeningEndpointAllowedCidrs("zmqilrixysfnim"))
+            .withZones(Arrays.asList("iedfsbwcei"))
+            .create();
+
+        Assertions.assertEquals("xocuullojkpoyhgw", response.location());
+        Assertions.assertEquals("uxdbdljzgdyrcvuq", response.tags().get("sgzlrqhb"));
+        Assertions.assertEquals("to", response.properties().resourceAnchorId());
+        Assertions.assertEquals("kerv", response.properties().subnetId());
+        Assertions.assertEquals("ajglzrsubklr", response.properties().ociVcnDnsLabel());
+        Assertions.assertEquals("qkwaruwd", response.properties().ociBackupCidrBlock());
+        Assertions.assertTrue(response.properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertFalse(response.properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(response.properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("gjxb", response.properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("banbaupwtzv", response.properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("klozkxbz", response.properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("ej", response.zones().get(0));
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsGetByResourceGroupWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsGetByResourceGroupWithResponseMockTests.java
new file mode 100644
index 000000000000..7704aecdb57c
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsGetByResourceGroupWithResponseMockTests.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class NetworkAnchorsGetByResourceGroupWithResponseMockTests {
+    @Test
+    public void testGetByResourceGroupWithResponse() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"resourceAnchorId\":\"cpqtwloesq\",\"provisioningState\":\"Failed\",\"vnetId\":\"rbnyrukoilacidu\",\"subnetId\":\"jleip\",\"cidrBlock\":\"h\",\"ociVcnId\":\"xpzruzythqkk\",\"ociVcnDnsLabel\":\"bg\",\"ociSubnetId\":\"ellv\",\"ociBackupCidrBlock\":\"nxdmnitmujdtv\",\"isOracleToAzureDnsZoneSyncEnabled\":true,\"isOracleDnsListeningEndpointEnabled\":true,\"isOracleDnsForwardingEndpointEnabled\":false,\"dnsForwardingRules\":[{\"domainNames\":\"mjpddnyxf\",\"forwardingIpAddress\":\"uvrzmzqmzjqrb\"},{\"domainNames\":\"pv\",\"forwardingIpAddress\":\"mdyfoebojtj\"}],\"dnsListeningEndpointAllowedCidrs\":\"g\",\"dnsListeningEndpointIpAddress\":\"ohoqkpjtnqjilayw\",\"dnsForwardingEndpointIpAddress\":\"cwm\",\"dnsForwardingRulesUrl\":\"yrilmhxdqaolf\",\"dnsListeningEndpointNsgRulesUrl\":\"nkkbjpjvlywltmfw\",\"dnsForwardingEndpointNsgRulesUrl\":\"bjwhlwyjfnqzocr\"},\"zones\":[\"czeuntgx\",\"ncaqttiekoifu\",\"nyttzgix\"],\"location\":\"rihl\",\"tags\":{\"lkndrndpgfjodh\":\"behlqtxnr\",\"ipowza\":\"aqotwfhipxwgsabv\",\"pefyc\":\"czuumljcir\"},\"id\":\"veitit\",\"name\":\"nsxzajlns\",\"type\":\"hwjuyxxbxqvmvua\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        NetworkAnchor response = manager.networkAnchors()
+            .getByResourceGroupWithResponse("thvmaxgnuyeamcmh", "dfjeceho", com.azure.core.util.Context.NONE)
+            .getValue();
+
+        Assertions.assertEquals("rihl", response.location());
+        Assertions.assertEquals("behlqtxnr", response.tags().get("lkndrndpgfjodh"));
+        Assertions.assertEquals("cpqtwloesq", response.properties().resourceAnchorId());
+        Assertions.assertEquals("jleip", response.properties().subnetId());
+        Assertions.assertEquals("bg", response.properties().ociVcnDnsLabel());
+        Assertions.assertEquals("nxdmnitmujdtv", response.properties().ociBackupCidrBlock());
+        Assertions.assertTrue(response.properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertTrue(response.properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(response.properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("mjpddnyxf", response.properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("uvrzmzqmzjqrb",
+            response.properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("g", response.properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("czeuntgx", response.zones().get(0));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListByResourceGroupMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListByResourceGroupMockTests.java
new file mode 100644
index 000000000000..66c06ae42ec1
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListByResourceGroupMockTests.java
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class NetworkAnchorsListByResourceGroupMockTests {
+    @Test
+    public void testListByResourceGroup() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"resourceAnchorId\":\"ntghyksarcdr\",\"provisioningState\":\"Provisioning\",\"vnetId\":\"u\",\"subnetId\":\"lzladltxkpbqh\",\"cidrBlock\":\"dqqjwkrhwzdano\",\"ociVcnId\":\"sgglmv\",\"ociVcnDnsLabel\":\"atuztjct\",\"ociSubnetId\":\"pvbkaehxsmzyg\",\"ociBackupCidrBlock\":\"wakwseivmakxhys\",\"isOracleToAzureDnsZoneSyncEnabled\":false,\"isOracleDnsListeningEndpointEnabled\":false,\"isOracleDnsForwardingEndpointEnabled\":true,\"dnsForwardingRules\":[{\"domainNames\":\"ect\",\"forwardingIpAddress\":\"tfjmskdchmaiub\"},{\"domainNames\":\"vlzw\",\"forwardingIpAddress\":\"vgmfalkzazmgok\"},{\"domainNames\":\"dgjqafkmkro\",\"forwardingIpAddress\":\"zrthqet\"},{\"domainNames\":\"pqrtvaoznqni\",\"forwardingIpAddress\":\"iezeagm\"}],\"dnsListeningEndpointAllowedCidrs\":\"it\",\"dnsListeningEndpointIpAddress\":\"gedhfpjstlzm\",\"dnsForwardingEndpointIpAddress\":\"syjdeolctae\",\"dnsForwardingRulesUrl\":\"syrled\",\"dnsListeningEndpointNsgRulesUrl\":\"ustbvtqigdx\",\"dnsForwardingEndpointNsgRulesUrl\":\"sgeafgfosehx\"},\"zones\":[\"xezppk\",\"waaeskyfjl\",\"zeqtoyrplixlajml\"],\"location\":\"quevham\",\"tags\":{\"mkekxpkzwaqxo\":\"gwb\"},\"id\":\"qovchiqbp\",\"name\":\"vf\",\"type\":\"dusztekxby\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<NetworkAnchor> response
+            = manager.networkAnchors().listByResourceGroup("tuadxkxeqb", com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("quevham", response.iterator().next().location());
+        Assertions.assertEquals("gwb", response.iterator().next().tags().get("mkekxpkzwaqxo"));
+        Assertions.assertEquals("ntghyksarcdr", response.iterator().next().properties().resourceAnchorId());
+        Assertions.assertEquals("lzladltxkpbqh", response.iterator().next().properties().subnetId());
+        Assertions.assertEquals("atuztjct", response.iterator().next().properties().ociVcnDnsLabel());
+        Assertions.assertEquals("wakwseivmakxhys", response.iterator().next().properties().ociBackupCidrBlock());
+        Assertions.assertFalse(response.iterator().next().properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertFalse(response.iterator().next().properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertTrue(response.iterator().next().properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("ect",
+            response.iterator().next().properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("tfjmskdchmaiub",
+            response.iterator().next().properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("it", response.iterator().next().properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("xezppk", response.iterator().next().zones().get(0));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListMockTests.java
new file mode 100644
index 000000000000..c77822578018
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NetworkAnchorsListMockTests.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.NetworkAnchor;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class NetworkAnchorsListMockTests {
+    @Test
+    public void testList() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"resourceAnchorId\":\"igvjrktp\",\"provisioningState\":\"Failed\",\"vnetId\":\"kya\",\"subnetId\":\"ohpmwhqn\",\"cidrBlock\":\"sklhsidsjtdlp\",\"ociVcnId\":\"injgazlsvbzfcpuo\",\"ociVcnDnsLabel\":\"dwjcciklhs\",\"ociSubnetId\":\"krdre\",\"ociBackupCidrBlock\":\"olr\",\"isOracleToAzureDnsZoneSyncEnabled\":true,\"isOracleDnsListeningEndpointEnabled\":false,\"isOracleDnsForwardingEndpointEnabled\":false,\"dnsForwardingRules\":[{\"domainNames\":\"dlh\",\"forwardingIpAddress\":\"d\"},{\"domainNames\":\"bdbfgrlp\",\"forwardingIpAddress\":\"nytjlk\"},{\"domainNames\":\"smmpathubt\",\"forwardingIpAddress\":\"h\"},{\"domainNames\":\"e\",\"forwardingIpAddress\":\"niiwllbvgwz\"}],\"dnsListeningEndpointAllowedCidrs\":\"ft\",\"dnsListeningEndpointIpAddress\":\"ousnktjt\",\"dnsForwardingEndpointIpAddress\":\"avaqogfkbebau\",\"dnsForwardingRulesUrl\":\"qbtxxwpf\",\"dnsListeningEndpointNsgRulesUrl\":\"jzudrtpzk\",\"dnsForwardingEndpointNsgRulesUrl\":\"eboywhczzqrhm\"},\"zones\":[\"be\",\"ygisrz\",\"nykdi\"],\"location\":\"chl\",\"tags\":{\"xkbrfg\":\"wctofldseacdhz\",\"fj\":\"rwjiyew\"},\"id\":\"rwq\",\"name\":\"xet\",\"type\":\"gcwvrrmdqntycna\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<NetworkAnchor> response = manager.networkAnchors().list(com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("chl", response.iterator().next().location());
+        Assertions.assertEquals("wctofldseacdhz", response.iterator().next().tags().get("xkbrfg"));
+        Assertions.assertEquals("igvjrktp", response.iterator().next().properties().resourceAnchorId());
+        Assertions.assertEquals("ohpmwhqn", response.iterator().next().properties().subnetId());
+        Assertions.assertEquals("dwjcciklhs", response.iterator().next().properties().ociVcnDnsLabel());
+        Assertions.assertEquals("olr", response.iterator().next().properties().ociBackupCidrBlock());
+        Assertions.assertTrue(response.iterator().next().properties().isOracleToAzureDnsZoneSyncEnabled());
+        Assertions.assertFalse(response.iterator().next().properties().isOracleDnsListeningEndpointEnabled());
+        Assertions.assertFalse(response.iterator().next().properties().isOracleDnsForwardingEndpointEnabled());
+        Assertions.assertEquals("dlh",
+            response.iterator().next().properties().dnsForwardingRules().get(0).domainNames());
+        Assertions.assertEquals("d",
+            response.iterator().next().properties().dnsForwardingRules().get(0).forwardingIpAddress());
+        Assertions.assertEquals("ft", response.iterator().next().properties().dnsListeningEndpointAllowedCidrs());
+        Assertions.assertEquals("be", response.iterator().next().zones().get(0));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NsgCidrTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NsgCidrTests.java
index 3094705499cc..8c8ff5fc4830 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NsgCidrTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/NsgCidrTests.java
@@ -13,21 +13,20 @@ public final class NsgCidrTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         NsgCidr model = BinaryData
-            .fromString(
-                "{\"source\":\"eopzfqrhhuaopp\",\"destinationPortRange\":{\"min\":1290719044,\"max\":646649620}}")
+            .fromString("{\"source\":\"pybsrfbjfdtw\",\"destinationPortRange\":{\"min\":1365200524,\"max\":22179172}}")
             .toObject(NsgCidr.class);
-        Assertions.assertEquals("eopzfqrhhuaopp", model.source());
-        Assertions.assertEquals(1290719044, model.destinationPortRange().min());
-        Assertions.assertEquals(646649620, model.destinationPortRange().max());
+        Assertions.assertEquals("pybsrfbjfdtw", model.source());
+        Assertions.assertEquals(1365200524, model.destinationPortRange().min());
+        Assertions.assertEquals(22179172, model.destinationPortRange().max());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        NsgCidr model = new NsgCidr().withSource("eopzfqrhhuaopp")
-            .withDestinationPortRange(new PortRange().withMin(1290719044).withMax(646649620));
+        NsgCidr model = new NsgCidr().withSource("pybsrfbjfdtw")
+            .withDestinationPortRange(new PortRange().withMin(1365200524).withMax(22179172));
         model = BinaryData.fromObject(model).toObject(NsgCidr.class);
-        Assertions.assertEquals("eopzfqrhhuaopp", model.source());
-        Assertions.assertEquals(1290719044, model.destinationPortRange().min());
-        Assertions.assertEquals(646649620, model.destinationPortRange().max());
+        Assertions.assertEquals("pybsrfbjfdtw", model.source());
+        Assertions.assertEquals(1365200524, model.destinationPortRange().min());
+        Assertions.assertEquals(22179172, model.destinationPortRange().max());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListMockTests.java
index 30746302a666..2e0286d11d18 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OperationsListMockTests.java
@@ -21,7 +21,7 @@ public final class OperationsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"name\":\"lkdghr\",\"isDataAction\":true,\"display\":{\"provider\":\"lwxezwzhokvbwnh\",\"resource\":\"qlgehg\",\"operation\":\"ipifhpfeoajvg\",\"description\":\"txjcsheafidlt\"},\"origin\":\"user,system\",\"actionType\":\"Internal\"}]}";
+            = "{\"value\":[{\"name\":\"cpzgpxtiv\",\"isDataAction\":false,\"display\":{\"provider\":\"dibgqjxgpnrhgov\",\"resource\":\"pikqmh\",\"operation\":\"owjrmzvuporqz\",\"description\":\"uydzvk\"},\"origin\":\"system\",\"actionType\":\"Internal\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksMockTests.java
index 4b7e81e06573..3b0c21a43d4d 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListActivationLinksMockTests.java
@@ -20,7 +20,7 @@ public final class OracleSubscriptionsListActivationLinksMockTests {
     @Test
     public void testListActivationLinks() throws Exception {
         String responseStr
-            = "{\"newCloudAccountActivationLink\":\"lkafhonqjuje\",\"existingCloudAccountActivationLink\":\"kpzvcpopmxelnwc\"}";
+            = "{\"newCloudAccountActivationLink\":\"nq\",\"existingCloudAccountActivationLink\":\"gjfbpkuwxeoi\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsMockTests.java
index a3aecda3361d..887446778da3 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListCloudAccountDetailsMockTests.java
@@ -19,7 +19,7 @@
 public final class OracleSubscriptionsListCloudAccountDetailsMockTests {
     @Test
     public void testListCloudAccountDetails() throws Exception {
-        String responseStr = "{\"cloudAccountName\":\"zrdpsovwxznptgoe\",\"cloudAccountHomeRegion\":\"bbabp\"}";
+        String responseStr = "{\"cloudAccountName\":\"wotmmwllcolsrsxa\",\"cloudAccountHomeRegion\":\"efh\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsMockTests.java
index 724f4a405c38..623ef3ff586c 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/OracleSubscriptionsListSaasSubscriptionDetailsMockTests.java
@@ -20,7 +20,7 @@ public final class OracleSubscriptionsListSaasSubscriptionDetailsMockTests {
     @Test
     public void testListSaasSubscriptionDetails() throws Exception {
         String responseStr
-            = "{\"id\":\"vf\",\"subscriptionName\":\"kvntjlrigjkskyri\",\"timeCreated\":\"2020-12-31T15:34:24Z\",\"offerId\":\"idsxwaabzmifry\",\"planId\":\"nmmaxrizkzob\",\"saasSubscriptionStatus\":\"pxl\",\"publisherId\":\"lnelxieixynl\",\"purchaserEmailId\":\"ecwcrojphslhcawj\",\"purchaserTenantId\":\"i\",\"termUnit\":\"wfmvigorqjbt\",\"isAutoRenew\":false,\"isFreeTrial\":true}";
+            = "{\"id\":\"cgjokjljnhvlq\",\"subscriptionName\":\"ek\",\"timeCreated\":\"2021-01-20T04:18:54Z\",\"offerId\":\"snbksdqhj\",\"planId\":\"klxesl\",\"saasSubscriptionStatus\":\"hustcpoqmavnwqjw\",\"publisherId\":\"knlejjjkxybwfd\",\"purchaserEmailId\":\"jbzten\",\"purchaserTenantId\":\"kzykjtjk\",\"termUnit\":\"xfwush\",\"isAutoRenew\":false,\"isFreeTrial\":true}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PeerDbDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PeerDbDetailsTests.java
index 6355d83cbec6..cd497785a97f 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PeerDbDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PeerDbDetailsTests.java
@@ -11,22 +11,20 @@
 public final class PeerDbDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        PeerDbDetails model = BinaryData
-            .fromString("{\"peerDbId\":\"kwcf\",\"peerDbOcid\":\"ljyxgtczhe\",\"peerDbLocation\":\"bsdshmkxmaehvbbx\"}")
-            .toObject(PeerDbDetails.class);
-        Assertions.assertEquals("kwcf", model.peerDbId());
-        Assertions.assertEquals("ljyxgtczhe", model.peerDbOcid());
-        Assertions.assertEquals("bsdshmkxmaehvbbx", model.peerDbLocation());
+        PeerDbDetails model
+            = BinaryData.fromString("{\"peerDbId\":\"ufactk\",\"peerDbOcid\":\"zov\",\"peerDbLocation\":\"j\"}")
+                .toObject(PeerDbDetails.class);
+        Assertions.assertEquals("ufactk", model.peerDbId());
+        Assertions.assertEquals("zov", model.peerDbOcid());
+        Assertions.assertEquals("j", model.peerDbLocation());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PeerDbDetails model = new PeerDbDetails().withPeerDbId("kwcf")
-            .withPeerDbOcid("ljyxgtczhe")
-            .withPeerDbLocation("bsdshmkxmaehvbbx");
+        PeerDbDetails model = new PeerDbDetails().withPeerDbId("ufactk").withPeerDbOcid("zov").withPeerDbLocation("j");
         model = BinaryData.fromObject(model).toObject(PeerDbDetails.class);
-        Assertions.assertEquals("kwcf", model.peerDbId());
-        Assertions.assertEquals("ljyxgtczhe", model.peerDbOcid());
-        Assertions.assertEquals("bsdshmkxmaehvbbx", model.peerDbLocation());
+        Assertions.assertEquals("ufactk", model.peerDbId());
+        Assertions.assertEquals("zov", model.peerDbOcid());
+        Assertions.assertEquals("j", model.peerDbLocation());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PortRangeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PortRangeTests.java
index a17bc11edee1..252b9b04d52e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PortRangeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PortRangeTests.java
@@ -11,16 +11,16 @@
 public final class PortRangeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        PortRange model = BinaryData.fromString("{\"min\":495294265,\"max\":108593741}").toObject(PortRange.class);
-        Assertions.assertEquals(495294265, model.min());
-        Assertions.assertEquals(108593741, model.max());
+        PortRange model = BinaryData.fromString("{\"min\":772106102,\"max\":2101794539}").toObject(PortRange.class);
+        Assertions.assertEquals(772106102, model.min());
+        Assertions.assertEquals(2101794539, model.max());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PortRange model = new PortRange().withMin(495294265).withMax(108593741);
+        PortRange model = new PortRange().withMin(772106102).withMax(2101794539);
         model = BinaryData.fromObject(model).toObject(PortRange.class);
-        Assertions.assertEquals(495294265, model.min());
-        Assertions.assertEquals(108593741, model.max());
+        Assertions.assertEquals(772106102, model.min());
+        Assertions.assertEquals(2101794539, model.max());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressPropertiesInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressPropertiesInnerTests.java
index add5e03dde2f..bf40cf0402dc 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressPropertiesInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressPropertiesInnerTests.java
@@ -12,12 +12,12 @@ public final class PrivateIpAddressPropertiesInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateIpAddressPropertiesInner model = BinaryData.fromString(
-            "{\"displayName\":\"lfmmdnbbglzpswi\",\"hostnameLabel\":\"d\",\"ocid\":\"cwyhzdxssa\",\"ipAddress\":\"bzmnvdfznud\",\"subnetId\":\"od\"}")
+            "{\"displayName\":\"yhtozfikdowwqu\",\"hostnameLabel\":\"v\",\"ocid\":\"zx\",\"ipAddress\":\"lvithhqzonosgg\",\"subnetId\":\"hcohfwdsjnk\"}")
             .toObject(PrivateIpAddressPropertiesInner.class);
-        Assertions.assertEquals("lfmmdnbbglzpswi", model.displayName());
-        Assertions.assertEquals("d", model.hostnameLabel());
-        Assertions.assertEquals("cwyhzdxssa", model.ocid());
-        Assertions.assertEquals("bzmnvdfznud", model.ipAddress());
-        Assertions.assertEquals("od", model.subnetId());
+        Assertions.assertEquals("yhtozfikdowwqu", model.displayName());
+        Assertions.assertEquals("v", model.hostnameLabel());
+        Assertions.assertEquals("zx", model.ocid());
+        Assertions.assertEquals("lvithhqzonosgg", model.ipAddress());
+        Assertions.assertEquals("hcohfwdsjnk", model.subnetId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressesFilterTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressesFilterTests.java
index 1d4b190e7557..b9a0a01c8203 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressesFilterTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/PrivateIpAddressesFilterTests.java
@@ -11,17 +11,19 @@
 public final class PrivateIpAddressesFilterTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        PrivateIpAddressesFilter model = BinaryData.fromString("{\"subnetId\":\"r\",\"vnicId\":\"gccymvaolpssl\"}")
-            .toObject(PrivateIpAddressesFilter.class);
-        Assertions.assertEquals("r", model.subnetId());
-        Assertions.assertEquals("gccymvaolpssl", model.vnicId());
+        PrivateIpAddressesFilter model
+            = BinaryData.fromString("{\"subnetId\":\"bmnzbtbhjpgl\",\"vnicId\":\"fgohdneuelfphs\"}")
+                .toObject(PrivateIpAddressesFilter.class);
+        Assertions.assertEquals("bmnzbtbhjpgl", model.subnetId());
+        Assertions.assertEquals("fgohdneuelfphs", model.vnicId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PrivateIpAddressesFilter model = new PrivateIpAddressesFilter().withSubnetId("r").withVnicId("gccymvaolpssl");
+        PrivateIpAddressesFilter model
+            = new PrivateIpAddressesFilter().withSubnetId("bmnzbtbhjpgl").withVnicId("fgohdneuelfphs");
         model = BinaryData.fromObject(model).toObject(PrivateIpAddressesFilter.class);
-        Assertions.assertEquals("r", model.subnetId());
-        Assertions.assertEquals("gccymvaolpssl", model.vnicId());
+        Assertions.assertEquals("bmnzbtbhjpgl", model.subnetId());
+        Assertions.assertEquals("fgohdneuelfphs", model.vnicId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ProfileTypeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ProfileTypeTests.java
index a01a857864ae..107554a535ae 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ProfileTypeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ProfileTypeTests.java
@@ -18,16 +18,16 @@ public final class ProfileTypeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ProfileType model = BinaryData.fromString(
-            "{\"consumerGroup\":\"Tpurgent\",\"displayName\":\"tpwoqhihejq\",\"hostFormat\":\"Fqdn\",\"isRegional\":true,\"protocol\":\"TCP\",\"sessionMode\":\"Direct\",\"syntaxFormat\":\"Long\",\"tlsAuthentication\":\"Mutual\",\"value\":\"cypsxjv\"}")
+            "{\"consumerGroup\":\"Low\",\"displayName\":\"vdxec\",\"hostFormat\":\"Ip\",\"isRegional\":true,\"protocol\":\"TCPS\",\"sessionMode\":\"Redirect\",\"syntaxFormat\":\"Long\",\"tlsAuthentication\":\"Mutual\",\"value\":\"zlhp\"}")
             .toObject(ProfileType.class);
-        Assertions.assertEquals(ConsumerGroup.TPURGENT, model.consumerGroup());
-        Assertions.assertEquals("tpwoqhihejq", model.displayName());
-        Assertions.assertEquals(HostFormatType.FQDN, model.hostFormat());
+        Assertions.assertEquals(ConsumerGroup.LOW, model.consumerGroup());
+        Assertions.assertEquals("vdxec", model.displayName());
+        Assertions.assertEquals(HostFormatType.IP, model.hostFormat());
         Assertions.assertTrue(model.isRegional());
-        Assertions.assertEquals(ProtocolType.TCP, model.protocol());
-        Assertions.assertEquals(SessionModeType.DIRECT, model.sessionMode());
+        Assertions.assertEquals(ProtocolType.TCPS, model.protocol());
+        Assertions.assertEquals(SessionModeType.REDIRECT, model.sessionMode());
         Assertions.assertEquals(SyntaxFormatType.LONG, model.syntaxFormat());
         Assertions.assertEquals(TlsAuthenticationType.MUTUAL, model.tlsAuthentication());
-        Assertions.assertEquals("cypsxjv", model.value());
+        Assertions.assertEquals("zlhp", model.value());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RemoveVirtualMachineFromExadbVmClusterDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RemoveVirtualMachineFromExadbVmClusterDetailsTests.java
index ca025db512cc..142729f8fa44 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RemoveVirtualMachineFromExadbVmClusterDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RemoveVirtualMachineFromExadbVmClusterDetailsTests.java
@@ -13,19 +13,18 @@
 public final class RemoveVirtualMachineFromExadbVmClusterDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        RemoveVirtualMachineFromExadbVmClusterDetails model = BinaryData
-            .fromString(
-                "{\"dbNodes\":[{\"dbNodeId\":\"nwiaaomyl\"},{\"dbNodeId\":\"eazulcs\"},{\"dbNodeId\":\"thwwn\"}]}")
-            .toObject(RemoveVirtualMachineFromExadbVmClusterDetails.class);
-        Assertions.assertEquals("nwiaaomyl", model.dbNodes().get(0).dbNodeId());
+        RemoveVirtualMachineFromExadbVmClusterDetails model
+            = BinaryData.fromString("{\"dbNodes\":[{\"dbNodeId\":\"gdslqxihhrmoo\"},{\"dbNodeId\":\"z\"}]}")
+                .toObject(RemoveVirtualMachineFromExadbVmClusterDetails.class);
+        Assertions.assertEquals("gdslqxihhrmoo", model.dbNodes().get(0).dbNodeId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        RemoveVirtualMachineFromExadbVmClusterDetails model = new RemoveVirtualMachineFromExadbVmClusterDetails()
-            .withDbNodes(Arrays.asList(new DbNodeDetails().withDbNodeId("nwiaaomyl"),
-                new DbNodeDetails().withDbNodeId("eazulcs"), new DbNodeDetails().withDbNodeId("thwwn")));
+        RemoveVirtualMachineFromExadbVmClusterDetails model
+            = new RemoveVirtualMachineFromExadbVmClusterDetails().withDbNodes(Arrays
+                .asList(new DbNodeDetails().withDbNodeId("gdslqxihhrmoo"), new DbNodeDetails().withDbNodeId("z")));
         model = BinaryData.fromObject(model).toObject(RemoveVirtualMachineFromExadbVmClusterDetails.class);
-        Assertions.assertEquals("nwiaaomyl", model.dbNodes().get(0).dbNodeId());
+        Assertions.assertEquals("gdslqxihhrmoo", model.dbNodes().get(0).dbNodeId());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorInnerTests.java
new file mode 100644
index 000000000000..47af8c421a46
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorInnerTests.java
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.fluent.models.ResourceAnchorInner;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+
+public final class ResourceAnchorInnerTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ResourceAnchorInner model = BinaryData.fromString(
+            "{\"properties\":{\"provisioningState\":\"Succeeded\",\"linkedCompartmentId\":\"eta\"},\"location\":\"tsxoatftgz\",\"tags\":{\"vefloccsrmozihmi\":\"bs\",\"wtxxpkyjcx\":\"g\",\"ycilrmcaykggnox\":\"jxgrytfmp\",\"pfnznthjtwkj\":\"ztrksxwpndf\"},\"id\":\"osrxuzvoa\",\"name\":\"ktcqio\",\"type\":\"mgbzahgxqdlyrtl\"}")
+            .toObject(ResourceAnchorInner.class);
+        Assertions.assertEquals("tsxoatftgz", model.location());
+        Assertions.assertEquals("bs", model.tags().get("vefloccsrmozihmi"));
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        ResourceAnchorInner model = new ResourceAnchorInner().withLocation("tsxoatftgz")
+            .withTags(mapOf("vefloccsrmozihmi", "bs", "wtxxpkyjcx", "g", "ycilrmcaykggnox", "jxgrytfmp", "pfnznthjtwkj",
+                "ztrksxwpndf"))
+            .withProperties(new ResourceAnchorProperties());
+        model = BinaryData.fromObject(model).toObject(ResourceAnchorInner.class);
+        Assertions.assertEquals("tsxoatftgz", model.location());
+        Assertions.assertEquals("bs", model.tags().get("vefloccsrmozihmi"));
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorListResultTests.java
new file mode 100644
index 000000000000..29edf8d1bdcb
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorListResultTests.java
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.implementation.models.ResourceAnchorListResult;
+import org.junit.jupiter.api.Assertions;
+
+public final class ResourceAnchorListResultTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ResourceAnchorListResult model = BinaryData.fromString(
+            "{\"value\":[{\"properties\":{\"provisioningState\":\"Failed\",\"linkedCompartmentId\":\"ruswhv\"},\"location\":\"zznvfbyc\",\"tags\":{\"xzv\":\"jww\"},\"id\":\"mwmxqhndvnoamld\",\"name\":\"ehaohdjhh\",\"type\":\"lzok\"}],\"nextLink\":\"ox\"}")
+            .toObject(ResourceAnchorListResult.class);
+        Assertions.assertEquals("zznvfbyc", model.value().get(0).location());
+        Assertions.assertEquals("jww", model.value().get(0).tags().get("xzv"));
+        Assertions.assertEquals("ox", model.nextLink());
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorPropertiesTests.java
new file mode 100644
index 000000000000..1cc49339d244
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorPropertiesTests.java
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties;
+
+public final class ResourceAnchorPropertiesTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ResourceAnchorProperties model
+            = BinaryData.fromString("{\"provisioningState\":\"Succeeded\",\"linkedCompartmentId\":\"rltzkatbhjmz\"}")
+                .toObject(ResourceAnchorProperties.class);
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        ResourceAnchorProperties model = new ResourceAnchorProperties();
+        model = BinaryData.fromObject(model).toObject(ResourceAnchorProperties.class);
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorUpdateTests.java
new file mode 100644
index 000000000000..eb7727b709a3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorUpdateTests.java
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.util.BinaryData;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorUpdate;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+
+public final class ResourceAnchorUpdateTests {
+    @org.junit.jupiter.api.Test
+    public void testDeserialize() throws Exception {
+        ResourceAnchorUpdate model
+            = BinaryData.fromString("{\"tags\":{\"qeqala\":\"s\",\"tgfebwln\":\"vlagun\",\"av\":\"mhyreeudz\"}}")
+                .toObject(ResourceAnchorUpdate.class);
+        Assertions.assertEquals("s", model.tags().get("qeqala"));
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testSerialize() throws Exception {
+        ResourceAnchorUpdate model
+            = new ResourceAnchorUpdate().withTags(mapOf("qeqala", "s", "tgfebwln", "vlagun", "av", "mhyreeudz"));
+        model = BinaryData.fromObject(model).toObject(ResourceAnchorUpdate.class);
+        Assertions.assertEquals("s", model.tags().get("qeqala"));
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsCreateOrUpdateMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsCreateOrUpdateMockTests.java
new file mode 100644
index 000000000000..cf5da70601b3
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsCreateOrUpdateMockTests.java
@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchorProperties;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class ResourceAnchorsCreateOrUpdateMockTests {
+    @Test
+    public void testCreateOrUpdate() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"linkedCompartmentId\":\"culregpqt\"},\"location\":\"jhvrztnvgyshqrdg\",\"tags\":{\"fa\":\"mewjzlpyk\",\"zrransyb\":\"zwjcaye\",\"nkfscjfn\":\"lpolwzrghsrle\"},\"id\":\"jwvuag\",\"name\":\"qwtltngvmreupt\",\"type\":\"klzmijajw\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        ResourceAnchor response = manager.resourceAnchors()
+            .define("wmn")
+            .withRegion("wkudrbcpf")
+            .withExistingResourceGroup("clctzey")
+            .withTags(mapOf("irtneemmjau", "dqyemebunaucm", "rwgudasmxub", "cgxefnohaitraniz"))
+            .withProperties(new ResourceAnchorProperties())
+            .create();
+
+        Assertions.assertEquals("jhvrztnvgyshqrdg", response.location());
+        Assertions.assertEquals("mewjzlpyk", response.tags().get("fa"));
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsGetByResourceGroupWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsGetByResourceGroupWithResponseMockTests.java
new file mode 100644
index 000000000000..6b2f20ca462d
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsGetByResourceGroupWithResponseMockTests.java
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class ResourceAnchorsGetByResourceGroupWithResponseMockTests {
+    @Test
+    public void testGetByResourceGroupWithResponse() throws Exception {
+        String responseStr
+            = "{\"properties\":{\"provisioningState\":\"Provisioning\",\"linkedCompartmentId\":\"ossscyva\"},\"location\":\"ppuacvfyeowp\",\"tags\":{\"ttehdp\":\"tjdhsoymhpvtyq\"},\"id\":\"ou\",\"name\":\"stkfvvdshxcdeds\",\"type\":\"enygnxcgjtfrnquk\"}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        ResourceAnchor response = manager.resourceAnchors()
+            .getByResourceGroupWithResponse("lefksxq", "eazfpxgnmqvzvlu", com.azure.core.util.Context.NONE)
+            .getValue();
+
+        Assertions.assertEquals("ppuacvfyeowp", response.location());
+        Assertions.assertEquals("tjdhsoymhpvtyq", response.tags().get("ttehdp"));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListByResourceGroupMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListByResourceGroupMockTests.java
new file mode 100644
index 000000000000..4e399b47e7c1
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListByResourceGroupMockTests.java
@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class ResourceAnchorsListByResourceGroupMockTests {
+    @Test
+    public void testListByResourceGroup() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Provisioning\",\"linkedCompartmentId\":\"rxsmyltrw\"},\"location\":\"fmtbgwjdxwn\",\"tags\":{\"wzzqseuzuukykcy\":\"urrdreyzjwhsetww\",\"ey\":\"hyqqzzdcy\",\"pew\":\"tewfopazdazgbsq\"},\"id\":\"c\",\"name\":\"utmdpvozg\",\"type\":\"qjbknl\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<ResourceAnchor> response
+            = manager.resourceAnchors().listByResourceGroup("rf", com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("fmtbgwjdxwn", response.iterator().next().location());
+        Assertions.assertEquals("urrdreyzjwhsetww", response.iterator().next().tags().get("wzzqseuzuukykcy"));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListMockTests.java
new file mode 100644
index 000000000000..1766c3aa04da
--- /dev/null
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ResourceAnchorsListMockTests.java
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.resourcemanager.oracledatabase.generated;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.http.HttpClient;
+import com.azure.core.http.rest.PagedIterable;
+import com.azure.core.management.profile.AzureProfile;
+import com.azure.core.models.AzureCloud;
+import com.azure.core.test.http.MockHttpResponse;
+import com.azure.resourcemanager.oracledatabase.OracleDatabaseManager;
+import com.azure.resourcemanager.oracledatabase.models.ResourceAnchor;
+import java.nio.charset.StandardCharsets;
+import java.time.OffsetDateTime;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import reactor.core.publisher.Mono;
+
+public final class ResourceAnchorsListMockTests {
+    @Test
+    public void testList() throws Exception {
+        String responseStr
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Canceled\",\"linkedCompartmentId\":\"inxojjlux\"},\"location\":\"hilzzdzzq\",\"tags\":{\"vribqlotokht\":\"ezay\",\"xwjyofgwhnk\":\"wtaznkcqw\"},\"id\":\"tlwljssmcts\",\"name\":\"ldkpwolgisu\",\"type\":\"xbteogfgfiijryk\"}]}";
+
+        HttpClient httpClient
+            = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
+        OracleDatabaseManager manager = OracleDatabaseManager.configure()
+            .withHttpClient(httpClient)
+            .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
+                new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
+
+        PagedIterable<ResourceAnchor> response = manager.resourceAnchors().list(com.azure.core.util.Context.NONE);
+
+        Assertions.assertEquals("hilzzdzzq", response.iterator().next().location());
+        Assertions.assertEquals("ezay", response.iterator().next().tags().get("vribqlotokht"));
+    }
+}
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RestoreAutonomousDatabaseDetailsTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RestoreAutonomousDatabaseDetailsTests.java
index 812805af99d8..35680b1a4742 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RestoreAutonomousDatabaseDetailsTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/RestoreAutonomousDatabaseDetailsTests.java
@@ -12,16 +12,16 @@
 public final class RestoreAutonomousDatabaseDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        RestoreAutonomousDatabaseDetails model = BinaryData.fromString("{\"timestamp\":\"2021-07-20T17:37:51Z\"}")
+        RestoreAutonomousDatabaseDetails model = BinaryData.fromString("{\"timestamp\":\"2021-03-05T15:56:58Z\"}")
             .toObject(RestoreAutonomousDatabaseDetails.class);
-        Assertions.assertEquals(OffsetDateTime.parse("2021-07-20T17:37:51Z"), model.timestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-03-05T15:56:58Z"), model.timestamp());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         RestoreAutonomousDatabaseDetails model
-            = new RestoreAutonomousDatabaseDetails().withTimestamp(OffsetDateTime.parse("2021-07-20T17:37:51Z"));
+            = new RestoreAutonomousDatabaseDetails().withTimestamp(OffsetDateTime.parse("2021-03-05T15:56:58Z"));
         model = BinaryData.fromObject(model).toObject(RestoreAutonomousDatabaseDetails.class);
-        Assertions.assertEquals(OffsetDateTime.parse("2021-07-20T17:37:51Z"), model.timestamp());
+        Assertions.assertEquals(OffsetDateTime.parse("2021-03-05T15:56:58Z"), model.timestamp());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SaasSubscriptionDetailsInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SaasSubscriptionDetailsInnerTests.java
index 1cbd3fc5850b..7a81777097d1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SaasSubscriptionDetailsInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SaasSubscriptionDetailsInnerTests.java
@@ -11,7 +11,7 @@ public final class SaasSubscriptionDetailsInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SaasSubscriptionDetailsInner model = BinaryData.fromString(
-            "{\"id\":\"w\",\"subscriptionName\":\"mslyzrpzbchckqqz\",\"timeCreated\":\"2021-07-29T22:35:12Z\",\"offerId\":\"iysui\",\"planId\":\"ynkedyatrwyhqmib\",\"saasSubscriptionStatus\":\"hwit\",\"publisherId\":\"ypyynpcdpumnzg\",\"purchaserEmailId\":\"z\",\"purchaserTenantId\":\"abikns\",\"termUnit\":\"gj\",\"isAutoRenew\":false,\"isFreeTrial\":true}")
+            "{\"id\":\"jzkzi\",\"subscriptionName\":\"vvcnayr\",\"timeCreated\":\"2021-08-18T18:02:42Z\",\"offerId\":\"xxmueedn\",\"planId\":\"dvstkw\",\"saasSubscriptionStatus\":\"tchealmf\",\"publisherId\":\"d\",\"purchaserEmailId\":\"ygdvwv\",\"purchaserTenantId\":\"iohgwxrtfud\",\"termUnit\":\"pxgy\",\"isAutoRenew\":false,\"isFreeTrial\":true}")
             .toObject(SaasSubscriptionDetailsInner.class);
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeTests.java
index c3a360e0fb53..c251f36bf914 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeTests.java
@@ -14,22 +14,22 @@ public final class ScheduledOperationsTypeTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ScheduledOperationsType model = BinaryData.fromString(
-            "{\"dayOfWeek\":{\"name\":\"Wednesday\"},\"scheduledStartTime\":\"opqgikyzirtxdyux\",\"scheduledStopTime\":\"jntpsewgioilqu\"}")
+            "{\"dayOfWeek\":{\"name\":\"Sunday\"},\"scheduledStartTime\":\"jgcyztsfmznba\",\"scheduledStopTime\":\"ph\"}")
             .toObject(ScheduledOperationsType.class);
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY, model.dayOfWeek().name());
-        Assertions.assertEquals("opqgikyzirtxdyux", model.scheduledStartTime());
-        Assertions.assertEquals("jntpsewgioilqu", model.scheduledStopTime());
+        Assertions.assertEquals(DayOfWeekName.SUNDAY, model.dayOfWeek().name());
+        Assertions.assertEquals("jgcyztsfmznba", model.scheduledStartTime());
+        Assertions.assertEquals("ph", model.scheduledStopTime());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ScheduledOperationsType model
-            = new ScheduledOperationsType().withDayOfWeek(new DayOfWeek().withName(DayOfWeekName.WEDNESDAY))
-                .withScheduledStartTime("opqgikyzirtxdyux")
-                .withScheduledStopTime("jntpsewgioilqu");
+            = new ScheduledOperationsType().withDayOfWeek(new DayOfWeek().withName(DayOfWeekName.SUNDAY))
+                .withScheduledStartTime("jgcyztsfmznba")
+                .withScheduledStopTime("ph");
         model = BinaryData.fromObject(model).toObject(ScheduledOperationsType.class);
-        Assertions.assertEquals(DayOfWeekName.WEDNESDAY, model.dayOfWeek().name());
-        Assertions.assertEquals("opqgikyzirtxdyux", model.scheduledStartTime());
-        Assertions.assertEquals("jntpsewgioilqu", model.scheduledStopTime());
+        Assertions.assertEquals(DayOfWeekName.SUNDAY, model.dayOfWeek().name());
+        Assertions.assertEquals("jgcyztsfmznba", model.scheduledStartTime());
+        Assertions.assertEquals("ph", model.scheduledStopTime());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeUpdateTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeUpdateTests.java
index eebd75250939..a5413c9f4088 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeUpdateTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/ScheduledOperationsTypeUpdateTests.java
@@ -14,22 +14,22 @@ public final class ScheduledOperationsTypeUpdateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ScheduledOperationsTypeUpdate model = BinaryData.fromString(
-            "{\"dayOfWeek\":{\"name\":\"Tuesday\"},\"scheduledStartTime\":\"tmczuomejwcwwqi\",\"scheduledStopTime\":\"nssxmojmsvpk\"}")
+            "{\"dayOfWeek\":{\"name\":\"Tuesday\"},\"scheduledStartTime\":\"tdrjfutacoebj\",\"scheduledStopTime\":\"wzcjznmwcpmgua\"}")
             .toObject(ScheduledOperationsTypeUpdate.class);
         Assertions.assertEquals(DayOfWeekName.TUESDAY, model.dayOfWeek().name());
-        Assertions.assertEquals("tmczuomejwcwwqi", model.scheduledStartTime());
-        Assertions.assertEquals("nssxmojmsvpk", model.scheduledStopTime());
+        Assertions.assertEquals("tdrjfutacoebj", model.scheduledStartTime());
+        Assertions.assertEquals("wzcjznmwcpmgua", model.scheduledStopTime());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ScheduledOperationsTypeUpdate model
             = new ScheduledOperationsTypeUpdate().withDayOfWeek(new DayOfWeekUpdate().withName(DayOfWeekName.TUESDAY))
-                .withScheduledStartTime("tmczuomejwcwwqi")
-                .withScheduledStopTime("nssxmojmsvpk");
+                .withScheduledStartTime("tdrjfutacoebj")
+                .withScheduledStopTime("wzcjznmwcpmgua");
         model = BinaryData.fromObject(model).toObject(ScheduledOperationsTypeUpdate.class);
         Assertions.assertEquals(DayOfWeekName.TUESDAY, model.dayOfWeek().name());
-        Assertions.assertEquals("tmczuomejwcwwqi", model.scheduledStartTime());
-        Assertions.assertEquals("nssxmojmsvpk", model.scheduledStopTime());
+        Assertions.assertEquals("tdrjfutacoebj", model.scheduledStartTime());
+        Assertions.assertEquals("wzcjznmwcpmgua", model.scheduledStopTime());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionInnerTests.java
index 0ae21f0eb96d..cc58ac5c04a6 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionInnerTests.java
@@ -12,8 +12,8 @@ public final class SystemVersionInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SystemVersionInner model = BinaryData.fromString(
-            "{\"properties\":{\"systemVersion\":\"sluicpdggkzz\"},\"id\":\"mbmpaxmodfvuefy\",\"name\":\"sbpfvmwyhr\",\"type\":\"ouyftaakc\"}")
+            "{\"properties\":{\"systemVersion\":\"mbqfqvmk\"},\"id\":\"oz\",\"name\":\"pvhelxprg\",\"type\":\"yat\"}")
             .toObject(SystemVersionInner.class);
-        Assertions.assertEquals("sluicpdggkzz", model.properties().systemVersion());
+        Assertions.assertEquals("mbqfqvmk", model.properties().systemVersion());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionListResultTests.java
index 9756ce4fc663..3a2cc7bb0fd1 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionListResultTests.java
@@ -12,9 +12,9 @@ public final class SystemVersionListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SystemVersionListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"systemVersion\":\"mond\"},\"id\":\"quxvypomgkop\",\"name\":\"whojvp\",\"type\":\"jqg\"},{\"properties\":{\"systemVersion\":\"smocmbq\"},\"id\":\"vmkcx\",\"name\":\"zapvhelx\",\"type\":\"rgly\"}],\"nextLink\":\"dd\"}")
+            "{\"value\":[{\"properties\":{\"systemVersion\":\"rjxgciqib\"},\"id\":\"osx\",\"name\":\"dqrhzoymib\",\"type\":\"rq\"},{\"properties\":{\"systemVersion\":\"bahwfl\"},\"id\":\"zdtmhrkwofy\",\"name\":\"voqacpiexpbt\",\"type\":\"iwbwoenwashrtdtk\"},{\"properties\":{\"systemVersion\":\"qxwbpokulpiu\"},\"id\":\"aasipqi\",\"name\":\"obyu\",\"type\":\"erpqlpqwcciuqg\"},{\"properties\":{\"systemVersion\":\"butauvfb\"},\"id\":\"uwhhmhykojoxafn\",\"name\":\"dlpichkoymkcdyhb\",\"type\":\"kkpwdreqnovvq\"}],\"nextLink\":\"vljxywsu\"}")
             .toObject(SystemVersionListResult.class);
-        Assertions.assertEquals("mond", model.value().get(0).properties().systemVersion());
-        Assertions.assertEquals("dd", model.nextLink());
+        Assertions.assertEquals("rjxgciqib", model.value().get(0).properties().systemVersion());
+        Assertions.assertEquals("vljxywsu", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionPropertiesTests.java
index 505d1ca941ce..403be4df6527 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionPropertiesTests.java
@@ -12,7 +12,7 @@ public final class SystemVersionPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SystemVersionProperties model
-            = BinaryData.fromString("{\"systemVersion\":\"wiyzvqtmnubexkp\"}").toObject(SystemVersionProperties.class);
-        Assertions.assertEquals("wiyzvqtmnubexkp", model.systemVersion());
+            = BinaryData.fromString("{\"systemVersion\":\"dckcbc\"}").toObject(SystemVersionProperties.class);
+        Assertions.assertEquals("dckcbc", model.systemVersion());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetWithResponseMockTests.java
index 8d675cb8bdda..f0ec028a6d9b 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class SystemVersionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"systemVersion\":\"nsjlpjrtws\"},\"id\":\"vv\",\"name\":\"icphvtrrmhw\",\"type\":\"bfdpyflubhv\"}";
+            = "{\"properties\":{\"systemVersion\":\"aoyte\"},\"id\":\"puvjmvqmtd\",\"name\":\"ckygroejnndljdju\",\"type\":\"kb\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,10 +30,9 @@ public void testGetWithResponse() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        SystemVersion response = manager.systemVersions()
-            .getWithResponse("rdfjmzsyzfhotl", "ikcyyc", com.azure.core.util.Context.NONE)
-            .getValue();
+        SystemVersion response
+            = manager.systemVersions().getWithResponse("yf", "x", com.azure.core.util.Context.NONE).getValue();
 
-        Assertions.assertEquals("nsjlpjrtws", response.properties().systemVersion());
+        Assertions.assertEquals("aoyte", response.properties().systemVersion());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationMockTests.java
index b24025315f01..644fb03a102e 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/SystemVersionsListByLocationMockTests.java
@@ -22,7 +22,7 @@ public final class SystemVersionsListByLocationMockTests {
     @Test
     public void testListByLocation() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"systemVersion\":\"whhmemhooc\"},\"id\":\"tnpqmemczjk\",\"name\":\"mykyujxsglhs\",\"type\":\"rryejylmbkzudnig\"}]}";
+            = "{\"value\":[{\"properties\":{\"systemVersion\":\"kceysfaqegplw\"},\"id\":\"shwddkvbxgk\",\"name\":\"usybwptdaca\",\"type\":\"vvlfntymtp\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,8 +32,8 @@ public void testListByLocation() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<SystemVersion> response
-            = manager.systemVersions().listByLocation("glrocuy", com.azure.core.util.Context.NONE);
+            = manager.systemVersions().listByLocation("req", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("whhmemhooc", response.iterator().next().properties().systemVersion());
+        Assertions.assertEquals("kceysfaqegplw", response.iterator().next().properties().systemVersion());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressInnerTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressInnerTests.java
index 0d3a165e74a7..ad1a34e47424 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressInnerTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressInnerTests.java
@@ -13,18 +13,18 @@ public final class VirtualNetworkAddressInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VirtualNetworkAddressInner model = BinaryData.fromString(
-            "{\"properties\":{\"ipAddress\":\"bncblylpstdbhhx\",\"vmOcid\":\"zdzucerscdntnevf\",\"ocid\":\"jmygtdsslswtmwer\",\"domain\":\"fzp\",\"lifecycleDetails\":\"semwabnet\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminating\",\"timeAssigned\":\"2021-01-22T19:10:23Z\"},\"id\":\"plvwiwubmwmbes\",\"name\":\"dnkwwtppjflcxog\",\"type\":\"okonzmnsikvmkqz\"}")
+            "{\"properties\":{\"ipAddress\":\"utiiswacf\",\"vmOcid\":\"dkzzewkfvhqcrail\",\"ocid\":\"n\",\"domain\":\"fuflrwdmhdlx\",\"lifecycleDetails\":\"rxsagafcnihgwqa\",\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Available\",\"timeAssigned\":\"2021-11-13T04:56:11Z\"},\"id\":\"vkcvqvpkeqd\",\"name\":\"vdrhvoo\",\"type\":\"sotbob\"}")
             .toObject(VirtualNetworkAddressInner.class);
-        Assertions.assertEquals("bncblylpstdbhhx", model.properties().ipAddress());
-        Assertions.assertEquals("zdzucerscdntnevf", model.properties().vmOcid());
+        Assertions.assertEquals("utiiswacf", model.properties().ipAddress());
+        Assertions.assertEquals("dkzzewkfvhqcrail", model.properties().vmOcid());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VirtualNetworkAddressInner model = new VirtualNetworkAddressInner().withProperties(
-            new VirtualNetworkAddressProperties().withIpAddress("bncblylpstdbhhx").withVmOcid("zdzucerscdntnevf"));
+            new VirtualNetworkAddressProperties().withIpAddress("utiiswacf").withVmOcid("dkzzewkfvhqcrail"));
         model = BinaryData.fromObject(model).toObject(VirtualNetworkAddressInner.class);
-        Assertions.assertEquals("bncblylpstdbhhx", model.properties().ipAddress());
-        Assertions.assertEquals("zdzucerscdntnevf", model.properties().vmOcid());
+        Assertions.assertEquals("utiiswacf", model.properties().ipAddress());
+        Assertions.assertEquals("dkzzewkfvhqcrail", model.properties().vmOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressListResultTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressListResultTests.java
index 0b87616ef5ef..71d4685cf550 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressListResultTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressListResultTests.java
@@ -12,10 +12,10 @@ public final class VirtualNetworkAddressListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VirtualNetworkAddressListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"ipAddress\":\"lkzgxhuriplbp\",\"vmOcid\":\"xunkbebxmubyynt\",\"ocid\":\"rbqtkoie\",\"domain\":\"eotg\",\"lifecycleDetails\":\"l\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Available\",\"timeAssigned\":\"2021-03-25T05:26:25Z\"},\"id\":\"wzizxbmpgcjefuzm\",\"name\":\"vpbttd\",\"type\":\"morppxebmnzbtbh\"},{\"properties\":{\"ipAddress\":\"lkfg\",\"vmOcid\":\"dneu\",\"ocid\":\"fphsdyhtozfikdow\",\"domain\":\"uuvxz\",\"lifecycleDetails\":\"lvithhqzonosgg\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Terminating\",\"timeAssigned\":\"2021-09-10T06:03:01Z\"},\"id\":\"sjnkal\",\"name\":\"utiiswacf\",\"type\":\"gdkz\"},{\"properties\":{\"ipAddress\":\"kfvhqcrailvpn\",\"vmOcid\":\"fuflrwdmhdlx\",\"ocid\":\"rxsagafcnihgwqa\",\"domain\":\"edgfbcvkcvq\",\"lifecycleDetails\":\"keqdcvdrhvoods\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminating\",\"timeAssigned\":\"2021-02-17T19:25:45Z\"},\"id\":\"pcjwv\",\"name\":\"hdldwmgxcxrsl\",\"type\":\"mutwuoe\"}],\"nextLink\":\"pkhjwni\"}")
+            "{\"value\":[{\"properties\":{\"ipAddress\":\"mbmpaxmodfvuefy\",\"vmOcid\":\"bpfvm\",\"ocid\":\"hrfou\",\"domain\":\"taakc\",\"lifecycleDetails\":\"iyzvqtmnub\",\"provisioningState\":\"Canceled\",\"lifecycleState\":\"Terminated\",\"timeAssigned\":\"2021-05-08T13:31:38Z\"},\"id\":\"ondjmq\",\"name\":\"xvy\",\"type\":\"omgkopkwho\"}],\"nextLink\":\"pajqgxysm\"}")
             .toObject(VirtualNetworkAddressListResult.class);
-        Assertions.assertEquals("lkzgxhuriplbp", model.value().get(0).properties().ipAddress());
-        Assertions.assertEquals("xunkbebxmubyynt", model.value().get(0).properties().vmOcid());
-        Assertions.assertEquals("pkhjwni", model.nextLink());
+        Assertions.assertEquals("mbmpaxmodfvuefy", model.value().get(0).properties().ipAddress());
+        Assertions.assertEquals("bpfvm", model.value().get(0).properties().vmOcid());
+        Assertions.assertEquals("pajqgxysm", model.nextLink());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressPropertiesTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressPropertiesTests.java
index e394cf890e75..e6ae7ee86562 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressPropertiesTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressPropertiesTests.java
@@ -12,18 +12,18 @@ public final class VirtualNetworkAddressPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         VirtualNetworkAddressProperties model = BinaryData.fromString(
-            "{\"ipAddress\":\"qkdltfz\",\"vmOcid\":\"hhvh\",\"ocid\":\"r\",\"domain\":\"dkwobdagx\",\"lifecycleDetails\":\"bqdxbx\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Failed\",\"timeAssigned\":\"2021-01-22T07:28:26Z\"}")
+            "{\"ipAddress\":\"opcjwvnhd\",\"vmOcid\":\"wmgxcxrsl\",\"ocid\":\"utwu\",\"domain\":\"grpkhjwniyqs\",\"lifecycleDetails\":\"i\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Terminated\",\"timeAssigned\":\"2021-03-11T02:43:20Z\"}")
             .toObject(VirtualNetworkAddressProperties.class);
-        Assertions.assertEquals("qkdltfz", model.ipAddress());
-        Assertions.assertEquals("hhvh", model.vmOcid());
+        Assertions.assertEquals("opcjwvnhd", model.ipAddress());
+        Assertions.assertEquals("wmgxcxrsl", model.vmOcid());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         VirtualNetworkAddressProperties model
-            = new VirtualNetworkAddressProperties().withIpAddress("qkdltfz").withVmOcid("hhvh");
+            = new VirtualNetworkAddressProperties().withIpAddress("opcjwvnhd").withVmOcid("wmgxcxrsl");
         model = BinaryData.fromObject(model).toObject(VirtualNetworkAddressProperties.class);
-        Assertions.assertEquals("qkdltfz", model.ipAddress());
-        Assertions.assertEquals("hhvh", model.vmOcid());
+        Assertions.assertEquals("opcjwvnhd", model.ipAddress());
+        Assertions.assertEquals("wmgxcxrsl", model.vmOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateMockTests.java
index 39b4ca5fab4d..0726393484e8 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesCreateOrUpdateMockTests.java
@@ -22,7 +22,7 @@ public final class VirtualNetworkAddressesCreateOrUpdateMockTests {
     @Test
     public void testCreateOrUpdate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ipAddress\":\"hqykizmdk\",\"vmOcid\":\"oafcluqvox\",\"ocid\":\"cjimryvwgcwwpbmz\",\"domain\":\"esyds\",\"lifecycleDetails\":\"efoh\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"timeAssigned\":\"2021-01-07T15:19:45Z\"},\"id\":\"dy\",\"name\":\"leallklm\",\"type\":\"khlowkxxpv\"}";
+            = "{\"properties\":{\"ipAddress\":\"iswskuk\",\"vmOcid\":\"asbvw\",\"ocid\":\"pkxkdtxfk\",\"domain\":\"lq\",\"lifecycleDetails\":\"w\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Provisioning\",\"timeAssigned\":\"2021-06-28T03:53:06Z\"},\"id\":\"gtywatmqaqkue\",\"name\":\"tgroesh\",\"type\":\"ygzc\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,12 +32,12 @@ public void testCreateOrUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         VirtualNetworkAddress response = manager.virtualNetworkAddresses()
-            .define("hqepvufhbzehewh")
-            .withExistingCloudVmCluster("kuma", "jcaacfdmmcpugm")
-            .withProperties(new VirtualNetworkAddressProperties().withIpAddress("nlbqnbldxeaclg").withVmOcid("horimkr"))
+            .define("ycblevpmcl")
+            .withExistingCloudVmCluster("j", "bajbuscgduusi")
+            .withProperties(new VirtualNetworkAddressProperties().withIpAddress("xkyxlzgs").withVmOcid("kzzltafhbzf"))
             .create();
 
-        Assertions.assertEquals("hqykizmdk", response.properties().ipAddress());
-        Assertions.assertEquals("oafcluqvox", response.properties().vmOcid());
+        Assertions.assertEquals("iswskuk", response.properties().ipAddress());
+        Assertions.assertEquals("asbvw", response.properties().vmOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetWithResponseMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetWithResponseMockTests.java
index a4ab9548bb7a..bf32c23f51cb 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetWithResponseMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class VirtualNetworkAddressesGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"ipAddress\":\"rouuxvnsasbcry\",\"vmOcid\":\"dizr\",\"ocid\":\"lobdxna\",\"domain\":\"mkmlmvevfx\",\"lifecycleDetails\":\"pj\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Failed\",\"timeAssigned\":\"2021-05-23T07:43:32Z\"},\"id\":\"rdddtfgxqbawpcb\",\"name\":\"nzqcy\",\"type\":\"napqo\"}";
+            = "{\"properties\":{\"ipAddress\":\"nlzafwxudgnh\",\"vmOcid\":\"okrtalvnb\",\"ocid\":\"pbeme\",\"domain\":\"clvdjjukyrdnqod\",\"lifecycleDetails\":\"hhxhq\",\"provisioningState\":\"Provisioning\",\"lifecycleState\":\"Provisioning\",\"timeAssigned\":\"2021-06-09T02:34:33Z\"},\"id\":\"gyipem\",\"name\":\"hgav\",\"type\":\"czuejdtxptl\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         VirtualNetworkAddress response = manager.virtualNetworkAddresses()
-            .getWithResponse("xbannovvoxc", "ytprwnwvroev", "tlyo", com.azure.core.util.Context.NONE)
+            .getWithResponse("ztwhghmupg", "yjtcdxabbujftab", "nbbklqpxzucafed", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("rouuxvnsasbcry", response.properties().ipAddress());
-        Assertions.assertEquals("dizr", response.properties().vmOcid());
+        Assertions.assertEquals("nlzafwxudgnh", response.properties().ipAddress());
+        Assertions.assertEquals("okrtalvnb", response.properties().vmOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterMockTests.java b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterMockTests.java
index 0c95360b8386..935561eafd49 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterMockTests.java
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/src/test/java/com/azure/resourcemanager/oracledatabase/generated/VirtualNetworkAddressesListByCloudVmClusterMockTests.java
@@ -22,7 +22,7 @@ public final class VirtualNetworkAddressesListByCloudVmClusterMockTests {
     @Test
     public void testListByCloudVmCluster() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"ipAddress\":\"jkmfxapjwo\",\"vmOcid\":\"qnobp\",\"ocid\":\"cdabtqwpwya\",\"domain\":\"zasqbucljgkyexao\",\"lifecycleDetails\":\"yaipidsda\",\"provisioningState\":\"Succeeded\",\"lifecycleState\":\"Failed\",\"timeAssigned\":\"2021-03-06T23:02:25Z\"},\"id\":\"mfqwa\",\"name\":\"lnqnmcjn\",\"type\":\"zqdqxt\"}]}";
+            = "{\"value\":[{\"properties\":{\"ipAddress\":\"wmoaiancznvodrrs\",\"vmOcid\":\"lxydkxrxv\",\"ocid\":\"xiwkgfbql\",\"domain\":\"qkhychocok\",\"lifecycleDetails\":\"ehurqlr\",\"provisioningState\":\"Failed\",\"lifecycleState\":\"Provisioning\",\"timeAssigned\":\"2021-09-28T05:58:32Z\"},\"id\":\"rkphyjdxr\",\"name\":\"vjuqdbrxmrgchb\",\"type\":\"pxkiyf\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,9 +32,9 @@ public void testListByCloudVmCluster() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<VirtualNetworkAddress> response = manager.virtualNetworkAddresses()
-            .listByCloudVmCluster("lewjwiuubwef", "sfapaqtferrq", com.azure.core.util.Context.NONE);
+            .listByCloudVmCluster("h", "zhomewjjstliu", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("jkmfxapjwo", response.iterator().next().properties().ipAddress());
-        Assertions.assertEquals("qnobp", response.iterator().next().properties().vmOcid());
+        Assertions.assertEquals("wmoaiancznvodrrs", response.iterator().next().properties().ipAddress());
+        Assertions.assertEquals("lxydkxrxv", response.iterator().next().properties().vmOcid());
     }
 }
diff --git a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/tsp-location.yaml b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/tsp-location.yaml
index 53b5a51651ef..beacaf6bd311 100644
--- a/sdk/oracledatabase/azure-resourcemanager-oracledatabase/tsp-location.yaml
+++ b/sdk/oracledatabase/azure-resourcemanager-oracledatabase/tsp-location.yaml
@@ -1,5 +1,5 @@
 directory: specification/oracle/Oracle.Database.Management
-commit: 6267b64842af3d744c5b092a3f3beef49729ad6d
+commit: 817d1dd38cab5e7fb8445624ecdf82a4d192b73b
 repo: Azure/azure-rest-api-specs
 additionalDirectories: 
 - specification/oracle/Oracle.Database.Management/models
diff --git a/sdk/orbital/azure-resourcemanager-orbital/pom.xml b/sdk/orbital/azure-resourcemanager-orbital/pom.xml
index 6b3fd0841fc1..5f9bd27d10c2 100644
--- a/sdk/orbital/azure-resourcemanager-orbital/pom.xml
+++ b/sdk/orbital/azure-resourcemanager-orbital/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/paloaltonetworks/azure-resourcemanager-paloaltonetworks-ngfw/pom.xml b/sdk/paloaltonetworks/azure-resourcemanager-paloaltonetworks-ngfw/pom.xml
index fa24ee519515..054e936e6fd5 100644
--- a/sdk/paloaltonetworks/azure-resourcemanager-paloaltonetworks-ngfw/pom.xml
+++ b/sdk/paloaltonetworks/azure-resourcemanager-paloaltonetworks-ngfw/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/peering/azure-resourcemanager-peering/pom.xml b/sdk/peering/azure-resourcemanager-peering/pom.xml
index be3d7dd2f2e9..c5a1d3210a85 100644
--- a/sdk/peering/azure-resourcemanager-peering/pom.xml
+++ b/sdk/peering/azure-resourcemanager-peering/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/personalizer/azure-ai-personalizer/pom.xml b/sdk/personalizer/azure-ai-personalizer/pom.xml
index db1c7c9913f9..534551dafd9a 100644
--- a/sdk/personalizer/azure-ai-personalizer/pom.xml
+++ b/sdk/personalizer/azure-ai-personalizer/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/pineconevectordb/azure-resourcemanager-pineconevectordb/pom.xml b/sdk/pineconevectordb/azure-resourcemanager-pineconevectordb/pom.xml
index e81b0ce601d2..13d0ab5b876a 100644
--- a/sdk/pineconevectordb/azure-resourcemanager-pineconevectordb/pom.xml
+++ b/sdk/pineconevectordb/azure-resourcemanager-pineconevectordb/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/planetarycomputer/azure-resourcemanager-planetarycomputer/pom.xml b/sdk/planetarycomputer/azure-resourcemanager-planetarycomputer/pom.xml
index 951bfea39538..4ec22efa87f8 100644
--- a/sdk/planetarycomputer/azure-resourcemanager-planetarycomputer/pom.xml
+++ b/sdk/planetarycomputer/azure-resourcemanager-planetarycomputer/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/playwright/azure-resourcemanager-playwright/pom.xml b/sdk/playwright/azure-resourcemanager-playwright/pom.xml
index 9576defe0ea7..7d86575e0316 100644
--- a/sdk/playwright/azure-resourcemanager-playwright/pom.xml
+++ b/sdk/playwright/azure-resourcemanager-playwright/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/playwrighttesting/azure-resourcemanager-playwrighttesting/pom.xml b/sdk/playwrighttesting/azure-resourcemanager-playwrighttesting/pom.xml
index db7ec452518b..1f605a8d610b 100644
--- a/sdk/playwrighttesting/azure-resourcemanager-playwrighttesting/pom.xml
+++ b/sdk/playwrighttesting/azure-resourcemanager-playwrighttesting/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml b/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml
index 4f6c428a6f7d..4ab122eae724 100644
--- a/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml
+++ b/sdk/policyinsights/azure-resourcemanager-policyinsights/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/portalservices/azure-resourcemanager-portalservicescopilot/pom.xml b/sdk/portalservices/azure-resourcemanager-portalservicescopilot/pom.xml
index 62517fce3bf5..bcd1b4d5be27 100644
--- a/sdk/portalservices/azure-resourcemanager-portalservicescopilot/pom.xml
+++ b/sdk/portalservices/azure-resourcemanager-portalservicescopilot/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml b/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml
index 6189acb87728..e2b3251246d8 100644
--- a/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml
+++ b/sdk/postgresql/azure-resourcemanager-postgresql/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml
index 6ac665db8563..e2a6f1c809e4 100644
--- a/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml
+++ b/sdk/postgresqlflexibleserver/azure-resourcemanager-postgresqlflexibleserver/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml b/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml
index b3eced7abae9..b83be994ed9c 100644
--- a/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml
+++ b/sdk/powerbidedicated/azure-resourcemanager-powerbidedicated/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml b/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml
index b8539c4d79a9..3633f6689c4c 100644
--- a/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml
+++ b/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/programmableconnectivity/azure-resourcemanager-programmableconnectivity/pom.xml b/sdk/programmableconnectivity/azure-resourcemanager-programmableconnectivity/pom.xml
index fc91098e7047..a81ab7ba25fb 100644
--- a/sdk/programmableconnectivity/azure-resourcemanager-programmableconnectivity/pom.xml
+++ b/sdk/programmableconnectivity/azure-resourcemanager-programmableconnectivity/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/providerhub/azure-resourcemanager-providerhub/pom.xml b/sdk/providerhub/azure-resourcemanager-providerhub/pom.xml
index 40b55e7019f5..9022644de7dc 100644
--- a/sdk/providerhub/azure-resourcemanager-providerhub/pom.xml
+++ b/sdk/providerhub/azure-resourcemanager-providerhub/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/purestorageblock/azure-resourcemanager-purestorageblock/pom.xml b/sdk/purestorageblock/azure-resourcemanager-purestorageblock/pom.xml
index 18017ca26233..5363673344a8 100644
--- a/sdk/purestorageblock/azure-resourcemanager-purestorageblock/pom.xml
+++ b/sdk/purestorageblock/azure-resourcemanager-purestorageblock/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/purview/azure-analytics-purview-administration/README.md b/sdk/purview/azure-analytics-purview-administration/README.md
index 98cac8b061ca..890818f70db3 100644
--- a/sdk/purview/azure-analytics-purview-administration/README.md
+++ b/sdk/purview/azure-analytics-purview-administration/README.md
@@ -52,7 +52,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/purview/azure-analytics-purview-administration/pom.xml b/sdk/purview/azure-analytics-purview-administration/pom.xml
index fb4556e2982d..30641083cae2 100644
--- a/sdk/purview/azure-analytics-purview-administration/pom.xml
+++ b/sdk/purview/azure-analytics-purview-administration/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/purview/azure-analytics-purview-datamap/pom.xml b/sdk/purview/azure-analytics-purview-datamap/pom.xml
index 7695a4b4397c..681c3226d3b3 100644
--- a/sdk/purview/azure-analytics-purview-datamap/pom.xml
+++ b/sdk/purview/azure-analytics-purview-datamap/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/purview/azure-analytics-purview-scanning/README.md b/sdk/purview/azure-analytics-purview-scanning/README.md
index 3f723c273257..22f55cb7a8d2 100644
--- a/sdk/purview/azure-analytics-purview-scanning/README.md
+++ b/sdk/purview/azure-analytics-purview-scanning/README.md
@@ -54,7 +54,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/purview/azure-analytics-purview-scanning/pom.xml b/sdk/purview/azure-analytics-purview-scanning/pom.xml
index 9e96239d0e3b..051220a1240b 100644
--- a/sdk/purview/azure-analytics-purview-scanning/pom.xml
+++ b/sdk/purview/azure-analytics-purview-scanning/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/purview/azure-analytics-purview-sharing/pom.xml b/sdk/purview/azure-analytics-purview-sharing/pom.xml
index fd6ca8d50086..3b1a7aa064c9 100644
--- a/sdk/purview/azure-analytics-purview-sharing/pom.xml
+++ b/sdk/purview/azure-analytics-purview-sharing/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/purview/azure-analytics-purview-workflow/README.md b/sdk/purview/azure-analytics-purview-workflow/README.md
index b78661ea0502..d620a62c2143 100644
--- a/sdk/purview/azure-analytics-purview-workflow/README.md
+++ b/sdk/purview/azure-analytics-purview-workflow/README.md
@@ -29,7 +29,7 @@ To use the [UsernamePasswordCredential][username_password_credential] provider s
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 
diff --git a/sdk/purview/azure-analytics-purview-workflow/pom.xml b/sdk/purview/azure-analytics-purview-workflow/pom.xml
index d1216b3823da..246fe14af126 100644
--- a/sdk/purview/azure-analytics-purview-workflow/pom.xml
+++ b/sdk/purview/azure-analytics-purview-workflow/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/purview/azure-resourcemanager-purview/pom.xml b/sdk/purview/azure-resourcemanager-purview/pom.xml
index 253ed8f34621..3909e0a84c22 100644
--- a/sdk/purview/azure-resourcemanager-purview/pom.xml
+++ b/sdk/purview/azure-resourcemanager-purview/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/quantum/azure-quantum-jobs/pom.xml b/sdk/quantum/azure-quantum-jobs/pom.xml
index db8af5e551d4..fd3c45e0c5ee 100644
--- a/sdk/quantum/azure-quantum-jobs/pom.xml
+++ b/sdk/quantum/azure-quantum-jobs/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/quantum/azure-resourcemanager-quantum/pom.xml b/sdk/quantum/azure-resourcemanager-quantum/pom.xml
index 67f163fb13da..8eace09b5262 100644
--- a/sdk/quantum/azure-resourcemanager-quantum/pom.xml
+++ b/sdk/quantum/azure-resourcemanager-quantum/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/qumulo/azure-resourcemanager-qumulo/pom.xml b/sdk/qumulo/azure-resourcemanager-qumulo/pom.xml
index 04f2a5d8ed82..af97d09e03ec 100644
--- a/sdk/qumulo/azure-resourcemanager-qumulo/pom.xml
+++ b/sdk/qumulo/azure-resourcemanager-qumulo/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/quota/azure-resourcemanager-quota/pom.xml b/sdk/quota/azure-resourcemanager-quota/pom.xml
index 8de33052b2bc..d9a5564173eb 100644
--- a/sdk/quota/azure-resourcemanager-quota/pom.xml
+++ b/sdk/quota/azure-resourcemanager-quota/pom.xml
@@ -66,7 +66,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml b/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml
index ec92d22b3313..52123f6439af 100644
--- a/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml
+++ b/sdk/recoveryservices/azure-resourcemanager-recoveryservices/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml b/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml
index d52fcaf0e4d7..8866a3797c45 100644
--- a/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml
+++ b/sdk/recoveryservicesbackup/azure-resourcemanager-recoveryservicesbackup/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/recoveryservicesdatareplication/azure-resourcemanager-recoveryservicesdatareplication/pom.xml b/sdk/recoveryservicesdatareplication/azure-resourcemanager-recoveryservicesdatareplication/pom.xml
index e060ca1689f0..602c070b7a55 100644
--- a/sdk/recoveryservicesdatareplication/azure-resourcemanager-recoveryservicesdatareplication/pom.xml
+++ b/sdk/recoveryservicesdatareplication/azure-resourcemanager-recoveryservicesdatareplication/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/pom.xml b/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/pom.xml
index 6cd8db1b211b..c69a210b0cb6 100644
--- a/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/pom.xml
+++ b/sdk/recoveryservicessiterecovery/azure-resourcemanager-recoveryservicessiterecovery/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/redhatopenshift/azure-resourcemanager-redhatopenshift/pom.xml b/sdk/redhatopenshift/azure-resourcemanager-redhatopenshift/pom.xml
index 80fb9a93da5a..b5ec057c172a 100644
--- a/sdk/redhatopenshift/azure-resourcemanager-redhatopenshift/pom.xml
+++ b/sdk/redhatopenshift/azure-resourcemanager-redhatopenshift/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md
index 1abf7ebfcbb1..97204f152b7a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Release History
 
-## 2.1.0-beta.4 (Unreleased)
+## 2.2.0-beta.1 (Unreleased)
 
 ### Features Added
 
@@ -10,6 +10,256 @@
 
 ### Other Changes
 
+## 2.1.0 (2025-10-15)
+
+- Azure Resource Manager RedisEnterprise client library for Java. This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. REST API for managing Redis Enterprise resources in Azure. Package tag package-2025-07-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+
+### Breaking Changes
+
+#### `models.Database` was modified
+
+* `flush(models.FlushParameters)` was removed
+
+#### `models.Databases` was modified
+
+* `flush(java.lang.String,java.lang.String,java.lang.String,models.FlushParameters)` was removed
+
+### Features Added
+
+* `models.Kind` was added
+
+* `models.ForceLinkParametersGeoReplication` was added
+
+* `models.AccessKeysAuthentication` was added
+
+* `models.PublicNetworkAccess` was added
+
+* `models.AccessPolicyAssignment$DefinitionStages` was added
+
+* `models.HighAvailability` was added
+
+* `models.AccessPolicyAssignments` was added
+
+* `models.AccessPolicyAssignment$Definition` was added
+
+* `models.AccessPolicyAssignmentPropertiesUser` was added
+
+* `models.AccessPolicyAssignment$UpdateStages` was added
+
+* `models.RedundancyMode` was added
+
+* `models.AccessPolicyAssignmentList` was added
+
+* `models.ClusterCommonProperties` was added
+
+* `models.AccessPolicyAssignment` was added
+
+* `models.ForceLinkParameters` was added
+
+* `models.SkuDetailsList` was added
+
+* `models.DatabaseCommonProperties` was added
+
+* `models.AccessPolicyAssignment$Update` was added
+
+* `models.SkuDetails` was added
+
+* `models.DeferUpgradeSetting` was added
+
+#### `models.ManagedServiceIdentity` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.ClusterUpdate` was modified
+
+* `withPublicNetworkAccess(models.PublicNetworkAccess)` was added
+* `highAvailability()` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+* `withHighAvailability(models.HighAvailability)` was added
+* `publicNetworkAccess()` was added
+* `redundancyMode()` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.ForceUnlinkParameters` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.UserAssignedIdentity` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.RedisEnterprises` was modified
+
+* `listSkusForScalingWithResponse(java.lang.String,java.lang.String,com.azure.core.util.Context)` was added
+* `listSkusForScaling(java.lang.String,java.lang.String)` was added
+
+#### `models.PrivateLinkResourceListResult` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.DatabaseUpdate` was modified
+
+* `deferUpgrade()` was added
+* `accessKeysAuthentication()` was added
+* `redisVersion()` was added
+* `withDeferUpgrade(models.DeferUpgradeSetting)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+* `withAccessKeysAuthentication(models.AccessKeysAuthentication)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.Module` was modified
+
+* `toJson(com.azure.json.JsonWriter)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+
+#### `models.Cluster$Update` was modified
+
+* `withHighAvailability(models.HighAvailability)` was added
+* `withPublicNetworkAccess(models.PublicNetworkAccess)` was added
+
+#### `models.PrivateEndpoint` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.Sku` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.ClusterPropertiesEncryption` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.DatabasePropertiesGeoReplication` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.RegenerateKeyParameters` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.LinkedDatabase` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `RedisEnterpriseManager` was modified
+
+* `accessPolicyAssignments()` was added
+
+#### `models.PrivateLinkServiceConnectionState` was modified
+
+* `toJson(com.azure.json.JsonWriter)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+
+#### `models.ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity` was modified
+
+* `toJson(com.azure.json.JsonWriter)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+
+#### `models.PrivateEndpointConnectionListResult` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.OperationListResult` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.Database$Definition` was modified
+
+* `withDeferUpgrade(models.DeferUpgradeSetting)` was added
+* `withAccessKeysAuthentication(models.AccessKeysAuthentication)` was added
+
+#### `models.ImportClusterParameters` was modified
+
+* `toJson(com.azure.json.JsonWriter)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+
+#### `models.Cluster$Definition` was modified
+
+* `withPublicNetworkAccess(models.PublicNetworkAccess)` was added
+* `withHighAvailability(models.HighAvailability)` was added
+
+#### `models.Database$Update` was modified
+
+* `withClusteringPolicy(models.ClusteringPolicy)` was added
+* `withAccessKeysAuthentication(models.AccessKeysAuthentication)` was added
+* `withDeferUpgrade(models.DeferUpgradeSetting)` was added
+
+#### `models.FlushParameters` was modified
+
+* `toJson(com.azure.json.JsonWriter)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+
+#### `models.Database` was modified
+
+* `upgradeDBRedisVersion(com.azure.core.util.Context)` was added
+* `flush()` was added
+* `upgradeDBRedisVersion()` was added
+* `deferUpgrade()` was added
+* `forceLinkToReplicationGroup(models.ForceLinkParameters,com.azure.core.util.Context)` was added
+* `accessKeysAuthentication()` was added
+* `forceLinkToReplicationGroup(models.ForceLinkParameters)` was added
+* `redisVersion()` was added
+* `systemData()` was added
+
+#### `models.ClusterList` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.OperationDisplay` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.ExportClusterParameters` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.Persistence` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.DatabaseList` was modified
+
+* `toJson(com.azure.json.JsonWriter)` was added
+* `fromJson(com.azure.json.JsonReader)` was added
+
+#### `models.ClusterPropertiesEncryptionCustomerManagedKeyEncryption` was modified
+
+* `fromJson(com.azure.json.JsonReader)` was added
+* `toJson(com.azure.json.JsonWriter)` was added
+
+#### `models.Cluster` was modified
+
+* `listSkusForScalingWithResponse(com.azure.core.util.Context)` was added
+* `kind()` was added
+* `highAvailability()` was added
+* `redundancyMode()` was added
+* `listSkusForScaling()` was added
+* `publicNetworkAccess()` was added
+
+#### `models.Databases` was modified
+
+* `forceLinkToReplicationGroup(java.lang.String,java.lang.String,java.lang.String,models.ForceLinkParameters,com.azure.core.util.Context)` was added
+* `forceLinkToReplicationGroup(java.lang.String,java.lang.String,java.lang.String,models.ForceLinkParameters)` was added
+* `upgradeDBRedisVersion(java.lang.String,java.lang.String,java.lang.String)` was added
+* `flush(java.lang.String,java.lang.String,java.lang.String)` was added
+* `upgradeDBRedisVersion(java.lang.String,java.lang.String,java.lang.String,com.azure.core.util.Context)` was added
+
 ## 2.1.0-beta.3 (2025-05-06)
 
 - Azure Resource Manager RedisEnterprise client library for Java. This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. REST API for managing Redis Enterprise resources in Azure. Package tag package-preview-2025-05-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md
index 71ec58210f79..1e053c4631b4 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager RedisEnterprise client library for Java.
 
-This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. REST API for managing Redis Enterprise resources in Azure. Package tag package-preview-2025-05-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. REST API for managing Redis Enterprise resources in Azure. Package tag package-2025-07-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-redisenterprise</artifactId>
-    <version>2.1.0-beta.3</version>
+    <version>2.1.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/SAMPLE.md b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/SAMPLE.md
index 879efde52823..a8d0a9293569 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/SAMPLE.md
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/SAMPLE.md
@@ -55,23 +55,30 @@
 ### AccessPolicyAssignment_CreateUpdate
 
 ```java
+import com.azure.resourcemanager.redisenterprise.models.AccessPolicyAssignmentPropertiesUser;
+
 /**
- * Samples for PrivateLinkResources ListByCluster.
+ * Samples for AccessPolicyAssignment CreateUpdate.
  */
-public final class PrivateLinkResourcesListByClusterSamples {
+public final class AccessPolicyAssignmentCreateUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseListPrivateLinkResources.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseAccessPolicyAssignmentCreateUpdate.json
      */
     /**
-     * Sample code: RedisEnterpriseListPrivateLinkResources.
+     * Sample code: RedisEnterpriseAccessPolicyAssignmentCreateUpdate.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseListPrivateLinkResources(
+    public static void redisEnterpriseAccessPolicyAssignmentCreateUpdate(
         com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.privateLinkResources().listByCluster("rg1", "cache1", com.azure.core.util.Context.NONE);
+        manager.accessPolicyAssignments()
+            .define("defaultTestEntraApp1")
+            .withExistingDatabase("rg1", "cache1", "default")
+            .withAccessPolicyName("default")
+            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("6497c918-11ad-41e7-1b0f-7c518a87d0b0"))
+            .create();
     }
 }
 ```
@@ -80,22 +87,23 @@ public final class PrivateLinkResourcesListByClusterSamples {
 
 ```java
 /**
- * Samples for Databases Delete.
+ * Samples for AccessPolicyAssignment Delete.
  */
-public final class DatabasesDeleteSamples {
+public final class AccessPolicyAssignmentDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesDelete.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseAccessPolicyAssignmentDelete.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesDelete.
+     * Sample code: RedisEnterpriseAccessPolicyAssignmentDelete.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void
-        redisEnterpriseDatabasesDelete(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases().delete("rg1", "cache1", "db1", com.azure.core.util.Context.NONE);
+    public static void redisEnterpriseAccessPolicyAssignmentDelete(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.accessPolicyAssignments()
+            .delete("rg1", "cache1", "default", "defaultTestEntraApp1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -104,21 +112,24 @@ public final class DatabasesDeleteSamples {
 
 ```java
 /**
- * Samples for RedisEnterprise List.
+ * Samples for AccessPolicyAssignment Get.
  */
-public final class RedisEnterpriseListSamples {
+public final class AccessPolicyAssignmentGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseList.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseAccessPolicyAssignmentGet.json
      */
     /**
-     * Sample code: RedisEnterpriseList.
+     * Sample code: RedisEnterpriseAccessPolicyAssignmentGet.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseList(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.redisEnterprises().list(com.azure.core.util.Context.NONE);
+    public static void redisEnterpriseAccessPolicyAssignmentGet(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.accessPolicyAssignments()
+            .getWithResponse("rg1", "cache1", "default", "accessPolicyAssignmentName1",
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -126,28 +137,23 @@ public final class RedisEnterpriseListSamples {
 ### AccessPolicyAssignment_List
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.AccessKeyType;
-import com.azure.resourcemanager.redisenterprise.models.RegenerateKeyParameters;
-
 /**
- * Samples for Databases RegenerateKey.
+ * Samples for AccessPolicyAssignment List.
  */
-public final class DatabasesRegenerateKeySamples {
+public final class AccessPolicyAssignmentListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesRegenerateKey.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseAccessPolicyAssignmentsList.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesRegenerateKey.
+     * Sample code: RedisEnterpriseAccessPolicyAssignmentList.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseDatabasesRegenerateKey(
+    public static void redisEnterpriseAccessPolicyAssignmentList(
         com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .regenerateKey("rg1", "cache1", "default", new RegenerateKeyParameters().withKeyType(AccessKeyType.PRIMARY),
-                com.azure.core.util.Context.NONE);
+        manager.accessPolicyAssignments().list("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -155,67 +161,98 @@ public final class DatabasesRegenerateKeySamples {
 ### Databases_Create
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryption;
-import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryptionCustomerManagedKeyEncryption;
-import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity;
-import com.azure.resourcemanager.redisenterprise.models.CmkIdentityType;
-import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentity;
-import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentityType;
-import com.azure.resourcemanager.redisenterprise.models.Sku;
-import com.azure.resourcemanager.redisenterprise.models.SkuName;
-import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
-import com.azure.resourcemanager.redisenterprise.models.UserAssignedIdentity;
+import com.azure.resourcemanager.redisenterprise.models.AccessKeysAuthentication;
+import com.azure.resourcemanager.redisenterprise.models.AofFrequency;
+import com.azure.resourcemanager.redisenterprise.models.ClusteringPolicy;
+import com.azure.resourcemanager.redisenterprise.models.DatabasePropertiesGeoReplication;
+import com.azure.resourcemanager.redisenterprise.models.DeferUpgradeSetting;
+import com.azure.resourcemanager.redisenterprise.models.EvictionPolicy;
+import com.azure.resourcemanager.redisenterprise.models.LinkedDatabase;
+import com.azure.resourcemanager.redisenterprise.models.Module;
+import com.azure.resourcemanager.redisenterprise.models.Persistence;
+import com.azure.resourcemanager.redisenterprise.models.Protocol;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * Samples for RedisEnterprise Create.
+ * Samples for Databases Create.
  */
-public final class RedisEnterpriseCreateSamples {
+public final class DatabasesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseCreate.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesNoClusterCacheCreate.json
      */
     /**
-     * Sample code: RedisEnterpriseCreate.
+     * Sample code: RedisEnterpriseDatabasesCreate No Cluster Cache.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseCreate(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.redisEnterprises()
-            .define("cache1")
-            .withRegion("West US")
-            .withExistingResourceGroup("rg1")
-            .withSku(new Sku().withName(SkuName.ENTERPRISE_FLASH_F300).withCapacity(3))
-            .withTags(mapOf("tag1", "value1"))
-            .withZones(Arrays.asList("1", "2", "3"))
-            .withIdentity(new ManagedServiceIdentity().withType(ManagedServiceIdentityType.USER_ASSIGNED)
-                .withUserAssignedIdentities(mapOf(
-                    "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity",
-                    new UserAssignedIdentity())))
-            .withMinimumTlsVersion(TlsVersion.ONE_TWO)
-            .withEncryption(new ClusterPropertiesEncryption().withCustomerManagedKeyEncryption(
-                new ClusterPropertiesEncryptionCustomerManagedKeyEncryption().withKeyEncryptionKeyIdentity(
-                    new ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity()
-                        .withUserAssignedIdentityResourceId(
-                            "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity")
-                        .withIdentityType(CmkIdentityType.USER_ASSIGNED_IDENTITY))
-                    .withKeyEncryptionKeyUrl("fakeTokenPlaceholder")))
+    public static void redisEnterpriseDatabasesCreateNoClusterCache(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases()
+            .define("default")
+            .withExistingRedisEnterprise("rg1", "cache1")
+            .withClientProtocol(Protocol.ENCRYPTED)
+            .withPort(10000)
+            .withClusteringPolicy(ClusteringPolicy.NO_CLUSTER)
+            .withEvictionPolicy(EvictionPolicy.NO_EVICTION)
             .create();
     }
 
-    // Use "Map.of" if available
-    @SuppressWarnings("unchecked")
-    private static <T> Map<String, T> mapOf(Object... inputs) {
-        Map<String, T> map = new HashMap<>();
-        for (int i = 0; i < inputs.length; i += 2) {
-            String key = (String) inputs[i];
-            T value = (T) inputs[i + 1];
-            map.put(key, value);
-        }
-        return map;
+    /*
+     * x-ms-original-file:
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesCreate.json
+     */
+    /**
+     * Sample code: RedisEnterpriseDatabasesCreate.
+     * 
+     * @param manager Entry point to RedisEnterpriseManager.
+     */
+    public static void
+        redisEnterpriseDatabasesCreate(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases()
+            .define("default")
+            .withExistingRedisEnterprise("rg1", "cache1")
+            .withClientProtocol(Protocol.ENCRYPTED)
+            .withPort(10000)
+            .withClusteringPolicy(ClusteringPolicy.ENTERPRISE_CLUSTER)
+            .withEvictionPolicy(EvictionPolicy.ALL_KEYS_LRU)
+            .withPersistence(new Persistence().withAofEnabled(true).withAofFrequency(AofFrequency.ONES))
+            .withModules(Arrays.asList(new Module().withName("RedisBloom").withArgs("ERROR_RATE 0.00 INITIAL_SIZE 400"),
+                new Module().withName("RedisTimeSeries").withArgs("RETENTION_POLICY 20"),
+                new Module().withName("RediSearch")))
+            .withDeferUpgrade(DeferUpgradeSetting.NOT_DEFERRED)
+            .withAccessKeysAuthentication(AccessKeysAuthentication.ENABLED)
+            .create();
+    }
+
+    /*
+     * x-ms-original-file:
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesCreateWithGeoReplication.json
+     */
+    /**
+     * Sample code: RedisEnterpriseDatabasesCreate With Active Geo Replication.
+     * 
+     * @param manager Entry point to RedisEnterpriseManager.
+     */
+    public static void redisEnterpriseDatabasesCreateWithActiveGeoReplication(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases()
+            .define("default")
+            .withExistingRedisEnterprise("rg1", "cache1")
+            .withClientProtocol(Protocol.ENCRYPTED)
+            .withPort(10000)
+            .withClusteringPolicy(ClusteringPolicy.ENTERPRISE_CLUSTER)
+            .withEvictionPolicy(EvictionPolicy.NO_EVICTION)
+            .withGeoReplication(new DatabasePropertiesGeoReplication().withGroupNickname("groupName")
+                .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId(
+                    "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default"),
+                    new LinkedDatabase().withId(
+                        "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8e/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default"))))
+            .withAccessKeysAuthentication(AccessKeysAuthentication.ENABLED)
+            .create();
     }
 }
 ```
@@ -224,22 +261,22 @@ public final class RedisEnterpriseCreateSamples {
 
 ```java
 /**
- * Samples for RedisEnterprise ListSkusForScaling.
+ * Samples for Databases Delete.
  */
-public final class RedisEnterpriseListSkusForScalingSamples {
+public final class DatabasesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseListSkusForScaling.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesDelete.json
      */
     /**
-     * Sample code: RedisEnterpriseListSkusForScaling.
+     * Sample code: RedisEnterpriseDatabasesDelete.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
     public static void
-        redisEnterpriseListSkusForScaling(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.redisEnterprises().listSkusForScalingWithResponse("rg1", "cache1", com.azure.core.util.Context.NONE);
+        redisEnterpriseDatabasesDelete(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases().delete("rg1", "cache1", "db1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -247,30 +284,28 @@ public final class RedisEnterpriseListSkusForScalingSamples {
 ### Databases_Export
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.ImportClusterParameters;
-import java.util.Arrays;
+import com.azure.resourcemanager.redisenterprise.models.ExportClusterParameters;
 
 /**
- * Samples for Databases ImportMethod.
+ * Samples for Databases Export.
  */
-public final class DatabasesImportMethodSamples {
+public final class DatabasesExportSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesImport.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesExport.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesImport.
+     * Sample code: RedisEnterpriseDatabasesExport.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
     public static void
-        redisEnterpriseDatabasesImport(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        redisEnterpriseDatabasesExport(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
         manager.databases()
-            .importMethod("rg1", "cache1", "default",
-                new ImportClusterParameters().withSasUris(
-                    Arrays.asList("https://contosostorage.blob.core.window.net/urltoBlobFile1?sasKeyParameters",
-                        "https://contosostorage.blob.core.window.net/urltoBlobFile2?sasKeyParameters")),
+            .export("rg1", "cache1", "default",
+                new ExportClusterParameters()
+                    .withSasUri("https://contosostorage.blob.core.window.net/urlToBlobContainer?sasKeyParameters"),
                 com.azure.core.util.Context.NONE);
     }
 }
@@ -279,23 +314,29 @@ public final class DatabasesImportMethodSamples {
 ### Databases_Flush
 
 ```java
+import com.azure.resourcemanager.redisenterprise.models.FlushParameters;
+import java.util.Arrays;
+
 /**
- * Samples for Databases ListKeys.
+ * Samples for Databases Flush.
  */
-public final class DatabasesListKeysSamples {
+public final class DatabasesFlushSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesListKeys.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesFlush.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesListKeys.
+     * Sample code: How to flush all the keys in the database.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
     public static void
-        redisEnterpriseDatabasesListKeys(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases().listKeysWithResponse("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
+        howToFlushAllTheKeysInTheDatabase(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases()
+            .flush("rg1", "cache1", "default", new FlushParameters().withIds(Arrays.asList(
+                "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default")),
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -303,22 +344,36 @@ public final class DatabasesListKeysSamples {
 ### Databases_ForceLinkToReplicationGroup
 
 ```java
+import com.azure.resourcemanager.redisenterprise.models.ForceLinkParameters;
+import com.azure.resourcemanager.redisenterprise.models.ForceLinkParametersGeoReplication;
+import com.azure.resourcemanager.redisenterprise.models.LinkedDatabase;
+import java.util.Arrays;
+
 /**
- * Samples for Operations List.
+ * Samples for Databases ForceLinkToReplicationGroup.
  */
-public final class OperationsListSamples {
+public final class DatabasesForceLinkToReplicationGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/OperationsList
-     * .json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesForceLink.json
      */
     /**
-     * Sample code: OperationsList.
+     * Sample code: How to relink a database after a regional outage.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void operationsList(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.operations().list(com.azure.core.util.Context.NONE);
+    public static void howToRelinkADatabaseAfterARegionalOutage(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases()
+            .forceLinkToReplicationGroup("rg1", "cache1", "default",
+                new ForceLinkParameters().withGeoReplication(new ForceLinkParametersGeoReplication()
+                    .withGroupNickname("groupName")
+                    .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId(
+                        "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default"),
+                        new LinkedDatabase().withId(
+                            "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default")))),
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -326,24 +381,29 @@ public final class OperationsListSamples {
 ### Databases_ForceUnlink
 
 ```java
+import com.azure.resourcemanager.redisenterprise.models.ForceUnlinkParameters;
+import java.util.Arrays;
+
 /**
- * Samples for AccessPolicyAssignment Delete.
+ * Samples for Databases ForceUnlink.
  */
-public final class AccessPolicyAssignmentDeleteSamples {
+public final class DatabasesForceUnlinkSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseAccessPolicyAssignmentDelete.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesForceUnlink.json
      */
     /**
-     * Sample code: RedisEnterpriseAccessPolicyAssignmentDelete.
+     * Sample code: How to unlink a database during a regional outage.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseAccessPolicyAssignmentDelete(
+    public static void howToUnlinkADatabaseDuringARegionalOutage(
         com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.accessPolicyAssignments()
-            .delete("rg1", "cache1", "default", "defaultTestEntraApp1", com.azure.core.util.Context.NONE);
+        manager.databases()
+            .forceUnlink("rg1", "cache1", "default", new ForceUnlinkParameters().withIds(Arrays.asList(
+                "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default")),
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -352,22 +412,22 @@ public final class AccessPolicyAssignmentDeleteSamples {
 
 ```java
 /**
- * Samples for Databases ListByCluster.
+ * Samples for Databases Get.
  */
-public final class DatabasesListByClusterSamples {
+public final class DatabasesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesListByCluster.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesGet.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesListByCluster.
+     * Sample code: RedisEnterpriseDatabasesGet.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseDatabasesListByCluster(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases().listByCluster("rg1", "cache1", com.azure.core.util.Context.NONE);
+    public static void
+        redisEnterpriseDatabasesGet(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases().getWithResponse("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -375,28 +435,30 @@ public final class DatabasesListByClusterSamples {
 ### Databases_ImportMethod
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.ForceUnlinkParameters;
+import com.azure.resourcemanager.redisenterprise.models.ImportClusterParameters;
 import java.util.Arrays;
 
 /**
- * Samples for Databases ForceUnlink.
+ * Samples for Databases ImportMethod.
  */
-public final class DatabasesForceUnlinkSamples {
+public final class DatabasesImportMethodSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesForceUnlink.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesImport.json
      */
     /**
-     * Sample code: How to unlink a database during a regional outage.
+     * Sample code: RedisEnterpriseDatabasesImport.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void howToUnlinkADatabaseDuringARegionalOutage(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+    public static void
+        redisEnterpriseDatabasesImport(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
         manager.databases()
-            .forceUnlink("rg1", "cache1", "default", new ForceUnlinkParameters().withIds(Arrays.asList(
-                "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default")),
+            .importMethod("rg1", "cache1", "default",
+                new ImportClusterParameters().withSasUris(
+                    Arrays.asList("https://contosostorage.blob.core.window.net/urltoBlobFile1?sasKeyParameters",
+                        "https://contosostorage.blob.core.window.net/urltoBlobFile2?sasKeyParameters")),
                 com.azure.core.util.Context.NONE);
     }
 }
@@ -406,22 +468,22 @@ public final class DatabasesForceUnlinkSamples {
 
 ```java
 /**
- * Samples for PrivateEndpointConnections Delete.
+ * Samples for Databases ListByCluster.
  */
-public final class PrivateEndpointConnectionsDeleteSamples {
+public final class DatabasesListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDeletePrivateEndpointConnection.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesListByCluster.json
      */
     /**
-     * Sample code: RedisEnterpriseDeletePrivateEndpointConnection.
+     * Sample code: RedisEnterpriseDatabasesListByCluster.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseDeletePrivateEndpointConnection(
+    public static void redisEnterpriseDatabasesListByCluster(
         com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.privateEndpointConnections().delete("rg1", "cache1", "pectest01", com.azure.core.util.Context.NONE);
+        manager.databases().listByCluster("rg1", "cache1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -430,22 +492,22 @@ public final class PrivateEndpointConnectionsDeleteSamples {
 
 ```java
 /**
- * Samples for Databases UpgradeDBRedisVersion.
+ * Samples for Databases ListKeys.
  */
-public final class DatabasesUpgradeDBRedisVersionSamples {
+public final class DatabasesListKeysSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesUpgradeDBRedisVersion.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesListKeys.json
      */
     /**
-     * Sample code: How to upgrade your database Redis version.
+     * Sample code: RedisEnterpriseDatabasesListKeys.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
     public static void
-        howToUpgradeYourDatabaseRedisVersion(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases().upgradeDBRedisVersion("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
+        redisEnterpriseDatabasesListKeys(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases().listKeysWithResponse("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -453,23 +515,28 @@ public final class DatabasesUpgradeDBRedisVersionSamples {
 ### Databases_RegenerateKey
 
 ```java
+import com.azure.resourcemanager.redisenterprise.models.AccessKeyType;
+import com.azure.resourcemanager.redisenterprise.models.RegenerateKeyParameters;
+
 /**
- * Samples for PrivateEndpointConnections List.
+ * Samples for Databases RegenerateKey.
  */
-public final class PrivateEndpointConnectionsListSamples {
+public final class DatabasesRegenerateKeySamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseListPrivateEndpointConnections.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesRegenerateKey.json
      */
     /**
-     * Sample code: RedisEnterpriseListPrivateEndpointConnections.
+     * Sample code: RedisEnterpriseDatabasesRegenerateKey.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseListPrivateEndpointConnections(
+    public static void redisEnterpriseDatabasesRegenerateKey(
         com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.privateEndpointConnections().list("rg1", "cache1", com.azure.core.util.Context.NONE);
+        manager.databases()
+            .regenerateKey("rg1", "cache1", "default", new RegenerateKeyParameters().withKeyType(AccessKeyType.PRIMARY),
+                com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -491,7 +558,7 @@ import com.azure.resourcemanager.redisenterprise.models.RdbFrequency;
 public final class DatabasesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json
      */
     /**
@@ -513,7 +580,7 @@ public final class DatabasesUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesUpdate.json
      */
     /**
@@ -540,22 +607,22 @@ public final class DatabasesUpdateSamples {
 
 ```java
 /**
- * Samples for Databases Get.
+ * Samples for Databases UpgradeDBRedisVersion.
  */
-public final class DatabasesGetSamples {
+public final class DatabasesUpgradeDBRedisVersionSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesGet.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDatabasesUpgradeDBRedisVersion.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesGet.
+     * Sample code: How to upgrade your database Redis version.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
     public static void
-        redisEnterpriseDatabasesGet(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases().getWithResponse("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
+        howToUpgradeYourDatabaseRedisVersion(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.databases().upgradeDBRedisVersion("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -563,29 +630,22 @@ public final class DatabasesGetSamples {
 ### Operations_List
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.FlushParameters;
-import java.util.Arrays;
-
 /**
- * Samples for Databases Flush.
+ * Samples for Operations List.
  */
-public final class DatabasesFlushSamples {
+public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesFlush.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * OperationsList.json
      */
     /**
-     * Sample code: How to flush all the keys in the database.
+     * Sample code: OperationsList.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void
-        howToFlushAllTheKeysInTheDatabase(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .flush("rg1", "cache1", "default", new FlushParameters().withIds(Arrays.asList(
-                "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default")),
-                com.azure.core.util.Context.NONE);
+    public static void operationsList(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.operations().list(com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -594,254 +654,99 @@ public final class DatabasesFlushSamples {
 
 ```java
 /**
- * Samples for RedisEnterprise ListByResourceGroup.
- */
-public final class RedisEnterpriseListByResourceGroupSamples {
-    /*
-     * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseListByResourceGroup.json
-     */
-    /**
-     * Sample code: RedisEnterpriseListByResourceGroup.
-     * 
-     * @param manager Entry point to RedisEnterpriseManager.
-     */
-    public static void
-        redisEnterpriseListByResourceGroup(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.redisEnterprises().listByResourceGroup("rg1", com.azure.core.util.Context.NONE);
-    }
-}
-```
-
-### PrivateEndpointConnections_Delete
-
-```java
-import com.azure.resourcemanager.redisenterprise.models.Cluster;
-import com.azure.resourcemanager.redisenterprise.models.Sku;
-import com.azure.resourcemanager.redisenterprise.models.SkuName;
-import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Samples for RedisEnterprise Update.
- */
-public final class RedisEnterpriseUpdateSamples {
-    /*
-     * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseUpdate.json
-     */
-    /**
-     * Sample code: RedisEnterpriseUpdate.
-     * 
-     * @param manager Entry point to RedisEnterpriseManager.
-     */
-    public static void redisEnterpriseUpdate(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        Cluster resource = manager.redisEnterprises()
-            .getByResourceGroupWithResponse("rg1", "cache1", com.azure.core.util.Context.NONE)
-            .getValue();
-        resource.update()
-            .withTags(mapOf("tag1", "value1"))
-            .withSku(new Sku().withName(SkuName.ENTERPRISE_FLASH_F300).withCapacity(9))
-            .withMinimumTlsVersion(TlsVersion.ONE_TWO)
-            .apply();
-    }
-
-    // Use "Map.of" if available
-    @SuppressWarnings("unchecked")
-    private static <T> Map<String, T> mapOf(Object... inputs) {
-        Map<String, T> map = new HashMap<>();
-        for (int i = 0; i < inputs.length; i += 2) {
-            String key = (String) inputs[i];
-            T value = (T) inputs[i + 1];
-            map.put(key, value);
-        }
-        return map;
-    }
-}
-```
-
-### PrivateEndpointConnections_Get
-
-```java
-import com.azure.resourcemanager.redisenterprise.models.AccessKeysAuthentication;
-import com.azure.resourcemanager.redisenterprise.models.AofFrequency;
-import com.azure.resourcemanager.redisenterprise.models.ClusteringPolicy;
-import com.azure.resourcemanager.redisenterprise.models.DatabasePropertiesGeoReplication;
-import com.azure.resourcemanager.redisenterprise.models.DeferUpgradeSetting;
-import com.azure.resourcemanager.redisenterprise.models.EvictionPolicy;
-import com.azure.resourcemanager.redisenterprise.models.LinkedDatabase;
-import com.azure.resourcemanager.redisenterprise.models.Module;
-import com.azure.resourcemanager.redisenterprise.models.Persistence;
-import com.azure.resourcemanager.redisenterprise.models.Protocol;
-import java.util.Arrays;
-
-/**
- * Samples for Databases Create.
+ * Samples for OperationsStatus Get.
  */
-public final class DatabasesCreateSamples {
-    /*
-     * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesNoClusterCacheCreate.json
-     */
-    /**
-     * Sample code: RedisEnterpriseDatabasesCreate No Cluster Cache.
-     * 
-     * @param manager Entry point to RedisEnterpriseManager.
-     */
-    public static void redisEnterpriseDatabasesCreateNoClusterCache(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .define("default")
-            .withExistingRedisEnterprise("rg1", "cache1")
-            .withClientProtocol(Protocol.ENCRYPTED)
-            .withPort(10000)
-            .withClusteringPolicy(ClusteringPolicy.NO_CLUSTER)
-            .withEvictionPolicy(EvictionPolicy.NO_EVICTION)
-            .create();
-    }
-
-    /*
-     * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesCreate.json
-     */
-    /**
-     * Sample code: RedisEnterpriseDatabasesCreate.
-     * 
-     * @param manager Entry point to RedisEnterpriseManager.
-     */
-    public static void
-        redisEnterpriseDatabasesCreate(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .define("default")
-            .withExistingRedisEnterprise("rg1", "cache1")
-            .withClientProtocol(Protocol.ENCRYPTED)
-            .withPort(10000)
-            .withClusteringPolicy(ClusteringPolicy.ENTERPRISE_CLUSTER)
-            .withEvictionPolicy(EvictionPolicy.ALL_KEYS_LRU)
-            .withPersistence(new Persistence().withAofEnabled(true).withAofFrequency(AofFrequency.ONES))
-            .withModules(Arrays.asList(new Module().withName("RedisBloom").withArgs("ERROR_RATE 0.00 INITIAL_SIZE 400"),
-                new Module().withName("RedisTimeSeries").withArgs("RETENTION_POLICY 20"),
-                new Module().withName("RediSearch")))
-            .withDeferUpgrade(DeferUpgradeSetting.NOT_DEFERRED)
-            .withAccessKeysAuthentication(AccessKeysAuthentication.ENABLED)
-            .create();
-    }
-
+public final class OperationsStatusGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesCreateWithGeoReplication.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * OperationsStatusGet.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesCreate With Active Geo Replication.
+     * Sample code: OperationsStatusGet.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseDatabasesCreateWithActiveGeoReplication(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .define("default")
-            .withExistingRedisEnterprise("rg1", "cache1")
-            .withClientProtocol(Protocol.ENCRYPTED)
-            .withPort(10000)
-            .withClusteringPolicy(ClusteringPolicy.ENTERPRISE_CLUSTER)
-            .withEvictionPolicy(EvictionPolicy.NO_EVICTION)
-            .withGeoReplication(new DatabasePropertiesGeoReplication().withGroupNickname("groupName")
-                .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId(
-                    "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8f/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default"),
-                    new LinkedDatabase().withId(
-                        "/subscriptions/e7b5a9d2-6b6a-4d2f-9143-20d9a10f5b8e/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default"))))
-            .withAccessKeysAuthentication(AccessKeysAuthentication.ENABLED)
-            .create();
+    public static void operationsStatusGet(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.operationsStatus().getWithResponse("West US", "testoperationid", com.azure.core.util.Context.NONE);
     }
 }
 ```
 
-### PrivateEndpointConnections_List
+### PrivateEndpointConnections_Delete
 
 ```java
 /**
- * Samples for RedisEnterprise GetByResourceGroup.
+ * Samples for PrivateEndpointConnections Delete.
  */
-public final class RedisEnterpriseGetByResourceGroupSamples {
+public final class PrivateEndpointConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseGet.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseDeletePrivateEndpointConnection.json
      */
     /**
-     * Sample code: RedisEnterpriseGet.
+     * Sample code: RedisEnterpriseDeletePrivateEndpointConnection.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseGet(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.redisEnterprises().getByResourceGroupWithResponse("rg1", "cache1", com.azure.core.util.Context.NONE);
+    public static void redisEnterpriseDeletePrivateEndpointConnection(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.privateEndpointConnections().delete("rg1", "cache1", "pectest01", com.azure.core.util.Context.NONE);
     }
 }
 ```
 
-### PrivateEndpointConnections_Put
+### PrivateEndpointConnections_Get
 
 ```java
 /**
- * Samples for AccessPolicyAssignment Get.
+ * Samples for PrivateEndpointConnections Get.
  */
-public final class AccessPolicyAssignmentGetSamples {
+public final class PrivateEndpointConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseAccessPolicyAssignmentGet.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseGetPrivateEndpointConnection.json
      */
     /**
-     * Sample code: RedisEnterpriseAccessPolicyAssignmentGet.
+     * Sample code: RedisEnterpriseGetPrivateEndpointConnection.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseAccessPolicyAssignmentGet(
+    public static void redisEnterpriseGetPrivateEndpointConnection(
         com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.accessPolicyAssignments()
-            .getWithResponse("rg1", "cache1", "default", "accessPolicyAssignmentName1",
-                com.azure.core.util.Context.NONE);
+        manager.privateEndpointConnections()
+            .getWithResponse("rg1", "cache1", "pectest01", com.azure.core.util.Context.NONE);
     }
 }
 ```
 
-### PrivateLinkResources_ListByCluster
+### PrivateEndpointConnections_List
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.ExportClusterParameters;
-
 /**
- * Samples for Databases Export.
+ * Samples for PrivateEndpointConnections List.
  */
-public final class DatabasesExportSamples {
+public final class PrivateEndpointConnectionsListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesExport.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseListPrivateEndpointConnections.json
      */
     /**
-     * Sample code: RedisEnterpriseDatabasesExport.
+     * Sample code: RedisEnterpriseListPrivateEndpointConnections.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void
-        redisEnterpriseDatabasesExport(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .export("rg1", "cache1", "default",
-                new ExportClusterParameters()
-                    .withSasUri("https://contosostorage.blob.core.window.net/urlToBlobContainer?sasKeyParameters"),
-                com.azure.core.util.Context.NONE);
+    public static void redisEnterpriseListPrivateEndpointConnections(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.privateEndpointConnections().list("rg1", "cache1", com.azure.core.util.Context.NONE);
     }
 }
 ```
 
-### RedisEnterprise_Create
+### PrivateEndpointConnections_Put
 
 ```java
 import com.azure.resourcemanager.redisenterprise.models.PrivateEndpointServiceConnectionStatus;
@@ -853,7 +758,7 @@ import com.azure.resourcemanager.redisenterprise.models.PrivateLinkServiceConnec
 public final class PrivateEndpointConnectionsPutSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterprisePutPrivateEndpointConnection.json
      */
     /**
@@ -874,44 +779,101 @@ public final class PrivateEndpointConnectionsPutSamples {
 }
 ```
 
-### RedisEnterprise_Delete
+### PrivateLinkResources_ListByCluster
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.ForceLinkParameters;
-import com.azure.resourcemanager.redisenterprise.models.ForceLinkParametersGeoReplication;
-import com.azure.resourcemanager.redisenterprise.models.LinkedDatabase;
+/**
+ * Samples for PrivateLinkResources ListByCluster.
+ */
+public final class PrivateLinkResourcesListByClusterSamples {
+    /*
+     * x-ms-original-file:
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseListPrivateLinkResources.json
+     */
+    /**
+     * Sample code: RedisEnterpriseListPrivateLinkResources.
+     * 
+     * @param manager Entry point to RedisEnterpriseManager.
+     */
+    public static void redisEnterpriseListPrivateLinkResources(
+        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.privateLinkResources().listByCluster("rg1", "cache1", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
+### RedisEnterprise_Create
+
+```java
+import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryption;
+import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryptionCustomerManagedKeyEncryption;
+import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity;
+import com.azure.resourcemanager.redisenterprise.models.CmkIdentityType;
+import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentity;
+import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentityType;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
+import com.azure.resourcemanager.redisenterprise.models.Sku;
+import com.azure.resourcemanager.redisenterprise.models.SkuName;
+import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
+import com.azure.resourcemanager.redisenterprise.models.UserAssignedIdentity;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * Samples for Databases ForceLinkToReplicationGroup.
+ * Samples for RedisEnterprise Create.
  */
-public final class DatabasesForceLinkToReplicationGroupSamples {
+public final class RedisEnterpriseCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseDatabasesForceLink.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseCreate.json
      */
     /**
-     * Sample code: How to relink a database after a regional outage.
+     * Sample code: RedisEnterpriseCreate.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void howToRelinkADatabaseAfterARegionalOutage(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.databases()
-            .forceLinkToReplicationGroup("rg1", "cache1", "default",
-                new ForceLinkParameters().withGeoReplication(new ForceLinkParametersGeoReplication()
-                    .withGroupNickname("groupName")
-                    .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId(
-                        "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default"),
-                        new LinkedDatabase().withId(
-                            "/subscriptions/11111111-1111-1111-1111-111111111111/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default")))),
-                com.azure.core.util.Context.NONE);
+    public static void redisEnterpriseCreate(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.redisEnterprises()
+            .define("cache1")
+            .withRegion("West US")
+            .withExistingResourceGroup("rg1")
+            .withSku(new Sku().withName(SkuName.ENTERPRISE_FLASH_F300).withCapacity(3))
+            .withTags(mapOf("tag1", "value1"))
+            .withZones(Arrays.asList("1", "2", "3"))
+            .withIdentity(new ManagedServiceIdentity().withType(ManagedServiceIdentityType.USER_ASSIGNED)
+                .withUserAssignedIdentities(mapOf(
+                    "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity",
+                    new UserAssignedIdentity())))
+            .withPublicNetworkAccess(PublicNetworkAccess.DISABLED)
+            .withMinimumTlsVersion(TlsVersion.ONE_TWO)
+            .withEncryption(new ClusterPropertiesEncryption().withCustomerManagedKeyEncryption(
+                new ClusterPropertiesEncryptionCustomerManagedKeyEncryption().withKeyEncryptionKeyIdentity(
+                    new ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity()
+                        .withUserAssignedIdentityResourceId(
+                            "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity")
+                        .withIdentityType(CmkIdentityType.USER_ASSIGNED_IDENTITY))
+                    .withKeyEncryptionKeyUrl("fakeTokenPlaceholder")))
+            .create();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
     }
 }
 ```
 
-### RedisEnterprise_GetByResourceGroup
+### RedisEnterprise_Delete
 
 ```java
 /**
@@ -920,7 +882,7 @@ public final class DatabasesForceLinkToReplicationGroupSamples {
 public final class RedisEnterpriseDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDelete.json
      */
     /**
@@ -934,27 +896,48 @@ public final class RedisEnterpriseDeleteSamples {
 }
 ```
 
+### RedisEnterprise_GetByResourceGroup
+
+```java
+/**
+ * Samples for RedisEnterprise GetByResourceGroup.
+ */
+public final class RedisEnterpriseGetByResourceGroupSamples {
+    /*
+     * x-ms-original-file:
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseGet.json
+     */
+    /**
+     * Sample code: RedisEnterpriseGet.
+     * 
+     * @param manager Entry point to RedisEnterpriseManager.
+     */
+    public static void redisEnterpriseGet(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.redisEnterprises().getByResourceGroupWithResponse("rg1", "cache1", com.azure.core.util.Context.NONE);
+    }
+}
+```
+
 ### RedisEnterprise_List
 
 ```java
 /**
- * Samples for PrivateEndpointConnections Get.
+ * Samples for RedisEnterprise List.
  */
-public final class PrivateEndpointConnectionsGetSamples {
+public final class RedisEnterpriseListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseGetPrivateEndpointConnection.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseList.json
      */
     /**
-     * Sample code: RedisEnterpriseGetPrivateEndpointConnection.
+     * Sample code: RedisEnterpriseList.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseGetPrivateEndpointConnection(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.privateEndpointConnections()
-            .getWithResponse("rg1", "cache1", "pectest01", com.azure.core.util.Context.NONE);
+    public static void redisEnterpriseList(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.redisEnterprises().list(com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -963,22 +946,22 @@ public final class PrivateEndpointConnectionsGetSamples {
 
 ```java
 /**
- * Samples for AccessPolicyAssignment List.
+ * Samples for RedisEnterprise ListByResourceGroup.
  */
-public final class AccessPolicyAssignmentListSamples {
+public final class RedisEnterpriseListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseAccessPolicyAssignmentsList.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseListByResourceGroup.json
      */
     /**
-     * Sample code: RedisEnterpriseAccessPolicyAssignmentList.
+     * Sample code: RedisEnterpriseListByResourceGroup.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseAccessPolicyAssignmentList(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.accessPolicyAssignments().list("rg1", "cache1", "default", com.azure.core.util.Context.NONE);
+    public static void
+        redisEnterpriseListByResourceGroup(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.redisEnterprises().listByResourceGroup("rg1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -987,21 +970,22 @@ public final class AccessPolicyAssignmentListSamples {
 
 ```java
 /**
- * Samples for OperationsStatus Get.
+ * Samples for RedisEnterprise ListSkusForScaling.
  */
-public final class OperationsStatusGetSamples {
+public final class RedisEnterpriseListSkusForScalingSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * OperationsStatusGet.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseListSkusForScaling.json
      */
     /**
-     * Sample code: OperationsStatusGet.
+     * Sample code: RedisEnterpriseListSkusForScaling.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void operationsStatusGet(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.operationsStatus().getWithResponse("West US", "testoperationid", com.azure.core.util.Context.NONE);
+    public static void
+        redisEnterpriseListSkusForScaling(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        manager.redisEnterprises().listSkusForScalingWithResponse("rg1", "cache1", com.azure.core.util.Context.NONE);
     }
 }
 ```
@@ -1009,30 +993,50 @@ public final class OperationsStatusGetSamples {
 ### RedisEnterprise_Update
 
 ```java
-import com.azure.resourcemanager.redisenterprise.models.AccessPolicyAssignmentPropertiesUser;
+import com.azure.resourcemanager.redisenterprise.models.Cluster;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
+import com.azure.resourcemanager.redisenterprise.models.Sku;
+import com.azure.resourcemanager.redisenterprise.models.SkuName;
+import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
- * Samples for AccessPolicyAssignment CreateUpdate.
+ * Samples for RedisEnterprise Update.
  */
-public final class AccessPolicyAssignmentCreateUpdateSamples {
+public final class RedisEnterpriseUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
-     * RedisEnterpriseAccessPolicyAssignmentCreateUpdate.json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * RedisEnterpriseUpdate.json
      */
     /**
-     * Sample code: RedisEnterpriseAccessPolicyAssignmentCreateUpdate.
+     * Sample code: RedisEnterpriseUpdate.
      * 
      * @param manager Entry point to RedisEnterpriseManager.
      */
-    public static void redisEnterpriseAccessPolicyAssignmentCreateUpdate(
-        com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
-        manager.accessPolicyAssignments()
-            .define("defaultTestEntraApp1")
-            .withExistingDatabase("rg1", "cache1", "default")
-            .withAccessPolicyName("default")
-            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("6497c918-11ad-41e7-1b0f-7c518a87d0b0"))
-            .create();
+    public static void redisEnterpriseUpdate(com.azure.resourcemanager.redisenterprise.RedisEnterpriseManager manager) {
+        Cluster resource = manager.redisEnterprises()
+            .getByResourceGroupWithResponse("rg1", "cache1", com.azure.core.util.Context.NONE)
+            .getValue();
+        resource.update()
+            .withTags(mapOf("tag1", "value1"))
+            .withSku(new Sku().withName(SkuName.ENTERPRISE_FLASH_F300).withCapacity(9))
+            .withPublicNetworkAccess(PublicNetworkAccess.ENABLED)
+            .withMinimumTlsVersion(TlsVersion.ONE_TWO)
+            .apply();
+    }
+
+    // Use "Map.of" if available
+    @SuppressWarnings("unchecked")
+    private static <T> Map<String, T> mapOf(Object... inputs) {
+        Map<String, T> map = new HashMap<>();
+        for (int i = 0; i < inputs.length; i += 2) {
+            String key = (String) inputs[i];
+            T value = (T) inputs[i + 1];
+            map.put(key, value);
+        }
+        return map;
     }
 }
 ```
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
index c2d771c0a7b7..9448631bf4df 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/pom.xml
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-redisenterprise</artifactId>
-  <version>2.1.0-beta.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-redisenterprise;current} -->
+  <version>2.2.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-redisenterprise;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for RedisEnterprise Management</name>
-  <description>This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for managing Redis Enterprise resources in Azure. Package tag package-preview-2025-05-01.</description>
+  <description>This package contains Microsoft Azure SDK for RedisEnterprise Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. REST API for managing Redis Enterprise resources in Azure. Package tag package-2025-07-01.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java
index 70deafee6890..c551264b5d1e 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterInner.java
@@ -15,6 +15,7 @@
 import com.azure.resourcemanager.redisenterprise.models.Kind;
 import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentity;
 import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
 import com.azure.resourcemanager.redisenterprise.models.RedundancyMode;
 import com.azure.resourcemanager.redisenterprise.models.ResourceState;
 import com.azure.resourcemanager.redisenterprise.models.Sku;
@@ -200,6 +201,33 @@ public ClusterInner withTags(Map<String, String> tags) {
         return this;
     }
 
+    /**
+     * Get the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @return the publicNetworkAccess value.
+     */
+    public PublicNetworkAccess publicNetworkAccess() {
+        return this.innerProperties() == null ? null : this.innerProperties().publicNetworkAccess();
+    }
+
+    /**
+     * Set the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @param publicNetworkAccess the publicNetworkAccess value to set.
+     * @return the ClusterInner object itself.
+     */
+    public ClusterInner withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ClusterProperties();
+        }
+        this.innerProperties().withPublicNetworkAccess(publicNetworkAccess);
+        return this;
+    }
+
     /**
      * Get the highAvailability property: 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.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java
index 669970c6cd56..74f2bac2995e 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterProperties.java
@@ -5,13 +5,15 @@
 package com.azure.resourcemanager.redisenterprise.fluent.models;
 
 import com.azure.core.annotation.Fluent;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.redisenterprise.models.ClusterCommonProperties;
 import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryption;
 import com.azure.resourcemanager.redisenterprise.models.HighAvailability;
 import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
 import com.azure.resourcemanager.redisenterprise.models.RedundancyMode;
 import com.azure.resourcemanager.redisenterprise.models.ResourceState;
 import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
@@ -19,39 +21,32 @@
 import java.util.List;
 
 /**
- * Redis Enterprise cluster properties
+ * Redis Enterprise cluster properties for create operations
  * 
- * Properties of Redis Enterprise clusters, as opposed to general resource properties like location, tags.
+ * Properties of Redis Enterprise clusters for create operations.
  */
 @Fluent
-public final class ClusterProperties implements JsonSerializable<ClusterProperties> {
+public final class ClusterProperties extends ClusterCommonProperties {
     /*
-     * 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.
+     * Whether or not public network traffic can access the Redis cluster. Only 'Enabled' or 'Disabled' can be set. null
+     * is returned only for clusters created using an old API version which do not have this property and cannot be set.
      */
-    private HighAvailability highAvailability;
+    private PublicNetworkAccess publicNetworkAccess;
 
     /*
-     * 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.
-     */
-    private TlsVersion minimumTlsVersion;
-
-    /*
-     * Encryption-at-rest configuration for the cluster.
+     * List of private endpoint connections associated with the specified Redis Enterprise cluster
      */
-    private ClusterPropertiesEncryption encryption;
+    private List<PrivateEndpointConnectionInner> privateEndpointConnections;
 
     /*
-     * DNS name of the cluster endpoint
+     * Version of redis the cluster supports, e.g. '6'
      */
-    private String hostname;
+    private String redisVersion;
 
     /*
-     * Current provisioning status of the cluster
+     * Current resource status of the cluster
      */
-    private ProvisioningState provisioningState;
+    private ResourceState resourceState;
 
     /*
      * Explains the current redundancy strategy of the cluster, which affects the expected SLA.
@@ -59,19 +54,14 @@ public final class ClusterProperties implements JsonSerializable<ClusterProperti
     private RedundancyMode redundancyMode;
 
     /*
-     * Current resource status of the cluster
-     */
-    private ResourceState resourceState;
-
-    /*
-     * Version of redis the cluster supports, e.g. '6'
+     * Current provisioning status of the cluster
      */
-    private String redisVersion;
+    private ProvisioningState provisioningState;
 
     /*
-     * List of private endpoint connections associated with the specified Redis Enterprise cluster
+     * DNS name of the cluster endpoint
      */
-    private List<PrivateEndpointConnectionInner> privateEndpointConnections;
+    private String hostname;
 
     /**
      * Creates an instance of ClusterProperties class.
@@ -80,78 +70,69 @@ public ClusterProperties() {
     }
 
     /**
-     * Get the highAvailability property: 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.
+     * Get the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
      * 
-     * @return the highAvailability value.
+     * @return the publicNetworkAccess value.
      */
-    public HighAvailability highAvailability() {
-        return this.highAvailability;
+    public PublicNetworkAccess publicNetworkAccess() {
+        return this.publicNetworkAccess;
     }
 
     /**
-     * Set the highAvailability property: 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.
+     * Set the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
      * 
-     * @param highAvailability the highAvailability value to set.
+     * @param publicNetworkAccess the publicNetworkAccess value to set.
      * @return the ClusterProperties object itself.
      */
-    public ClusterProperties withHighAvailability(HighAvailability highAvailability) {
-        this.highAvailability = highAvailability;
+    public ClusterProperties withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
+        this.publicNetworkAccess = publicNetworkAccess;
         return this;
     }
 
     /**
-     * Get the minimumTlsVersion property: 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.
-     * 
-     * @return the minimumTlsVersion value.
-     */
-    public TlsVersion minimumTlsVersion() {
-        return this.minimumTlsVersion;
-    }
-
-    /**
-     * Set the minimumTlsVersion property: 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.
+     * Get the privateEndpointConnections property: List of private endpoint connections associated with the specified
+     * Redis Enterprise cluster.
      * 
-     * @param minimumTlsVersion the minimumTlsVersion value to set.
-     * @return the ClusterProperties object itself.
+     * @return the privateEndpointConnections value.
      */
-    public ClusterProperties withMinimumTlsVersion(TlsVersion minimumTlsVersion) {
-        this.minimumTlsVersion = minimumTlsVersion;
-        return this;
+    @Override
+    public List<PrivateEndpointConnectionInner> privateEndpointConnections() {
+        return this.privateEndpointConnections;
     }
 
     /**
-     * Get the encryption property: Encryption-at-rest configuration for the cluster.
+     * Get the redisVersion property: Version of redis the cluster supports, e.g. '6'.
      * 
-     * @return the encryption value.
+     * @return the redisVersion value.
      */
-    public ClusterPropertiesEncryption encryption() {
-        return this.encryption;
+    @Override
+    public String redisVersion() {
+        return this.redisVersion;
     }
 
     /**
-     * Set the encryption property: Encryption-at-rest configuration for the cluster.
+     * Get the resourceState property: Current resource status of the cluster.
      * 
-     * @param encryption the encryption value to set.
-     * @return the ClusterProperties object itself.
+     * @return the resourceState value.
      */
-    public ClusterProperties withEncryption(ClusterPropertiesEncryption encryption) {
-        this.encryption = encryption;
-        return this;
+    @Override
+    public ResourceState resourceState() {
+        return this.resourceState;
     }
 
     /**
-     * Get the hostname property: DNS name of the cluster endpoint.
+     * Get the redundancyMode property: Explains the current redundancy strategy of the cluster, which affects the
+     * expected SLA.
      * 
-     * @return the hostname value.
+     * @return the redundancyMode value.
      */
-    public String hostname() {
-        return this.hostname;
+    @Override
+    public RedundancyMode redundancyMode() {
+        return this.redundancyMode;
     }
 
     /**
@@ -159,46 +140,46 @@ public String hostname() {
      * 
      * @return the provisioningState value.
      */
+    @Override
     public ProvisioningState provisioningState() {
         return this.provisioningState;
     }
 
     /**
-     * Get the redundancyMode property: Explains the current redundancy strategy of the cluster, which affects the
-     * expected SLA.
+     * Get the hostname property: DNS name of the cluster endpoint.
      * 
-     * @return the redundancyMode value.
+     * @return the hostname value.
      */
-    public RedundancyMode redundancyMode() {
-        return this.redundancyMode;
+    @Override
+    public String hostname() {
+        return this.hostname;
     }
 
     /**
-     * Get the resourceState property: Current resource status of the cluster.
-     * 
-     * @return the resourceState value.
+     * {@inheritDoc}
      */
-    public ResourceState resourceState() {
-        return this.resourceState;
+    @Override
+    public ClusterProperties withHighAvailability(HighAvailability highAvailability) {
+        super.withHighAvailability(highAvailability);
+        return this;
     }
 
     /**
-     * Get the redisVersion property: Version of redis the cluster supports, e.g. '6'.
-     * 
-     * @return the redisVersion value.
+     * {@inheritDoc}
      */
-    public String redisVersion() {
-        return this.redisVersion;
+    @Override
+    public ClusterProperties withMinimumTlsVersion(TlsVersion minimumTlsVersion) {
+        super.withMinimumTlsVersion(minimumTlsVersion);
+        return this;
     }
 
     /**
-     * Get the privateEndpointConnections property: List of private endpoint connections associated with the specified
-     * Redis Enterprise cluster.
-     * 
-     * @return the privateEndpointConnections value.
+     * {@inheritDoc}
      */
-    public List<PrivateEndpointConnectionInner> privateEndpointConnections() {
-        return this.privateEndpointConnections;
+    @Override
+    public ClusterProperties withEncryption(ClusterPropertiesEncryption encryption) {
+        super.withEncryption(encryption);
+        return this;
     }
 
     /**
@@ -206,7 +187,13 @@ public List<PrivateEndpointConnectionInner> privateEndpointConnections() {
      * 
      * @throws IllegalArgumentException thrown if the instance is not valid.
      */
+    @Override
     public void validate() {
+        if (publicNetworkAccess() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Missing required property publicNetworkAccess in model ClusterProperties"));
+        }
         if (encryption() != null) {
             encryption().validate();
         }
@@ -215,6 +202,8 @@ public void validate() {
         }
     }
 
+    private static final ClientLogger LOGGER = new ClientLogger(ClusterProperties.class);
+
     /**
      * {@inheritDoc}
      */
@@ -222,10 +211,12 @@ public void validate() {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("highAvailability",
-            this.highAvailability == null ? null : this.highAvailability.toString());
+            highAvailability() == null ? null : highAvailability().toString());
         jsonWriter.writeStringField("minimumTlsVersion",
-            this.minimumTlsVersion == null ? null : this.minimumTlsVersion.toString());
-        jsonWriter.writeJsonField("encryption", this.encryption);
+            minimumTlsVersion() == null ? null : minimumTlsVersion().toString());
+        jsonWriter.writeJsonField("encryption", encryption());
+        jsonWriter.writeStringField("publicNetworkAccess",
+            this.publicNetworkAccess == null ? null : this.publicNetworkAccess.toString());
         return jsonWriter.writeEndObject();
     }
 
@@ -235,6 +226,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
      * @param jsonReader The JsonReader being read.
      * @return An instance of ClusterProperties if the JsonReader was pointing to an instance of it, or null if it was
      * pointing to JSON null.
+     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
      * @throws IOException If an error occurs while reading the ClusterProperties.
      */
     public static ClusterProperties fromJson(JsonReader jsonReader) throws IOException {
@@ -245,11 +237,11 @@ public static ClusterProperties fromJson(JsonReader jsonReader) throws IOExcepti
                 reader.nextToken();
 
                 if ("highAvailability".equals(fieldName)) {
-                    deserializedClusterProperties.highAvailability = HighAvailability.fromString(reader.getString());
+                    deserializedClusterProperties.withHighAvailability(HighAvailability.fromString(reader.getString()));
                 } else if ("minimumTlsVersion".equals(fieldName)) {
-                    deserializedClusterProperties.minimumTlsVersion = TlsVersion.fromString(reader.getString());
+                    deserializedClusterProperties.withMinimumTlsVersion(TlsVersion.fromString(reader.getString()));
                 } else if ("encryption".equals(fieldName)) {
-                    deserializedClusterProperties.encryption = ClusterPropertiesEncryption.fromJson(reader);
+                    deserializedClusterProperties.withEncryption(ClusterPropertiesEncryption.fromJson(reader));
                 } else if ("hostName".equals(fieldName)) {
                     deserializedClusterProperties.hostname = reader.getString();
                 } else if ("provisioningState".equals(fieldName)) {
@@ -264,6 +256,9 @@ public static ClusterProperties fromJson(JsonReader jsonReader) throws IOExcepti
                     List<PrivateEndpointConnectionInner> privateEndpointConnections
                         = reader.readArray(reader1 -> PrivateEndpointConnectionInner.fromJson(reader1));
                     deserializedClusterProperties.privateEndpointConnections = privateEndpointConnections;
+                } else if ("publicNetworkAccess".equals(fieldName)) {
+                    deserializedClusterProperties.publicNetworkAccess
+                        = PublicNetworkAccess.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterUpdateProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterUpdateProperties.java
new file mode 100644
index 000000000000..16994ce267bf
--- /dev/null
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/ClusterUpdateProperties.java
@@ -0,0 +1,264 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.redisenterprise.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.redisenterprise.models.ClusterCommonProperties;
+import com.azure.resourcemanager.redisenterprise.models.ClusterPropertiesEncryption;
+import com.azure.resourcemanager.redisenterprise.models.HighAvailability;
+import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
+import com.azure.resourcemanager.redisenterprise.models.RedundancyMode;
+import com.azure.resourcemanager.redisenterprise.models.ResourceState;
+import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Redis Enterprise cluster properties for update operations
+ * 
+ * Properties of Redis Enterprise clusters for update operations.
+ */
+@Fluent
+public final class ClusterUpdateProperties extends ClusterCommonProperties {
+    /*
+     * Whether or not public network traffic can access the Redis cluster. Only 'Enabled' or 'Disabled' can be set. null
+     * is returned only for clusters created using an old API version which do not have this property and cannot be set.
+     */
+    private PublicNetworkAccess publicNetworkAccess;
+
+    /*
+     * List of private endpoint connections associated with the specified Redis Enterprise cluster
+     */
+    private List<PrivateEndpointConnectionInner> privateEndpointConnections;
+
+    /*
+     * Version of redis the cluster supports, e.g. '6'
+     */
+    private String redisVersion;
+
+    /*
+     * Current resource status of the cluster
+     */
+    private ResourceState resourceState;
+
+    /*
+     * Explains the current redundancy strategy of the cluster, which affects the expected SLA.
+     */
+    private RedundancyMode redundancyMode;
+
+    /*
+     * Current provisioning status of the cluster
+     */
+    private ProvisioningState provisioningState;
+
+    /*
+     * DNS name of the cluster endpoint
+     */
+    private String hostname;
+
+    /**
+     * Creates an instance of ClusterUpdateProperties class.
+     */
+    public ClusterUpdateProperties() {
+    }
+
+    /**
+     * Get the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @return the publicNetworkAccess value.
+     */
+    public PublicNetworkAccess publicNetworkAccess() {
+        return this.publicNetworkAccess;
+    }
+
+    /**
+     * Set the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @param publicNetworkAccess the publicNetworkAccess value to set.
+     * @return the ClusterUpdateProperties object itself.
+     */
+    public ClusterUpdateProperties withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
+        this.publicNetworkAccess = publicNetworkAccess;
+        return this;
+    }
+
+    /**
+     * Get the privateEndpointConnections property: List of private endpoint connections associated with the specified
+     * Redis Enterprise cluster.
+     * 
+     * @return the privateEndpointConnections value.
+     */
+    @Override
+    public List<PrivateEndpointConnectionInner> privateEndpointConnections() {
+        return this.privateEndpointConnections;
+    }
+
+    /**
+     * Get the redisVersion property: Version of redis the cluster supports, e.g. '6'.
+     * 
+     * @return the redisVersion value.
+     */
+    @Override
+    public String redisVersion() {
+        return this.redisVersion;
+    }
+
+    /**
+     * Get the resourceState property: Current resource status of the cluster.
+     * 
+     * @return the resourceState value.
+     */
+    @Override
+    public ResourceState resourceState() {
+        return this.resourceState;
+    }
+
+    /**
+     * Get the redundancyMode property: Explains the current redundancy strategy of the cluster, which affects the
+     * expected SLA.
+     * 
+     * @return the redundancyMode value.
+     */
+    @Override
+    public RedundancyMode redundancyMode() {
+        return this.redundancyMode;
+    }
+
+    /**
+     * Get the provisioningState property: Current provisioning status of the cluster.
+     * 
+     * @return the provisioningState value.
+     */
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Get the hostname property: DNS name of the cluster endpoint.
+     * 
+     * @return the hostname value.
+     */
+    @Override
+    public String hostname() {
+        return this.hostname;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ClusterUpdateProperties withHighAvailability(HighAvailability highAvailability) {
+        super.withHighAvailability(highAvailability);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ClusterUpdateProperties withMinimumTlsVersion(TlsVersion minimumTlsVersion) {
+        super.withMinimumTlsVersion(minimumTlsVersion);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public ClusterUpdateProperties withEncryption(ClusterPropertiesEncryption encryption) {
+        super.withEncryption(encryption);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    @Override
+    public void validate() {
+        if (encryption() != null) {
+            encryption().validate();
+        }
+        if (privateEndpointConnections() != null) {
+            privateEndpointConnections().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("highAvailability",
+            highAvailability() == null ? null : highAvailability().toString());
+        jsonWriter.writeStringField("minimumTlsVersion",
+            minimumTlsVersion() == null ? null : minimumTlsVersion().toString());
+        jsonWriter.writeJsonField("encryption", encryption());
+        jsonWriter.writeStringField("publicNetworkAccess",
+            this.publicNetworkAccess == null ? null : this.publicNetworkAccess.toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ClusterUpdateProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ClusterUpdateProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ClusterUpdateProperties.
+     */
+    public static ClusterUpdateProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ClusterUpdateProperties deserializedClusterUpdateProperties = new ClusterUpdateProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("highAvailability".equals(fieldName)) {
+                    deserializedClusterUpdateProperties
+                        .withHighAvailability(HighAvailability.fromString(reader.getString()));
+                } else if ("minimumTlsVersion".equals(fieldName)) {
+                    deserializedClusterUpdateProperties
+                        .withMinimumTlsVersion(TlsVersion.fromString(reader.getString()));
+                } else if ("encryption".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.withEncryption(ClusterPropertiesEncryption.fromJson(reader));
+                } else if ("hostName".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.hostname = reader.getString();
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.provisioningState
+                        = ProvisioningState.fromString(reader.getString());
+                } else if ("redundancyMode".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.redundancyMode = RedundancyMode.fromString(reader.getString());
+                } else if ("resourceState".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.resourceState = ResourceState.fromString(reader.getString());
+                } else if ("redisVersion".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.redisVersion = reader.getString();
+                } else if ("privateEndpointConnections".equals(fieldName)) {
+                    List<PrivateEndpointConnectionInner> privateEndpointConnections
+                        = reader.readArray(reader1 -> PrivateEndpointConnectionInner.fromJson(reader1));
+                    deserializedClusterUpdateProperties.privateEndpointConnections = privateEndpointConnections;
+                } else if ("publicNetworkAccess".equals(fieldName)) {
+                    deserializedClusterUpdateProperties.publicNetworkAccess
+                        = PublicNetworkAccess.fromString(reader.getString());
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedClusterUpdateProperties;
+        });
+    }
+}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseCreateProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseCreateProperties.java
new file mode 100644
index 000000000000..c0bd666e40b2
--- /dev/null
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseCreateProperties.java
@@ -0,0 +1,256 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.redisenterprise.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.redisenterprise.models.AccessKeysAuthentication;
+import com.azure.resourcemanager.redisenterprise.models.ClusteringPolicy;
+import com.azure.resourcemanager.redisenterprise.models.DatabaseCommonProperties;
+import com.azure.resourcemanager.redisenterprise.models.DatabasePropertiesGeoReplication;
+import com.azure.resourcemanager.redisenterprise.models.DeferUpgradeSetting;
+import com.azure.resourcemanager.redisenterprise.models.EvictionPolicy;
+import com.azure.resourcemanager.redisenterprise.models.Module;
+import com.azure.resourcemanager.redisenterprise.models.Persistence;
+import com.azure.resourcemanager.redisenterprise.models.Protocol;
+import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
+import com.azure.resourcemanager.redisenterprise.models.ResourceState;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Redis Enterprise database create properties
+ * 
+ * Properties for creating Redis Enterprise databases.
+ */
+@Fluent
+public final class DatabaseCreateProperties extends DatabaseCommonProperties {
+    /*
+     * Version of Redis the database is running on, e.g. '6.0'
+     */
+    private String redisVersion;
+
+    /*
+     * Current resource status of the database
+     */
+    private ResourceState resourceState;
+
+    /*
+     * Current provisioning status of the database
+     */
+    private ProvisioningState provisioningState;
+
+    /**
+     * Creates an instance of DatabaseCreateProperties class.
+     */
+    public DatabaseCreateProperties() {
+    }
+
+    /**
+     * Get the redisVersion property: Version of Redis the database is running on, e.g. '6.0'.
+     * 
+     * @return the redisVersion value.
+     */
+    @Override
+    public String redisVersion() {
+        return this.redisVersion;
+    }
+
+    /**
+     * Get the resourceState property: Current resource status of the database.
+     * 
+     * @return the resourceState value.
+     */
+    @Override
+    public ResourceState resourceState() {
+        return this.resourceState;
+    }
+
+    /**
+     * Get the provisioningState property: Current provisioning status of the database.
+     * 
+     * @return the provisioningState value.
+     */
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withClientProtocol(Protocol clientProtocol) {
+        super.withClientProtocol(clientProtocol);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withPort(Integer port) {
+        super.withPort(port);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withClusteringPolicy(ClusteringPolicy clusteringPolicy) {
+        super.withClusteringPolicy(clusteringPolicy);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withEvictionPolicy(EvictionPolicy evictionPolicy) {
+        super.withEvictionPolicy(evictionPolicy);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withPersistence(Persistence persistence) {
+        super.withPersistence(persistence);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withModules(List<Module> modules) {
+        super.withModules(modules);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withGeoReplication(DatabasePropertiesGeoReplication geoReplication) {
+        super.withGeoReplication(geoReplication);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withDeferUpgrade(DeferUpgradeSetting deferUpgrade) {
+        super.withDeferUpgrade(deferUpgrade);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseCreateProperties withAccessKeysAuthentication(AccessKeysAuthentication accessKeysAuthentication) {
+        super.withAccessKeysAuthentication(accessKeysAuthentication);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    @Override
+    public void validate() {
+        if (persistence() != null) {
+            persistence().validate();
+        }
+        if (modules() != null) {
+            modules().forEach(e -> e.validate());
+        }
+        if (geoReplication() != null) {
+            geoReplication().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("clientProtocol", clientProtocol() == null ? null : clientProtocol().toString());
+        jsonWriter.writeNumberField("port", port());
+        jsonWriter.writeStringField("clusteringPolicy",
+            clusteringPolicy() == null ? null : clusteringPolicy().toString());
+        jsonWriter.writeStringField("evictionPolicy", evictionPolicy() == null ? null : evictionPolicy().toString());
+        jsonWriter.writeJsonField("persistence", persistence());
+        jsonWriter.writeArrayField("modules", modules(), (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeJsonField("geoReplication", geoReplication());
+        jsonWriter.writeStringField("deferUpgrade", deferUpgrade() == null ? null : deferUpgrade().toString());
+        jsonWriter.writeStringField("accessKeysAuthentication",
+            accessKeysAuthentication() == null ? null : accessKeysAuthentication().toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DatabaseCreateProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DatabaseCreateProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the DatabaseCreateProperties.
+     */
+    public static DatabaseCreateProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DatabaseCreateProperties deserializedDatabaseCreateProperties = new DatabaseCreateProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("clientProtocol".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties.withClientProtocol(Protocol.fromString(reader.getString()));
+                } else if ("port".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties.withPort(reader.getNullable(JsonReader::getInt));
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties.provisioningState
+                        = ProvisioningState.fromString(reader.getString());
+                } else if ("resourceState".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties.resourceState = ResourceState.fromString(reader.getString());
+                } else if ("clusteringPolicy".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties
+                        .withClusteringPolicy(ClusteringPolicy.fromString(reader.getString()));
+                } else if ("evictionPolicy".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties
+                        .withEvictionPolicy(EvictionPolicy.fromString(reader.getString()));
+                } else if ("persistence".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties.withPersistence(Persistence.fromJson(reader));
+                } else if ("modules".equals(fieldName)) {
+                    List<Module> modules = reader.readArray(reader1 -> Module.fromJson(reader1));
+                    deserializedDatabaseCreateProperties.withModules(modules);
+                } else if ("geoReplication".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties
+                        .withGeoReplication(DatabasePropertiesGeoReplication.fromJson(reader));
+                } else if ("redisVersion".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties.redisVersion = reader.getString();
+                } else if ("deferUpgrade".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties
+                        .withDeferUpgrade(DeferUpgradeSetting.fromString(reader.getString()));
+                } else if ("accessKeysAuthentication".equals(fieldName)) {
+                    deserializedDatabaseCreateProperties
+                        .withAccessKeysAuthentication(AccessKeysAuthentication.fromString(reader.getString()));
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDatabaseCreateProperties;
+        });
+    }
+}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java
index 4a54ebe563ac..3166368a0c67 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseInner.java
@@ -31,7 +31,7 @@ public final class DatabaseInner extends ProxyResource {
     /*
      * Other properties of the database.
      */
-    private DatabaseProperties innerProperties;
+    private DatabaseCreateProperties innerProperties;
 
     /*
      * Azure Resource Manager metadata containing createdBy and modifiedBy information.
@@ -64,7 +64,7 @@ public DatabaseInner() {
      * 
      * @return the innerProperties value.
      */
-    private DatabaseProperties innerProperties() {
+    private DatabaseCreateProperties innerProperties() {
         return this.innerProperties;
     }
 
@@ -126,7 +126,7 @@ public Protocol clientProtocol() {
      */
     public DatabaseInner withClientProtocol(Protocol clientProtocol) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withClientProtocol(clientProtocol);
         return this;
@@ -151,7 +151,7 @@ public Integer port() {
      */
     public DatabaseInner withPort(Integer port) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withPort(port);
         return this;
@@ -196,7 +196,7 @@ public ClusteringPolicy clusteringPolicy() {
      */
     public DatabaseInner withClusteringPolicy(ClusteringPolicy clusteringPolicy) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withClusteringPolicy(clusteringPolicy);
         return this;
@@ -219,7 +219,7 @@ public EvictionPolicy evictionPolicy() {
      */
     public DatabaseInner withEvictionPolicy(EvictionPolicy evictionPolicy) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withEvictionPolicy(evictionPolicy);
         return this;
@@ -242,7 +242,7 @@ public Persistence persistence() {
      */
     public DatabaseInner withPersistence(Persistence persistence) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withPersistence(persistence);
         return this;
@@ -267,7 +267,7 @@ public List<Module> modules() {
      */
     public DatabaseInner withModules(List<Module> modules) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withModules(modules);
         return this;
@@ -290,7 +290,7 @@ public DatabasePropertiesGeoReplication geoReplication() {
      */
     public DatabaseInner withGeoReplication(DatabasePropertiesGeoReplication geoReplication) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withGeoReplication(geoReplication);
         return this;
@@ -324,7 +324,7 @@ public DeferUpgradeSetting deferUpgrade() {
      */
     public DatabaseInner withDeferUpgrade(DeferUpgradeSetting deferUpgrade) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withDeferUpgrade(deferUpgrade);
         return this;
@@ -349,7 +349,7 @@ public AccessKeysAuthentication accessKeysAuthentication() {
      */
     public DatabaseInner withAccessKeysAuthentication(AccessKeysAuthentication accessKeysAuthentication) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseCreateProperties();
         }
         this.innerProperties().withAccessKeysAuthentication(accessKeysAuthentication);
         return this;
@@ -399,7 +399,7 @@ public static DatabaseInner fromJson(JsonReader jsonReader) throws IOException {
                 } else if ("type".equals(fieldName)) {
                     deserializedDatabaseInner.type = reader.getString();
                 } else if ("properties".equals(fieldName)) {
-                    deserializedDatabaseInner.innerProperties = DatabaseProperties.fromJson(reader);
+                    deserializedDatabaseInner.innerProperties = DatabaseCreateProperties.fromJson(reader);
                 } else if ("systemData".equals(fieldName)) {
                     deserializedDatabaseInner.systemData = SystemData.fromJson(reader);
                 } else {
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseUpdateProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseUpdateProperties.java
new file mode 100644
index 000000000000..1238bcd80c10
--- /dev/null
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseUpdateProperties.java
@@ -0,0 +1,256 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.redisenterprise.fluent.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.redisenterprise.models.AccessKeysAuthentication;
+import com.azure.resourcemanager.redisenterprise.models.ClusteringPolicy;
+import com.azure.resourcemanager.redisenterprise.models.DatabaseCommonProperties;
+import com.azure.resourcemanager.redisenterprise.models.DatabasePropertiesGeoReplication;
+import com.azure.resourcemanager.redisenterprise.models.DeferUpgradeSetting;
+import com.azure.resourcemanager.redisenterprise.models.EvictionPolicy;
+import com.azure.resourcemanager.redisenterprise.models.Module;
+import com.azure.resourcemanager.redisenterprise.models.Persistence;
+import com.azure.resourcemanager.redisenterprise.models.Protocol;
+import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
+import com.azure.resourcemanager.redisenterprise.models.ResourceState;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Redis Enterprise database update properties
+ * 
+ * Properties for updating Redis Enterprise databases.
+ */
+@Fluent
+public final class DatabaseUpdateProperties extends DatabaseCommonProperties {
+    /*
+     * Version of Redis the database is running on, e.g. '6.0'
+     */
+    private String redisVersion;
+
+    /*
+     * Current resource status of the database
+     */
+    private ResourceState resourceState;
+
+    /*
+     * Current provisioning status of the database
+     */
+    private ProvisioningState provisioningState;
+
+    /**
+     * Creates an instance of DatabaseUpdateProperties class.
+     */
+    public DatabaseUpdateProperties() {
+    }
+
+    /**
+     * Get the redisVersion property: Version of Redis the database is running on, e.g. '6.0'.
+     * 
+     * @return the redisVersion value.
+     */
+    @Override
+    public String redisVersion() {
+        return this.redisVersion;
+    }
+
+    /**
+     * Get the resourceState property: Current resource status of the database.
+     * 
+     * @return the resourceState value.
+     */
+    @Override
+    public ResourceState resourceState() {
+        return this.resourceState;
+    }
+
+    /**
+     * Get the provisioningState property: Current provisioning status of the database.
+     * 
+     * @return the provisioningState value.
+     */
+    @Override
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withClientProtocol(Protocol clientProtocol) {
+        super.withClientProtocol(clientProtocol);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withPort(Integer port) {
+        super.withPort(port);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withClusteringPolicy(ClusteringPolicy clusteringPolicy) {
+        super.withClusteringPolicy(clusteringPolicy);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withEvictionPolicy(EvictionPolicy evictionPolicy) {
+        super.withEvictionPolicy(evictionPolicy);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withPersistence(Persistence persistence) {
+        super.withPersistence(persistence);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withModules(List<Module> modules) {
+        super.withModules(modules);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withGeoReplication(DatabasePropertiesGeoReplication geoReplication) {
+        super.withGeoReplication(geoReplication);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withDeferUpgrade(DeferUpgradeSetting deferUpgrade) {
+        super.withDeferUpgrade(deferUpgrade);
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public DatabaseUpdateProperties withAccessKeysAuthentication(AccessKeysAuthentication accessKeysAuthentication) {
+        super.withAccessKeysAuthentication(accessKeysAuthentication);
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    @Override
+    public void validate() {
+        if (persistence() != null) {
+            persistence().validate();
+        }
+        if (modules() != null) {
+            modules().forEach(e -> e.validate());
+        }
+        if (geoReplication() != null) {
+            geoReplication().validate();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("clientProtocol", clientProtocol() == null ? null : clientProtocol().toString());
+        jsonWriter.writeNumberField("port", port());
+        jsonWriter.writeStringField("clusteringPolicy",
+            clusteringPolicy() == null ? null : clusteringPolicy().toString());
+        jsonWriter.writeStringField("evictionPolicy", evictionPolicy() == null ? null : evictionPolicy().toString());
+        jsonWriter.writeJsonField("persistence", persistence());
+        jsonWriter.writeArrayField("modules", modules(), (writer, element) -> writer.writeJson(element));
+        jsonWriter.writeJsonField("geoReplication", geoReplication());
+        jsonWriter.writeStringField("deferUpgrade", deferUpgrade() == null ? null : deferUpgrade().toString());
+        jsonWriter.writeStringField("accessKeysAuthentication",
+            accessKeysAuthentication() == null ? null : accessKeysAuthentication().toString());
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of DatabaseUpdateProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of DatabaseUpdateProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the DatabaseUpdateProperties.
+     */
+    public static DatabaseUpdateProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            DatabaseUpdateProperties deserializedDatabaseUpdateProperties = new DatabaseUpdateProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("clientProtocol".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties.withClientProtocol(Protocol.fromString(reader.getString()));
+                } else if ("port".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties.withPort(reader.getNullable(JsonReader::getInt));
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties.provisioningState
+                        = ProvisioningState.fromString(reader.getString());
+                } else if ("resourceState".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties.resourceState = ResourceState.fromString(reader.getString());
+                } else if ("clusteringPolicy".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties
+                        .withClusteringPolicy(ClusteringPolicy.fromString(reader.getString()));
+                } else if ("evictionPolicy".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties
+                        .withEvictionPolicy(EvictionPolicy.fromString(reader.getString()));
+                } else if ("persistence".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties.withPersistence(Persistence.fromJson(reader));
+                } else if ("modules".equals(fieldName)) {
+                    List<Module> modules = reader.readArray(reader1 -> Module.fromJson(reader1));
+                    deserializedDatabaseUpdateProperties.withModules(modules);
+                } else if ("geoReplication".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties
+                        .withGeoReplication(DatabasePropertiesGeoReplication.fromJson(reader));
+                } else if ("redisVersion".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties.redisVersion = reader.getString();
+                } else if ("deferUpgrade".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties
+                        .withDeferUpgrade(DeferUpgradeSetting.fromString(reader.getString()));
+                } else if ("accessKeysAuthentication".equals(fieldName)) {
+                    deserializedDatabaseUpdateProperties
+                        .withAccessKeysAuthentication(AccessKeysAuthentication.fromString(reader.getString()));
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedDatabaseUpdateProperties;
+        });
+    }
+}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/AccessPolicyAssignmentsClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/AccessPolicyAssignmentsClientImpl.java
index dca8e9f8f5eb..a2711db000b4 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/AccessPolicyAssignmentsClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/AccessPolicyAssignmentsClientImpl.java
@@ -27,8 +27,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.redisenterprise.fluent.AccessPolicyAssignmentsClient;
@@ -68,7 +70,7 @@ public final class AccessPolicyAssignmentsClientImpl implements AccessPolicyAssi
      * the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientAccessPolicyAssignments")
     public interface AccessPolicyAssignmentsService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}")
@@ -83,6 +85,19 @@ Mono<Response<Flux<ByteBuffer>>> createUpdate(@HostParam("$host") String endpoin
             @BodyParam("application/json") AccessPolicyAssignmentInner parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createUpdateSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName,
+            @PathParam("accessPolicyAssignmentName") String accessPolicyAssignmentName,
+            @QueryParam("api-version") String apiVersion,
+            @BodyParam("application/json") AccessPolicyAssignmentInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}")
         @ExpectedResponses({ 200 })
@@ -94,6 +109,17 @@ Mono<Response<AccessPolicyAssignmentInner>> get(@HostParam("$host") String endpo
             @PathParam("accessPolicyAssignmentName") String accessPolicyAssignmentName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AccessPolicyAssignmentInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName,
+            @PathParam("accessPolicyAssignmentName") String accessPolicyAssignmentName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}")
         @ExpectedResponses({ 202, 204 })
@@ -105,6 +131,17 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @PathParam("accessPolicyAssignmentName") String accessPolicyAssignmentName,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments/{accessPolicyAssignmentName}")
+        @ExpectedResponses({ 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName,
+            @PathParam("accessPolicyAssignmentName") String accessPolicyAssignmentName,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments")
         @ExpectedResponses({ 200 })
@@ -114,6 +151,15 @@ Mono<Response<AccessPolicyAssignmentList>> list(@HostParam("$host") String endpo
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @PathParam("databaseName") String databaseName, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/accessPolicyAssignments")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AccessPolicyAssignmentList> listSync(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -121,6 +167,14 @@ Mono<Response<AccessPolicyAssignmentList>> list(@HostParam("$host") String endpo
         Mono<Response<AccessPolicyAssignmentList>> listNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AccessPolicyAssignmentList> listNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -185,49 +239,51 @@ private Mono<Response<Flux<ByteBuffer>>> createUpdateWithResponseAsync(String re
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the access policy assignment of Redis Enterprise database along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return describes the access policy assignment of Redis Enterprise database along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createUpdateWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, String accessPolicyAssignmentName, AccessPolicyAssignmentInner parameters,
-        Context context) {
+    private Response<BinaryData> createUpdateWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, String accessPolicyAssignmentName, AccessPolicyAssignmentInner parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (accessPolicyAssignmentName == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter accessPolicyAssignmentName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter accessPolicyAssignmentName is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.createUpdate(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+        return service.createUpdateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
             clusterName, databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), parameters, accept,
-            context);
+            Context.NONE);
     }
 
     /**
@@ -239,21 +295,53 @@ private Mono<Response<Flux<ByteBuffer>>> createUpdateWithResponseAsync(String re
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of describes the access policy assignment of Redis Enterprise
-     * database.
+     * @return describes the access policy assignment of Redis Enterprise database along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignmentInner> beginCreateUpdateAsync(
-        String resourceGroupName, String clusterName, String databaseName, String accessPolicyAssignmentName,
-        AccessPolicyAssignmentInner parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono = createUpdateWithResponseAsync(resourceGroupName, clusterName,
-            databaseName, accessPolicyAssignmentName, parameters);
-        return this.client.<AccessPolicyAssignmentInner, AccessPolicyAssignmentInner>getLroResult(mono,
-            this.client.getHttpPipeline(), AccessPolicyAssignmentInner.class, AccessPolicyAssignmentInner.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createUpdateWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, String accessPolicyAssignmentName, AccessPolicyAssignmentInner parameters,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (accessPolicyAssignmentName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter accessPolicyAssignmentName is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createUpdateSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), parameters, accept,
+            context);
     }
 
     /**
@@ -265,7 +353,6 @@ private PollerFlux<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignme
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -275,13 +362,12 @@ private PollerFlux<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignme
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignmentInner> beginCreateUpdateAsync(
         String resourceGroupName, String clusterName, String databaseName, String accessPolicyAssignmentName,
-        AccessPolicyAssignmentInner parameters, Context context) {
-        context = this.client.mergeContext(context);
+        AccessPolicyAssignmentInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono = createUpdateWithResponseAsync(resourceGroupName, clusterName,
-            databaseName, accessPolicyAssignmentName, parameters, context);
+            databaseName, accessPolicyAssignmentName, parameters);
         return this.client.<AccessPolicyAssignmentInner, AccessPolicyAssignmentInner>getLroResult(mono,
             this.client.getHttpPipeline(), AccessPolicyAssignmentInner.class, AccessPolicyAssignmentInner.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -303,10 +389,10 @@ private PollerFlux<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignme
     public SyncPoller<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignmentInner> beginCreateUpdate(
         String resourceGroupName, String clusterName, String databaseName, String accessPolicyAssignmentName,
         AccessPolicyAssignmentInner parameters) {
-        return this
-            .beginCreateUpdateAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName,
-                parameters)
-            .getSyncPoller();
+        Response<BinaryData> response = createUpdateWithResponse(resourceGroupName, clusterName, databaseName,
+            accessPolicyAssignmentName, parameters);
+        return this.client.<AccessPolicyAssignmentInner, AccessPolicyAssignmentInner>getLroResult(response,
+            AccessPolicyAssignmentInner.class, AccessPolicyAssignmentInner.class, Context.NONE);
     }
 
     /**
@@ -329,10 +415,10 @@ public SyncPoller<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignmen
     public SyncPoller<PollResult<AccessPolicyAssignmentInner>, AccessPolicyAssignmentInner> beginCreateUpdate(
         String resourceGroupName, String clusterName, String databaseName, String accessPolicyAssignmentName,
         AccessPolicyAssignmentInner parameters, Context context) {
-        return this
-            .beginCreateUpdateAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName,
-                parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response = createUpdateWithResponse(resourceGroupName, clusterName, databaseName,
+            accessPolicyAssignmentName, parameters, context);
+        return this.client.<AccessPolicyAssignmentInner, AccessPolicyAssignmentInner>getLroResult(response,
+            AccessPolicyAssignmentInner.class, AccessPolicyAssignmentInner.class, context);
     }
 
     /**
@@ -357,30 +443,6 @@ private Mono<AccessPolicyAssignmentInner> createUpdateAsync(String resourceGroup
             parameters).last().flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 accessPolicyAssignmentName The name of the Redis Enterprise database access policy assignment.
-     * @param parameters Parameters supplied to the create access policy assignment for database.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the access policy assignment of Redis Enterprise database on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<AccessPolicyAssignmentInner> createUpdateAsync(String resourceGroupName, String clusterName,
-        String databaseName, String accessPolicyAssignmentName, AccessPolicyAssignmentInner parameters,
-        Context context) {
-        return beginCreateUpdateAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName,
-            parameters, context).last().flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Creates/Updates a particular access policy assignment for a database.
      * 
@@ -398,8 +460,8 @@ private Mono<AccessPolicyAssignmentInner> createUpdateAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AccessPolicyAssignmentInner createUpdate(String resourceGroupName, String clusterName, String databaseName,
         String accessPolicyAssignmentName, AccessPolicyAssignmentInner parameters) {
-        return createUpdateAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, parameters)
-            .block();
+        return beginCreateUpdate(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, parameters)
+            .getFinalResult();
     }
 
     /**
@@ -420,8 +482,8 @@ public AccessPolicyAssignmentInner createUpdate(String resourceGroupName, String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AccessPolicyAssignmentInner createUpdate(String resourceGroupName, String clusterName, String databaseName,
         String accessPolicyAssignmentName, AccessPolicyAssignmentInner parameters, Context context) {
-        return createUpdateAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, parameters,
-            context).block();
+        return beginCreateUpdate(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, parameters,
+            context).getFinalResult();
     }
 
     /**
@@ -471,52 +533,6 @@ private Mono<Response<AccessPolicyAssignmentInner>> getWithResponseAsync(String
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * 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. 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 accessPolicyAssignmentName The name of the Redis Enterprise database access policy assignment.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about access policy assignment for database along with {@link Response} on successful
-     * completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AccessPolicyAssignmentInner>> getWithResponseAsync(String resourceGroupName,
-        String clusterName, String databaseName, String accessPolicyAssignmentName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
-        }
-        if (accessPolicyAssignmentName == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter accessPolicyAssignmentName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName, clusterName,
-            databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), accept, context);
-    }
-
     /**
      * Gets information about access policy assignment for database.
      * 
@@ -554,8 +570,36 @@ private Mono<AccessPolicyAssignmentInner> getAsync(String resourceGroupName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AccessPolicyAssignmentInner> getWithResponse(String resourceGroupName, String clusterName,
         String databaseName, String accessPolicyAssignmentName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, context)
-            .block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (accessPolicyAssignmentName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter accessPolicyAssignmentName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -632,41 +676,44 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * 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 accessPolicyAssignmentName The name of the Redis Enterprise database access policy assignment.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, String accessPolicyAssignmentName, Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        String accessPolicyAssignmentName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (accessPolicyAssignmentName == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter accessPolicyAssignmentName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter accessPolicyAssignmentName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
-            clusterName, databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), accept, context);
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), accept, Context.NONE);
     }
 
     /**
@@ -677,18 +724,45 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * 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 accessPolicyAssignmentName The name of the Redis Enterprise database access policy assignment.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String databaseName, String accessPolicyAssignmentName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        String accessPolicyAssignmentName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (accessPolicyAssignmentName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter accessPolicyAssignmentName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), this.client.getSubscriptionId(), resourceGroupName,
+            clusterName, databaseName, accessPolicyAssignmentName, this.client.getApiVersion(), accept, context);
     }
 
     /**
@@ -699,7 +773,6 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * 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 accessPolicyAssignmentName The name of the Redis Enterprise database access policy assignment.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -707,12 +780,11 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String databaseName, String accessPolicyAssignmentName, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, databaseName,
-            accessPolicyAssignmentName, context);
+        String databaseName, String accessPolicyAssignmentName) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = deleteWithResponseAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -731,8 +803,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String databaseName, String accessPolicyAssignmentName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -752,8 +825,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String databaseName, String accessPolicyAssignmentName, Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -776,28 +850,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 accessPolicyAssignmentName The name of the Redis Enterprise database access policy assignment.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String databaseName,
-        String accessPolicyAssignmentName, Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, context)
-            .last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes a single access policy assignment.
      * 
@@ -813,7 +865,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String databaseName,
         String accessPolicyAssignmentName) {
-        deleteAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName).block();
+        beginDelete(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName).getFinalResult();
     }
 
     /**
@@ -832,7 +884,7 @@ public void delete(String resourceGroupName, String clusterName, String database
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String databaseName,
         String accessPolicyAssignmentName, Context context) {
-        deleteAsync(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, context).block();
+        beginDelete(resourceGroupName, clusterName, databaseName, accessPolicyAssignmentName, context).getFinalResult();
     }
 
     /**
@@ -884,40 +936,16 @@ private Mono<PagedResponse<AccessPolicyAssignmentInner>> listSinglePageAsync(Str
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all access policy assignments. along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all access policy assignments. as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<AccessPolicyAssignmentInner>> listSinglePageAsync(String resourceGroupName,
-        String clusterName, String databaseName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .list(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-                resourceGroupName, clusterName, databaseName, accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<AccessPolicyAssignmentInner> listAsync(String resourceGroupName, String clusterName,
+        String databaseName) {
+        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, clusterName, databaseName),
+            nextLink -> listNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -930,13 +958,39 @@ private Mono<PagedResponse<AccessPolicyAssignmentInner>> listSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all access policy assignments. as paginated response with {@link PagedFlux}.
+     * @return all access policy assignments. along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<AccessPolicyAssignmentInner> listAsync(String resourceGroupName, String clusterName,
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<AccessPolicyAssignmentInner> listSinglePage(String resourceGroupName, String clusterName,
         String databaseName) {
-        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, clusterName, databaseName),
-            nextLink -> listNextSinglePageAsync(nextLink));
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<AccessPolicyAssignmentList> res
+            = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
+                resourceGroupName, clusterName, databaseName, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -950,13 +1004,39 @@ private PagedFlux<AccessPolicyAssignmentInner> listAsync(String resourceGroupNam
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all access policy assignments. as paginated response with {@link PagedFlux}.
+     * @return all access policy assignments. along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<AccessPolicyAssignmentInner> listAsync(String resourceGroupName, String clusterName,
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<AccessPolicyAssignmentInner> listSinglePage(String resourceGroupName, String clusterName,
         String databaseName, Context context) {
-        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, clusterName, databaseName, context),
-            nextLink -> listNextSinglePageAsync(nextLink, context));
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<AccessPolicyAssignmentList> res
+            = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
+                resourceGroupName, clusterName, databaseName, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -974,7 +1054,8 @@ private PagedFlux<AccessPolicyAssignmentInner> listAsync(String resourceGroupNam
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<AccessPolicyAssignmentInner> list(String resourceGroupName, String clusterName,
         String databaseName) {
-        return new PagedIterable<>(listAsync(resourceGroupName, clusterName, databaseName));
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, clusterName, databaseName),
+            nextLink -> listNextSinglePage(nextLink));
     }
 
     /**
@@ -993,7 +1074,8 @@ public PagedIterable<AccessPolicyAssignmentInner> list(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<AccessPolicyAssignmentInner> list(String resourceGroupName, String clusterName,
         String databaseName, Context context) {
-        return new PagedIterable<>(listAsync(resourceGroupName, clusterName, databaseName, context));
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, clusterName, databaseName, context),
+            nextLink -> listNextSinglePage(nextLink, context));
     }
 
     /**
@@ -1003,8 +1085,7 @@ public PagedIterable<AccessPolicyAssignmentInner> list(String resourceGroupName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all access policy assignments. along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<AccessPolicyAssignmentInner>> listNextSinglePageAsync(String nextLink) {
@@ -1022,6 +1103,33 @@ private Mono<PagedResponse<AccessPolicyAssignmentInner>> listNextSinglePageAsync
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all access policy assignments. along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<AccessPolicyAssignmentInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<AccessPolicyAssignmentList> res
+            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -1030,22 +1138,25 @@ private Mono<PagedResponse<AccessPolicyAssignmentInner>> listNextSinglePageAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all access policy assignments. along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<AccessPolicyAssignmentInner>> listNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<AccessPolicyAssignmentInner> listNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<AccessPolicyAssignmentList> res
+            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(AccessPolicyAssignmentsClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java
index 13bfb8e0f3ea..2d5f40b8da58 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/ClusterImpl.java
@@ -17,6 +17,7 @@
 import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentity;
 import com.azure.resourcemanager.redisenterprise.models.PrivateEndpointConnection;
 import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
 import com.azure.resourcemanager.redisenterprise.models.RedundancyMode;
 import com.azure.resourcemanager.redisenterprise.models.ResourceState;
 import com.azure.resourcemanager.redisenterprise.models.Sku;
@@ -78,6 +79,10 @@ public ManagedServiceIdentity identity() {
         return this.innerModel().identity();
     }
 
+    public PublicNetworkAccess publicNetworkAccess() {
+        return this.innerModel().publicNetworkAccess();
+    }
+
     public HighAvailability highAvailability() {
         return this.innerModel().highAvailability();
     }
@@ -269,6 +274,16 @@ public ClusterImpl withIdentity(ManagedServiceIdentity identity) {
         }
     }
 
+    public ClusterImpl withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
+        if (isInCreateMode()) {
+            this.innerModel().withPublicNetworkAccess(publicNetworkAccess);
+            return this;
+        } else {
+            this.updateParameters.withPublicNetworkAccess(publicNetworkAccess);
+            return this;
+        }
+    }
+
     public ClusterImpl withHighAvailability(HighAvailability highAvailability) {
         if (isInCreateMode()) {
             this.innerModel().withHighAvailability(highAvailability);
@@ -300,6 +315,6 @@ public ClusterImpl withEncryption(ClusterPropertiesEncryption encryption) {
     }
 
     private boolean isInCreateMode() {
-        return this.innerModel().id() == null;
+        return this.innerModel() == null || this.innerModel().id() == null;
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java
index dcf020610758..a8ce62043694 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabaseImpl.java
@@ -337,6 +337,6 @@ public DatabaseImpl withAccessKeysAuthentication(AccessKeysAuthentication access
     }
 
     private boolean isInCreateMode() {
-        return this.innerModel().id() == null;
+        return this.innerModel() == null || this.innerModel().id() == null;
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java
index 5b045b5776aa..e44d49fb1991 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/DatabasesClientImpl.java
@@ -29,8 +29,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.redisenterprise.fluent.DatabasesClient;
@@ -78,7 +80,7 @@ public final class DatabasesClientImpl implements DatabasesClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientDatabases")
     public interface DatabasesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases")
@@ -89,6 +91,15 @@ Mono<Response<DatabaseList>> listByCluster(@HostParam("$host") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DatabaseList> listByClusterSync(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
         @ExpectedResponses({ 200, 201 })
@@ -99,6 +110,16 @@ Mono<Response<Flux<ByteBuffer>>> create(@HostParam("$host") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @BodyParam("application/json") DatabaseInner parameters,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId, @BodyParam("application/json") DatabaseInner parameters,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
         @ExpectedResponses({ 200, 202 })
@@ -110,6 +131,17 @@ Mono<Response<Flux<ByteBuffer>>> update(@HostParam("$host") String endpoint,
             @BodyParam("application/json") DatabaseUpdate parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") DatabaseUpdate parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
         @ExpectedResponses({ 200 })
@@ -119,6 +151,15 @@ Mono<Response<DatabaseInner>> get(@HostParam("$host") String endpoint,
             @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DatabaseInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -128,6 +169,15 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/listKeys")
         @ExpectedResponses({ 200 })
@@ -137,6 +187,15 @@ Mono<Response<AccessKeysInner>> listKeys(@HostParam("$host") String endpoint,
             @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/listKeys")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<AccessKeysInner> listKeysSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/regenerateKey")
         @ExpectedResponses({ 200, 202 })
@@ -148,6 +207,17 @@ Mono<Response<Flux<ByteBuffer>>> regenerateKey(@HostParam("$host") String endpoi
             @BodyParam("application/json") RegenerateKeyParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/regenerateKey")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> regenerateKeySync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") RegenerateKeyParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/import")
         @ExpectedResponses({ 200, 202 })
@@ -159,6 +229,17 @@ Mono<Response<Flux<ByteBuffer>>> importMethod(@HostParam("$host") String endpoin
             @BodyParam("application/json") ImportClusterParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/import")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> importMethodSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") ImportClusterParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/export")
         @ExpectedResponses({ 200, 202 })
@@ -170,6 +251,17 @@ Mono<Response<Flux<ByteBuffer>>> export(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ExportClusterParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/export")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> exportSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") ExportClusterParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/forceUnlink")
         @ExpectedResponses({ 200, 202 })
@@ -181,6 +273,17 @@ Mono<Response<Flux<ByteBuffer>>> forceUnlink(@HostParam("$host") String endpoint
             @BodyParam("application/json") ForceUnlinkParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/forceUnlink")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> forceUnlinkSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") ForceUnlinkParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/forceLinkToReplicationGroup")
         @ExpectedResponses({ 202 })
@@ -192,6 +295,17 @@ Mono<Response<Flux<ByteBuffer>>> forceLinkToReplicationGroup(@HostParam("$host")
             @BodyParam("application/json") ForceLinkParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/forceLinkToReplicationGroup")
+        @ExpectedResponses({ 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> forceLinkToReplicationGroupSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") ForceLinkParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/flush")
         @ExpectedResponses({ 200, 202 })
@@ -203,6 +317,17 @@ Mono<Response<Flux<ByteBuffer>>> flush(@HostParam("$host") String endpoint,
             @BodyParam("application/json") FlushParameters parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/flush")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> flushSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") FlushParameters parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/upgradeDBRedisVersion")
         @ExpectedResponses({ 202 })
@@ -212,12 +337,28 @@ Mono<Response<Flux<ByteBuffer>>> upgradeDBRedisVersion(@HostParam("$host") Strin
             @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/databases/{databaseName}/upgradeDBRedisVersion")
+        @ExpectedResponses({ 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> upgradeDBRedisVersionSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("databaseName") String databaseName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<DatabaseList>> listByClusterNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
             @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<DatabaseList> listByClusterNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -265,38 +406,15 @@ private Mono<PagedResponse<DatabaseInner>> listByClusterSinglePageAsync(String r
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all databases in the specified Redis Enterprise cluster along with {@link PagedResponse} on successful
-     * completion of {@link Mono}.
+     * @return all databases in the specified Redis Enterprise cluster as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<DatabaseInner>> listByClusterSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByCluster(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-                resourceGroupName, clusterName, accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<DatabaseInner> listByClusterAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -308,12 +426,33 @@ private Mono<PagedResponse<DatabaseInner>> listByClusterSinglePageAsync(String r
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all databases in the specified Redis Enterprise cluster as paginated response with {@link PagedFlux}.
+     * @return all databases in the specified Redis Enterprise cluster along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<DatabaseInner> listByClusterAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DatabaseInner> listByClusterSinglePage(String resourceGroupName, String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<DatabaseList> res = service.listByClusterSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, clusterName, accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -326,12 +465,34 @@ private PagedFlux<DatabaseInner> listByClusterAsync(String resourceGroupName, St
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all databases in the specified Redis Enterprise cluster as paginated response with {@link PagedFlux}.
+     * @return all databases in the specified Redis Enterprise cluster along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<DatabaseInner> listByClusterAsync(String resourceGroupName, String clusterName, Context context) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName, context),
-            nextLink -> listByClusterNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DatabaseInner> listByClusterSinglePage(String resourceGroupName, String clusterName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<DatabaseList> res = service.listByClusterSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, clusterName, accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -347,7 +508,8 @@ private PagedFlux<DatabaseInner> listByClusterAsync(String resourceGroupName, St
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<DatabaseInner> listByCluster(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName),
+            nextLink -> listByClusterNextSinglePage(nextLink));
     }
 
     /**
@@ -364,7 +526,8 @@ public PagedIterable<DatabaseInner> listByCluster(String resourceGroupName, Stri
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<DatabaseInner> listByCluster(String resourceGroupName, String clusterName, Context context) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName, context),
+            nextLink -> listByClusterNextSinglePage(nextLink, context));
     }
 
     /**
@@ -423,43 +586,45 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a database on the Redis Enterprise cluster along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return describes a database on the Redis Enterprise cluster along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, DatabaseInner parameters, Context context) {
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        DatabaseInner parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.create(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.createSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -470,18 +635,46 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of describes a database on the Redis Enterprise cluster.
+     * @return describes a database on the Redis Enterprise cluster along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, String databaseName, DatabaseInner parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<DatabaseInner, DatabaseInner>getLroResult(mono, this.client.getHttpPipeline(),
-            DatabaseInner.class, DatabaseInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        DatabaseInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -492,7 +685,6 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(St
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -500,12 +692,11 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(St
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, String databaseName, DatabaseInner parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, String databaseName, DatabaseInner parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
+            = createWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<DatabaseInner, DatabaseInner>getLroResult(mono, this.client.getHttpPipeline(),
-            DatabaseInner.class, DatabaseInner.class, context);
+            DatabaseInner.class, DatabaseInner.class, this.client.getContext());
     }
 
     /**
@@ -524,7 +715,9 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginCreateAsync(St
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(String resourceGroupName,
         String clusterName, String databaseName, DatabaseInner parameters) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<DatabaseInner, DatabaseInner>getLroResult(response, DatabaseInner.class,
+            DatabaseInner.class, Context.NONE);
     }
 
     /**
@@ -544,7 +737,10 @@ public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(String r
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginCreate(String resourceGroupName,
         String clusterName, String databaseName, DatabaseInner parameters, Context context) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, databaseName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = createWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<DatabaseInner, DatabaseInner>getLroResult(response, DatabaseInner.class,
+            DatabaseInner.class, context);
     }
 
     /**
@@ -567,27 +763,6 @@ private Mono<DatabaseInner> createAsync(String resourceGroupName, String cluster
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a database on the Redis Enterprise cluster on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<DatabaseInner> createAsync(String resourceGroupName, String clusterName, String databaseName,
-        DatabaseInner parameters, Context context) {
-        return beginCreateAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Creates a database.
      * 
@@ -604,7 +779,7 @@ private Mono<DatabaseInner> createAsync(String resourceGroupName, String cluster
     @ServiceMethod(returns = ReturnType.SINGLE)
     public DatabaseInner create(String resourceGroupName, String clusterName, String databaseName,
         DatabaseInner parameters) {
-        return createAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        return beginCreate(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -624,7 +799,7 @@ public DatabaseInner create(String resourceGroupName, String clusterName, String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public DatabaseInner create(String resourceGroupName, String clusterName, String databaseName,
         DatabaseInner parameters, Context context) {
-        return createAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        return beginCreate(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -683,43 +858,45 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a database on the Redis Enterprise cluster along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return describes a database on the Redis Enterprise cluster along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, DatabaseUpdate parameters, Context context) {
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        DatabaseUpdate parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.update(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.updateSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -730,18 +907,46 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of describes a database on the Redis Enterprise cluster.
+     * @return describes a database on the Redis Enterprise cluster along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginUpdateAsync(String resourceGroupName,
-        String clusterName, String databaseName, DatabaseUpdate parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = updateWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<DatabaseInner, DatabaseInner>getLroResult(mono, this.client.getHttpPipeline(),
-            DatabaseInner.class, DatabaseInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        DatabaseUpdate parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -752,7 +957,6 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginUpdateAsync(St
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -760,12 +964,11 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginUpdateAsync(St
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginUpdateAsync(String resourceGroupName,
-        String clusterName, String databaseName, DatabaseUpdate parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, String databaseName, DatabaseUpdate parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = updateWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
+            = updateWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<DatabaseInner, DatabaseInner>getLroResult(mono, this.client.getHttpPipeline(),
-            DatabaseInner.class, DatabaseInner.class, context);
+            DatabaseInner.class, DatabaseInner.class, this.client.getContext());
     }
 
     /**
@@ -784,7 +987,9 @@ private PollerFlux<PollResult<DatabaseInner>, DatabaseInner> beginUpdateAsync(St
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginUpdate(String resourceGroupName,
         String clusterName, String databaseName, DatabaseUpdate parameters) {
-        return this.beginUpdateAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<DatabaseInner, DatabaseInner>getLroResult(response, DatabaseInner.class,
+            DatabaseInner.class, Context.NONE);
     }
 
     /**
@@ -804,7 +1009,10 @@ public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginUpdate(String r
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<DatabaseInner>, DatabaseInner> beginUpdate(String resourceGroupName,
         String clusterName, String databaseName, DatabaseUpdate parameters, Context context) {
-        return this.beginUpdateAsync(resourceGroupName, clusterName, databaseName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = updateWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<DatabaseInner, DatabaseInner>getLroResult(response, DatabaseInner.class,
+            DatabaseInner.class, context);
     }
 
     /**
@@ -827,27 +1035,6 @@ private Mono<DatabaseInner> updateAsync(String resourceGroupName, String cluster
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes a database on the Redis Enterprise cluster on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<DatabaseInner> updateAsync(String resourceGroupName, String clusterName, String databaseName,
-        DatabaseUpdate parameters, Context context) {
-        return beginUpdateAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Updates a database.
      * 
@@ -864,7 +1051,7 @@ private Mono<DatabaseInner> updateAsync(String resourceGroupName, String cluster
     @ServiceMethod(returns = ReturnType.SINGLE)
     public DatabaseInner update(String resourceGroupName, String clusterName, String databaseName,
         DatabaseUpdate parameters) {
-        return updateAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        return beginUpdate(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -884,7 +1071,7 @@ public DatabaseInner update(String resourceGroupName, String clusterName, String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public DatabaseInner update(String resourceGroupName, String clusterName, String databaseName,
         DatabaseUpdate parameters, Context context) {
-        return updateAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        return beginUpdate(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -928,47 +1115,6 @@ private Mono<Response<DatabaseInner>> getWithResponseAsync(String resourceGroupN
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets information about a database in a Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about a database in a Redis Enterprise cluster along with {@link Response} on successful
-     * completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<DatabaseInner>> getWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
-    }
-
     /**
      * Gets information about a database in a Redis Enterprise cluster.
      * 
@@ -1003,7 +1149,31 @@ private Mono<DatabaseInner> getAsync(String resourceGroupName, String clusterNam
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<DatabaseInner> getWithResponse(String resourceGroupName, String clusterName, String databaseName,
         Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, databaseName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -1070,37 +1240,38 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, String databaseName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
+        return service.deleteSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, Context.NONE);
     }
 
     /**
@@ -1110,17 +1281,40 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String databaseName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, databaseName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -1130,7 +1324,6 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1138,12 +1331,10 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String databaseName, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, databaseName, context);
+        String databaseName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, databaseName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1161,7 +1352,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String databaseName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, databaseName).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, databaseName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1180,7 +1372,8 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String databaseName, Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, databaseName, context).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, databaseName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1201,25 +1394,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String databaseName, Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, databaseName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes a single database.
      * 
@@ -1233,7 +1407,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String databaseName) {
-        deleteAsync(resourceGroupName, clusterName, databaseName).block();
+        beginDelete(resourceGroupName, clusterName, databaseName).getFinalResult();
     }
 
     /**
@@ -1246,51 +1420,11 @@ public void delete(String resourceGroupName, String clusterName, String database
      * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public void delete(String resourceGroupName, String clusterName, String databaseName, Context context) {
-        deleteAsync(resourceGroupName, clusterName, databaseName, context).block();
-    }
-
-    /**
-     * Retrieves the access keys for the Redis Enterprise database.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return access keys along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<AccessKeysInner>> listKeysWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        return FluxUtil
-            .withContext(context -> service.listKeys(this.client.getEndpoint(), resourceGroupName, clusterName,
-                databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context))
-            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    public void delete(String resourceGroupName, String clusterName, String databaseName, Context context) {
+        beginDelete(resourceGroupName, clusterName, databaseName, context).getFinalResult();
     }
 
     /**
@@ -1300,7 +1434,6 @@ private Mono<Response<AccessKeysInner>> listKeysWithResponseAsync(String resourc
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1308,7 +1441,7 @@ private Mono<Response<AccessKeysInner>> listKeysWithResponseAsync(String resourc
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<Response<AccessKeysInner>> listKeysWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, Context context) {
+        String databaseName) {
         if (this.client.getEndpoint() == null) {
             return Mono.error(
                 new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
@@ -1328,9 +1461,10 @@ private Mono<Response<AccessKeysInner>> listKeysWithResponseAsync(String resourc
                 "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listKeys(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
+        return FluxUtil
+            .withContext(context -> service.listKeys(this.client.getEndpoint(), resourceGroupName, clusterName,
+                databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context))
+            .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
     /**
@@ -1367,7 +1501,31 @@ private Mono<AccessKeysInner> listKeysAsync(String resourceGroupName, String clu
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<AccessKeysInner> listKeysWithResponse(String resourceGroupName, String clusterName,
         String databaseName, Context context) {
-        return listKeysWithResponseAsync(resourceGroupName, clusterName, databaseName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listKeysSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -1442,42 +1600,45 @@ private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(String r
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return access keys along with {@link Response} on successful completion of {@link Mono}.
+     * @return access keys along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(String resourceGroupName,
-        String clusterName, String databaseName, RegenerateKeyParameters parameters, Context context) {
+    private Response<BinaryData> regenerateKeyWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, RegenerateKeyParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.regenerateKey(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.regenerateKeySync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1488,18 +1649,46 @@ private Mono<Response<Flux<ByteBuffer>>> regenerateKeyWithResponseAsync(String r
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of access keys.
+     * @return access keys along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerateKeyAsync(String resourceGroupName,
-        String clusterName, String databaseName, RegenerateKeyParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = regenerateKeyWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<AccessKeysInner, AccessKeysInner>getLroResult(mono, this.client.getHttpPipeline(),
-            AccessKeysInner.class, AccessKeysInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> regenerateKeyWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, RegenerateKeyParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.regenerateKeySync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -1510,7 +1699,6 @@ private PollerFlux<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerate
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1518,12 +1706,11 @@ private PollerFlux<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerate
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerateKeyAsync(String resourceGroupName,
-        String clusterName, String databaseName, RegenerateKeyParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, String databaseName, RegenerateKeyParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = regenerateKeyWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
+            = regenerateKeyWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<AccessKeysInner, AccessKeysInner>getLroResult(mono, this.client.getHttpPipeline(),
-            AccessKeysInner.class, AccessKeysInner.class, context);
+            AccessKeysInner.class, AccessKeysInner.class, this.client.getContext());
     }
 
     /**
@@ -1542,7 +1729,10 @@ private PollerFlux<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerate
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerateKey(String resourceGroupName,
         String clusterName, String databaseName, RegenerateKeyParameters parameters) {
-        return this.beginRegenerateKeyAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response
+            = regenerateKeyWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<AccessKeysInner, AccessKeysInner>getLroResult(response, AccessKeysInner.class,
+            AccessKeysInner.class, Context.NONE);
     }
 
     /**
@@ -1562,8 +1752,10 @@ public SyncPoller<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerateK
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<AccessKeysInner>, AccessKeysInner> beginRegenerateKey(String resourceGroupName,
         String clusterName, String databaseName, RegenerateKeyParameters parameters, Context context) {
-        return this.beginRegenerateKeyAsync(resourceGroupName, clusterName, databaseName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = regenerateKeyWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<AccessKeysInner, AccessKeysInner>getLroResult(response, AccessKeysInner.class,
+            AccessKeysInner.class, context);
     }
 
     /**
@@ -1586,27 +1778,6 @@ private Mono<AccessKeysInner> regenerateKeyAsync(String resourceGroupName, Strin
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Regenerates the Redis Enterprise 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return access keys on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<AccessKeysInner> regenerateKeyAsync(String resourceGroupName, String clusterName, String databaseName,
-        RegenerateKeyParameters parameters, Context context) {
-        return beginRegenerateKeyAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Regenerates the Redis Enterprise database's access keys.
      * 
@@ -1623,7 +1794,7 @@ private Mono<AccessKeysInner> regenerateKeyAsync(String resourceGroupName, Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AccessKeysInner regenerateKey(String resourceGroupName, String clusterName, String databaseName,
         RegenerateKeyParameters parameters) {
-        return regenerateKeyAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        return beginRegenerateKey(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -1643,7 +1814,7 @@ public AccessKeysInner regenerateKey(String resourceGroupName, String clusterNam
     @ServiceMethod(returns = ReturnType.SINGLE)
     public AccessKeysInner regenerateKey(String resourceGroupName, String clusterName, String databaseName,
         RegenerateKeyParameters parameters, Context context) {
-        return regenerateKeyAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        return beginRegenerateKey(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -1701,42 +1872,45 @@ private Mono<Response<Flux<ByteBuffer>>> importMethodWithResponseAsync(String re
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> importMethodWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, ImportClusterParameters parameters, Context context) {
+    private Response<BinaryData> importMethodWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, ImportClusterParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.importMethod(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.importMethodSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -1747,18 +1921,46 @@ private Mono<Response<Flux<ByteBuffer>>> importMethodWithResponseAsync(String re
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginImportMethodAsync(String resourceGroupName, String clusterName,
-        String databaseName, ImportClusterParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = importMethodWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> importMethodWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, ImportClusterParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.importMethodSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -1769,7 +1971,6 @@ private PollerFlux<PollResult<Void>, Void> beginImportMethodAsync(String resourc
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -1777,12 +1978,11 @@ private PollerFlux<PollResult<Void>, Void> beginImportMethodAsync(String resourc
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginImportMethodAsync(String resourceGroupName, String clusterName,
-        String databaseName, ImportClusterParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String databaseName, ImportClusterParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = importMethodWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
+            = importMethodWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -1801,7 +2001,9 @@ private PollerFlux<PollResult<Void>, Void> beginImportMethodAsync(String resourc
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginImportMethod(String resourceGroupName, String clusterName,
         String databaseName, ImportClusterParameters parameters) {
-        return this.beginImportMethodAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response
+            = importMethodWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -1821,8 +2023,9 @@ public SyncPoller<PollResult<Void>, Void> beginImportMethod(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginImportMethod(String resourceGroupName, String clusterName,
         String databaseName, ImportClusterParameters parameters, Context context) {
-        return this.beginImportMethodAsync(resourceGroupName, clusterName, databaseName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = importMethodWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -1845,27 +2048,6 @@ private Mono<Void> importMethodAsync(String resourceGroupName, String clusterNam
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> importMethodAsync(String resourceGroupName, String clusterName, String databaseName,
-        ImportClusterParameters parameters, Context context) {
-        return beginImportMethodAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Imports database files to target database.
      * 
@@ -1881,7 +2063,7 @@ private Mono<Void> importMethodAsync(String resourceGroupName, String clusterNam
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void importMethod(String resourceGroupName, String clusterName, String databaseName,
         ImportClusterParameters parameters) {
-        importMethodAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        beginImportMethod(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -1900,7 +2082,7 @@ public void importMethod(String resourceGroupName, String clusterName, String da
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void importMethod(String resourceGroupName, String clusterName, String databaseName,
         ImportClusterParameters parameters, Context context) {
-        importMethodAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        beginImportMethod(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -1958,42 +2140,45 @@ private Mono<Response<Flux<ByteBuffer>>> exportWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> exportWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, ExportClusterParameters parameters, Context context) {
+    private Response<BinaryData> exportWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        ExportClusterParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.export(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.exportSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -2004,18 +2189,46 @@ private Mono<Response<Flux<ByteBuffer>>> exportWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginExportAsync(String resourceGroupName, String clusterName,
-        String databaseName, ExportClusterParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = exportWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> exportWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        ExportClusterParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.exportSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -2026,7 +2239,6 @@ private PollerFlux<PollResult<Void>, Void> beginExportAsync(String resourceGroup
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2034,12 +2246,11 @@ private PollerFlux<PollResult<Void>, Void> beginExportAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginExportAsync(String resourceGroupName, String clusterName,
-        String databaseName, ExportClusterParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String databaseName, ExportClusterParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = exportWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
+            = exportWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2058,7 +2269,8 @@ private PollerFlux<PollResult<Void>, Void> beginExportAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginExport(String resourceGroupName, String clusterName,
         String databaseName, ExportClusterParameters parameters) {
-        return this.beginExportAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response = exportWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2078,7 +2290,9 @@ public SyncPoller<PollResult<Void>, Void> beginExport(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginExport(String resourceGroupName, String clusterName,
         String databaseName, ExportClusterParameters parameters, Context context) {
-        return this.beginExportAsync(resourceGroupName, clusterName, databaseName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = exportWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2101,27 +2315,6 @@ private Mono<Void> exportAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> exportAsync(String resourceGroupName, String clusterName, String databaseName,
-        ExportClusterParameters parameters, Context context) {
-        return beginExportAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Exports a database file from target database.
      * 
@@ -2137,7 +2330,7 @@ private Mono<Void> exportAsync(String resourceGroupName, String clusterName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void export(String resourceGroupName, String clusterName, String databaseName,
         ExportClusterParameters parameters) {
-        exportAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        beginExport(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -2156,7 +2349,7 @@ public void export(String resourceGroupName, String clusterName, String database
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void export(String resourceGroupName, String clusterName, String databaseName,
         ExportClusterParameters parameters, Context context) {
-        exportAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        beginExport(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -2214,42 +2407,45 @@ private Mono<Response<Flux<ByteBuffer>>> forceUnlinkWithResponseAsync(String res
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> forceUnlinkWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, ForceUnlinkParameters parameters, Context context) {
+    private Response<BinaryData> forceUnlinkWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, ForceUnlinkParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.forceUnlink(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.forceUnlinkSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -2260,18 +2456,46 @@ private Mono<Response<Flux<ByteBuffer>>> forceUnlinkWithResponseAsync(String res
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginForceUnlinkAsync(String resourceGroupName, String clusterName,
-        String databaseName, ForceUnlinkParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = forceUnlinkWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> forceUnlinkWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, ForceUnlinkParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.forceUnlinkSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -2282,7 +2506,6 @@ private PollerFlux<PollResult<Void>, Void> beginForceUnlinkAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2290,12 +2513,11 @@ private PollerFlux<PollResult<Void>, Void> beginForceUnlinkAsync(String resource
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginForceUnlinkAsync(String resourceGroupName, String clusterName,
-        String databaseName, ForceUnlinkParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
+        String databaseName, ForceUnlinkParameters parameters) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = forceUnlinkWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
+            = forceUnlinkWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2314,7 +2536,9 @@ private PollerFlux<PollResult<Void>, Void> beginForceUnlinkAsync(String resource
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginForceUnlink(String resourceGroupName, String clusterName,
         String databaseName, ForceUnlinkParameters parameters) {
-        return this.beginForceUnlinkAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response
+            = forceUnlinkWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2334,8 +2558,9 @@ public SyncPoller<PollResult<Void>, Void> beginForceUnlink(String resourceGroupN
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginForceUnlink(String resourceGroupName, String clusterName,
         String databaseName, ForceUnlinkParameters parameters, Context context) {
-        return this.beginForceUnlinkAsync(resourceGroupName, clusterName, databaseName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = forceUnlinkWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2358,27 +2583,6 @@ private Mono<Void> forceUnlinkAsync(String resourceGroupName, String clusterName
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> forceUnlinkAsync(String resourceGroupName, String clusterName, String databaseName,
-        ForceUnlinkParameters parameters, Context context) {
-        return beginForceUnlinkAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Forcibly removes the link to the specified database resource.
      * 
@@ -2394,7 +2598,7 @@ private Mono<Void> forceUnlinkAsync(String resourceGroupName, String clusterName
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void forceUnlink(String resourceGroupName, String clusterName, String databaseName,
         ForceUnlinkParameters parameters) {
-        forceUnlinkAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        beginForceUnlink(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -2413,7 +2617,7 @@ public void forceUnlink(String resourceGroupName, String clusterName, String dat
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void forceUnlink(String resourceGroupName, String clusterName, String databaseName,
         ForceUnlinkParameters parameters, Context context) {
-        forceUnlinkAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        beginForceUnlink(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -2475,42 +2679,46 @@ private Mono<Response<Flux<ByteBuffer>>> forceLinkToReplicationGroupWithResponse
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> forceLinkToReplicationGroupWithResponseAsync(String resourceGroupName,
-        String clusterName, String databaseName, ForceLinkParameters parameters, Context context) {
+    private Response<BinaryData> forceLinkToReplicationGroupWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, ForceLinkParameters parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.forceLinkToReplicationGroup(this.client.getEndpoint(), resourceGroupName, clusterName,
-            databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
+        return service.forceLinkToReplicationGroupSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept,
+            Context.NONE);
     }
 
     /**
@@ -2523,18 +2731,46 @@ private Mono<Response<Flux<ByteBuffer>>> forceLinkToReplicationGroupWithResponse
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginForceLinkToReplicationGroupAsync(String resourceGroupName,
-        String clusterName, String databaseName, ForceLinkParameters parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = forceLinkToReplicationGroupWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> forceLinkToReplicationGroupWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, ForceLinkParameters parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.forceLinkToReplicationGroupSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -2547,7 +2783,6 @@ private PollerFlux<PollResult<Void>, Void> beginForceLinkToReplicationGroupAsync
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -2555,12 +2790,11 @@ private PollerFlux<PollResult<Void>, Void> beginForceLinkToReplicationGroupAsync
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginForceLinkToReplicationGroupAsync(String resourceGroupName,
-        String clusterName, String databaseName, ForceLinkParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono = forceLinkToReplicationGroupWithResponseAsync(resourceGroupName,
-            clusterName, databaseName, parameters, context);
+        String clusterName, String databaseName, ForceLinkParameters parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono
+            = forceLinkToReplicationGroupWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -2581,8 +2815,9 @@ private PollerFlux<PollResult<Void>, Void> beginForceLinkToReplicationGroupAsync
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginForceLinkToReplicationGroup(String resourceGroupName,
         String clusterName, String databaseName, ForceLinkParameters parameters) {
-        return this.beginForceLinkToReplicationGroupAsync(resourceGroupName, clusterName, databaseName, parameters)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = forceLinkToReplicationGroupWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2604,9 +2839,9 @@ public SyncPoller<PollResult<Void>, Void> beginForceLinkToReplicationGroup(Strin
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginForceLinkToReplicationGroup(String resourceGroupName,
         String clusterName, String databaseName, ForceLinkParameters parameters, Context context) {
-        return this
-            .beginForceLinkToReplicationGroupAsync(resourceGroupName, clusterName, databaseName, parameters, context)
-            .getSyncPoller();
+        Response<BinaryData> response = forceLinkToReplicationGroupWithResponse(resourceGroupName, clusterName,
+            databaseName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2631,30 +2866,6 @@ private Mono<Void> forceLinkToReplicationGroupAsync(String resourceGroupName, St
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Forcibly recreates an existing database on the specified cluster, and rejoins it to an existing 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> forceLinkToReplicationGroupAsync(String resourceGroupName, String clusterName,
-        String databaseName, ForceLinkParameters parameters, Context context) {
-        return beginForceLinkToReplicationGroupAsync(resourceGroupName, clusterName, databaseName, parameters, context)
-            .last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Forcibly recreates an existing database on the specified cluster, and rejoins it to an existing replication
      * group. **IMPORTANT NOTE:** All data in this database will be discarded, and the database will temporarily be
@@ -2672,7 +2883,7 @@ private Mono<Void> forceLinkToReplicationGroupAsync(String resourceGroupName, St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void forceLinkToReplicationGroup(String resourceGroupName, String clusterName, String databaseName,
         ForceLinkParameters parameters) {
-        forceLinkToReplicationGroupAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        beginForceLinkToReplicationGroup(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -2693,7 +2904,8 @@ public void forceLinkToReplicationGroup(String resourceGroupName, String cluster
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void forceLinkToReplicationGroup(String resourceGroupName, String clusterName, String databaseName,
         ForceLinkParameters parameters, Context context) {
-        forceLinkToReplicationGroupAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        beginForceLinkToReplicationGroup(resourceGroupName, clusterName, databaseName, parameters, context)
+            .getFinalResult();
     }
 
     /**
@@ -2741,6 +2953,52 @@ private Mono<Response<Flux<ByteBuffer>>> flushWithResponseAsync(String resourceG
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * 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. 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.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response body along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> flushWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        FlushParameters parameters) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters != null) {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.flushSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
+    }
+
     /**
      * Flushes all the keys in this database and also from its linked databases.
      * 
@@ -2753,35 +3011,38 @@ private Mono<Response<Flux<ByteBuffer>>> flushWithResponseAsync(String resourceG
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> flushWithResponseAsync(String resourceGroupName, String clusterName,
-        String databaseName, FlushParameters parameters, Context context) {
+    private Response<BinaryData> flushWithResponse(String resourceGroupName, String clusterName, String databaseName,
+        FlushParameters parameters, Context context) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters != null) {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.flush(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
+        return service.flushSync(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
             this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
@@ -2837,20 +3098,16 @@ private PollerFlux<PollResult<Void>, Void> beginFlushAsync(String resourceGroupN
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the {@link SyncPoller} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginFlushAsync(String resourceGroupName, String clusterName,
-        String databaseName, FlushParameters parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = flushWithResponseAsync(resourceGroupName, clusterName, databaseName, parameters, context);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+    public SyncPoller<PollResult<Void>, Void> beginFlush(String resourceGroupName, String clusterName,
+        String databaseName, FlushParameters parameters) {
+        Response<BinaryData> response = flushWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2869,7 +3126,8 @@ private PollerFlux<PollResult<Void>, Void> beginFlushAsync(String resourceGroupN
     public SyncPoller<PollResult<Void>, Void> beginFlush(String resourceGroupName, String clusterName,
         String databaseName) {
         final FlushParameters parameters = null;
-        return this.beginFlushAsync(resourceGroupName, clusterName, databaseName, parameters).getSyncPoller();
+        Response<BinaryData> response = flushWithResponse(resourceGroupName, clusterName, databaseName, parameters);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -2889,7 +3147,9 @@ public SyncPoller<PollResult<Void>, Void> beginFlush(String resourceGroupName, S
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginFlush(String resourceGroupName, String clusterName,
         String databaseName, FlushParameters parameters, Context context) {
-        return this.beginFlushAsync(resourceGroupName, clusterName, databaseName, parameters, context).getSyncPoller();
+        Response<BinaryData> response
+            = flushWithResponse(resourceGroupName, clusterName, databaseName, parameters, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -2931,27 +3191,6 @@ private Mono<Void> flushAsync(String resourceGroupName, String clusterName, Stri
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> flushAsync(String resourceGroupName, String clusterName, String databaseName,
-        FlushParameters parameters, Context context) {
-        return beginFlushAsync(resourceGroupName, clusterName, databaseName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Flushes all the keys in this database and also from its linked databases.
      * 
@@ -2966,7 +3205,7 @@ private Mono<Void> flushAsync(String resourceGroupName, String clusterName, Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void flush(String resourceGroupName, String clusterName, String databaseName) {
         final FlushParameters parameters = null;
-        flushAsync(resourceGroupName, clusterName, databaseName, parameters).block();
+        beginFlush(resourceGroupName, clusterName, databaseName, parameters).getFinalResult();
     }
 
     /**
@@ -2985,7 +3224,7 @@ public void flush(String resourceGroupName, String clusterName, String databaseN
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void flush(String resourceGroupName, String clusterName, String databaseName, FlushParameters parameters,
         Context context) {
-        flushAsync(resourceGroupName, clusterName, databaseName, parameters, context).block();
+        beginFlush(resourceGroupName, clusterName, databaseName, parameters, context).getFinalResult();
     }
 
     /**
@@ -3036,37 +3275,39 @@ private Mono<Response<Flux<ByteBuffer>>> upgradeDBRedisVersionWithResponseAsync(
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> upgradeDBRedisVersionWithResponseAsync(String resourceGroupName,
-        String clusterName, String databaseName, Context context) {
+    private Response<BinaryData> upgradeDBRedisVersionWithResponse(String resourceGroupName, String clusterName,
+        String databaseName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (databaseName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.upgradeDBRedisVersion(this.client.getEndpoint(), resourceGroupName, clusterName, databaseName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
+        return service.upgradeDBRedisVersionSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), accept, Context.NONE);
     }
 
     /**
@@ -3076,18 +3317,40 @@ private Mono<Response<Flux<ByteBuffer>>> upgradeDBRedisVersionWithResponseAsync(
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginUpgradeDBRedisVersionAsync(String resourceGroupName,
-        String clusterName, String databaseName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = upgradeDBRedisVersionWithResponseAsync(resourceGroupName, clusterName, databaseName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> upgradeDBRedisVersionWithResponse(String resourceGroupName, String clusterName,
+        String databaseName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (databaseName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter databaseName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.upgradeDBRedisVersionSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            databaseName, this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -3097,7 +3360,6 @@ private PollerFlux<PollResult<Void>, Void> beginUpgradeDBRedisVersionAsync(Strin
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -3105,12 +3367,11 @@ private PollerFlux<PollResult<Void>, Void> beginUpgradeDBRedisVersionAsync(Strin
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginUpgradeDBRedisVersionAsync(String resourceGroupName,
-        String clusterName, String databaseName, Context context) {
-        context = this.client.mergeContext(context);
+        String clusterName, String databaseName) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = upgradeDBRedisVersionWithResponseAsync(resourceGroupName, clusterName, databaseName, context);
+            = upgradeDBRedisVersionWithResponseAsync(resourceGroupName, clusterName, databaseName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -3128,7 +3389,8 @@ private PollerFlux<PollResult<Void>, Void> beginUpgradeDBRedisVersionAsync(Strin
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpgradeDBRedisVersion(String resourceGroupName, String clusterName,
         String databaseName) {
-        return this.beginUpgradeDBRedisVersionAsync(resourceGroupName, clusterName, databaseName).getSyncPoller();
+        Response<BinaryData> response = upgradeDBRedisVersionWithResponse(resourceGroupName, clusterName, databaseName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -3147,8 +3409,9 @@ public SyncPoller<PollResult<Void>, Void> beginUpgradeDBRedisVersion(String reso
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginUpgradeDBRedisVersion(String resourceGroupName, String clusterName,
         String databaseName, Context context) {
-        return this.beginUpgradeDBRedisVersionAsync(resourceGroupName, clusterName, databaseName, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = upgradeDBRedisVersionWithResponse(resourceGroupName, clusterName, databaseName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -3169,26 +3432,6 @@ private Mono<Void> upgradeDBRedisVersionAsync(String resourceGroupName, String c
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> upgradeDBRedisVersionAsync(String resourceGroupName, String clusterName, String databaseName,
-        Context context) {
-        return beginUpgradeDBRedisVersionAsync(resourceGroupName, clusterName, databaseName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Upgrades the database Redis version to the latest available.
      * 
@@ -3202,7 +3445,7 @@ private Mono<Void> upgradeDBRedisVersionAsync(String resourceGroupName, String c
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void upgradeDBRedisVersion(String resourceGroupName, String clusterName, String databaseName) {
-        upgradeDBRedisVersionAsync(resourceGroupName, clusterName, databaseName).block();
+        beginUpgradeDBRedisVersion(resourceGroupName, clusterName, databaseName).getFinalResult();
     }
 
     /**
@@ -3220,7 +3463,7 @@ public void upgradeDBRedisVersion(String resourceGroupName, String clusterName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void upgradeDBRedisVersion(String resourceGroupName, String clusterName, String databaseName,
         Context context) {
-        upgradeDBRedisVersionAsync(resourceGroupName, clusterName, databaseName, context).block();
+        beginUpgradeDBRedisVersion(resourceGroupName, clusterName, databaseName, context).getFinalResult();
     }
 
     /**
@@ -3230,8 +3473,8 @@ public void upgradeDBRedisVersion(String resourceGroupName, String clusterName,
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all databases in the specified Redis Enterprise cluster along with {@link PagedResponse} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono<PagedResponse<DatabaseInner>> listByClusterNextSinglePageAsync(String nextLink) {
@@ -3250,6 +3493,33 @@ private Mono<PagedResponse<DatabaseInner>> listByClusterNextSinglePageAsync(Stri
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return all databases in the specified Redis Enterprise cluster along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<DatabaseInner> listByClusterNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<DatabaseList> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -3258,22 +3528,25 @@ private Mono<PagedResponse<DatabaseInner>> listByClusterNextSinglePageAsync(Stri
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return all databases in the specified Redis Enterprise cluster along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<DatabaseInner>> listByClusterNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<DatabaseInner> listByClusterNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByClusterNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<DatabaseList> res
+            = service.listByClusterNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(DatabasesClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java
index 8ea951a97f48..e700306c50ca 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsClientImpl.java
@@ -25,6 +25,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.redisenterprise.fluent.OperationsClient;
 import com.azure.resourcemanager.redisenterprise.fluent.models.OperationInner;
 import com.azure.resourcemanager.redisenterprise.models.OperationListResult;
@@ -60,7 +61,7 @@ public final class OperationsClientImpl implements OperationsClient {
      * service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientOperations")
     public interface OperationsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/providers/Microsoft.Cache/operations")
@@ -69,12 +70,26 @@ public interface OperationsService {
         Mono<Response<OperationListResult>> list(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/providers/Microsoft.Cache/operations")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<OperationListResult> listSync(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<OperationListResult>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
             @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<OperationListResult> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -103,24 +118,14 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync() {
     /**
      * Lists all of the available REST API operations of the Microsoft.Cache provider.
      * 
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of REST API operations supported by an Azure Resource Provider along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return a list of REST API operations supported by an Azure Resource Provider as paginated response with
+     * {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.list(this.client.getEndpoint(), this.client.getApiVersion(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<OperationInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -128,12 +133,20 @@ private Mono<PagedResponse<OperationInner>> listSinglePageAsync(Context context)
      * 
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of REST API operations supported by an Azure Resource Provider as paginated response with
-     * {@link PagedFlux}.
+     * @return a list of REST API operations supported by an Azure Resource Provider along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<OperationInner> listAsync() {
-        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<OperationInner> listSinglePage() {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<OperationListResult> res
+            = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -143,13 +156,20 @@ private PagedFlux<OperationInner> listAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of REST API operations supported by an Azure Resource Provider as paginated response with
-     * {@link PagedFlux}.
+     * @return a list of REST API operations supported by an Azure Resource Provider along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<OperationInner> listAsync(Context context) {
-        return new PagedFlux<>(() -> listSinglePageAsync(context),
-            nextLink -> listNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<OperationInner> listSinglePage(Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<OperationListResult> res
+            = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -162,7 +182,7 @@ private PagedFlux<OperationInner> listAsync(Context context) {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<OperationInner> list() {
-        return new PagedIterable<>(listAsync());
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listNextSinglePage(nextLink));
     }
 
     /**
@@ -177,7 +197,7 @@ public PagedIterable<OperationInner> list() {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<OperationInner> list(Context context) {
-        return new PagedIterable<>(listAsync(context));
+        return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context));
     }
 
     /**
@@ -206,6 +226,33 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return a list of REST API operations supported by an Azure Resource Provider along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<OperationInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<OperationListResult> res
+            = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -214,22 +261,24 @@ private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextL
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of REST API operations supported by an Azure Resource Provider along with {@link PagedResponse} on
-     * successful completion of {@link Mono}.
+     * @return a list of REST API operations supported by an Azure Resource Provider along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<OperationInner>> listNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<OperationInner> listNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<OperationListResult> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(OperationsClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java
index 5709f8c7f699..18b742b00bbc 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/OperationsStatusClientImpl.java
@@ -21,6 +21,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.redisenterprise.fluent.OperationsStatusClient;
 import com.azure.resourcemanager.redisenterprise.fluent.models.OperationStatusInner;
 import reactor.core.publisher.Mono;
@@ -55,7 +56,7 @@ public final class OperationsStatusClientImpl implements OperationsStatusClient
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientOperationsStatus")
     public interface OperationsStatusService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Cache/locations/{location}/operationsStatus/{operationId}")
@@ -65,6 +66,15 @@ Mono<Response<OperationStatusInner>> get(@HostParam("$host") String endpoint,
             @PathParam("location") String location, @PathParam("operationId") String operationId,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Cache/locations/{location}/operationsStatus/{operationId}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<OperationStatusInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("location") String location, @PathParam("operationId") String operationId,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -100,40 +110,6 @@ private Mono<Response<OperationStatusInner>> getWithResponseAsync(String locatio
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the status of operation.
-     * 
-     * @param location The name of Azure region.
-     * @param operationId The ID of an ongoing async operation.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of operation along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<OperationStatusInner>> getWithResponseAsync(String location, String operationId,
-        Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (location == null) {
-            return Mono.error(new IllegalArgumentException("Parameter location is required and cannot be null."));
-        }
-        if (operationId == null) {
-            return Mono.error(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), location, operationId, this.client.getApiVersion(),
-            this.client.getSubscriptionId(), accept, context);
-    }
-
     /**
      * Gets the status of operation.
      * 
@@ -162,7 +138,27 @@ private Mono<OperationStatusInner> getAsync(String location, String operationId)
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<OperationStatusInner> getWithResponse(String location, String operationId, Context context) {
-        return getWithResponseAsync(location, operationId, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (location == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter location is required and cannot be null."));
+        }
+        if (operationId == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter operationId is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), location, operationId, this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -179,4 +175,6 @@ public Response<OperationStatusInner> getWithResponse(String location, String op
     public OperationStatusInner get(String location, String operationId) {
         return getWithResponse(location, operationId, Context.NONE).getValue();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(OperationsStatusClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java
index 706df8659896..5ee1b2e2ff94 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -27,8 +27,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.redisenterprise.fluent.PrivateEndpointConnectionsClient;
@@ -68,7 +70,7 @@ public final class PrivateEndpointConnectionsClientImpl implements PrivateEndpoi
      * by the proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientPrivateEndpointConnections")
     public interface PrivateEndpointConnectionsService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections")
@@ -79,6 +81,15 @@ Mono<Response<PrivateEndpointConnectionListResult>> list(@HostParam("$host") Str
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateEndpointConnectionListResult> listSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200 })
@@ -89,6 +100,16 @@ Mono<Response<PrivateEndpointConnectionInner>> get(@HostParam("$host") String en
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateEndpointConnectionInner> getSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 201 })
@@ -100,6 +121,17 @@ Mono<Response<Flux<ByteBuffer>>> put(@HostParam("$host") String endpoint,
             @BodyParam("application/json") PrivateEndpointConnectionInner properties,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
+        @ExpectedResponses({ 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> putSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
+            @BodyParam("application/json") PrivateEndpointConnectionInner properties,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -109,6 +141,16 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -156,38 +198,15 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of private endpoint connection associated with the specified storage account along with
-     * {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return list of private endpoint connection associated with the specified storage account as paginated response
+     * with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .list(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-                this.client.getSubscriptionId(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), null, null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, clusterName));
     }
 
     /**
@@ -199,12 +218,35 @@ private Mono<PagedResponse<PrivateEndpointConnectionInner>> listSinglePageAsync(
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of private endpoint connection associated with the specified storage account as paginated response
-     * with {@link PagedFlux}.
+     * @return list of private endpoint connection associated with the specified storage account along with
+     * {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, clusterName));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateEndpointConnectionInner> listSinglePage(String resourceGroupName, String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateEndpointConnectionListResult> res
+            = service.listSync(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
+                this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            null, null);
     }
 
     /**
@@ -217,13 +259,36 @@ private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroup
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of private endpoint connection associated with the specified storage account as paginated response
-     * with {@link PagedFlux}.
+     * @return list of private endpoint connection associated with the specified storage account along with
+     * {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroupName, String clusterName,
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateEndpointConnectionInner> listSinglePage(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedFlux<>(() -> listSinglePageAsync(resourceGroupName, clusterName, context));
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateEndpointConnectionListResult> res
+            = service.listSync(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
+                this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            null, null);
     }
 
     /**
@@ -240,7 +305,7 @@ private PagedFlux<PrivateEndpointConnectionInner> listAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, clusterName));
     }
 
     /**
@@ -259,7 +324,7 @@ public PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupNa
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateEndpointConnectionInner> list(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedIterable<>(listAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listSinglePage(resourceGroupName, clusterName, context));
     }
 
     /**
@@ -306,49 +371,6 @@ private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(Stri
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets the specified private endpoint connection associated with the Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the specified private endpoint connection associated with the Redis Enterprise cluster along with
-     * {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<PrivateEndpointConnectionInner>> getWithResponseAsync(String resourceGroupName,
-        String clusterName, String privateEndpointConnectionName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (privateEndpointConnectionName == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter privateEndpointConnectionName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.get(this.client.getEndpoint(), resourceGroupName, clusterName, privateEndpointConnectionName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
-    }
-
     /**
      * Gets the specified private endpoint connection associated with the Redis Enterprise cluster.
      * 
@@ -388,7 +410,32 @@ private Mono<PrivateEndpointConnectionInner> getAsync(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<PrivateEndpointConnectionInner> getWithResponse(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, Context context) {
-        return getWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (privateEndpointConnectionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getSync(this.client.getEndpoint(), resourceGroupName, clusterName, privateEndpointConnectionName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -469,44 +516,46 @@ private Mono<Response<Flux<ByteBuffer>>> putWithResponseAsync(String resourceGro
      * @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
      * resource.
      * @param properties The private endpoint connection properties.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Private Endpoint Connection resource along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return the Private Endpoint Connection resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> putWithResponseAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, PrivateEndpointConnectionInner properties, Context context) {
+    private Response<BinaryData> putWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName, PrivateEndpointConnectionInner properties) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (privateEndpointConnectionName == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter privateEndpointConnectionName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
         if (properties == null) {
-            return Mono.error(new IllegalArgumentException("Parameter properties is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter properties is required and cannot be null."));
         } else {
             properties.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.put(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-            this.client.getSubscriptionId(), privateEndpointConnectionName, properties, accept, context);
+        return service.putSync(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
+            this.client.getSubscriptionId(), privateEndpointConnectionName, properties, accept, Context.NONE);
     }
 
     /**
@@ -518,20 +567,47 @@ private Mono<Response<Flux<ByteBuffer>>> putWithResponseAsync(String resourceGro
      * @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
      * resource.
      * @param properties The private endpoint connection properties.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of the Private Endpoint Connection resource.
+     * @return the Private Endpoint Connection resource along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner> beginPutAsync(
-        String resourceGroupName, String clusterName, String privateEndpointConnectionName,
-        PrivateEndpointConnectionInner properties) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = putWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties);
-        return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(mono,
-            this.client.getHttpPipeline(), PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> putWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName, PrivateEndpointConnectionInner properties, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (privateEndpointConnectionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
+        }
+        if (properties == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter properties is required and cannot be null."));
+        } else {
+            properties.validate();
+        }
+        final String accept = "application/json";
+        return service.putSync(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
+            this.client.getSubscriptionId(), privateEndpointConnectionName, properties, accept, context);
     }
 
     /**
@@ -543,7 +619,6 @@ private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointCo
      * @param privateEndpointConnectionName The name of the private endpoint connection associated with the Azure
      * resource.
      * @param properties The private endpoint connection properties.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -552,13 +627,12 @@ private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointCo
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner> beginPutAsync(
         String resourceGroupName, String clusterName, String privateEndpointConnectionName,
-        PrivateEndpointConnectionInner properties, Context context) {
-        context = this.client.mergeContext(context);
+        PrivateEndpointConnectionInner properties) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = putWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties, context);
+            = putWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties);
         return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(mono,
             this.client.getHttpPipeline(), PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -579,8 +653,10 @@ private PollerFlux<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointCo
     public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner> beginPut(
         String resourceGroupName, String clusterName, String privateEndpointConnectionName,
         PrivateEndpointConnectionInner properties) {
-        return this.beginPutAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = putWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, properties);
+        return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(response,
+            PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class, Context.NONE);
     }
 
     /**
@@ -602,8 +678,10 @@ public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointCon
     public SyncPoller<PollResult<PrivateEndpointConnectionInner>, PrivateEndpointConnectionInner> beginPut(
         String resourceGroupName, String clusterName, String privateEndpointConnectionName,
         PrivateEndpointConnectionInner properties, Context context) {
-        return this.beginPutAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = putWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, properties, context);
+        return this.client.<PrivateEndpointConnectionInner, PrivateEndpointConnectionInner>getLroResult(response,
+            PrivateEndpointConnectionInner.class, PrivateEndpointConnectionInner.class, context);
     }
 
     /**
@@ -627,28 +705,6 @@ private Mono<PrivateEndpointConnectionInner> putAsync(String resourceGroupName,
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Updates the state of the specified private endpoint connection associated with the Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Private Endpoint Connection resource on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PrivateEndpointConnectionInner> putAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, PrivateEndpointConnectionInner properties, Context context) {
-        return beginPutAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Updates the state of the specified private endpoint connection associated with the Redis Enterprise cluster.
      * 
@@ -666,7 +722,7 @@ private Mono<PrivateEndpointConnectionInner> putAsync(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public PrivateEndpointConnectionInner put(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, PrivateEndpointConnectionInner properties) {
-        return putAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties).block();
+        return beginPut(resourceGroupName, clusterName, privateEndpointConnectionName, properties).getFinalResult();
     }
 
     /**
@@ -687,7 +743,8 @@ public PrivateEndpointConnectionInner put(String resourceGroupName, String clust
     @ServiceMethod(returns = ReturnType.SINGLE)
     public PrivateEndpointConnectionInner put(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, PrivateEndpointConnectionInner properties, Context context) {
-        return putAsync(resourceGroupName, clusterName, privateEndpointConnectionName, properties, context).block();
+        return beginPut(resourceGroupName, clusterName, privateEndpointConnectionName, properties, context)
+            .getFinalResult();
     }
 
     /**
@@ -741,38 +798,41 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (privateEndpointConnectionName == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter privateEndpointConnectionName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-            this.client.getSubscriptionId(), privateEndpointConnectionName, accept, context);
+        return service.deleteSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), privateEndpointConnectionName, accept,
+            Context.NONE);
     }
 
     /**
@@ -783,18 +843,42 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName) {
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName,
+        String privateEndpointConnectionName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (privateEndpointConnectionName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter privateEndpointConnectionName is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), privateEndpointConnectionName, accept,
+            context);
     }
 
     /**
@@ -805,7 +889,6 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * 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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -813,12 +896,11 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        String privateEndpointConnectionName, Context context) {
-        context = this.client.mergeContext(context);
+        String privateEndpointConnectionName) {
         Mono<Response<Flux<ByteBuffer>>> mono
-            = deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context);
+            = deleteWithResponseAsync(resourceGroupName, clusterName, privateEndpointConnectionName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -837,7 +919,9 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName).getSyncPoller();
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -857,8 +941,9 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         String privateEndpointConnectionName, Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context)
-            .getSyncPoller();
+        Response<BinaryData> response
+            = deleteWithResponse(resourceGroupName, clusterName, privateEndpointConnectionName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -880,27 +965,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Deletes the specified private endpoint connection associated with the Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, String privateEndpointConnectionName,
-        Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes the specified private endpoint connection associated with the Redis Enterprise cluster.
      * 
@@ -915,7 +979,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Str
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName) {
-        deleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName).block();
+        beginDelete(resourceGroupName, clusterName, privateEndpointConnectionName).getFinalResult();
     }
 
     /**
@@ -934,6 +998,8 @@ public void delete(String resourceGroupName, String clusterName, String privateE
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, String privateEndpointConnectionName,
         Context context) {
-        deleteAsync(resourceGroupName, clusterName, privateEndpointConnectionName, context).block();
+        beginDelete(resourceGroupName, clusterName, privateEndpointConnectionName, context).getFinalResult();
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(PrivateEndpointConnectionsClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateLinkResourcesClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateLinkResourcesClientImpl.java
index 28056dfd400f..f45c7d374031 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateLinkResourcesClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/PrivateLinkResourcesClientImpl.java
@@ -25,6 +25,7 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.resourcemanager.redisenterprise.fluent.PrivateLinkResourcesClient;
 import com.azure.resourcemanager.redisenterprise.fluent.models.PrivateLinkResourceInner;
 import com.azure.resourcemanager.redisenterprise.models.PrivateLinkResourceListResult;
@@ -60,7 +61,7 @@ public final class PrivateLinkResourcesClientImpl implements PrivateLinkResource
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientPrivateLinkResources")
     public interface PrivateLinkResourcesService {
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateLinkResources")
@@ -70,6 +71,15 @@ Mono<Response<PrivateLinkResourceListResult>> listByCluster(@HostParam("$host")
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/privateLinkResources")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<PrivateLinkResourceListResult> listByClusterSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -117,38 +127,15 @@ private Mono<PagedResponse<PrivateLinkResourceInner>> listByClusterSinglePageAsy
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a Redis Enterprise cluster along with
-     * {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return the private link resources that need to be created for a Redis Enterprise cluster as paginated response
+     * with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<PrivateLinkResourceInner>> listByClusterSinglePageAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByCluster(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-                this.client.getSubscriptionId(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), null, null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<PrivateLinkResourceInner> listByClusterAsync(String resourceGroupName, String clusterName) {
+        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName));
     }
 
     /**
@@ -160,12 +147,36 @@ private Mono<PagedResponse<PrivateLinkResourceInner>> listByClusterSinglePageAsy
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a Redis Enterprise cluster as paginated response
-     * with {@link PagedFlux}.
+     * @return the private link resources that need to be created for a Redis Enterprise cluster along with
+     * {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<PrivateLinkResourceInner> listByClusterAsync(String resourceGroupName, String clusterName) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateLinkResourceInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateLinkResourceListResult> res
+            = service.listByClusterSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+                this.client.getApiVersion(), this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            null, null);
     }
 
     /**
@@ -178,13 +189,36 @@ private PagedFlux<PrivateLinkResourceInner> listByClusterAsync(String resourceGr
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the private link resources that need to be created for a Redis Enterprise cluster as paginated response
-     * with {@link PagedFlux}.
+     * @return the private link resources that need to be created for a Redis Enterprise cluster along with
+     * {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<PrivateLinkResourceInner> listByClusterAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        return new PagedFlux<>(() -> listByClusterSinglePageAsync(resourceGroupName, clusterName, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<PrivateLinkResourceInner> listByClusterSinglePage(String resourceGroupName,
+        String clusterName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<PrivateLinkResourceListResult> res
+            = service.listByClusterSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+                this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            null, null);
     }
 
     /**
@@ -201,7 +235,7 @@ private PagedFlux<PrivateLinkResourceInner> listByClusterAsync(String resourceGr
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateLinkResourceInner> listByCluster(String resourceGroupName, String clusterName) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName));
     }
 
     /**
@@ -220,6 +254,8 @@ public PagedIterable<PrivateLinkResourceInner> listByCluster(String resourceGrou
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<PrivateLinkResourceInner> listByCluster(String resourceGroupName, String clusterName,
         Context context) {
-        return new PagedIterable<>(listByClusterAsync(resourceGroupName, clusterName, context));
+        return new PagedIterable<>(() -> listByClusterSinglePage(resourceGroupName, clusterName, context));
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(PrivateLinkResourcesClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java
index 32832717d3a2..85b0c406dcc1 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterpriseManagementClientImpl.java
@@ -15,12 +15,15 @@
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
 import com.azure.core.management.polling.PollerFactory;
+import com.azure.core.management.polling.SyncPollerFactory;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.AsyncPollResponse;
 import com.azure.core.util.polling.LongRunningOperationStatus;
 import com.azure.core.util.polling.PollerFlux;
+import com.azure.core.util.polling.SyncPoller;
 import com.azure.core.util.serializer.SerializerAdapter;
 import com.azure.core.util.serializer.SerializerEncoding;
 import com.azure.resourcemanager.redisenterprise.fluent.AccessPolicyAssignmentsClient;
@@ -244,7 +247,7 @@ public PrivateLinkResourcesClient getPrivateLinkResources() {
         this.defaultPollInterval = defaultPollInterval;
         this.subscriptionId = subscriptionId;
         this.endpoint = endpoint;
-        this.apiVersion = "2025-05-01-preview";
+        this.apiVersion = "2025-07-01";
         this.operations = new OperationsClientImpl(this);
         this.operationsStatus = new OperationsStatusClientImpl(this);
         this.redisEnterprises = new RedisEnterprisesClientImpl(this);
@@ -291,6 +294,23 @@ public <T, U> PollerFlux<PollResult<T>, U> getLroResult(Mono<Response<Flux<ByteB
             defaultPollInterval, activationResponse, context);
     }
 
+    /**
+     * Gets long running operation result.
+     * 
+     * @param activationResponse the response of activation operation.
+     * @param pollResultType type of poll result.
+     * @param finalResultType type of final result.
+     * @param context the context shared by all requests.
+     * @param <T> type of poll result.
+     * @param <U> type of final result.
+     * @return SyncPoller for poll result and final result.
+     */
+    public <T, U> SyncPoller<PollResult<T>, U> getLroResult(Response<BinaryData> activationResponse,
+        Type pollResultType, Type finalResultType, Context context) {
+        return SyncPollerFactory.create(serializerAdapter, httpPipeline, pollResultType, finalResultType,
+            defaultPollInterval, () -> activationResponse, context);
+    }
+
     /**
      * Gets the final result, or an error, based on last async poll response.
      * 
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterprisesClientImpl.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterprisesClientImpl.java
index 5635ec4be2bb..f9d37853e12d 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterprisesClientImpl.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/implementation/RedisEnterprisesClientImpl.java
@@ -29,8 +29,10 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.management.exception.ManagementException;
 import com.azure.core.management.polling.PollResult;
+import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
 import com.azure.core.util.FluxUtil;
+import com.azure.core.util.logging.ClientLogger;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.resourcemanager.redisenterprise.fluent.RedisEnterprisesClient;
@@ -72,7 +74,7 @@ public final class RedisEnterprisesClientImpl implements RedisEnterprisesClient
      * proxy service to perform REST calls.
      */
     @Host("{$host}")
-    @ServiceInterface(name = "RedisEnterpriseManag")
+    @ServiceInterface(name = "RedisEnterpriseManagementClientRedisEnterprises")
     public interface RedisEnterprisesService {
         @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
@@ -84,6 +86,16 @@ Mono<Response<Flux<ByteBuffer>>> create(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ClusterInner parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
+        @ExpectedResponses({ 200, 201 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> createSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") ClusterInner parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
         @ExpectedResponses({ 200, 202 })
@@ -94,6 +106,16 @@ Mono<Response<Flux<ByteBuffer>>> update(@HostParam("$host") String endpoint,
             @BodyParam("application/json") ClusterUpdate parameters, @HeaderParam("Accept") String accept,
             Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
+        @ExpectedResponses({ 200, 202 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> updateSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @BodyParam("application/json") ClusterUpdate parameters, @HeaderParam("Accept") String accept,
+            Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
         @ExpectedResponses({ 200, 202, 204 })
@@ -103,6 +125,15 @@ Mono<Response<Flux<ByteBuffer>>> delete(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
+        @ExpectedResponses({ 200, 202, 204 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<BinaryData> deleteSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
         @ExpectedResponses({ 200 })
@@ -112,6 +143,15 @@ Mono<Response<ClusterInner>> getByResourceGroup(@HostParam("$host") String endpo
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterInner> getByResourceGroupSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise")
         @ExpectedResponses({ 200 })
@@ -120,6 +160,14 @@ Mono<Response<ClusterList>> listByResourceGroup(@HostParam("$host") String endpo
             @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterList> listByResourceGroupSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @QueryParam("api-version") String apiVersion,
+            @PathParam("subscriptionId") String subscriptionId, @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Cache/redisEnterprise")
         @ExpectedResponses({ 200 })
@@ -128,6 +176,14 @@ Mono<Response<ClusterList>> list(@HostParam("$host") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("/subscriptions/{subscriptionId}/providers/Microsoft.Cache/redisEnterprise")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterList> listSync(@HostParam("$host") String endpoint,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/listSkusForScaling")
         @ExpectedResponses({ 200 })
@@ -137,6 +193,15 @@ Mono<Response<SkuDetailsListInner>> listSkusForScaling(@HostParam("$host") Strin
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cache/redisEnterprise/{clusterName}/listSkusForScaling")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<SkuDetailsListInner> listSkusForScalingSync(@HostParam("$host") String endpoint,
+            @PathParam("resourceGroupName") String resourceGroupName, @PathParam("clusterName") String clusterName,
+            @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -145,12 +210,27 @@ Mono<Response<ClusterList>> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
             @HeaderParam("Accept") String accept, Context context);
 
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterList> listByResourceGroupNextSync(
+            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("$host") String endpoint,
+            @HeaderParam("Accept") String accept, Context context);
+
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono<Response<ClusterList>> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
             @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
+
+        @Headers({ "Content-Type: application/json" })
+        @Get("{nextLink}")
+        @ExpectedResponses({ 200 })
+        @UnexpectedResponseExceptionType(ManagementException.class)
+        Response<ClusterList> listNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
+            @HostParam("$host") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -203,40 +283,41 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @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 Redis Enterprise operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the Redis Enterprise cluster along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return describes the Redis Enterprise cluster along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resourceGroupName, String clusterName,
-        ClusterInner parameters, Context context) {
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName,
+        ClusterInner parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.create(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-            this.client.getSubscriptionId(), parameters, accept, context);
+        return service.createSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -246,17 +327,42 @@ private Mono<Response<Flux<ByteBuffer>>> createWithResponseAsync(String resource
      * @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 Redis Enterprise operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of describes the Redis Enterprise cluster.
+     * @return describes the Redis Enterprise cluster along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, ClusterInner parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono = createWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<ClusterInner, ClusterInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ClusterInner.class, ClusterInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> createWithResponse(String resourceGroupName, String clusterName,
+        ClusterInner parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.createSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -266,7 +372,6 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(Stri
      * @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 Redis Enterprise operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -274,12 +379,10 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(Stri
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(String resourceGroupName,
-        String clusterName, ClusterInner parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = createWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+        String clusterName, ClusterInner parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono = createWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<ClusterInner, ClusterInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ClusterInner.class, ClusterInner.class, context);
+            ClusterInner.class, ClusterInner.class, this.client.getContext());
     }
 
     /**
@@ -297,7 +400,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginCreateAsync(Stri
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreate(String resourceGroupName, String clusterName,
         ClusterInner parameters) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<ClusterInner, ClusterInner>getLroResult(response, ClusterInner.class, ClusterInner.class,
+            Context.NONE);
     }
 
     /**
@@ -316,7 +421,9 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreate(String res
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginCreate(String resourceGroupName, String clusterName,
         ClusterInner parameters, Context context) {
-        return this.beginCreateAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
+        Response<BinaryData> response = createWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<ClusterInner, ClusterInner>getLroResult(response, ClusterInner.class, ClusterInner.class,
+            context);
     }
 
     /**
@@ -337,26 +444,6 @@ private Mono<ClusterInner> createAsync(String resourceGroupName, String clusterN
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * 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. 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 Redis Enterprise operation.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the Redis Enterprise cluster on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<ClusterInner> createAsync(String resourceGroupName, String clusterName, ClusterInner parameters,
-        Context context) {
-        return beginCreateAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Creates or updates an existing (overwrite/recreate, with potential downtime) cache cluster.
      * 
@@ -371,7 +458,7 @@ private Mono<ClusterInner> createAsync(String resourceGroupName, String clusterN
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ClusterInner create(String resourceGroupName, String clusterName, ClusterInner parameters) {
-        return createAsync(resourceGroupName, clusterName, parameters).block();
+        return beginCreate(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -389,7 +476,7 @@ public ClusterInner create(String resourceGroupName, String clusterName, Cluster
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ClusterInner create(String resourceGroupName, String clusterName, ClusterInner parameters, Context context) {
-        return createAsync(resourceGroupName, clusterName, parameters, context).block();
+        return beginCreate(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -442,40 +529,41 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
      * @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 Redis Enterprise operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the Redis Enterprise cluster along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return describes the Redis Enterprise cluster along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resourceGroupName, String clusterName,
-        ClusterUpdate parameters, Context context) {
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String clusterName,
+        ClusterUpdate parameters) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         if (parameters == null) {
-            return Mono.error(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
         } else {
             parameters.validate();
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.update(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-            this.client.getSubscriptionId(), parameters, accept, context);
+        return service.updateSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, Context.NONE);
     }
 
     /**
@@ -485,17 +573,42 @@ private Mono<Response<Flux<ByteBuffer>>> updateWithResponseAsync(String resource
      * @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 Redis Enterprise operation.
+     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of describes the Redis Enterprise cluster.
+     * @return describes the Redis Enterprise cluster along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(String resourceGroupName,
-        String clusterName, ClusterUpdate parameters) {
-        Mono<Response<Flux<ByteBuffer>>> mono = updateWithResponseAsync(resourceGroupName, clusterName, parameters);
-        return this.client.<ClusterInner, ClusterInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ClusterInner.class, ClusterInner.class, this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> updateWithResponse(String resourceGroupName, String clusterName,
+        ClusterUpdate parameters, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        if (parameters == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter parameters is required and cannot be null."));
+        } else {
+            parameters.validate();
+        }
+        final String accept = "application/json";
+        return service.updateSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), parameters, accept, context);
     }
 
     /**
@@ -505,7 +618,6 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(Stri
      * @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 Redis Enterprise operation.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
@@ -513,12 +625,10 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(Stri
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(String resourceGroupName,
-        String clusterName, ClusterUpdate parameters, Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono
-            = updateWithResponseAsync(resourceGroupName, clusterName, parameters, context);
+        String clusterName, ClusterUpdate parameters) {
+        Mono<Response<Flux<ByteBuffer>>> mono = updateWithResponseAsync(resourceGroupName, clusterName, parameters);
         return this.client.<ClusterInner, ClusterInner>getLroResult(mono, this.client.getHttpPipeline(),
-            ClusterInner.class, ClusterInner.class, context);
+            ClusterInner.class, ClusterInner.class, this.client.getContext());
     }
 
     /**
@@ -536,7 +646,9 @@ private PollerFlux<PollResult<ClusterInner>, ClusterInner> beginUpdateAsync(Stri
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(String resourceGroupName, String clusterName,
         ClusterUpdate parameters) {
-        return this.beginUpdateAsync(resourceGroupName, clusterName, parameters).getSyncPoller();
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, clusterName, parameters);
+        return this.client.<ClusterInner, ClusterInner>getLroResult(response, ClusterInner.class, ClusterInner.class,
+            Context.NONE);
     }
 
     /**
@@ -555,7 +667,9 @@ public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(String res
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<ClusterInner>, ClusterInner> beginUpdate(String resourceGroupName, String clusterName,
         ClusterUpdate parameters, Context context) {
-        return this.beginUpdateAsync(resourceGroupName, clusterName, parameters, context).getSyncPoller();
+        Response<BinaryData> response = updateWithResponse(resourceGroupName, clusterName, parameters, context);
+        return this.client.<ClusterInner, ClusterInner>getLroResult(response, ClusterInner.class, ClusterInner.class,
+            context);
     }
 
     /**
@@ -576,26 +690,6 @@ private Mono<ClusterInner> updateAsync(String resourceGroupName, String clusterN
             .flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Updates an existing Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 Redis Enterprise operation.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return describes the Redis Enterprise cluster on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<ClusterInner> updateAsync(String resourceGroupName, String clusterName, ClusterUpdate parameters,
-        Context context) {
-        return beginUpdateAsync(resourceGroupName, clusterName, parameters, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Updates an existing Redis Enterprise cluster.
      * 
@@ -610,7 +704,7 @@ private Mono<ClusterInner> updateAsync(String resourceGroupName, String clusterN
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ClusterInner update(String resourceGroupName, String clusterName, ClusterUpdate parameters) {
-        return updateAsync(resourceGroupName, clusterName, parameters).block();
+        return beginUpdate(resourceGroupName, clusterName, parameters).getFinalResult();
     }
 
     /**
@@ -629,7 +723,7 @@ public ClusterInner update(String resourceGroupName, String clusterName, Cluster
     @ServiceMethod(returns = ReturnType.SINGLE)
     public ClusterInner update(String resourceGroupName, String clusterName, ClusterUpdate parameters,
         Context context) {
-        return updateAsync(resourceGroupName, clusterName, parameters, context).block();
+        return beginUpdate(resourceGroupName, clusterName, parameters, context).getFinalResult();
     }
 
     /**
@@ -673,34 +767,34 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
+     * @return the response body along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceGroupName, String clusterName,
-        Context context) {
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName) {
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
         }
         if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
         }
         if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.delete(this.client.getEndpoint(), resourceGroupName, clusterName, this.client.getApiVersion(),
-            this.client.getSubscriptionId(), accept, context);
+        return service.deleteSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, Context.NONE);
     }
 
     /**
@@ -709,16 +803,35 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of long-running operation.
+     * @return the response body along with {@link Response}.
      */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName) {
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName);
-        return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            this.client.getContext());
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private Response<BinaryData> deleteWithResponse(String resourceGroupName, String clusterName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.deleteSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -727,19 +840,16 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @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 context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
      * @return the {@link PollerFlux} for polling of long-running operation.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName,
-        Context context) {
-        context = this.client.mergeContext(context);
-        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName, context);
+    private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroupName, String clusterName) {
+        Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, clusterName);
         return this.client.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class,
-            context);
+            this.client.getContext());
     }
 
     /**
@@ -755,7 +865,8 @@ private PollerFlux<PollResult<Void>, Void> beginDeleteAsync(String resourceGroup
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, Context.NONE);
     }
 
     /**
@@ -773,7 +884,8 @@ public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName,
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller<PollResult<Void>, Void> beginDelete(String resourceGroupName, String clusterName,
         Context context) {
-        return this.beginDeleteAsync(resourceGroupName, clusterName, context).getSyncPoller();
+        Response<BinaryData> response = deleteWithResponse(resourceGroupName, clusterName, context);
+        return this.client.<Void, Void>getLroResult(response, Void.class, Void.class, context);
     }
 
     /**
@@ -792,24 +904,6 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName) {
         return beginDeleteAsync(resourceGroupName, clusterName).last().flatMap(this.client::getLroFinalResultOrError);
     }
 
-    /**
-     * Deletes a Redis Enterprise cache cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Context context) {
-        return beginDeleteAsync(resourceGroupName, clusterName, context).last()
-            .flatMap(this.client::getLroFinalResultOrError);
-    }
-
     /**
      * Deletes a Redis Enterprise cache cluster.
      * 
@@ -822,7 +916,7 @@ private Mono<Void> deleteAsync(String resourceGroupName, String clusterName, Con
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName) {
-        deleteAsync(resourceGroupName, clusterName).block();
+        beginDelete(resourceGroupName, clusterName).getFinalResult();
     }
 
     /**
@@ -838,7 +932,7 @@ public void delete(String resourceGroupName, String clusterName) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public void delete(String resourceGroupName, String clusterName, Context context) {
-        deleteAsync(resourceGroupName, clusterName, context).block();
+        beginDelete(resourceGroupName, clusterName, context).getFinalResult();
     }
 
     /**
@@ -878,43 +972,6 @@ private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(String
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Gets information about a Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return information about a Redis Enterprise cluster along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<ClusterInner>> getByResourceGroupWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.getByResourceGroup(this.client.getEndpoint(), resourceGroupName, clusterName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
-    }
-
     /**
      * Gets information about a Redis Enterprise cluster.
      * 
@@ -947,7 +1004,27 @@ private Mono<ClusterInner> getByResourceGroupAsync(String resourceGroupName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<ClusterInner> getByResourceGroupWithResponse(String resourceGroupName, String clusterName,
         Context context) {
-        return getByResourceGroupWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.getByResourceGroupSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -1003,35 +1080,15 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupSinglePageAsync(Str
      * Lists all Redis Enterprise clusters in a resource group.
      * 
      * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @param context The context to associate with this operation.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the response of a list-all operation as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listByResourceGroupSinglePageAsync(String resourceGroupName,
-        Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .listByResourceGroup(this.client.getEndpoint(), resourceGroupName, this.client.getApiVersion(),
-                this.client.getSubscriptionId(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupName) {
+        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -1041,12 +1098,29 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupSinglePageAsync(Str
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation as paginated response with {@link PagedFlux}.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupName) {
-        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName),
-            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listByResourceGroupSinglePage(String resourceGroupName) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterList> res = service.listByResourceGroupSync(this.client.getEndpoint(), resourceGroupName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1057,12 +1131,29 @@ private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupNam
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation as paginated response with {@link PagedFlux}.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupName, Context context) {
-        return new PagedFlux<>(() -> listByResourceGroupSinglePageAsync(resourceGroupName, context),
-            nextLink -> listByResourceGroupNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listByResourceGroupSinglePage(String resourceGroupName, Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterList> res = service.listByResourceGroupSync(this.client.getEndpoint(), resourceGroupName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1076,7 +1167,8 @@ private PagedFlux<ClusterInner> listByResourceGroupAsync(String resourceGroupNam
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> listByResourceGroup(String resourceGroupName) {
-        return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName));
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink));
     }
 
     /**
@@ -1091,7 +1183,8 @@ public PagedIterable<ClusterInner> listByResourceGroup(String resourceGroupName)
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> listByResourceGroup(String resourceGroupName, Context context) {
-        return new PagedIterable<>(listByResourceGroupAsync(resourceGroupName, context));
+        return new PagedIterable<>(() -> listByResourceGroupSinglePage(resourceGroupName, context),
+            nextLink -> listByResourceGroupNextSinglePage(nextLink, context));
     }
 
     /**
@@ -1124,30 +1217,13 @@ private Mono<PagedResponse<ClusterInner>> listSinglePageAsync() {
     /**
      * Lists all Redis Enterprise clusters in the specified subscription.
      * 
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the response of a list-all operation as paginated response with {@link PagedFlux}.
      */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listSinglePageAsync(Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service
-            .list(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(), accept,
-                context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    private PagedFlux<ClusterInner> listAsync() {
+        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
     }
 
     /**
@@ -1155,11 +1231,25 @@ private Mono<PagedResponse<ClusterInner>> listSinglePageAsync(Context context) {
      * 
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation as paginated response with {@link PagedFlux}.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listAsync() {
-        return new PagedFlux<>(() -> listSinglePageAsync(), nextLink -> listNextSinglePageAsync(nextLink));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listSinglePage() {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterList> res = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1169,12 +1259,25 @@ private PagedFlux<ClusterInner> listAsync() {
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation as paginated response with {@link PagedFlux}.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
      */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    private PagedFlux<ClusterInner> listAsync(Context context) {
-        return new PagedFlux<>(() -> listSinglePageAsync(context),
-            nextLink -> listNextSinglePageAsync(nextLink, context));
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listSinglePage(Context context) {
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterList> res = service.listSync(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1186,7 +1289,7 @@ private PagedFlux<ClusterInner> listAsync(Context context) {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> list() {
-        return new PagedIterable<>(listAsync());
+        return new PagedIterable<>(() -> listSinglePage(), nextLink -> listNextSinglePage(nextLink));
     }
 
     /**
@@ -1200,7 +1303,7 @@ public PagedIterable<ClusterInner> list() {
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable<ClusterInner> list(Context context) {
-        return new PagedIterable<>(listAsync(context));
+        return new PagedIterable<>(() -> listSinglePage(context), nextLink -> listNextSinglePage(nextLink, context));
     }
 
     /**
@@ -1240,43 +1343,6 @@ private Mono<Response<SkuDetailsListInner>> listSkusForScalingWithResponseAsync(
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
-    /**
-     * Lists the available SKUs for scaling the Redis Enterprise cluster.
-     * 
-     * @param resourceGroupName The name of the resource group. The name is case insensitive.
-     * @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 context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ManagementException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a listSkusForScaling operation along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<Response<SkuDetailsListInner>> listSkusForScalingWithResponseAsync(String resourceGroupName,
-        String clusterName, Context context) {
-        if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
-        }
-        if (resourceGroupName == null) {
-            return Mono
-                .error(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
-        }
-        if (clusterName == null) {
-            return Mono.error(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
-        }
-        if (this.client.getSubscriptionId() == null) {
-            return Mono.error(new IllegalArgumentException(
-                "Parameter this.client.getSubscriptionId() is required and cannot be null."));
-        }
-        final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listSkusForScaling(this.client.getEndpoint(), resourceGroupName, clusterName,
-            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
-    }
-
     /**
      * Lists the available SKUs for scaling the Redis Enterprise cluster.
      * 
@@ -1309,7 +1375,27 @@ private Mono<SkuDetailsListInner> listSkusForScalingAsync(String resourceGroupNa
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<SkuDetailsListInner> listSkusForScalingWithResponse(String resourceGroupName, String clusterName,
         Context context) {
-        return listSkusForScalingWithResponseAsync(resourceGroupName, clusterName, context).block();
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        if (resourceGroupName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."));
+        }
+        if (clusterName == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter clusterName is required and cannot be null."));
+        }
+        if (this.client.getSubscriptionId() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getSubscriptionId() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        return service.listSkusForScalingSync(this.client.getEndpoint(), resourceGroupName, clusterName,
+            this.client.getApiVersion(), this.client.getSubscriptionId(), accept, context);
     }
 
     /**
@@ -1356,6 +1442,33 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupNextSinglePageAsync
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listByResourceGroupNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterList> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -1364,23 +1477,24 @@ private Mono<PagedResponse<ClusterInner>> listByResourceGroupNextSinglePageAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listByResourceGroupNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<ClusterInner> listByResourceGroupNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listByResourceGroupNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ClusterList> res
+            = service.listByResourceGroupNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
 
     /**
@@ -1409,6 +1523,32 @@ private Mono<PagedResponse<ClusterInner>> listNextSinglePageAsync(String nextLin
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
+    /**
+     * Get the next page of items.
+     * 
+     * @param nextLink The URL to get the next list of items.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    private PagedResponse<ClusterInner> listNextSinglePage(String nextLink) {
+        if (nextLink == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+        }
+        if (this.client.getEndpoint() == null) {
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
+        }
+        final String accept = "application/json";
+        Response<ClusterList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, Context.NONE);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
+    }
+
     /**
      * Get the next page of items.
      * 
@@ -1417,22 +1557,24 @@ private Mono<PagedResponse<ClusterInner>> listNextSinglePageAsync(String nextLin
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws ManagementException thrown if the request is rejected by server.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the response of a list-all operation along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
+     * @return the response of a list-all operation along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono<PagedResponse<ClusterInner>> listNextSinglePageAsync(String nextLink, Context context) {
+    private PagedResponse<ClusterInner> listNextSinglePage(String nextLink, Context context) {
         if (nextLink == null) {
-            return Mono.error(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException("Parameter nextLink is required and cannot be null."));
         }
         if (this.client.getEndpoint() == null) {
-            return Mono.error(
-                new IllegalArgumentException("Parameter this.client.getEndpoint() is required and cannot be null."));
+            throw LOGGER.atError()
+                .log(new IllegalArgumentException(
+                    "Parameter this.client.getEndpoint() is required and cannot be null."));
         }
         final String accept = "application/json";
-        context = this.client.mergeContext(context);
-        return service.listNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().value(), res.getValue().nextLink(), null));
+        Response<ClusterList> res = service.listNextSync(nextLink, this.client.getEndpoint(), accept, context);
+        return new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(), res.getValue().value(),
+            res.getValue().nextLink(), null);
     }
+
+    private static final ClientLogger LOGGER = new ClientLogger(RedisEnterprisesClientImpl.class);
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/Cluster.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/Cluster.java
index fab80ee9d78b..4f975a6756d1 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/Cluster.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/Cluster.java
@@ -78,6 +78,15 @@ public interface Cluster {
      */
     ManagedServiceIdentity identity();
 
+    /**
+     * Gets the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @return the publicNetworkAccess value.
+     */
+    PublicNetworkAccess publicNetworkAccess();
+
     /**
      * Gets the highAvailability property: 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.
@@ -242,8 +251,9 @@ interface WithSku {
          * The stage of the Cluster definition which contains all the minimum required properties for the resource to be
          * created, but also allows for any other optional properties to be specified.
          */
-        interface WithCreate extends DefinitionStages.WithTags, DefinitionStages.WithZones,
-            DefinitionStages.WithIdentity, DefinitionStages.WithHighAvailability,
+        interface WithCreate
+            extends DefinitionStages.WithTags, DefinitionStages.WithZones, DefinitionStages.WithIdentity,
+            DefinitionStages.WithPublicNetworkAccess, DefinitionStages.WithHighAvailability,
             DefinitionStages.WithMinimumTlsVersion, DefinitionStages.WithEncryption {
             /**
              * Executes the create request.
@@ -300,6 +310,23 @@ interface WithIdentity {
             WithCreate withIdentity(ManagedServiceIdentity identity);
         }
 
+        /**
+         * The stage of the Cluster definition allowing to specify publicNetworkAccess.
+         */
+        interface WithPublicNetworkAccess {
+            /**
+             * Specifies the publicNetworkAccess property: Whether or not public network traffic can access the Redis
+             * cluster. Only 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old
+             * API version which do not have this property and cannot be set..
+             * 
+             * @param publicNetworkAccess Whether or not public network traffic can access the Redis cluster. Only
+             * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version
+             * which do not have this property and cannot be set.
+             * @return the next definition stage.
+             */
+            WithCreate withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess);
+        }
+
         /**
          * The stage of the Cluster definition allowing to specify highAvailability.
          */
@@ -357,7 +384,8 @@ interface WithEncryption {
      * The template for Cluster update.
      */
     interface Update extends UpdateStages.WithTags, UpdateStages.WithSku, UpdateStages.WithIdentity,
-        UpdateStages.WithHighAvailability, UpdateStages.WithMinimumTlsVersion, UpdateStages.WithEncryption {
+        UpdateStages.WithPublicNetworkAccess, UpdateStages.WithHighAvailability, UpdateStages.WithMinimumTlsVersion,
+        UpdateStages.WithEncryption {
         /**
          * Executes the update request.
          * 
@@ -417,6 +445,23 @@ interface WithIdentity {
             Update withIdentity(ManagedServiceIdentity identity);
         }
 
+        /**
+         * The stage of the Cluster update allowing to specify publicNetworkAccess.
+         */
+        interface WithPublicNetworkAccess {
+            /**
+             * Specifies the publicNetworkAccess property: Whether or not public network traffic can access the Redis
+             * cluster. Only 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old
+             * API version which do not have this property and cannot be set..
+             * 
+             * @param publicNetworkAccess Whether or not public network traffic can access the Redis cluster. Only
+             * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version
+             * which do not have this property and cannot be set.
+             * @return the next definition stage.
+             */
+            Update withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess);
+        }
+
         /**
          * The stage of the Cluster update allowing to specify highAvailability.
          */
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterCommonProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterCommonProperties.java
new file mode 100644
index 000000000000..5ed089bfee90
--- /dev/null
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterCommonProperties.java
@@ -0,0 +1,341 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.redisenterprise.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.json.JsonReader;
+import com.azure.json.JsonSerializable;
+import com.azure.json.JsonToken;
+import com.azure.json.JsonWriter;
+import com.azure.resourcemanager.redisenterprise.fluent.models.PrivateEndpointConnectionInner;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * Redis Enterprise cluster properties
+ * 
+ * Properties of Redis Enterprise clusters, as opposed to general resource properties like location, tags.
+ */
+@Fluent
+public class ClusterCommonProperties implements JsonSerializable<ClusterCommonProperties> {
+    /*
+     * 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.
+     */
+    private 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.
+     */
+    private TlsVersion minimumTlsVersion;
+
+    /*
+     * Encryption-at-rest configuration for the cluster.
+     */
+    private ClusterPropertiesEncryption encryption;
+
+    /*
+     * DNS name of the cluster endpoint
+     */
+    private String hostname;
+
+    /*
+     * Current provisioning status of the cluster
+     */
+    private ProvisioningState provisioningState;
+
+    /*
+     * Explains the current redundancy strategy of the cluster, which affects the expected SLA.
+     */
+    private RedundancyMode redundancyMode;
+
+    /*
+     * Current resource status of the cluster
+     */
+    private ResourceState resourceState;
+
+    /*
+     * Version of redis the cluster supports, e.g. '6'
+     */
+    private String redisVersion;
+
+    /*
+     * List of private endpoint connections associated with the specified Redis Enterprise cluster
+     */
+    private List<PrivateEndpointConnectionInner> privateEndpointConnections;
+
+    /**
+     * Creates an instance of ClusterCommonProperties class.
+     */
+    public ClusterCommonProperties() {
+    }
+
+    /**
+     * Get the highAvailability property: 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.
+     * 
+     * @return the highAvailability value.
+     */
+    public HighAvailability highAvailability() {
+        return this.highAvailability;
+    }
+
+    /**
+     * Set the highAvailability property: 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.
+     * 
+     * @param highAvailability the highAvailability value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    public ClusterCommonProperties withHighAvailability(HighAvailability highAvailability) {
+        this.highAvailability = highAvailability;
+        return this;
+    }
+
+    /**
+     * Get the minimumTlsVersion property: 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.
+     * 
+     * @return the minimumTlsVersion value.
+     */
+    public TlsVersion minimumTlsVersion() {
+        return this.minimumTlsVersion;
+    }
+
+    /**
+     * Set the minimumTlsVersion property: 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.
+     * 
+     * @param minimumTlsVersion the minimumTlsVersion value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    public ClusterCommonProperties withMinimumTlsVersion(TlsVersion minimumTlsVersion) {
+        this.minimumTlsVersion = minimumTlsVersion;
+        return this;
+    }
+
+    /**
+     * Get the encryption property: Encryption-at-rest configuration for the cluster.
+     * 
+     * @return the encryption value.
+     */
+    public ClusterPropertiesEncryption encryption() {
+        return this.encryption;
+    }
+
+    /**
+     * Set the encryption property: Encryption-at-rest configuration for the cluster.
+     * 
+     * @param encryption the encryption value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    public ClusterCommonProperties withEncryption(ClusterPropertiesEncryption encryption) {
+        this.encryption = encryption;
+        return this;
+    }
+
+    /**
+     * Get the hostname property: DNS name of the cluster endpoint.
+     * 
+     * @return the hostname value.
+     */
+    public String hostname() {
+        return this.hostname;
+    }
+
+    /**
+     * Set the hostname property: DNS name of the cluster endpoint.
+     * 
+     * @param hostname the hostname value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    ClusterCommonProperties withHostname(String hostname) {
+        this.hostname = hostname;
+        return this;
+    }
+
+    /**
+     * Get the provisioningState property: Current provisioning status of the cluster.
+     * 
+     * @return the provisioningState value.
+     */
+    public ProvisioningState provisioningState() {
+        return this.provisioningState;
+    }
+
+    /**
+     * Set the provisioningState property: Current provisioning status of the cluster.
+     * 
+     * @param provisioningState the provisioningState value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    ClusterCommonProperties withProvisioningState(ProvisioningState provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
+    /**
+     * Get the redundancyMode property: Explains the current redundancy strategy of the cluster, which affects the
+     * expected SLA.
+     * 
+     * @return the redundancyMode value.
+     */
+    public RedundancyMode redundancyMode() {
+        return this.redundancyMode;
+    }
+
+    /**
+     * Set the redundancyMode property: Explains the current redundancy strategy of the cluster, which affects the
+     * expected SLA.
+     * 
+     * @param redundancyMode the redundancyMode value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    ClusterCommonProperties withRedundancyMode(RedundancyMode redundancyMode) {
+        this.redundancyMode = redundancyMode;
+        return this;
+    }
+
+    /**
+     * Get the resourceState property: Current resource status of the cluster.
+     * 
+     * @return the resourceState value.
+     */
+    public ResourceState resourceState() {
+        return this.resourceState;
+    }
+
+    /**
+     * Set the resourceState property: Current resource status of the cluster.
+     * 
+     * @param resourceState the resourceState value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    ClusterCommonProperties withResourceState(ResourceState resourceState) {
+        this.resourceState = resourceState;
+        return this;
+    }
+
+    /**
+     * Get the redisVersion property: Version of redis the cluster supports, e.g. '6'.
+     * 
+     * @return the redisVersion value.
+     */
+    public String redisVersion() {
+        return this.redisVersion;
+    }
+
+    /**
+     * Set the redisVersion property: Version of redis the cluster supports, e.g. '6'.
+     * 
+     * @param redisVersion the redisVersion value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    ClusterCommonProperties withRedisVersion(String redisVersion) {
+        this.redisVersion = redisVersion;
+        return this;
+    }
+
+    /**
+     * Get the privateEndpointConnections property: List of private endpoint connections associated with the specified
+     * Redis Enterprise cluster.
+     * 
+     * @return the privateEndpointConnections value.
+     */
+    public List<PrivateEndpointConnectionInner> privateEndpointConnections() {
+        return this.privateEndpointConnections;
+    }
+
+    /**
+     * Set the privateEndpointConnections property: List of private endpoint connections associated with the specified
+     * Redis Enterprise cluster.
+     * 
+     * @param privateEndpointConnections the privateEndpointConnections value to set.
+     * @return the ClusterCommonProperties object itself.
+     */
+    ClusterCommonProperties
+        withPrivateEndpointConnections(List<PrivateEndpointConnectionInner> privateEndpointConnections) {
+        this.privateEndpointConnections = privateEndpointConnections;
+        return this;
+    }
+
+    /**
+     * Validates the instance.
+     * 
+     * @throws IllegalArgumentException thrown if the instance is not valid.
+     */
+    public void validate() {
+        if (encryption() != null) {
+            encryption().validate();
+        }
+        if (privateEndpointConnections() != null) {
+            privateEndpointConnections().forEach(e -> e.validate());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
+        jsonWriter.writeStartObject();
+        jsonWriter.writeStringField("highAvailability",
+            this.highAvailability == null ? null : this.highAvailability.toString());
+        jsonWriter.writeStringField("minimumTlsVersion",
+            this.minimumTlsVersion == null ? null : this.minimumTlsVersion.toString());
+        jsonWriter.writeJsonField("encryption", this.encryption);
+        return jsonWriter.writeEndObject();
+    }
+
+    /**
+     * Reads an instance of ClusterCommonProperties from the JsonReader.
+     * 
+     * @param jsonReader The JsonReader being read.
+     * @return An instance of ClusterCommonProperties if the JsonReader was pointing to an instance of it, or null if it
+     * was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the ClusterCommonProperties.
+     */
+    public static ClusterCommonProperties fromJson(JsonReader jsonReader) throws IOException {
+        return jsonReader.readObject(reader -> {
+            ClusterCommonProperties deserializedClusterCommonProperties = new ClusterCommonProperties();
+            while (reader.nextToken() != JsonToken.END_OBJECT) {
+                String fieldName = reader.getFieldName();
+                reader.nextToken();
+
+                if ("highAvailability".equals(fieldName)) {
+                    deserializedClusterCommonProperties.highAvailability
+                        = HighAvailability.fromString(reader.getString());
+                } else if ("minimumTlsVersion".equals(fieldName)) {
+                    deserializedClusterCommonProperties.minimumTlsVersion = TlsVersion.fromString(reader.getString());
+                } else if ("encryption".equals(fieldName)) {
+                    deserializedClusterCommonProperties.encryption = ClusterPropertiesEncryption.fromJson(reader);
+                } else if ("hostName".equals(fieldName)) {
+                    deserializedClusterCommonProperties.hostname = reader.getString();
+                } else if ("provisioningState".equals(fieldName)) {
+                    deserializedClusterCommonProperties.provisioningState
+                        = ProvisioningState.fromString(reader.getString());
+                } else if ("redundancyMode".equals(fieldName)) {
+                    deserializedClusterCommonProperties.redundancyMode = RedundancyMode.fromString(reader.getString());
+                } else if ("resourceState".equals(fieldName)) {
+                    deserializedClusterCommonProperties.resourceState = ResourceState.fromString(reader.getString());
+                } else if ("redisVersion".equals(fieldName)) {
+                    deserializedClusterCommonProperties.redisVersion = reader.getString();
+                } else if ("privateEndpointConnections".equals(fieldName)) {
+                    List<PrivateEndpointConnectionInner> privateEndpointConnections
+                        = reader.readArray(reader1 -> PrivateEndpointConnectionInner.fromJson(reader1));
+                    deserializedClusterCommonProperties.privateEndpointConnections = privateEndpointConnections;
+                } else {
+                    reader.skipChildren();
+                }
+            }
+
+            return deserializedClusterCommonProperties;
+        });
+    }
+}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterUpdate.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterUpdate.java
index e46e9397e522..ecfd8f934bc5 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterUpdate.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/ClusterUpdate.java
@@ -9,7 +9,7 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.redisenterprise.fluent.models.ClusterProperties;
+import com.azure.resourcemanager.redisenterprise.fluent.models.ClusterUpdateProperties;
 import com.azure.resourcemanager.redisenterprise.fluent.models.PrivateEndpointConnectionInner;
 import java.io.IOException;
 import java.util.List;
@@ -28,7 +28,7 @@ public final class ClusterUpdate implements JsonSerializable<ClusterUpdate> {
     /*
      * Other properties of the cluster.
      */
-    private ClusterProperties innerProperties;
+    private ClusterUpdateProperties innerProperties;
 
     /*
      * The identity of the resource.
@@ -71,7 +71,7 @@ public ClusterUpdate withSku(Sku sku) {
      * 
      * @return the innerProperties value.
      */
-    private ClusterProperties innerProperties() {
+    private ClusterUpdateProperties innerProperties() {
         return this.innerProperties;
     }
 
@@ -115,6 +115,33 @@ public ClusterUpdate withTags(Map<String, String> tags) {
         return this;
     }
 
+    /**
+     * Get the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @return the publicNetworkAccess value.
+     */
+    public PublicNetworkAccess publicNetworkAccess() {
+        return this.innerProperties() == null ? null : this.innerProperties().publicNetworkAccess();
+    }
+
+    /**
+     * Set the publicNetworkAccess property: Whether or not public network traffic can access the Redis cluster. Only
+     * 'Enabled' or 'Disabled' can be set. null is returned only for clusters created using an old API version which do
+     * not have this property and cannot be set.
+     * 
+     * @param publicNetworkAccess the publicNetworkAccess value to set.
+     * @return the ClusterUpdate object itself.
+     */
+    public ClusterUpdate withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ClusterUpdateProperties();
+        }
+        this.innerProperties().withPublicNetworkAccess(publicNetworkAccess);
+        return this;
+    }
+
     /**
      * Get the highAvailability property: 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.
@@ -134,7 +161,7 @@ public HighAvailability highAvailability() {
      */
     public ClusterUpdate withHighAvailability(HighAvailability highAvailability) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new ClusterProperties();
+            this.innerProperties = new ClusterUpdateProperties();
         }
         this.innerProperties().withHighAvailability(highAvailability);
         return this;
@@ -161,7 +188,7 @@ public TlsVersion minimumTlsVersion() {
      */
     public ClusterUpdate withMinimumTlsVersion(TlsVersion minimumTlsVersion) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new ClusterProperties();
+            this.innerProperties = new ClusterUpdateProperties();
         }
         this.innerProperties().withMinimumTlsVersion(minimumTlsVersion);
         return this;
@@ -184,7 +211,7 @@ public ClusterPropertiesEncryption encryption() {
      */
     public ClusterUpdate withEncryption(ClusterPropertiesEncryption encryption) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new ClusterProperties();
+            this.innerProperties = new ClusterUpdateProperties();
         }
         this.innerProperties().withEncryption(encryption);
         return this;
@@ -294,7 +321,7 @@ public static ClusterUpdate fromJson(JsonReader jsonReader) throws IOException {
                 if ("sku".equals(fieldName)) {
                     deserializedClusterUpdate.sku = Sku.fromJson(reader);
                 } else if ("properties".equals(fieldName)) {
-                    deserializedClusterUpdate.innerProperties = ClusterProperties.fromJson(reader);
+                    deserializedClusterUpdate.innerProperties = ClusterUpdateProperties.fromJson(reader);
                 } else if ("identity".equals(fieldName)) {
                     deserializedClusterUpdate.identity = ManagedServiceIdentity.fromJson(reader);
                 } else if ("tags".equals(fieldName)) {
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseCommonProperties.java
similarity index 71%
rename from sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java
rename to sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseCommonProperties.java
index 9ba3ebaf5d7a..6fc3357dc47a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/fluent/models/DatabaseProperties.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseCommonProperties.java
@@ -2,23 +2,13 @@
 // Licensed under the MIT License.
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
-package com.azure.resourcemanager.redisenterprise.fluent.models;
+package com.azure.resourcemanager.redisenterprise.models;
 
 import com.azure.core.annotation.Fluent;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.redisenterprise.models.AccessKeysAuthentication;
-import com.azure.resourcemanager.redisenterprise.models.ClusteringPolicy;
-import com.azure.resourcemanager.redisenterprise.models.DatabasePropertiesGeoReplication;
-import com.azure.resourcemanager.redisenterprise.models.DeferUpgradeSetting;
-import com.azure.resourcemanager.redisenterprise.models.EvictionPolicy;
-import com.azure.resourcemanager.redisenterprise.models.Module;
-import com.azure.resourcemanager.redisenterprise.models.Persistence;
-import com.azure.resourcemanager.redisenterprise.models.Protocol;
-import com.azure.resourcemanager.redisenterprise.models.ProvisioningState;
-import com.azure.resourcemanager.redisenterprise.models.ResourceState;
 import java.io.IOException;
 import java.util.List;
 
@@ -28,7 +18,7 @@
  * Properties of Redis Enterprise databases, as opposed to general resource properties like location, tags.
  */
 @Fluent
-public final class DatabaseProperties implements JsonSerializable<DatabaseProperties> {
+public class DatabaseCommonProperties implements JsonSerializable<DatabaseCommonProperties> {
     /*
      * Specifies whether redis clients can connect using TLS-encrypted or plaintext redis protocols. Default is
      * TLS-encrypted.
@@ -94,9 +84,9 @@ public final class DatabaseProperties implements JsonSerializable<DatabaseProper
     private AccessKeysAuthentication accessKeysAuthentication;
 
     /**
-     * Creates an instance of DatabaseProperties class.
+     * Creates an instance of DatabaseCommonProperties class.
      */
-    public DatabaseProperties() {
+    public DatabaseCommonProperties() {
     }
 
     /**
@@ -114,9 +104,9 @@ public Protocol clientProtocol() {
      * redis protocols. Default is TLS-encrypted.
      * 
      * @param clientProtocol the clientProtocol value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withClientProtocol(Protocol clientProtocol) {
+    public DatabaseCommonProperties withClientProtocol(Protocol clientProtocol) {
         this.clientProtocol = clientProtocol;
         return this;
     }
@@ -136,9 +126,9 @@ public Integer port() {
      * port.
      * 
      * @param port the port value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withPort(Integer port) {
+    public DatabaseCommonProperties withPort(Integer port) {
         this.port = port;
         return this;
     }
@@ -152,6 +142,17 @@ public ProvisioningState provisioningState() {
         return this.provisioningState;
     }
 
+    /**
+     * Set the provisioningState property: Current provisioning status of the database.
+     * 
+     * @param provisioningState the provisioningState value to set.
+     * @return the DatabaseCommonProperties object itself.
+     */
+    DatabaseCommonProperties withProvisioningState(ProvisioningState provisioningState) {
+        this.provisioningState = provisioningState;
+        return this;
+    }
+
     /**
      * Get the resourceState property: Current resource status of the database.
      * 
@@ -161,6 +162,17 @@ public ResourceState resourceState() {
         return this.resourceState;
     }
 
+    /**
+     * Set the resourceState property: Current resource status of the database.
+     * 
+     * @param resourceState the resourceState value to set.
+     * @return the DatabaseCommonProperties object itself.
+     */
+    DatabaseCommonProperties withResourceState(ResourceState resourceState) {
+        this.resourceState = resourceState;
+        return this;
+    }
+
     /**
      * Get the clusteringPolicy property: Clustering policy - default is OSSCluster. This property can be updated only
      * if the current value is NoCluster. If the value is OSSCluster or EnterpriseCluster, it cannot be updated without
@@ -178,9 +190,9 @@ public ClusteringPolicy clusteringPolicy() {
      * deleting the database.
      * 
      * @param clusteringPolicy the clusteringPolicy value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withClusteringPolicy(ClusteringPolicy clusteringPolicy) {
+    public DatabaseCommonProperties withClusteringPolicy(ClusteringPolicy clusteringPolicy) {
         this.clusteringPolicy = clusteringPolicy;
         return this;
     }
@@ -198,9 +210,9 @@ public EvictionPolicy evictionPolicy() {
      * Set the evictionPolicy property: Redis eviction policy - default is VolatileLRU.
      * 
      * @param evictionPolicy the evictionPolicy value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withEvictionPolicy(EvictionPolicy evictionPolicy) {
+    public DatabaseCommonProperties withEvictionPolicy(EvictionPolicy evictionPolicy) {
         this.evictionPolicy = evictionPolicy;
         return this;
     }
@@ -218,9 +230,9 @@ public Persistence persistence() {
      * Set the persistence property: Persistence settings.
      * 
      * @param persistence the persistence value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withPersistence(Persistence persistence) {
+    public DatabaseCommonProperties withPersistence(Persistence persistence) {
         this.persistence = persistence;
         return this;
     }
@@ -240,9 +252,9 @@ public List<Module> modules() {
      * creation time.
      * 
      * @param modules the modules value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withModules(List<Module> modules) {
+    public DatabaseCommonProperties withModules(List<Module> modules) {
         this.modules = modules;
         return this;
     }
@@ -260,9 +272,9 @@ public DatabasePropertiesGeoReplication geoReplication() {
      * Set the geoReplication property: Optional set of properties to configure geo replication for this database.
      * 
      * @param geoReplication the geoReplication value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withGeoReplication(DatabasePropertiesGeoReplication geoReplication) {
+    public DatabaseCommonProperties withGeoReplication(DatabasePropertiesGeoReplication geoReplication) {
         this.geoReplication = geoReplication;
         return this;
     }
@@ -276,6 +288,17 @@ public String redisVersion() {
         return this.redisVersion;
     }
 
+    /**
+     * Set the redisVersion property: Version of Redis the database is running on, e.g. '6.0'.
+     * 
+     * @param redisVersion the redisVersion value to set.
+     * @return the DatabaseCommonProperties object itself.
+     */
+    DatabaseCommonProperties withRedisVersion(String redisVersion) {
+        this.redisVersion = redisVersion;
+        return this;
+    }
+
     /**
      * Get the deferUpgrade property: Option to defer upgrade when newest version is released - default is NotDeferred.
      * Learn more: https://aka.ms/redisversionupgrade.
@@ -291,9 +314,9 @@ public DeferUpgradeSetting deferUpgrade() {
      * Learn more: https://aka.ms/redisversionupgrade.
      * 
      * @param deferUpgrade the deferUpgrade value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withDeferUpgrade(DeferUpgradeSetting deferUpgrade) {
+    public DatabaseCommonProperties withDeferUpgrade(DeferUpgradeSetting deferUpgrade) {
         this.deferUpgrade = deferUpgrade;
         return this;
     }
@@ -313,9 +336,9 @@ public AccessKeysAuthentication accessKeysAuthentication() {
      * current access keys. Can be updated even after database is created.
      * 
      * @param accessKeysAuthentication the accessKeysAuthentication value to set.
-     * @return the DatabaseProperties object itself.
+     * @return the DatabaseCommonProperties object itself.
      */
-    public DatabaseProperties withAccessKeysAuthentication(AccessKeysAuthentication accessKeysAuthentication) {
+    public DatabaseCommonProperties withAccessKeysAuthentication(AccessKeysAuthentication accessKeysAuthentication) {
         this.accessKeysAuthentication = accessKeysAuthentication;
         return this;
     }
@@ -360,52 +383,56 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     }
 
     /**
-     * Reads an instance of DatabaseProperties from the JsonReader.
+     * Reads an instance of DatabaseCommonProperties from the JsonReader.
      * 
      * @param jsonReader The JsonReader being read.
-     * @return An instance of DatabaseProperties if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IOException If an error occurs while reading the DatabaseProperties.
+     * @return An instance of DatabaseCommonProperties if the JsonReader was pointing to an instance of it, or null if
+     * it was pointing to JSON null.
+     * @throws IOException If an error occurs while reading the DatabaseCommonProperties.
      */
-    public static DatabaseProperties fromJson(JsonReader jsonReader) throws IOException {
+    public static DatabaseCommonProperties fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
-            DatabaseProperties deserializedDatabaseProperties = new DatabaseProperties();
+            DatabaseCommonProperties deserializedDatabaseCommonProperties = new DatabaseCommonProperties();
             while (reader.nextToken() != JsonToken.END_OBJECT) {
                 String fieldName = reader.getFieldName();
                 reader.nextToken();
 
                 if ("clientProtocol".equals(fieldName)) {
-                    deserializedDatabaseProperties.clientProtocol = Protocol.fromString(reader.getString());
+                    deserializedDatabaseCommonProperties.clientProtocol = Protocol.fromString(reader.getString());
                 } else if ("port".equals(fieldName)) {
-                    deserializedDatabaseProperties.port = reader.getNullable(JsonReader::getInt);
+                    deserializedDatabaseCommonProperties.port = reader.getNullable(JsonReader::getInt);
                 } else if ("provisioningState".equals(fieldName)) {
-                    deserializedDatabaseProperties.provisioningState = ProvisioningState.fromString(reader.getString());
+                    deserializedDatabaseCommonProperties.provisioningState
+                        = ProvisioningState.fromString(reader.getString());
                 } else if ("resourceState".equals(fieldName)) {
-                    deserializedDatabaseProperties.resourceState = ResourceState.fromString(reader.getString());
+                    deserializedDatabaseCommonProperties.resourceState = ResourceState.fromString(reader.getString());
                 } else if ("clusteringPolicy".equals(fieldName)) {
-                    deserializedDatabaseProperties.clusteringPolicy = ClusteringPolicy.fromString(reader.getString());
+                    deserializedDatabaseCommonProperties.clusteringPolicy
+                        = ClusteringPolicy.fromString(reader.getString());
                 } else if ("evictionPolicy".equals(fieldName)) {
-                    deserializedDatabaseProperties.evictionPolicy = EvictionPolicy.fromString(reader.getString());
+                    deserializedDatabaseCommonProperties.evictionPolicy = EvictionPolicy.fromString(reader.getString());
                 } else if ("persistence".equals(fieldName)) {
-                    deserializedDatabaseProperties.persistence = Persistence.fromJson(reader);
+                    deserializedDatabaseCommonProperties.persistence = Persistence.fromJson(reader);
                 } else if ("modules".equals(fieldName)) {
                     List<Module> modules = reader.readArray(reader1 -> Module.fromJson(reader1));
-                    deserializedDatabaseProperties.modules = modules;
+                    deserializedDatabaseCommonProperties.modules = modules;
                 } else if ("geoReplication".equals(fieldName)) {
-                    deserializedDatabaseProperties.geoReplication = DatabasePropertiesGeoReplication.fromJson(reader);
+                    deserializedDatabaseCommonProperties.geoReplication
+                        = DatabasePropertiesGeoReplication.fromJson(reader);
                 } else if ("redisVersion".equals(fieldName)) {
-                    deserializedDatabaseProperties.redisVersion = reader.getString();
+                    deserializedDatabaseCommonProperties.redisVersion = reader.getString();
                 } else if ("deferUpgrade".equals(fieldName)) {
-                    deserializedDatabaseProperties.deferUpgrade = DeferUpgradeSetting.fromString(reader.getString());
+                    deserializedDatabaseCommonProperties.deferUpgrade
+                        = DeferUpgradeSetting.fromString(reader.getString());
                 } else if ("accessKeysAuthentication".equals(fieldName)) {
-                    deserializedDatabaseProperties.accessKeysAuthentication
+                    deserializedDatabaseCommonProperties.accessKeysAuthentication
                         = AccessKeysAuthentication.fromString(reader.getString());
                 } else {
                     reader.skipChildren();
                 }
             }
 
-            return deserializedDatabaseProperties;
+            return deserializedDatabaseCommonProperties;
         });
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseUpdate.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseUpdate.java
index fc7f5f57a11f..3884df924ce4 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseUpdate.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/DatabaseUpdate.java
@@ -9,7 +9,7 @@
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
 import com.azure.json.JsonWriter;
-import com.azure.resourcemanager.redisenterprise.fluent.models.DatabaseProperties;
+import com.azure.resourcemanager.redisenterprise.fluent.models.DatabaseUpdateProperties;
 import java.io.IOException;
 import java.util.List;
 
@@ -21,7 +21,7 @@ public final class DatabaseUpdate implements JsonSerializable<DatabaseUpdate> {
     /*
      * Properties of the database.
      */
-    private DatabaseProperties innerProperties;
+    private DatabaseUpdateProperties innerProperties;
 
     /**
      * Creates an instance of DatabaseUpdate class.
@@ -34,7 +34,7 @@ public DatabaseUpdate() {
      * 
      * @return the innerProperties value.
      */
-    private DatabaseProperties innerProperties() {
+    private DatabaseUpdateProperties innerProperties() {
         return this.innerProperties;
     }
 
@@ -57,7 +57,7 @@ public Protocol clientProtocol() {
      */
     public DatabaseUpdate withClientProtocol(Protocol clientProtocol) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withClientProtocol(clientProtocol);
         return this;
@@ -82,7 +82,7 @@ public Integer port() {
      */
     public DatabaseUpdate withPort(Integer port) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withPort(port);
         return this;
@@ -127,7 +127,7 @@ public ClusteringPolicy clusteringPolicy() {
      */
     public DatabaseUpdate withClusteringPolicy(ClusteringPolicy clusteringPolicy) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withClusteringPolicy(clusteringPolicy);
         return this;
@@ -150,7 +150,7 @@ public EvictionPolicy evictionPolicy() {
      */
     public DatabaseUpdate withEvictionPolicy(EvictionPolicy evictionPolicy) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withEvictionPolicy(evictionPolicy);
         return this;
@@ -173,7 +173,7 @@ public Persistence persistence() {
      */
     public DatabaseUpdate withPersistence(Persistence persistence) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withPersistence(persistence);
         return this;
@@ -198,7 +198,7 @@ public List<Module> modules() {
      */
     public DatabaseUpdate withModules(List<Module> modules) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withModules(modules);
         return this;
@@ -221,7 +221,7 @@ public DatabasePropertiesGeoReplication geoReplication() {
      */
     public DatabaseUpdate withGeoReplication(DatabasePropertiesGeoReplication geoReplication) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withGeoReplication(geoReplication);
         return this;
@@ -255,7 +255,7 @@ public DeferUpgradeSetting deferUpgrade() {
      */
     public DatabaseUpdate withDeferUpgrade(DeferUpgradeSetting deferUpgrade) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withDeferUpgrade(deferUpgrade);
         return this;
@@ -280,7 +280,7 @@ public AccessKeysAuthentication accessKeysAuthentication() {
      */
     public DatabaseUpdate withAccessKeysAuthentication(AccessKeysAuthentication accessKeysAuthentication) {
         if (this.innerProperties() == null) {
-            this.innerProperties = new DatabaseProperties();
+            this.innerProperties = new DatabaseUpdateProperties();
         }
         this.innerProperties().withAccessKeysAuthentication(accessKeysAuthentication);
         return this;
@@ -323,7 +323,7 @@ public static DatabaseUpdate fromJson(JsonReader jsonReader) throws IOException
                 reader.nextToken();
 
                 if ("properties".equals(fieldName)) {
-                    deserializedDatabaseUpdate.innerProperties = DatabaseProperties.fromJson(reader);
+                    deserializedDatabaseUpdate.innerProperties = DatabaseUpdateProperties.fromJson(reader);
                 } else {
                     reader.skipChildren();
                 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/PublicNetworkAccess.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/PublicNetworkAccess.java
new file mode 100644
index 000000000000..35a86929a53c
--- /dev/null
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/main/java/com/azure/resourcemanager/redisenterprise/models/PublicNetworkAccess.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.redisenterprise.models;
+
+import com.azure.core.util.ExpandableStringEnum;
+import java.util.Collection;
+
+/**
+ * Whether or not public network traffic can access the Redis cluster. Only 'Enabled' or 'Disabled' can be set. null is
+ * returned only for clusters created using an old API version which do not have this property and cannot be set.
+ */
+public final class PublicNetworkAccess extends ExpandableStringEnum<PublicNetworkAccess> {
+    /**
+     * Static value Enabled for PublicNetworkAccess.
+     */
+    public static final PublicNetworkAccess ENABLED = fromString("Enabled");
+
+    /**
+     * Static value Disabled for PublicNetworkAccess.
+     */
+    public static final PublicNetworkAccess DISABLED = fromString("Disabled");
+
+    /**
+     * Creates a new instance of PublicNetworkAccess value.
+     * 
+     * @deprecated Use the {@link #fromString(String)} factory method.
+     */
+    @Deprecated
+    public PublicNetworkAccess() {
+    }
+
+    /**
+     * Creates or finds a PublicNetworkAccess from its string representation.
+     * 
+     * @param name a name to look for.
+     * @return the corresponding PublicNetworkAccess.
+     */
+    public static PublicNetworkAccess fromString(String name) {
+        return fromString(name, PublicNetworkAccess.class);
+    }
+
+    /**
+     * Gets known PublicNetworkAccess values.
+     * 
+     * @return known PublicNetworkAccess values.
+     */
+    public static Collection<PublicNetworkAccess> values() {
+        return values(PublicNetworkAccess.class);
+    }
+}
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentCreateUpdateSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentCreateUpdateSamples.java
index d2f4926a0eac..b5585edae5a1 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentCreateUpdateSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentCreateUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class AccessPolicyAssignmentCreateUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseAccessPolicyAssignmentCreateUpdate.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentDeleteSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentDeleteSamples.java
index 1a169bf1c8e1..5d0d3906af9a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentDeleteSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class AccessPolicyAssignmentDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseAccessPolicyAssignmentDelete.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentGetSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentGetSamples.java
index 594940cd6ebf..a4ba91f2f30f 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentGetSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentGetSamples.java
@@ -10,7 +10,7 @@
 public final class AccessPolicyAssignmentGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseAccessPolicyAssignmentGet.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListSamples.java
index ab762cf3242a..6f88e4551a7f 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListSamples.java
@@ -10,7 +10,7 @@
 public final class AccessPolicyAssignmentListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseAccessPolicyAssignmentsList.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesCreateSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesCreateSamples.java
index 7b00e1367ca9..8c0e67bd23de 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesCreateSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesCreateSamples.java
@@ -22,7 +22,7 @@
 public final class DatabasesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesNoClusterCacheCreate.json
      */
     /**
@@ -44,7 +44,7 @@ public static void redisEnterpriseDatabasesCreateNoClusterCache(
 
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesCreate.json
      */
     /**
@@ -72,7 +72,7 @@ public static void redisEnterpriseDatabasesCreateNoClusterCache(
 
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesCreateWithGeoReplication.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteSamples.java
index 1fa74daea05f..8fd2b46d8b82 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class DatabasesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesDelete.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportSamples.java
index 7c45a2b7f3ce..7d40fe646295 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportSamples.java
@@ -12,7 +12,7 @@
 public final class DatabasesExportSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesExport.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushSamples.java
index d82f089f1273..b6670921df2b 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushSamples.java
@@ -13,7 +13,7 @@
 public final class DatabasesFlushSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesFlush.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceLinkToReplicationGroupSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceLinkToReplicationGroupSamples.java
index 7291ac863621..96db3331dd84 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceLinkToReplicationGroupSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceLinkToReplicationGroupSamples.java
@@ -15,7 +15,7 @@
 public final class DatabasesForceLinkToReplicationGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesForceLink.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkSamples.java
index 18ed938792a0..73f8378716e7 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkSamples.java
@@ -13,7 +13,7 @@
 public final class DatabasesForceUnlinkSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesForceUnlink.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesGetSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesGetSamples.java
index 782d11ec8c8b..50b2e4e24ce5 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesGetSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesGetSamples.java
@@ -10,7 +10,7 @@
 public final class DatabasesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesGet.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodSamples.java
index 68061f02c677..8aa1d142821e 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodSamples.java
@@ -13,7 +13,7 @@
 public final class DatabasesImportMethodSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesImport.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListByClusterSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListByClusterSamples.java
index 5b96d153039f..ceeca8707bc6 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListByClusterSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class DatabasesListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesListByCluster.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListKeysSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListKeysSamples.java
index fc3b2a50af83..3182b72cd58e 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListKeysSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesListKeysSamples.java
@@ -10,7 +10,7 @@
 public final class DatabasesListKeysSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesListKeys.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesRegenerateKeySamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesRegenerateKeySamples.java
index bfa74dd1c67b..a5f6f619684a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesRegenerateKeySamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesRegenerateKeySamples.java
@@ -13,7 +13,7 @@
 public final class DatabasesRegenerateKeySamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesRegenerateKey.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpdateSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpdateSamples.java
index ec96a3a9952a..fe7268e58172 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpdateSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpdateSamples.java
@@ -18,7 +18,7 @@
 public final class DatabasesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesNoClusterCacheUpdateClustering.json
      */
     /**
@@ -40,7 +40,7 @@ public static void redisEnterpriseDatabasesUpdateClusteringOnNoClusterCache(
 
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesUpdate.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpgradeDBRedisVersionSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpgradeDBRedisVersionSamples.java
index f47484eafc3f..6a4941399ffb 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpgradeDBRedisVersionSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesUpgradeDBRedisVersionSamples.java
@@ -10,7 +10,7 @@
 public final class DatabasesUpgradeDBRedisVersionSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDatabasesUpgradeDBRedisVersion.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListSamples.java
index 330faf8164d7..cd807ba406d6 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListSamples.java
@@ -10,8 +10,8 @@
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/OperationsList
-     * .json
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
+     * OperationsList.json
      */
     /**
      * Sample code: OperationsList.
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsStatusGetSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsStatusGetSamples.java
index dce97439c455..83e4e3f02deb 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsStatusGetSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/OperationsStatusGetSamples.java
@@ -10,7 +10,7 @@
 public final class OperationsStatusGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * OperationsStatusGet.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteSamples.java
index 89e92a84e840..26d9bb44647c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDeletePrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetSamples.java
index 9a30131b1d20..0525b559d23c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseGetPrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListSamples.java
index 84ad63edba76..d71b2bbc26c0 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseListPrivateEndpointConnections.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsPutSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsPutSamples.java
index 3c12eaef5ba2..91f19f74e7a4 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsPutSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsPutSamples.java
@@ -13,7 +13,7 @@
 public final class PrivateEndpointConnectionsPutSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterprisePutPrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterSamples.java
index e123dc05a712..89a18b70803f 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkResourcesListByClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseListPrivateLinkResources.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseCreateSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseCreateSamples.java
index e570836772cc..071e9f348591 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseCreateSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseCreateSamples.java
@@ -10,6 +10,7 @@
 import com.azure.resourcemanager.redisenterprise.models.CmkIdentityType;
 import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentity;
 import com.azure.resourcemanager.redisenterprise.models.ManagedServiceIdentityType;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
 import com.azure.resourcemanager.redisenterprise.models.Sku;
 import com.azure.resourcemanager.redisenterprise.models.SkuName;
 import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
@@ -24,7 +25,7 @@
 public final class RedisEnterpriseCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseCreate.json
      */
     /**
@@ -44,6 +45,7 @@ public static void redisEnterpriseCreate(com.azure.resourcemanager.redisenterpri
                 .withUserAssignedIdentities(mapOf(
                     "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity",
                     new UserAssignedIdentity())))
+            .withPublicNetworkAccess(PublicNetworkAccess.DISABLED)
             .withMinimumTlsVersion(TlsVersion.ONE_TWO)
             .withEncryption(new ClusterPropertiesEncryption().withCustomerManagedKeyEncryption(
                 new ClusterPropertiesEncryptionCustomerManagedKeyEncryption().withKeyEncryptionKeyIdentity(
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseDeleteSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseDeleteSamples.java
index 207ef342b14b..c5c59eaa9018 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseDeleteSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RedisEnterpriseDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseDelete.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseGetByResourceGroupSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseGetByResourceGroupSamples.java
index a484127570e4..61614662cf7a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseGetByResourceGroupSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class RedisEnterpriseGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseGet.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListByResourceGroupSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListByResourceGroupSamples.java
index 38d80f4f53c1..b881418ba33a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListByResourceGroupSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class RedisEnterpriseListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseListByResourceGroup.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSamples.java
index 283051d5ccbf..1cba02a2ea2e 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSamples.java
@@ -10,7 +10,7 @@
 public final class RedisEnterpriseListSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseList.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSkusForScalingSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSkusForScalingSamples.java
index f7697c723d8a..0151a8146111 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSkusForScalingSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseListSkusForScalingSamples.java
@@ -10,7 +10,7 @@
 public final class RedisEnterpriseListSkusForScalingSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseListSkusForScaling.json
      */
     /**
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseUpdateSamples.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseUpdateSamples.java
index a39f6828c087..43a3fbc8b5ff 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseUpdateSamples.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/samples/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterpriseUpdateSamples.java
@@ -5,6 +5,7 @@
 package com.azure.resourcemanager.redisenterprise.generated;
 
 import com.azure.resourcemanager.redisenterprise.models.Cluster;
+import com.azure.resourcemanager.redisenterprise.models.PublicNetworkAccess;
 import com.azure.resourcemanager.redisenterprise.models.Sku;
 import com.azure.resourcemanager.redisenterprise.models.SkuName;
 import com.azure.resourcemanager.redisenterprise.models.TlsVersion;
@@ -17,7 +18,7 @@
 public final class RedisEnterpriseUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2025-05-01-preview/examples/
+     * specification/redisenterprise/resource-manager/Microsoft.Cache/RedisEnterprise/stable/2025-07-01/examples/
      * RedisEnterpriseUpdate.json
      */
     /**
@@ -32,6 +33,7 @@ public static void redisEnterpriseUpdate(com.azure.resourcemanager.redisenterpri
         resource.update()
             .withTags(mapOf("tag1", "value1"))
             .withSku(new Sku().withName(SkuName.ENTERPRISE_FLASH_F300).withCapacity(9))
+            .withPublicNetworkAccess(PublicNetworkAccess.ENABLED)
             .withMinimumTlsVersion(TlsVersion.ONE_TWO)
             .apply();
     }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentInnerTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentInnerTests.java
index 1d920a327896..de144672fcb5 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentInnerTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentInnerTests.java
@@ -13,18 +13,18 @@ public final class AccessPolicyAssignmentInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AccessPolicyAssignmentInner model = BinaryData.fromString(
-            "{\"properties\":{\"provisioningState\":\"Updating\",\"accessPolicyName\":\"jmkljavbqidtqajz\",\"user\":{\"objectId\":\"l\"}},\"id\":\"kudjkrlkhb\",\"name\":\"hfepgzgqex\",\"type\":\"locx\"}")
+            "{\"properties\":{\"provisioningState\":\"Failed\",\"accessPolicyName\":\"vccfw\",\"user\":{\"objectId\":\"nbacfi\"}},\"id\":\"nlebxetqgtzxd\",\"name\":\"nqbqqwxr\",\"type\":\"feallnwsu\"}")
             .toObject(AccessPolicyAssignmentInner.class);
-        Assertions.assertEquals("jmkljavbqidtqajz", model.accessPolicyName());
-        Assertions.assertEquals("l", model.user().objectId());
+        Assertions.assertEquals("vccfw", model.accessPolicyName());
+        Assertions.assertEquals("nbacfi", model.user().objectId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AccessPolicyAssignmentInner model = new AccessPolicyAssignmentInner().withAccessPolicyName("jmkljavbqidtqajz")
-            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("l"));
+        AccessPolicyAssignmentInner model = new AccessPolicyAssignmentInner().withAccessPolicyName("vccfw")
+            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("nbacfi"));
         model = BinaryData.fromObject(model).toObject(AccessPolicyAssignmentInner.class);
-        Assertions.assertEquals("jmkljavbqidtqajz", model.accessPolicyName());
-        Assertions.assertEquals("l", model.user().objectId());
+        Assertions.assertEquals("vccfw", model.accessPolicyName());
+        Assertions.assertEquals("nbacfi", model.user().objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListTests.java
index 8853182b7c5b..36c74317a0f5 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentListTests.java
@@ -15,19 +15,19 @@ public final class AccessPolicyAssignmentListTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AccessPolicyAssignmentList model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"provisioningState\":\"Updating\",\"accessPolicyName\":\"xobnbdxkqpxok\",\"user\":{\"objectId\":\"ionpimexg\"}},\"id\":\"txgcpodgmaajr\",\"name\":\"vdjwzrlovm\",\"type\":\"lwhijcoejctbzaq\"}],\"nextLink\":\"sycbkbfk\"}")
+            "{\"value\":[{\"properties\":{\"provisioningState\":\"Canceled\",\"accessPolicyName\":\"pkvlrxn\",\"user\":{\"objectId\":\"ase\"}},\"id\":\"pheoflokeyy\",\"name\":\"enjbdlwtgrhp\",\"type\":\"jp\"}],\"nextLink\":\"masxazjpqyegu\"}")
             .toObject(AccessPolicyAssignmentList.class);
-        Assertions.assertEquals("xobnbdxkqpxok", model.value().get(0).accessPolicyName());
-        Assertions.assertEquals("ionpimexg", model.value().get(0).user().objectId());
+        Assertions.assertEquals("pkvlrxn", model.value().get(0).accessPolicyName());
+        Assertions.assertEquals("ase", model.value().get(0).user().objectId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         AccessPolicyAssignmentList model = new AccessPolicyAssignmentList()
-            .withValue(Arrays.asList(new AccessPolicyAssignmentInner().withAccessPolicyName("xobnbdxkqpxok")
-                .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("ionpimexg"))));
+            .withValue(Arrays.asList(new AccessPolicyAssignmentInner().withAccessPolicyName("pkvlrxn")
+                .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("ase"))));
         model = BinaryData.fromObject(model).toObject(AccessPolicyAssignmentList.class);
-        Assertions.assertEquals("xobnbdxkqpxok", model.value().get(0).accessPolicyName());
-        Assertions.assertEquals("ionpimexg", model.value().get(0).user().objectId());
+        Assertions.assertEquals("pkvlrxn", model.value().get(0).accessPolicyName());
+        Assertions.assertEquals("ase", model.value().get(0).user().objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesTests.java
index 06fc6212a3bd..06c02c626949 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesTests.java
@@ -12,20 +12,19 @@
 public final class AccessPolicyAssignmentPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        AccessPolicyAssignmentProperties model = BinaryData
-            .fromString(
-                "{\"provisioningState\":\"Updating\",\"accessPolicyName\":\"aierhhb\",\"user\":{\"objectId\":\"glu\"}}")
+        AccessPolicyAssignmentProperties model = BinaryData.fromString(
+            "{\"provisioningState\":\"Updating\",\"accessPolicyName\":\"njampm\",\"user\":{\"objectId\":\"nzscxa\"}}")
             .toObject(AccessPolicyAssignmentProperties.class);
-        Assertions.assertEquals("aierhhb", model.accessPolicyName());
-        Assertions.assertEquals("glu", model.user().objectId());
+        Assertions.assertEquals("njampm", model.accessPolicyName());
+        Assertions.assertEquals("nzscxa", model.user().objectId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AccessPolicyAssignmentProperties model = new AccessPolicyAssignmentProperties().withAccessPolicyName("aierhhb")
-            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("glu"));
+        AccessPolicyAssignmentProperties model = new AccessPolicyAssignmentProperties().withAccessPolicyName("njampm")
+            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("nzscxa"));
         model = BinaryData.fromObject(model).toObject(AccessPolicyAssignmentProperties.class);
-        Assertions.assertEquals("aierhhb", model.accessPolicyName());
-        Assertions.assertEquals("glu", model.user().objectId());
+        Assertions.assertEquals("njampm", model.accessPolicyName());
+        Assertions.assertEquals("nzscxa", model.user().objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesUserTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesUserTests.java
index f489505e8bde..0bdfbcbfea40 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesUserTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentPropertiesUserTests.java
@@ -12,14 +12,14 @@ public final class AccessPolicyAssignmentPropertiesUserTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         AccessPolicyAssignmentPropertiesUser model
-            = BinaryData.fromString("{\"objectId\":\"a\"}").toObject(AccessPolicyAssignmentPropertiesUser.class);
-        Assertions.assertEquals("a", model.objectId());
+            = BinaryData.fromString("{\"objectId\":\"ooch\"}").toObject(AccessPolicyAssignmentPropertiesUser.class);
+        Assertions.assertEquals("ooch", model.objectId());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        AccessPolicyAssignmentPropertiesUser model = new AccessPolicyAssignmentPropertiesUser().withObjectId("a");
+        AccessPolicyAssignmentPropertiesUser model = new AccessPolicyAssignmentPropertiesUser().withObjectId("ooch");
         model = BinaryData.fromObject(model).toObject(AccessPolicyAssignmentPropertiesUser.class);
-        Assertions.assertEquals("a", model.objectId());
+        Assertions.assertEquals("ooch", model.objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsCreateUpdateMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsCreateUpdateMockTests.java
index c4c6af4a4525..9ba1c623f07a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsCreateUpdateMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsCreateUpdateMockTests.java
@@ -22,7 +22,7 @@ public final class AccessPolicyAssignmentsCreateUpdateMockTests {
     @Test
     public void testCreateUpdate() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"accessPolicyName\":\"vzunluthnnprnxi\",\"user\":{\"objectId\":\"ilpjzuaejxdult\"}},\"id\":\"kzbbtd\",\"name\":\"umveekgpwozuhkf\",\"type\":\"bsjyofdx\"}";
+            = "{\"properties\":{\"provisioningState\":\"Succeeded\",\"accessPolicyName\":\"mvb\",\"user\":{\"objectId\":\"yjsflhhcaalnji\"}},\"id\":\"isxyawjoyaqcslyj\",\"name\":\"kiidzyex\",\"type\":\"nelixhnrztfo\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,13 +32,13 @@ public void testCreateUpdate() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AccessPolicyAssignment response = manager.accessPolicyAssignments()
-            .define("bexrmcq")
-            .withExistingDatabase("mtsavjcbpwxqp", "rknftguvriuhprwm", "yvxqtayriwwroy")
-            .withAccessPolicyName("nojvknmefqsg")
-            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("ah"))
+            .define("ultskzbbtdz")
+            .withExistingDatabase("vawjvzunlu", "hnnpr", "xipeilpjzuaejx")
+            .withAccessPolicyName("ekg")
+            .withUser(new AccessPolicyAssignmentPropertiesUser().withObjectId("ozuhkfp"))
             .create();
 
-        Assertions.assertEquals("vzunluthnnprnxi", response.accessPolicyName());
-        Assertions.assertEquals("ilpjzuaejxdult", response.user().objectId());
+        Assertions.assertEquals("mvb", response.accessPolicyName());
+        Assertions.assertEquals("yjsflhhcaalnji", response.user().objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsGetWithResponseMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsGetWithResponseMockTests.java
index 0832bd586627..79bc43ba3d67 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsGetWithResponseMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsGetWithResponseMockTests.java
@@ -21,7 +21,7 @@ public final class AccessPolicyAssignmentsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"provisioningState\":\"Creating\",\"accessPolicyName\":\"dauwhvylwzbtd\",\"user\":{\"objectId\":\"ujznb\"}},\"id\":\"pow\",\"name\":\"wpr\",\"type\":\"qlveualupjmkh\"}";
+            = "{\"properties\":{\"provisioningState\":\"Failed\",\"accessPolicyName\":\"vlvqhjkbegi\",\"user\":{\"objectId\":\"nmxiebwwaloayqc\"}},\"id\":\"wrtz\",\"name\":\"uzgwyzmhtx\",\"type\":\"ngmtsavjcb\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -31,10 +31,10 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         AccessPolicyAssignment response = manager.accessPolicyAssignments()
-            .getWithResponse("gxhnisk", "fbkp", "cg", "lwn", com.azure.core.util.Context.NONE)
+            .getWithResponse("upjm", "hfxobbcswsrtj", "iplrbpbewtghfgb", "c", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals("dauwhvylwzbtd", response.accessPolicyName());
-        Assertions.assertEquals("ujznb", response.user().objectId());
+        Assertions.assertEquals("vlvqhjkbegi", response.accessPolicyName());
+        Assertions.assertEquals("nmxiebwwaloayqc", response.user().objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsListMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsListMockTests.java
index a451ac18871d..6e34729ca3b9 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsListMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/AccessPolicyAssignmentsListMockTests.java
@@ -22,7 +22,7 @@ public final class AccessPolicyAssignmentsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Succeeded\",\"accessPolicyName\":\"xzvlvqhjkbegib\",\"user\":{\"objectId\":\"mxiebw\"}},\"id\":\"aloayqcgwrtzju\",\"name\":\"gwyzm\",\"type\":\"txon\"}]}";
+            = "{\"value\":[{\"properties\":{\"provisioningState\":\"Creating\",\"accessPolicyName\":\"yqbexrmcqibycno\",\"user\":{\"objectId\":\"knme\"}},\"id\":\"qsgzvahapj\",\"name\":\"zhpvgqzcjrvxd\",\"type\":\"zlmwlxkvugfhz\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,9 +32,9 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<AccessPolicyAssignment> response = manager.accessPolicyAssignments()
-            .list("xobbcswsrt", "riplrbpbewtg", "fgb", com.azure.core.util.Context.NONE);
+            .list("wxqpsrknftguvri", "hprwmdyv", "qtayri", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("xzvlvqhjkbegib", response.iterator().next().accessPolicyName());
-        Assertions.assertEquals("mxiebw", response.iterator().next().user().objectId());
+        Assertions.assertEquals("yqbexrmcqibycno", response.iterator().next().accessPolicyName());
+        Assertions.assertEquals("knme", response.iterator().next().user().objectId());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentityTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentityTests.java
index f7807135f9e5..f81cf4c48de2 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentityTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentityTests.java
@@ -13,21 +13,22 @@ public final class ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIde
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity model = BinaryData
-            .fromString("{\"userAssignedIdentityResourceId\":\"osygex\",\"identityType\":\"userAssignedIdentity\"}")
+            .fromString(
+                "{\"userAssignedIdentityResourceId\":\"qjbpfzfsin\",\"identityType\":\"systemAssignedIdentity\"}")
             .toObject(ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity.class);
-        Assertions.assertEquals("osygex", model.userAssignedIdentityResourceId());
-        Assertions.assertEquals(CmkIdentityType.USER_ASSIGNED_IDENTITY, model.identityType());
+        Assertions.assertEquals("qjbpfzfsin", model.userAssignedIdentityResourceId());
+        Assertions.assertEquals(CmkIdentityType.SYSTEM_ASSIGNED_IDENTITY, model.identityType());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity model
             = new ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity()
-                .withUserAssignedIdentityResourceId("osygex")
-                .withIdentityType(CmkIdentityType.USER_ASSIGNED_IDENTITY);
+                .withUserAssignedIdentityResourceId("qjbpfzfsin")
+                .withIdentityType(CmkIdentityType.SYSTEM_ASSIGNED_IDENTITY);
         model = BinaryData.fromObject(model)
             .toObject(ClusterPropertiesEncryptionCustomerManagedKeyEncryptionKeyIdentity.class);
-        Assertions.assertEquals("osygex", model.userAssignedIdentityResourceId());
-        Assertions.assertEquals(CmkIdentityType.USER_ASSIGNED_IDENTITY, model.identityType());
+        Assertions.assertEquals("qjbpfzfsin", model.userAssignedIdentityResourceId());
+        Assertions.assertEquals(CmkIdentityType.SYSTEM_ASSIGNED_IDENTITY, model.identityType());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasePropertiesGeoReplicationTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasePropertiesGeoReplicationTests.java
index a15d40752ede..8af15e6aa5ae 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasePropertiesGeoReplicationTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasePropertiesGeoReplicationTests.java
@@ -14,19 +14,19 @@ public final class DatabasePropertiesGeoReplicationTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         DatabasePropertiesGeoReplication model = BinaryData.fromString(
-            "{\"groupNickname\":\"idf\",\"linkedDatabases\":[{\"id\":\"zuhtymwisdkfthwx\",\"state\":\"Linking\"},{\"id\":\"i\",\"state\":\"LinkFailed\"},{\"id\":\"vkmijcmmxdcuf\",\"state\":\"Unlinking\"}]}")
+            "{\"groupNickname\":\"ijcoejctb\",\"linkedDatabases\":[{\"id\":\"qsycbkbfkgu\",\"state\":\"UnlinkFailed\"},{\"id\":\"xxppofm\",\"state\":\"UnlinkFailed\"}]}")
             .toObject(DatabasePropertiesGeoReplication.class);
-        Assertions.assertEquals("idf", model.groupNickname());
-        Assertions.assertEquals("zuhtymwisdkfthwx", model.linkedDatabases().get(0).id());
+        Assertions.assertEquals("ijcoejctb", model.groupNickname());
+        Assertions.assertEquals("qsycbkbfkgu", model.linkedDatabases().get(0).id());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        DatabasePropertiesGeoReplication model = new DatabasePropertiesGeoReplication().withGroupNickname("idf")
-            .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId("zuhtymwisdkfthwx"),
-                new LinkedDatabase().withId("i"), new LinkedDatabase().withId("vkmijcmmxdcuf")));
+        DatabasePropertiesGeoReplication model = new DatabasePropertiesGeoReplication().withGroupNickname("ijcoejctb")
+            .withLinkedDatabases(
+                Arrays.asList(new LinkedDatabase().withId("qsycbkbfkgu"), new LinkedDatabase().withId("xxppofm")));
         model = BinaryData.fromObject(model).toObject(DatabasePropertiesGeoReplication.class);
-        Assertions.assertEquals("idf", model.groupNickname());
-        Assertions.assertEquals("zuhtymwisdkfthwx", model.linkedDatabases().get(0).id());
+        Assertions.assertEquals("ijcoejctb", model.groupNickname());
+        Assertions.assertEquals("qsycbkbfkgu", model.linkedDatabases().get(0).id());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteMockTests.java
index 1188d3abb96b..5cefbc0a8b40 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesDeleteMockTests.java
@@ -27,7 +27,7 @@ public void testDelete() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.databases().delete("mtxpsiebtfh", "pesapskrdqmhjj", "htldwk", com.azure.core.util.Context.NONE);
+        manager.databases().delete("plpho", "uscrpabgyepsb", "tazqugxywpmueefj", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportMockTests.java
index b4dac5dfa114..2c8ba75b63ed 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesExportMockTests.java
@@ -29,7 +29,7 @@ public void testExport() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.databases()
-            .export("qugxywpmueefjzwf", "kqujidsuyono", "glaocq", new ExportClusterParameters().withSasUri("tcc"),
+            .export("ehhseyvjusrts", "hspkdeemao", "mx", new ExportClusterParameters().withSasUri("gkvtmelmqkrhah"),
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushMockTests.java
index 92fe05cbeb89..c5b26b2248b0 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesFlushMockTests.java
@@ -30,8 +30,8 @@ public void testFlush() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.databases()
-            .flush("sbkyvpycanuzbp", "kafkuwbcrnwbm", "hhseyv",
-                new FlushParameters().withIds(Arrays.asList("rts", "hspkdeemao", "mx", "gkvtmelmqkrhah")),
+            .flush("isgwbnbbeldawkz", "ali", "urqhaka",
+                new FlushParameters().withIds(Arrays.asList("shsfwxosowzxcu", "i", "jooxdjebw")),
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkMockTests.java
index a1c47856e4ae..e7373fe7f0ce 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesForceUnlinkMockTests.java
@@ -30,8 +30,9 @@ public void testForceUnlink() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.databases()
-            .forceUnlink("g", "udxytlmoyrx", "wfudwpzntxhdzhl",
-                new ForceUnlinkParameters().withIds(Arrays.asList("jbhckfrlhr")), com.azure.core.util.Context.NONE);
+            .forceUnlink("ljuahaquhcdh", "duala", "xqpvfadmw",
+                new ForceUnlinkParameters().withIds(Arrays.asList("crgvxpvgom", "lf")),
+                com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodMockTests.java
index da5a14f9bbcc..bb08cf4ead0d 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/DatabasesImportMethodMockTests.java
@@ -30,8 +30,8 @@ public void testImportMethod() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         manager.databases()
-            .importMethod("phywpnvj", "oqnermclfpl", "hoxus",
-                new ImportClusterParameters().withSasUris(Arrays.asList("pabgyeps", "jta")),
+            .importMethod("dzhlrq", "bh", "kfrlhrxsbky",
+                new ImportClusterParameters().withSasUris(Arrays.asList("ycanuzbpzkafku", "b", "rnwb")),
                 com.azure.core.util.Context.NONE);
 
     }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ExportClusterParametersTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ExportClusterParametersTests.java
index e6639ae8af94..1412b8e81d8f 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ExportClusterParametersTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ExportClusterParametersTests.java
@@ -12,14 +12,14 @@ public final class ExportClusterParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ExportClusterParameters model
-            = BinaryData.fromString("{\"sasUri\":\"jjgpb\"}").toObject(ExportClusterParameters.class);
-        Assertions.assertEquals("jjgpb", model.sasUri());
+            = BinaryData.fromString("{\"sasUri\":\"abcypmivk\"}").toObject(ExportClusterParameters.class);
+        Assertions.assertEquals("abcypmivk", model.sasUri());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ExportClusterParameters model = new ExportClusterParameters().withSasUri("jjgpb");
+        ExportClusterParameters model = new ExportClusterParameters().withSasUri("abcypmivk");
         model = BinaryData.fromObject(model).toObject(ExportClusterParameters.class);
-        Assertions.assertEquals("jjgpb", model.sasUri());
+        Assertions.assertEquals("abcypmivk", model.sasUri());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/FlushParametersTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/FlushParametersTests.java
index 876ef0a7bb1b..9b3f7d74de4c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/FlushParametersTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/FlushParametersTests.java
@@ -12,17 +12,14 @@
 public final class FlushParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        FlushParameters model
-            = BinaryData.fromString("{\"ids\":[\"xw\",\"ywqsmbsurexim\",\"ryocfsfksymdd\",\"stkiiuxhqyud\"]}")
-                .toObject(FlushParameters.class);
-        Assertions.assertEquals("xw", model.ids().get(0));
+        FlushParameters model = BinaryData.fromString("{\"ids\":[\"hrsajiwkuofo\"]}").toObject(FlushParameters.class);
+        Assertions.assertEquals("hrsajiwkuofo", model.ids().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        FlushParameters model
-            = new FlushParameters().withIds(Arrays.asList("xw", "ywqsmbsurexim", "ryocfsfksymdd", "stkiiuxhqyud"));
+        FlushParameters model = new FlushParameters().withIds(Arrays.asList("hrsajiwkuofo"));
         model = BinaryData.fromObject(model).toObject(FlushParameters.class);
-        Assertions.assertEquals("xw", model.ids().get(0));
+        Assertions.assertEquals("hrsajiwkuofo", model.ids().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersGeoReplicationTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersGeoReplicationTests.java
index d317b4896135..89ee8201c077 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersGeoReplicationTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersGeoReplicationTests.java
@@ -13,21 +13,20 @@
 public final class ForceLinkParametersGeoReplicationTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ForceLinkParametersGeoReplication model = BinaryData
-            .fromString(
-                "{\"groupNickname\":\"ozmyzydagfu\",\"linkedDatabases\":[{\"id\":\"zyiuokk\",\"state\":\"Linked\"}]}")
+        ForceLinkParametersGeoReplication model = BinaryData.fromString(
+            "{\"groupNickname\":\"zb\",\"linkedDatabases\":[{\"id\":\"ovm\",\"state\":\"Linked\"},{\"id\":\"cspkwlhzdobpxjmf\",\"state\":\"LinkFailed\"},{\"id\":\"nchrkcciww\",\"state\":\"Linked\"}]}")
             .toObject(ForceLinkParametersGeoReplication.class);
-        Assertions.assertEquals("ozmyzydagfu", model.groupNickname());
-        Assertions.assertEquals("zyiuokk", model.linkedDatabases().get(0).id());
+        Assertions.assertEquals("zb", model.groupNickname());
+        Assertions.assertEquals("ovm", model.linkedDatabases().get(0).id());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ForceLinkParametersGeoReplication model
-            = new ForceLinkParametersGeoReplication().withGroupNickname("ozmyzydagfu")
-                .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId("zyiuokk")));
+        ForceLinkParametersGeoReplication model = new ForceLinkParametersGeoReplication().withGroupNickname("zb")
+            .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId("ovm"),
+                new LinkedDatabase().withId("cspkwlhzdobpxjmf"), new LinkedDatabase().withId("nchrkcciww")));
         model = BinaryData.fromObject(model).toObject(ForceLinkParametersGeoReplication.class);
-        Assertions.assertEquals("ozmyzydagfu", model.groupNickname());
-        Assertions.assertEquals("zyiuokk", model.linkedDatabases().get(0).id());
+        Assertions.assertEquals("zb", model.groupNickname());
+        Assertions.assertEquals("ovm", model.linkedDatabases().get(0).id());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersTests.java
index 28239c79be51..16259b2262ad 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceLinkParametersTests.java
@@ -15,19 +15,19 @@ public final class ForceLinkParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ForceLinkParameters model = BinaryData.fromString(
-            "{\"geoReplication\":{\"groupNickname\":\"fhyhltrpmopjmcma\",\"linkedDatabases\":[{\"id\":\"thfuiuaodsfcpkvx\",\"state\":\"Linked\"}]}}")
+            "{\"geoReplication\":{\"groupNickname\":\"t\",\"linkedDatabases\":[{\"id\":\"ulexxbczwtr\",\"state\":\"UnlinkFailed\"}]}}")
             .toObject(ForceLinkParameters.class);
-        Assertions.assertEquals("fhyhltrpmopjmcma", model.geoReplication().groupNickname());
-        Assertions.assertEquals("thfuiuaodsfcpkvx", model.geoReplication().linkedDatabases().get(0).id());
+        Assertions.assertEquals("t", model.geoReplication().groupNickname());
+        Assertions.assertEquals("ulexxbczwtr", model.geoReplication().linkedDatabases().get(0).id());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         ForceLinkParameters model = new ForceLinkParameters()
-            .withGeoReplication(new ForceLinkParametersGeoReplication().withGroupNickname("fhyhltrpmopjmcma")
-                .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId("thfuiuaodsfcpkvx"))));
+            .withGeoReplication(new ForceLinkParametersGeoReplication().withGroupNickname("t")
+                .withLinkedDatabases(Arrays.asList(new LinkedDatabase().withId("ulexxbczwtr"))));
         model = BinaryData.fromObject(model).toObject(ForceLinkParameters.class);
-        Assertions.assertEquals("fhyhltrpmopjmcma", model.geoReplication().groupNickname());
-        Assertions.assertEquals("thfuiuaodsfcpkvx", model.geoReplication().linkedDatabases().get(0).id());
+        Assertions.assertEquals("t", model.geoReplication().groupNickname());
+        Assertions.assertEquals("ulexxbczwtr", model.geoReplication().linkedDatabases().get(0).id());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceUnlinkParametersTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceUnlinkParametersTests.java
index 0d28c77b611f..572abc4270c9 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceUnlinkParametersTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ForceUnlinkParametersTests.java
@@ -12,15 +12,14 @@
 public final class ForceUnlinkParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ForceUnlinkParameters model
-            = BinaryData.fromString("{\"ids\":[\"noae\"]}").toObject(ForceUnlinkParameters.class);
-        Assertions.assertEquals("noae", model.ids().get(0));
+        ForceUnlinkParameters model = BinaryData.fromString("{\"ids\":[\"f\"]}").toObject(ForceUnlinkParameters.class);
+        Assertions.assertEquals("f", model.ids().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ForceUnlinkParameters model = new ForceUnlinkParameters().withIds(Arrays.asList("noae"));
+        ForceUnlinkParameters model = new ForceUnlinkParameters().withIds(Arrays.asList("f"));
         model = BinaryData.fromObject(model).toObject(ForceUnlinkParameters.class);
-        Assertions.assertEquals("noae", model.ids().get(0));
+        Assertions.assertEquals("f", model.ids().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ImportClusterParametersTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ImportClusterParametersTests.java
index 749dfb7ecd71..4e4d9a337734 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ImportClusterParametersTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ImportClusterParametersTests.java
@@ -12,16 +12,15 @@
 public final class ImportClusterParametersTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        ImportClusterParameters model = BinaryData.fromString("{\"sasUris\":[\"abnmocpcyshu\",\"zafb\"]}")
-            .toObject(ImportClusterParameters.class);
-        Assertions.assertEquals("abnmocpcyshu", model.sasUris().get(0));
+        ImportClusterParameters model
+            = BinaryData.fromString("{\"sasUris\":[\"v\",\"bmqj\"]}").toObject(ImportClusterParameters.class);
+        Assertions.assertEquals("v", model.sasUris().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ImportClusterParameters model
-            = new ImportClusterParameters().withSasUris(Arrays.asList("abnmocpcyshu", "zafb"));
+        ImportClusterParameters model = new ImportClusterParameters().withSasUris(Arrays.asList("v", "bmqj"));
         model = BinaryData.fromObject(model).toObject(ImportClusterParameters.class);
-        Assertions.assertEquals("abnmocpcyshu", model.sasUris().get(0));
+        Assertions.assertEquals("v", model.sasUris().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/LinkedDatabaseTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/LinkedDatabaseTests.java
index 2f370033727e..8e418285d684 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/LinkedDatabaseTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/LinkedDatabaseTests.java
@@ -11,15 +11,15 @@
 public final class LinkedDatabaseTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        LinkedDatabase model = BinaryData.fromString("{\"id\":\"pymzidnsezcxtbzs\",\"state\":\"Linking\"}")
+        LinkedDatabase model = BinaryData.fromString("{\"id\":\"fjpgddtocjjxhvp\",\"state\":\"Unlinking\"}")
             .toObject(LinkedDatabase.class);
-        Assertions.assertEquals("pymzidnsezcxtbzs", model.id());
+        Assertions.assertEquals("fjpgddtocjjxhvp", model.id());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        LinkedDatabase model = new LinkedDatabase().withId("pymzidnsezcxtbzs");
+        LinkedDatabase model = new LinkedDatabase().withId("fjpgddtocjjxhvp");
         model = BinaryData.fromObject(model).toObject(LinkedDatabase.class);
-        Assertions.assertEquals("pymzidnsezcxtbzs", model.id());
+        Assertions.assertEquals("fjpgddtocjjxhvp", model.id());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ManagedServiceIdentityTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ManagedServiceIdentityTests.java
index bb231a6e3acf..ec647b813338 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ManagedServiceIdentityTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ManagedServiceIdentityTests.java
@@ -16,18 +16,19 @@ public final class ManagedServiceIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         ManagedServiceIdentity model = BinaryData.fromString(
-            "{\"principalId\":\"83869b10-e234-4090-bb22-6a9d1f9bc31b\",\"tenantId\":\"b817b711-482b-4a67-a9e2-fa9daf2fe637\",\"type\":\"SystemAssigned\",\"userAssignedIdentities\":{\"utegjvwmfdats\":{\"principalId\":\"322b53ea-9529-4fa3-81e0-37c4788b1643\",\"clientId\":\"a10de60e-57d5-43cc-a051-c83cb464bc33\"},\"vpjhulsuuv\":{\"principalId\":\"33f60527-bf15-4d62-9c7f-fd2a04b4f18a\",\"clientId\":\"e248761a-c1cf-4e0e-998d-1f1421eec332\"}}}")
+            "{\"principalId\":\"fc8cec0e-727d-4641-b54c-45e47ab6205f\",\"tenantId\":\"eb7e7691-5376-4781-98a6-32cc013f8785\",\"type\":\"UserAssigned\",\"userAssignedIdentities\":{\"sprozvcput\":{\"principalId\":\"b6d368d9-18d3-41c6-a0c2-562712ccd15f\",\"clientId\":\"3752daf0-89b2-4a5a-9dd3-30f8900b2e87\"},\"vwmf\":{\"principalId\":\"e41f247c-86b3-41b6-97db-227ee600d8a4\",\"clientId\":\"e6beb0dc-09b2-48ec-b3c7-72e936e04de2\"},\"scmdvpjhulsuu\":{\"principalId\":\"c5fe41d7-26ff-4b5e-95c2-806d7a18b4bc\",\"clientId\":\"88323a86-35b8-4f76-8d84-6e9d06ecbd39\"},\"jozkrwfndiod\":{\"principalId\":\"f0fe28d1-edb1-4e3e-a36e-287578e3c721\",\"clientId\":\"f4e56c9f-bb59-43e8-b809-f58ee312e728\"}}}")
             .toObject(ManagedServiceIdentity.class);
-        Assertions.assertEquals(ManagedServiceIdentityType.SYSTEM_ASSIGNED, model.type());
+        Assertions.assertEquals(ManagedServiceIdentityType.USER_ASSIGNED, model.type());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        ManagedServiceIdentity model = new ManagedServiceIdentity().withType(ManagedServiceIdentityType.SYSTEM_ASSIGNED)
+        ManagedServiceIdentity model = new ManagedServiceIdentity().withType(ManagedServiceIdentityType.USER_ASSIGNED)
             .withUserAssignedIdentities(
-                mapOf("utegjvwmfdats", new UserAssignedIdentity(), "vpjhulsuuv", new UserAssignedIdentity()));
+                mapOf("sprozvcput", new UserAssignedIdentity(), "vwmf", new UserAssignedIdentity(), "scmdvpjhulsuu",
+                    new UserAssignedIdentity(), "jozkrwfndiod", new UserAssignedIdentity()));
         model = BinaryData.fromObject(model).toObject(ManagedServiceIdentity.class);
-        Assertions.assertEquals(ManagedServiceIdentityType.SYSTEM_ASSIGNED, model.type());
+        Assertions.assertEquals(ManagedServiceIdentityType.USER_ASSIGNED, model.type());
     }
 
     // Use "Map.of" if available
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ModuleTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ModuleTests.java
index 7a0887e8ada0..85b30aadb831 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ModuleTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/ModuleTests.java
@@ -11,18 +11,17 @@
 public final class ModuleTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        Module model
-            = BinaryData.fromString("{\"name\":\"hmuouqfprwzwbn\",\"args\":\"itnwuizgazxufi\",\"version\":\"ckyfih\"}")
-                .toObject(Module.class);
-        Assertions.assertEquals("hmuouqfprwzwbn", model.name());
-        Assertions.assertEquals("itnwuizgazxufi", model.args());
+        Module model = BinaryData.fromString("{\"name\":\"gmaajrm\",\"args\":\"jwzrl\",\"version\":\"mcl\"}")
+            .toObject(Module.class);
+        Assertions.assertEquals("gmaajrm", model.name());
+        Assertions.assertEquals("jwzrl", model.args());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        Module model = new Module().withName("hmuouqfprwzwbn").withArgs("itnwuizgazxufi");
+        Module model = new Module().withName("gmaajrm").withArgs("jwzrl");
         model = BinaryData.fromObject(model).toObject(Module.class);
-        Assertions.assertEquals("hmuouqfprwzwbn", model.name());
-        Assertions.assertEquals("itnwuizgazxufi", model.args());
+        Assertions.assertEquals("gmaajrm", model.name());
+        Assertions.assertEquals("jwzrl", model.args());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListMockTests.java
index 48135a4a3b9d..8121fc2517ca 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/OperationsListMockTests.java
@@ -21,7 +21,7 @@ public final class OperationsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"name\":\"rrqnbpoczvyifqrv\",\"isDataAction\":true,\"display\":{\"provider\":\"llr\",\"resource\":\"vdfwatkpn\",\"operation\":\"lexxbczwtru\",\"description\":\"qzbqjvsov\"},\"origin\":\"user\",\"actionType\":\"Internal\"}]}";
+            = "{\"value\":[{\"name\":\"ghsauuimjmvxied\",\"isDataAction\":false,\"display\":{\"provider\":\"yjr\",\"resource\":\"byao\",\"operation\":\"e\",\"description\":\"sonpclhocohs\"},\"origin\":\"user\",\"actionType\":\"Internal\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PersistenceTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PersistenceTests.java
index e491988cebbb..d7c144852b93 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PersistenceTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PersistenceTests.java
@@ -14,24 +14,24 @@ public final class PersistenceTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         Persistence model = BinaryData
-            .fromString("{\"aofEnabled\":false,\"rdbEnabled\":false,\"aofFrequency\":\"1s\",\"rdbFrequency\":\"12h\"}")
+            .fromString("{\"aofEnabled\":true,\"rdbEnabled\":false,\"aofFrequency\":\"1s\",\"rdbFrequency\":\"6h\"}")
             .toObject(Persistence.class);
-        Assertions.assertFalse(model.aofEnabled());
+        Assertions.assertTrue(model.aofEnabled());
         Assertions.assertFalse(model.rdbEnabled());
         Assertions.assertEquals(AofFrequency.ONES, model.aofFrequency());
-        Assertions.assertEquals(RdbFrequency.ONE_TWOH, model.rdbFrequency());
+        Assertions.assertEquals(RdbFrequency.SIXH, model.rdbFrequency());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        Persistence model = new Persistence().withAofEnabled(false)
+        Persistence model = new Persistence().withAofEnabled(true)
             .withRdbEnabled(false)
             .withAofFrequency(AofFrequency.ONES)
-            .withRdbFrequency(RdbFrequency.ONE_TWOH);
+            .withRdbFrequency(RdbFrequency.SIXH);
         model = BinaryData.fromObject(model).toObject(Persistence.class);
-        Assertions.assertFalse(model.aofEnabled());
+        Assertions.assertTrue(model.aofEnabled());
         Assertions.assertFalse(model.rdbEnabled());
         Assertions.assertEquals(AofFrequency.ONES, model.aofFrequency());
-        Assertions.assertEquals(RdbFrequency.ONE_TWOH, model.rdbFrequency());
+        Assertions.assertEquals(RdbFrequency.SIXH, model.rdbFrequency());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionInnerTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionInnerTests.java
index 8ca281c118b9..a5ff2dcc3c0a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionInnerTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionInnerTests.java
@@ -15,12 +15,12 @@ public final class PrivateEndpointConnectionInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateEndpointConnectionInner model = BinaryData.fromString(
-            "{\"properties\":{\"privateEndpoint\":{\"id\":\"hmsbzjhcrzevdp\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"olthqtrgqjbp\",\"actionsRequired\":\"fsinzgvfcjrwzoxx\"},\"provisioningState\":\"Failed\"},\"id\":\"elluwfziton\",\"name\":\"eqfpj\",\"type\":\"jlxofpdvhpfxxyp\"}")
+            "{\"properties\":{\"privateEndpoint\":{\"id\":\"rwzoxxjtfelluwf\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"np\",\"actionsRequired\":\"fpjkjlxofp\"},\"provisioningState\":\"Succeeded\"},\"id\":\"pfxxy\",\"name\":\"ininmay\",\"type\":\"uybbkpodep\"}")
             .toObject(PrivateEndpointConnectionInner.class);
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.PENDING,
             model.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("olthqtrgqjbp", model.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("fsinzgvfcjrwzoxx", model.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("np", model.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("fpjkjlxofp", model.privateLinkServiceConnectionState().actionsRequired());
     }
 
     @org.junit.jupiter.api.Test
@@ -28,13 +28,13 @@ public void testSerialize() throws Exception {
         PrivateEndpointConnectionInner model
             = new PrivateEndpointConnectionInner().withPrivateEndpoint(new PrivateEndpoint())
                 .withPrivateLinkServiceConnectionState(
-                    new PrivateLinkServiceConnectionState().withStatus(PrivateEndpointServiceConnectionStatus.REJECTED)
-                        .withDescription("olthqtrgqjbp")
-                        .withActionsRequired("fsinzgvfcjrwzoxx"));
+                    new PrivateLinkServiceConnectionState().withStatus(PrivateEndpointServiceConnectionStatus.PENDING)
+                        .withDescription("np")
+                        .withActionsRequired("fpjkjlxofp"));
         model = BinaryData.fromObject(model).toObject(PrivateEndpointConnectionInner.class);
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.PENDING,
             model.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("olthqtrgqjbp", model.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("fsinzgvfcjrwzoxx", model.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("np", model.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("fpjkjlxofp", model.privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionListResultTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionListResultTests.java
index 60f7a246bac6..4b1ebac3cb3c 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionListResultTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionListResultTests.java
@@ -17,13 +17,12 @@ public final class PrivateEndpointConnectionListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateEndpointConnectionListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"xibqeojnx\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"ddntwndei\",\"actionsRequired\":\"twnpzaoqvuhrhcf\"},\"provisioningState\":\"Succeeded\"},\"id\":\"ddglm\",\"name\":\"t\",\"type\":\"jqkwpyeicx\"},{\"properties\":{\"privateEndpoint\":{\"id\":\"wqvhkhixuigdt\"},\"privateLinkServiceConnectionState\":{\"status\":\"Approved\",\"description\":\"bjoghmewuamau\",\"actionsRequired\":\"z\"},\"provisioningState\":\"Deleting\"},\"id\":\"vtpgvdfgiotkf\",\"name\":\"utqxlngx\",\"type\":\"efgugnxk\"},{\"properties\":{\"privateEndpoint\":{\"id\":\"mi\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"zrvqdr\",\"actionsRequired\":\"hjybigehoqfbo\"},\"provisioningState\":\"Failed\"},\"id\":\"anyktzlcuiywg\",\"name\":\"ywgndrv\",\"type\":\"nhzgpphrcgyn\"},{\"properties\":{\"privateEndpoint\":{\"id\":\"ecfvmm\"},\"privateLinkServiceConnectionState\":{\"status\":\"Pending\",\"description\":\"sxlzevgbmqj\",\"actionsRequired\":\"bcypmi\"},\"provisioningState\":\"Succeeded\"},\"id\":\"lzu\",\"name\":\"ccfwnfnbacfion\",\"type\":\"ebxetqgtzxdp\"}]}")
+            "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"gacftadeh\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"yfsoppu\",\"actionsRequired\":\"esnzwde\"},\"provisioningState\":\"Succeeded\"},\"id\":\"vorxzdmohct\",\"name\":\"qvudwxdndnvowgu\",\"type\":\"jugwdkcglhsl\"},{\"properties\":{\"privateEndpoint\":{\"id\":\"yggdtjixh\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"fqweykhmene\",\"actionsRequired\":\"yexfwh\"},\"provisioningState\":\"Failed\"},\"id\":\"i\",\"name\":\"vyvdcs\",\"type\":\"tynnaamdectehfi\"}]}")
             .toObject(PrivateEndpointConnectionListResult.class);
         Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
             model.value().get(0).privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("ddntwndei", model.value().get(0).privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("twnpzaoqvuhrhcf",
-            model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("yfsoppu", model.value().get(0).privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("esnzwde", model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
     }
 
     @org.junit.jupiter.api.Test
@@ -34,28 +33,17 @@ public void testSerialize() throws Exception {
                     new PrivateEndpointConnectionInner().withPrivateEndpoint(new PrivateEndpoint())
                         .withPrivateLinkServiceConnectionState(new PrivateLinkServiceConnectionState()
                             .withStatus(PrivateEndpointServiceConnectionStatus.REJECTED)
-                            .withDescription("ddntwndei")
-                            .withActionsRequired("twnpzaoqvuhrhcf")),
+                            .withDescription("yfsoppu")
+                            .withActionsRequired("esnzwde")),
                     new PrivateEndpointConnectionInner().withPrivateEndpoint(new PrivateEndpoint())
                         .withPrivateLinkServiceConnectionState(new PrivateLinkServiceConnectionState()
-                            .withStatus(PrivateEndpointServiceConnectionStatus.APPROVED)
-                            .withDescription("bjoghmewuamau")
-                            .withActionsRequired("z")),
-                    new PrivateEndpointConnectionInner().withPrivateEndpoint(new PrivateEndpoint())
-                        .withPrivateLinkServiceConnectionState(new PrivateLinkServiceConnectionState()
-                            .withStatus(PrivateEndpointServiceConnectionStatus.PENDING)
-                            .withDescription("zrvqdr")
-                            .withActionsRequired("hjybigehoqfbo")),
-                    new PrivateEndpointConnectionInner().withPrivateEndpoint(new PrivateEndpoint())
-                        .withPrivateLinkServiceConnectionState(new PrivateLinkServiceConnectionState()
-                            .withStatus(PrivateEndpointServiceConnectionStatus.PENDING)
-                            .withDescription("sxlzevgbmqj")
-                            .withActionsRequired("bcypmi"))));
+                            .withStatus(PrivateEndpointServiceConnectionStatus.REJECTED)
+                            .withDescription("fqweykhmene")
+                            .withActionsRequired("yexfwh"))));
         model = BinaryData.fromObject(model).toObject(PrivateEndpointConnectionListResult.class);
         Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
             model.value().get(0).privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("ddntwndei", model.value().get(0).privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("twnpzaoqvuhrhcf",
-            model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("yfsoppu", model.value().get(0).privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("esnzwde", model.value().get(0).privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionPropertiesTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionPropertiesTests.java
index facb7fdd54aa..ae7edbd99fdb 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionPropertiesTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionPropertiesTests.java
@@ -15,12 +15,12 @@ public final class PrivateEndpointConnectionPropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateEndpointConnectionProperties model = BinaryData.fromString(
-            "{\"privateEndpoint\":{\"id\":\"nmayhuybb\"},\"privateLinkServiceConnectionState\":{\"status\":\"Approved\",\"description\":\"epoo\",\"actionsRequired\":\"nuvamiheogna\"},\"provisioningState\":\"Failed\"}")
+            "{\"privateEndpoint\":{\"id\":\"inuvamiheogn\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"xth\",\"actionsRequired\":\"tusivyevcciqihn\"},\"provisioningState\":\"Creating\"}")
             .toObject(PrivateEndpointConnectionProperties.class);
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.APPROVED,
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
             model.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("epoo", model.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("nuvamiheogna", model.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("xth", model.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("tusivyevcciqihn", model.privateLinkServiceConnectionState().actionsRequired());
     }
 
     @org.junit.jupiter.api.Test
@@ -28,13 +28,13 @@ public void testSerialize() throws Exception {
         PrivateEndpointConnectionProperties model
             = new PrivateEndpointConnectionProperties().withPrivateEndpoint(new PrivateEndpoint())
                 .withPrivateLinkServiceConnectionState(
-                    new PrivateLinkServiceConnectionState().withStatus(PrivateEndpointServiceConnectionStatus.APPROVED)
-                        .withDescription("epoo")
-                        .withActionsRequired("nuvamiheogna"));
+                    new PrivateLinkServiceConnectionState().withStatus(PrivateEndpointServiceConnectionStatus.REJECTED)
+                        .withDescription("xth")
+                        .withActionsRequired("tusivyevcciqihn"));
         model = BinaryData.fromObject(model).toObject(PrivateEndpointConnectionProperties.class);
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.APPROVED,
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
             model.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("epoo", model.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("nuvamiheogna", model.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("xth", model.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("tusivyevcciqihn", model.privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteMockTests.java
index a361d1f5483f..d93b57ea994b 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsDeleteMockTests.java
@@ -27,7 +27,8 @@ public void testDelete() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.privateEndpointConnections().delete("qeqxo", "z", "ahzxctobgbk", com.azure.core.util.Context.NONE);
+        manager.privateEndpointConnections()
+            .delete("szjfauvjfdxxivet", "t", "qaqtdoqmcbxvwvxy", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
index e7d2a29e558c..242741d9a145 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsGetWithResponseMockTests.java
@@ -22,7 +22,7 @@ public final class PrivateEndpointConnectionsGetWithResponseMockTests {
     @Test
     public void testGetWithResponse() throws Exception {
         String responseStr
-            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"gylgqgitxmedjvcs\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"wwncwzzhxgk\",\"actionsRequired\":\"mgucna\"},\"provisioningState\":\"Succeeded\"},\"id\":\"eoellwptfdygp\",\"name\":\"qbuaceopzfqr\",\"type\":\"huaoppp\"}";
+            = "{\"properties\":{\"privateEndpoint\":{\"id\":\"pcqeqx\"},\"privateLinkServiceConnectionState\":{\"status\":\"Approved\",\"description\":\"ahzxctobgbk\",\"actionsRequired\":\"oizpostmgrcfbun\"},\"provisioningState\":\"Failed\"},\"id\":\"qjhhkxbpv\",\"name\":\"ymjhxxjyngudivkr\",\"type\":\"swbxqz\"}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,12 +32,12 @@ public void testGetWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PrivateEndpointConnection response = manager.privateEndpointConnections()
-            .getWithResponse("hb", "xknalaulppg", "dtpnapnyiropuhp", com.azure.core.util.Context.NONE)
+            .getWithResponse("oellwp", "fdygpfqbuaceopz", "qrhhu", com.azure.core.util.Context.NONE)
             .getValue();
 
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.APPROVED,
             response.privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("wwncwzzhxgk", response.privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("mgucna", response.privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("ahzxctobgbk", response.privateLinkServiceConnectionState().description());
+        Assertions.assertEquals("oizpostmgrcfbun", response.privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListMockTests.java
index 48c50acc16f9..39dabf2cf36a 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointConnectionsListMockTests.java
@@ -23,7 +23,7 @@ public final class PrivateEndpointConnectionsListMockTests {
     @Test
     public void testList() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"mvb\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"sflhhca\",\"actionsRequired\":\"n\"},\"provisioningState\":\"Failed\"},\"id\":\"isxyawjoyaqcslyj\",\"name\":\"kiidzyex\",\"type\":\"nelixhnrztfo\"}]}";
+            = "{\"value\":[{\"properties\":{\"privateEndpoint\":{\"id\":\"napnyiropuhpigv\"},\"privateLinkServiceConnectionState\":{\"status\":\"Rejected\",\"description\":\"gqgitxmedjvcsl\",\"actionsRequired\":\"qwwncw\"},\"provisioningState\":\"Succeeded\"},\"id\":\"xgk\",\"name\":\"rmgucnap\",\"type\":\"t\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -33,12 +33,13 @@ public void testList() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<PrivateEndpointConnection> response
-            = manager.privateEndpointConnections().list("uusdttouwa", "oekqvk", com.azure.core.util.Context.NONE);
+            = manager.privateEndpointConnections().list("hb", "xknalaulppg", com.azure.core.util.Context.NONE);
 
         Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.REJECTED,
             response.iterator().next().privateLinkServiceConnectionState().status());
-        Assertions.assertEquals("sflhhca",
+        Assertions.assertEquals("gqgitxmedjvcsl",
             response.iterator().next().privateLinkServiceConnectionState().description());
-        Assertions.assertEquals("n", response.iterator().next().privateLinkServiceConnectionState().actionsRequired());
+        Assertions.assertEquals("qwwncw",
+            response.iterator().next().privateLinkServiceConnectionState().actionsRequired());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointTests.java
index 434fb59d8dba..091b89136801 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateEndpointTests.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        PrivateEndpoint model = BinaryData.fromString("{\"id\":\"theotusiv\"}").toObject(PrivateEndpoint.class);
+        PrivateEndpoint model = BinaryData.fromString("{\"id\":\"bwjzr\"}").toObject(PrivateEndpoint.class);
     }
 
     @org.junit.jupiter.api.Test
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceInnerTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceInnerTests.java
index 2ba0a1a48a23..4caebaa790f9 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceInnerTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceInnerTests.java
@@ -13,16 +13,16 @@ public final class PrivateLinkResourceInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkResourceInner model = BinaryData.fromString(
-            "{\"properties\":{\"groupId\":\"zj\",\"requiredMembers\":[\"gdtjixhbkuofqwey\"],\"requiredZoneNames\":[\"enevfyexfwhybci\",\"vyvdcs\",\"tynnaamdectehfi\"]},\"id\":\"scjeypv\",\"name\":\"ezrkgqhcjrefo\",\"type\":\"gm\"}")
+            "{\"properties\":{\"groupId\":\"noae\",\"requiredMembers\":[\"hy\",\"ltrpmopj\",\"cma\",\"u\"],\"requiredZoneNames\":[\"hfuiuaodsfc\",\"kvxod\",\"uozmyzydagfua\",\"bezy\"]},\"id\":\"uokktwhrdxwz\",\"name\":\"wqsmbsur\",\"type\":\"xim\"}")
             .toObject(PrivateLinkResourceInner.class);
-        Assertions.assertEquals("enevfyexfwhybci", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("hfuiuaodsfc", model.requiredZoneNames().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         PrivateLinkResourceInner model = new PrivateLinkResourceInner()
-            .withRequiredZoneNames(Arrays.asList("enevfyexfwhybci", "vyvdcs", "tynnaamdectehfi"));
+            .withRequiredZoneNames(Arrays.asList("hfuiuaodsfc", "kvxod", "uozmyzydagfua", "bezy"));
         model = BinaryData.fromObject(model).toObject(PrivateLinkResourceInner.class);
-        Assertions.assertEquals("enevfyexfwhybci", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("hfuiuaodsfc", model.requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceListResultTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceListResultTests.java
index 239ed23740a5..0e499d6c2f81 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceListResultTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourceListResultTests.java
@@ -14,18 +14,16 @@ public final class PrivateLinkResourceListResultTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkResourceListResult model = BinaryData.fromString(
-            "{\"value\":[{\"properties\":{\"groupId\":\"wxrjfeallnwsub\",\"requiredMembers\":[\"jampmngnzscxaqw\",\"ochcbonqvpkvl\"],\"requiredZoneNames\":[\"jease\",\"pheoflokeyy\",\"enjbdlwtgrhp\",\"jp\"]},\"id\":\"umasxazjpq\",\"name\":\"e\",\"type\":\"ualhbxxhejj\"},{\"properties\":{\"groupId\":\"dudgwdslfhot\",\"requiredMembers\":[\"ynpwlbj\",\"pgacftadehxnlty\",\"sop\"],\"requiredZoneNames\":[\"uesnzwdejbavo\",\"xzdmohctb\"]},\"id\":\"vudwx\",\"name\":\"ndnvo\",\"type\":\"gujjugwdkcglh\"}]}")
+            "{\"value\":[{\"properties\":{\"groupId\":\"ypvhezrkg\",\"requiredMembers\":[\"jrefovgmkqsle\"],\"requiredZoneNames\":[\"xyqj\",\"k\",\"attpngjcrcczsq\",\"jh\"]},\"id\":\"mdajv\",\"name\":\"ysou\",\"type\":\"q\"}]}")
             .toObject(PrivateLinkResourceListResult.class);
-        Assertions.assertEquals("jease", model.value().get(0).requiredZoneNames().get(0));
+        Assertions.assertEquals("xyqj", model.value().get(0).requiredZoneNames().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         PrivateLinkResourceListResult model = new PrivateLinkResourceListResult().withValue(Arrays.asList(
-            new PrivateLinkResourceInner()
-                .withRequiredZoneNames(Arrays.asList("jease", "pheoflokeyy", "enjbdlwtgrhp", "jp")),
-            new PrivateLinkResourceInner().withRequiredZoneNames(Arrays.asList("uesnzwdejbavo", "xzdmohctb"))));
+            new PrivateLinkResourceInner().withRequiredZoneNames(Arrays.asList("xyqj", "k", "attpngjcrcczsq", "jh"))));
         model = BinaryData.fromObject(model).toObject(PrivateLinkResourceListResult.class);
-        Assertions.assertEquals("jease", model.value().get(0).requiredZoneNames().get(0));
+        Assertions.assertEquals("xyqj", model.value().get(0).requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcePropertiesTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcePropertiesTests.java
index a8d5a88c0346..45ba35660a36 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcePropertiesTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcePropertiesTests.java
@@ -13,16 +13,16 @@ public final class PrivateLinkResourcePropertiesTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkResourceProperties model = BinaryData.fromString(
-            "{\"groupId\":\"sle\",\"requiredMembers\":[\"xyqj\",\"k\",\"attpngjcrcczsq\",\"jh\"],\"requiredZoneNames\":[\"ajvnysounqe\"]}")
+            "{\"groupId\":\"yocf\",\"requiredMembers\":[\"s\",\"mddystkiiux\"],\"requiredZoneNames\":[\"udxorrqn\",\"poczvyifqrvkdvjs\",\"lrmv\"]}")
             .toObject(PrivateLinkResourceProperties.class);
-        Assertions.assertEquals("ajvnysounqe", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("udxorrqn", model.requiredZoneNames().get(0));
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        PrivateLinkResourceProperties model
-            = new PrivateLinkResourceProperties().withRequiredZoneNames(Arrays.asList("ajvnysounqe"));
+        PrivateLinkResourceProperties model = new PrivateLinkResourceProperties()
+            .withRequiredZoneNames(Arrays.asList("udxorrqn", "poczvyifqrvkdvjs", "lrmv"));
         model = BinaryData.fromObject(model).toObject(PrivateLinkResourceProperties.class);
-        Assertions.assertEquals("ajvnysounqe", model.requiredZoneNames().get(0));
+        Assertions.assertEquals("udxorrqn", model.requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterMockTests.java
index c756827548c5..034606c1c88e 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkResourcesListByClusterMockTests.java
@@ -22,7 +22,7 @@ public final class PrivateLinkResourcesListByClusterMockTests {
     @Test
     public void testListByCluster() throws Exception {
         String responseStr
-            = "{\"value\":[{\"properties\":{\"groupId\":\"fqjhhkxbpvjymj\",\"requiredMembers\":[\"j\",\"n\",\"u\"],\"requiredZoneNames\":[\"krtswbxqz\"]},\"id\":\"szjfauvjfdxxivet\",\"name\":\"t\",\"type\":\"qaqtdoqmcbxvwvxy\"}]}";
+            = "{\"value\":[{\"properties\":{\"groupId\":\"blmpewww\",\"requiredMembers\":[\"rvrnsvshqjohxc\",\"sbfov\"],\"requiredZoneNames\":[\"ruvw\",\"hsqfsubcgjbirxbp\",\"bsrfbj\"]},\"id\":\"dtws\",\"name\":\"otftpvjzbexilz\",\"type\":\"nfqqnvwp\"}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -32,8 +32,8 @@ public void testListByCluster() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         PagedIterable<PrivateLinkResource> response
-            = manager.privateLinkResources().listByCluster("moizpos", "mgrcfbu", com.azure.core.util.Context.NONE);
+            = manager.privateLinkResources().listByCluster("lqbhsf", "obl", com.azure.core.util.Context.NONE);
 
-        Assertions.assertEquals("krtswbxqz", response.iterator().next().requiredZoneNames().get(0));
+        Assertions.assertEquals("ruvw", response.iterator().next().requiredZoneNames().get(0));
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkServiceConnectionStateTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkServiceConnectionStateTests.java
index a1361d324c7f..4863cc40af43 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkServiceConnectionStateTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/PrivateLinkServiceConnectionStateTests.java
@@ -13,22 +13,22 @@ public final class PrivateLinkServiceConnectionStateTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         PrivateLinkServiceConnectionState model = BinaryData
-            .fromString("{\"status\":\"Pending\",\"description\":\"ciqihnhung\",\"actionsRequired\":\"jzrnf\"}")
+            .fromString("{\"status\":\"Approved\",\"description\":\"xgispemvtzfkufu\",\"actionsRequired\":\"jofxqe\"}")
             .toObject(PrivateLinkServiceConnectionState.class);
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.PENDING, model.status());
-        Assertions.assertEquals("ciqihnhung", model.description());
-        Assertions.assertEquals("jzrnf", model.actionsRequired());
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.APPROVED, model.status());
+        Assertions.assertEquals("xgispemvtzfkufu", model.description());
+        Assertions.assertEquals("jofxqe", model.actionsRequired());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
         PrivateLinkServiceConnectionState model
-            = new PrivateLinkServiceConnectionState().withStatus(PrivateEndpointServiceConnectionStatus.PENDING)
-                .withDescription("ciqihnhung")
-                .withActionsRequired("jzrnf");
+            = new PrivateLinkServiceConnectionState().withStatus(PrivateEndpointServiceConnectionStatus.APPROVED)
+                .withDescription("xgispemvtzfkufu")
+                .withActionsRequired("jofxqe");
         model = BinaryData.fromObject(model).toObject(PrivateLinkServiceConnectionState.class);
-        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.PENDING, model.status());
-        Assertions.assertEquals("ciqihnhung", model.description());
-        Assertions.assertEquals("jzrnf", model.actionsRequired());
+        Assertions.assertEquals(PrivateEndpointServiceConnectionStatus.APPROVED, model.status());
+        Assertions.assertEquals("xgispemvtzfkufu", model.description());
+        Assertions.assertEquals("jofxqe", model.actionsRequired());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesDeleteMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesDeleteMockTests.java
index 3dafbdb2cc51..f81ceb10f1ee 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesDeleteMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesDeleteMockTests.java
@@ -27,7 +27,7 @@ public void testDelete() throws Exception {
             .authenticate(tokenRequestContext -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX)),
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
-        manager.redisEnterprises().delete("e", "csonpclhoco", com.azure.core.util.Context.NONE);
+        manager.redisEnterprises().delete("ptkoenkoukn", "udwtiukbl", com.azure.core.util.Context.NONE);
 
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesListSkusForScalingWithResponseMockTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesListSkusForScalingWithResponseMockTests.java
index 7befca1629ce..35ba3e5bf890 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesListSkusForScalingWithResponseMockTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/RedisEnterprisesListSkusForScalingWithResponseMockTests.java
@@ -20,7 +20,7 @@ public final class RedisEnterprisesListSkusForScalingWithResponseMockTests {
     @Test
     public void testListSkusForScalingWithResponse() throws Exception {
         String responseStr
-            = "{\"skus\":[{\"name\":\"nuqszfkbey\",\"sizeInGB\":80.61801},{\"name\":\"mjmwvvjektcx\",\"sizeInGB\":86.37973},{\"name\":\"wlrsffrzpwv\",\"sizeInGB\":91.72675},{\"name\":\"gbiqylihkaet\",\"sizeInGB\":56.222622}]}";
+            = "{\"skus\":[{\"name\":\"ttxfvjr\",\"sizeInGB\":8.868826},{\"name\":\"hxepcyvahfnlj\",\"sizeInGB\":13.063425},{\"name\":\"j\",\"sizeInGB\":45.996456},{\"name\":\"qgidokgjljyo\",\"sizeInGB\":65.12365}]}";
 
         HttpClient httpClient
             = response -> Mono.just(new MockHttpResponse(response, 200, responseStr.getBytes(StandardCharsets.UTF_8)));
@@ -30,7 +30,7 @@ public void testListSkusForScalingWithResponse() throws Exception {
                 new AzureProfile("", "", AzureCloud.AZURE_PUBLIC_CLOUD));
 
         SkuDetailsList response = manager.redisEnterprises()
-            .listSkusForScalingWithResponse("noc", "koklya", com.azure.core.util.Context.NONE)
+            .listSkusForScalingWithResponse("qhjfbebr", "cxerf", com.azure.core.util.Context.NONE)
             .getValue();
 
     }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsListInnerTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsListInnerTests.java
index dc3eeb4480c3..5a03be69b0a6 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsListInnerTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsListInnerTests.java
@@ -12,16 +12,14 @@
 public final class SkuDetailsListInnerTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
-        SkuDetailsListInner model = BinaryData
-            .fromString(
-                "{\"skus\":[{\"name\":\"kexxppof\",\"sizeInGB\":93.731895},{\"name\":\"c\",\"sizeInGB\":9.220636}]}")
-            .toObject(SkuDetailsListInner.class);
+        SkuDetailsListInner model
+            = BinaryData.fromString("{\"skus\":[{\"name\":\"xxhejjzzvd\",\"sizeInGB\":63.329147}]}")
+                .toObject(SkuDetailsListInner.class);
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        SkuDetailsListInner model
-            = new SkuDetailsListInner().withSkus(Arrays.asList(new SkuDetails(), new SkuDetails()));
+        SkuDetailsListInner model = new SkuDetailsListInner().withSkus(Arrays.asList(new SkuDetails()));
         model = BinaryData.fromObject(model).toObject(SkuDetailsListInner.class);
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsTests.java
index fe533f70c7dc..3f06bc1dbc1d 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuDetailsTests.java
@@ -11,7 +11,7 @@ public final class SkuDetailsTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         SkuDetails model
-            = BinaryData.fromString("{\"name\":\"ddtocjjxhvp\",\"sizeInGB\":41.112267}").toObject(SkuDetails.class);
+            = BinaryData.fromString("{\"name\":\"dslfhotwmcy\",\"sizeInGB\":86.83051}").toObject(SkuDetails.class);
     }
 
     @org.junit.jupiter.api.Test
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuTests.java
index 39827aa613c8..d6c51bc443a3 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/SkuTests.java
@@ -13,16 +13,16 @@ public final class SkuTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         Sku model
-            = BinaryData.fromString("{\"name\":\"FlashOptimized_A500\",\"capacity\":355528987}").toObject(Sku.class);
-        Assertions.assertEquals(SkuName.FLASH_OPTIMIZED_A500, model.name());
-        Assertions.assertEquals(355528987, model.capacity());
+            = BinaryData.fromString("{\"name\":\"ComputeOptimized_X500\",\"capacity\":825844249}").toObject(Sku.class);
+        Assertions.assertEquals(SkuName.COMPUTE_OPTIMIZED_X500, model.name());
+        Assertions.assertEquals(825844249, model.capacity());
     }
 
     @org.junit.jupiter.api.Test
     public void testSerialize() throws Exception {
-        Sku model = new Sku().withName(SkuName.FLASH_OPTIMIZED_A500).withCapacity(355528987);
+        Sku model = new Sku().withName(SkuName.COMPUTE_OPTIMIZED_X500).withCapacity(825844249);
         model = BinaryData.fromObject(model).toObject(Sku.class);
-        Assertions.assertEquals(SkuName.FLASH_OPTIMIZED_A500, model.name());
-        Assertions.assertEquals(355528987, model.capacity());
+        Assertions.assertEquals(SkuName.COMPUTE_OPTIMIZED_X500, model.name());
+        Assertions.assertEquals(825844249, model.capacity());
     }
 }
diff --git a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/UserAssignedIdentityTests.java b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/UserAssignedIdentityTests.java
index 9e6d69cf44ad..5516524fcbf7 100644
--- a/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/UserAssignedIdentityTests.java
+++ b/sdk/redisenterprise/azure-resourcemanager-redisenterprise/src/test/java/com/azure/resourcemanager/redisenterprise/generated/UserAssignedIdentityTests.java
@@ -11,7 +11,7 @@ public final class UserAssignedIdentityTests {
     @org.junit.jupiter.api.Test
     public void testDeserialize() throws Exception {
         UserAssignedIdentity model = BinaryData.fromString(
-            "{\"principalId\":\"875d4eb4-4ea2-4bf7-b060-f017b4093a75\",\"clientId\":\"e9db5eb8-a685-4782-900d-ca57888b2a7e\"}")
+            "{\"principalId\":\"942b2ccd-109b-4808-94c9-47b8f5f29a29\",\"clientId\":\"e6ed9d5b-115e-4b86-888c-f4e250301ff4\"}")
             .toObject(UserAssignedIdentity.class);
     }
 
diff --git a/sdk/relay/azure-resourcemanager-relay/pom.xml b/sdk/relay/azure-resourcemanager-relay/pom.xml
index 4957d4de2a43..50c451581921 100644
--- a/sdk/relay/azure-resourcemanager-relay/pom.xml
+++ b/sdk/relay/azure-resourcemanager-relay/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/remoterendering/TestResources/testBox.fbx b/sdk/remoterendering/TestResources/testBox.fbx
deleted file mode 100644
index 13b967f33315..000000000000
--- a/sdk/remoterendering/TestResources/testBox.fbx
+++ /dev/null
@@ -1,346 +0,0 @@
-; FBX 7.5.0 project file
-; ----------------------------------------------------
-
-FBXHeaderExtension:  {
-	FBXHeaderVersion: 1003
-	FBXVersion: 7500
-	CreationTimeStamp:  {
-		Version: 1000
-		Year: 2021
-		Month: 1
-		Day: 24
-		Hour: 10
-		Minute: 15
-		Second: 0
-		Millisecond: 529
-	}
-	Creator: "FBX SDK/FBX Plugins version 2018.1.1"
-	SceneInfo: "SceneInfo::GlobalInfo", "UserData" {
-		Type: "UserData"
-		Version: 100
-		MetaData:  {
-			Version: 100
-			Title: "Exported .fbx from Lift"
-			Subject: "fbx"
-			Author: ""
-			Keywords: "Microsoft Community Paint"
-			Revision: "rev. 1.0"
-			Comment: ""
-		}
-		Properties70:  {
-			P: "DocumentUrl", "KString", "Url", "", "testBox.fbx"
-			P: "SrcDocumentUrl", "KString", "Url", "", "testBox.fbx"
-			P: "Original", "Compound", "", ""
-			P: "Original|ApplicationVendor", "KString", "", "", ""
-			P: "Original|ApplicationName", "KString", "", "", ""
-			P: "Original|ApplicationVersion", "KString", "", "", ""
-			P: "Original|DateTime_GMT", "DateTime", "", "", ""
-			P: "Original|FileName", "KString", "", "", ""
-			P: "LastSaved", "Compound", "", ""
-			P: "LastSaved|ApplicationVendor", "KString", "", "", ""
-			P: "LastSaved|ApplicationName", "KString", "", "", ""
-			P: "LastSaved|ApplicationVersion", "KString", "", "", ""
-			P: "LastSaved|DateTime_GMT", "DateTime", "", "", ""
-		}
-	}
-}
-GlobalSettings:  {
-	Version: 1000
-	Properties70:  {
-		P: "UpAxis", "int", "Integer", "",1
-		P: "UpAxisSign", "int", "Integer", "",1
-		P: "FrontAxis", "int", "Integer", "",2
-		P: "FrontAxisSign", "int", "Integer", "",1
-		P: "CoordAxis", "int", "Integer", "",0
-		P: "CoordAxisSign", "int", "Integer", "",1
-		P: "OriginalUpAxis", "int", "Integer", "",-1
-		P: "OriginalUpAxisSign", "int", "Integer", "",1
-		P: "UnitScaleFactor", "double", "Number", "",100
-		P: "OriginalUnitScaleFactor", "double", "Number", "",1
-		P: "AmbientColor", "ColorRGB", "Color", "",0,0,0
-		P: "DefaultCamera", "KString", "", "", "Producer Perspective"
-		P: "TimeMode", "enum", "", "",0
-		P: "TimeProtocol", "enum", "", "",2
-		P: "SnapOnFrameMode", "enum", "", "",0
-		P: "TimeSpanStart", "KTime", "Time", "",0
-		P: "TimeSpanStop", "KTime", "Time", "",46186158000
-		P: "CustomFrameRate", "double", "Number", "",-1
-		P: "TimeMarker", "Compound", "", ""
-		P: "CurrentTimeMarker", "int", "Integer", "",-1
-	}
-}
-
-; Documents Description
-;------------------------------------------------------------------
-
-Documents:  {
-	Count: 1
-	Document: 2520542649728, "Scene", "Scene" {
-		Properties70:  {
-			P: "SourceObject", "object", "", ""
-			P: "ActiveAnimStackName", "KString", "", "", ""
-		}
-		RootNode: 0
-	}
-}
-
-; Document References
-;------------------------------------------------------------------
-
-References:  {
-}
-
-; Object definitions
-;------------------------------------------------------------------
-
-Definitions:  {
-	Version: 100
-	Count: 4
-	ObjectType: "GlobalSettings" {
-		Count: 1
-	}
-	ObjectType: "Model" {
-		Count: 1
-		PropertyTemplate: "FbxNode" {
-			Properties70:  {
-				P: "QuaternionInterpolate", "enum", "", "",0
-				P: "RotationOffset", "Vector3D", "Vector", "",0,0,0
-				P: "RotationPivot", "Vector3D", "Vector", "",0,0,0
-				P: "ScalingOffset", "Vector3D", "Vector", "",0,0,0
-				P: "ScalingPivot", "Vector3D", "Vector", "",0,0,0
-				P: "TranslationActive", "bool", "", "",0
-				P: "TranslationMin", "Vector3D", "Vector", "",0,0,0
-				P: "TranslationMax", "Vector3D", "Vector", "",0,0,0
-				P: "TranslationMinX", "bool", "", "",0
-				P: "TranslationMinY", "bool", "", "",0
-				P: "TranslationMinZ", "bool", "", "",0
-				P: "TranslationMaxX", "bool", "", "",0
-				P: "TranslationMaxY", "bool", "", "",0
-				P: "TranslationMaxZ", "bool", "", "",0
-				P: "RotationOrder", "enum", "", "",0
-				P: "RotationSpaceForLimitOnly", "bool", "", "",0
-				P: "RotationStiffnessX", "double", "Number", "",0
-				P: "RotationStiffnessY", "double", "Number", "",0
-				P: "RotationStiffnessZ", "double", "Number", "",0
-				P: "AxisLen", "double", "Number", "",10
-				P: "PreRotation", "Vector3D", "Vector", "",0,0,0
-				P: "PostRotation", "Vector3D", "Vector", "",0,0,0
-				P: "RotationActive", "bool", "", "",0
-				P: "RotationMin", "Vector3D", "Vector", "",0,0,0
-				P: "RotationMax", "Vector3D", "Vector", "",0,0,0
-				P: "RotationMinX", "bool", "", "",0
-				P: "RotationMinY", "bool", "", "",0
-				P: "RotationMinZ", "bool", "", "",0
-				P: "RotationMaxX", "bool", "", "",0
-				P: "RotationMaxY", "bool", "", "",0
-				P: "RotationMaxZ", "bool", "", "",0
-				P: "InheritType", "enum", "", "",0
-				P: "ScalingActive", "bool", "", "",0
-				P: "ScalingMin", "Vector3D", "Vector", "",0,0,0
-				P: "ScalingMax", "Vector3D", "Vector", "",1,1,1
-				P: "ScalingMinX", "bool", "", "",0
-				P: "ScalingMinY", "bool", "", "",0
-				P: "ScalingMinZ", "bool", "", "",0
-				P: "ScalingMaxX", "bool", "", "",0
-				P: "ScalingMaxY", "bool", "", "",0
-				P: "ScalingMaxZ", "bool", "", "",0
-				P: "GeometricTranslation", "Vector3D", "Vector", "",0,0,0
-				P: "GeometricRotation", "Vector3D", "Vector", "",0,0,0
-				P: "GeometricScaling", "Vector3D", "Vector", "",1,1,1
-				P: "MinDampRangeX", "double", "Number", "",0
-				P: "MinDampRangeY", "double", "Number", "",0
-				P: "MinDampRangeZ", "double", "Number", "",0
-				P: "MaxDampRangeX", "double", "Number", "",0
-				P: "MaxDampRangeY", "double", "Number", "",0
-				P: "MaxDampRangeZ", "double", "Number", "",0
-				P: "MinDampStrengthX", "double", "Number", "",0
-				P: "MinDampStrengthY", "double", "Number", "",0
-				P: "MinDampStrengthZ", "double", "Number", "",0
-				P: "MaxDampStrengthX", "double", "Number", "",0
-				P: "MaxDampStrengthY", "double", "Number", "",0
-				P: "MaxDampStrengthZ", "double", "Number", "",0
-				P: "PreferedAngleX", "double", "Number", "",0
-				P: "PreferedAngleY", "double", "Number", "",0
-				P: "PreferedAngleZ", "double", "Number", "",0
-				P: "LookAtProperty", "object", "", ""
-				P: "UpVectorProperty", "object", "", ""
-				P: "Show", "bool", "", "",1
-				P: "NegativePercentShapeSupport", "bool", "", "",1
-				P: "DefaultAttributeIndex", "int", "Integer", "",-1
-				P: "Freeze", "bool", "", "",0
-				P: "LODBox", "bool", "", "",0
-				P: "Lcl Translation", "Lcl Translation", "", "A",0,0,0
-				P: "Lcl Rotation", "Lcl Rotation", "", "A",0,0,0
-				P: "Lcl Scaling", "Lcl Scaling", "", "A",1,1,1
-				P: "Visibility", "Visibility", "", "A",1
-				P: "Visibility Inheritance", "Visibility Inheritance", "", "",1
-			}
-		}
-	}
-	ObjectType: "Material" {
-		Count: 1
-		PropertyTemplate: "FbxSurfacePhong" {
-			Properties70:  {
-				P: "ShadingModel", "KString", "", "", "Phong"
-				P: "MultiLayer", "bool", "", "",0
-				P: "EmissiveColor", "Color", "", "A",0,0,0
-				P: "EmissiveFactor", "Number", "", "A",1
-				P: "AmbientColor", "Color", "", "A",0.2,0.2,0.2
-				P: "AmbientFactor", "Number", "", "A",1
-				P: "DiffuseColor", "Color", "", "A",0.8,0.8,0.8
-				P: "DiffuseFactor", "Number", "", "A",1
-				P: "Bump", "Vector3D", "Vector", "",0,0,0
-				P: "NormalMap", "Vector3D", "Vector", "",0,0,0
-				P: "BumpFactor", "double", "Number", "",1
-				P: "TransparentColor", "Color", "", "A",0,0,0
-				P: "TransparencyFactor", "Number", "", "A",0
-				P: "DisplacementColor", "ColorRGB", "Color", "",0,0,0
-				P: "DisplacementFactor", "double", "Number", "",1
-				P: "VectorDisplacementColor", "ColorRGB", "Color", "",0,0,0
-				P: "VectorDisplacementFactor", "double", "Number", "",1
-				P: "SpecularColor", "Color", "", "A",0.2,0.2,0.2
-				P: "SpecularFactor", "Number", "", "A",1
-				P: "ShininessExponent", "Number", "", "A",20
-				P: "ReflectionColor", "Color", "", "A",0,0,0
-				P: "ReflectionFactor", "Number", "", "A",1
-			}
-		}
-	}
-	ObjectType: "Geometry" {
-		Count: 1
-		PropertyTemplate: "FbxMesh" {
-			Properties70:  {
-				P: "Color", "ColorRGB", "Color", "",0.8,0.8,0.8
-				P: "BBoxMin", "Vector3D", "Vector", "",0,0,0
-				P: "BBoxMax", "Vector3D", "Vector", "",0,0,0
-				P: "Primary Visibility", "bool", "", "",1
-				P: "Casts Shadows", "bool", "", "",1
-				P: "Receive Shadows", "bool", "", "",1
-			}
-		}
-	}
-}
-
-; Object properties
-;------------------------------------------------------------------
-
-Objects:  {
-	Geometry: 2520544655040, "Geometry::mesh_id43", "Mesh" {
-		Properties70:  {
-			P: "BBoxMin", "Vector3D", "Vector", "",-100,-100,-100
-			P: "BBoxMax", "Vector3D", "Vector", "",100,100,100
-		}
-		Vertices: *72 {
-			a: 100,100,-100,-100,-100,-100,-100,100,-100,100,-100,-100,-100,100,100,100,-100,100,100,100,100,-100,-100,100,100,100,100,100,-100,-100,100,100,-100,100,-100,100,-100,100,-100,-100,-100,100,-100,100,100,-100,-100,-100,-100,100,-100,100,100,100,100,100,-100,-100,100,100,-100,-100,100,100,-100,-100,100,-100,100,-100,-100,-100
-		} 
-		PolygonVertexIndex: *36 {
-			a: 0,1,-3,0,3,-2,4,5,-7,4,7,-6,8,9,-11,8,11,-10,12,13,-15,12,15,-14,16,17,-19,16,19,-18,20,21,-23,20,23,-22
-		} 
-		GeometryVersion: 124
-		LayerElementNormal: 0 {
-			Version: 102
-			Name: ""
-			MappingInformationType: "ByVertice"
-			ReferenceInformationType: "Direct"
-			Normals: *72 {
-				a: 0,0,-1,0,0,-1,0,0,-1,0,0,-1,0,0,1,0,0,1,0,0,1,0,0,1,1,0,0,1,0,0,1,0,0,1,0,0,-1,0,0,-1,0,0,-1,0,0,-1,0,0,0,1,0,0,1,0,0,1,0,0,1,0,0,-1,0,0,-1,0,0,-1,0,0,-1,0
-			} 
-			NormalsW: *24 {
-				a: 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-			} 
-		}
-		LayerElementColor: 0 {
-			Version: 101
-			Name: "VertexColors"
-			MappingInformationType: "ByVertice"
-			ReferenceInformationType: "IndexToDirect"
-			Colors: *96 {
-				a: 0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1,0.980392156862745,0.843137254901961,0.388235294117647,1
-			} 
-		}
-		LayerElementUV: 0 {
-			Version: 101
-			Name: ""
-			MappingInformationType: "ByVertice"
-			ReferenceInformationType: "Direct"
-		}
-		LayerElementMaterial: 0 {
-			Version: 101
-			Name: ""
-			MappingInformationType: "AllSame"
-			ReferenceInformationType: "IndexToDirect"
-			Materials: *1 {
-				a: 0
-			} 
-		}
-		Layer: 0 {
-			Version: 100
-			LayerElement:  {
-				Type: "LayerElementNormal"
-				TypedIndex: 0
-			}
-			LayerElement:  {
-				Type: "LayerElementMaterial"
-				TypedIndex: 0
-			}
-			LayerElement:  {
-				Type: "LayerElementColor"
-				TypedIndex: 0
-			}
-			LayerElement:  {
-				Type: "LayerElementUV"
-				TypedIndex: 0
-			}
-		}
-	}
-	Model: 2520544652560, "Model::root", "Mesh" {
-		Version: 232
-		Properties70:  {
-			P: "ScalingMax", "Vector3D", "Vector", "",0,0,0
-			P: "GeometricTranslation", "Vector3D", "Vector", "",0.029182942584157,0.0412420704960823,0.200006887316704
-			P: "GeometricRotation", "Vector3D", "Vector", "",19.5286376895952,-30.3983310953995,0
-			P: "GeometricScaling", "Vector3D", "Vector", "",0.00176811746427344,0.00159080407945701,0.00159080401671689
-			P: "DefaultAttributeIndex", "int", "Integer", "",0
-		}
-		Shading: T
-		Culling: "CullingOff"
-	}
-	Material: 2520544654560, "Material::Material_50", "" {
-		Version: 102
-		ShadingModel: "phong"
-		MultiLayer: 0
-		Properties70:  {
-			P: "DiffuseColor", "Color", "", "A",0.992156862745098,0.925490196078431,0.650980392156863
-			P: "SpecularColor", "Color", "", "A",0.0352941176470588,0.0352941176470588,0.0352941176470588
-			P: "ShininessExponent", "Number", "", "A",62.8694496154785
-			P: "Emissive", "Vector3D", "Vector", "",0,0,0
-			P: "Ambient", "Vector3D", "Vector", "",0.2,0.2,0.2
-			P: "Diffuse", "Vector3D", "Vector", "",0.992156862745098,0.925490196078431,0.650980392156863
-			P: "Specular", "Vector3D", "Vector", "",0.0352941176470588,0.0352941176470588,0.0352941176470588
-			P: "Shininess", "double", "Number", "",62.8694496154785
-			P: "Opacity", "double", "Number", "",1
-			P: "Reflectivity", "double", "Number", "",0
-		}
-	}
-}
-
-; Object connections
-;------------------------------------------------------------------
-
-Connections:  {
-	
-	;Model::root, Model::RootNode
-	C: "OO",2520544652560,0
-	
-	;Geometry::mesh_id43, Model::root
-	C: "OO",2520544655040,2520544652560
-	
-	;Material::Material_50, Model::root
-	C: "OO",2520544654560,2520544652560
-}
-;Takes section
-;----------------------------------------------------
-
-Takes:  {
-	Current: ""
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md b/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md
deleted file mode 100644
index 7aae8c26afe2..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/CHANGELOG.md
+++ /dev/null
@@ -1,363 +0,0 @@
-# Release History
-
-## 1.2.0-beta.1 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-## 1.1.41 (2025-09-25)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.56.0` to version `1.56.1`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.34` to version `1.2.35`.
-
-## 1.1.40 (2025-08-21)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.33` to version `1.2.35`.
-- Upgraded `azure-core` from `1.55.5` to version `1.56.0`.
-
-## 1.1.39 (2025-08-01)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.55.4` to version `1.55.5`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.32` to version `1.2.33`.
-
-## 1.1.38 (2025-06-19)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.55.3` to version `1.55.4`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.31` to version `1.2.32`.
-
-## 1.1.37 (2025-03-24)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.55.2` to version `1.55.3`.
-
-## 1.1.36 (2025-02-27)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.54.1` to version `1.55.2`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.29` to version `1.2.31`.
-
-## 1.1.35 (2024-12-04)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.53.0` to version `1.54.1`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.28` to version `1.2.29`.
-
-## 1.1.34 (2024-10-27)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.52.0` to version `1.53.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.27` to version `1.2.28`.
-
-## 1.1.33 (2024-09-27)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.51.0` to version `1.52.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.26` to version `1.2.27`.
-
-## 1.1.32 (2024-08-24)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.25` to version `1.2.26`.
-- Upgraded `azure-core` from `1.50.0` to version `1.51.0`.
-
-## 1.1.31 (2024-07-26)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.24` to version `1.2.25`.
-- Upgraded `azure-core` from `1.49.1` to version `1.50.0`.
-
-## 1.1.30 (2024-06-27)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.23` to version `1.2.24`.
-- Upgraded `azure-core` from `1.49.0` to version `1.49.1`.
-
-## 1.1.29 (2024-05-28)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.22` to version `1.2.23`.
-- Upgraded `azure-core` from `1.48.0` to version `1.49.0`.
-
-## 1.1.28 (2024-04-23)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.47.0` to version `1.48.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.21` to version `1.2.22`.
-
-## 1.1.27 (2024-03-20)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.46.0` to version `1.47.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.20` to version `1.2.21`.
-
-## 1.1.26 (2024-02-20)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.19` to version `1.2.20`.
-- Upgraded `azure-core` from `1.45.1` to version `1.46.0`.
-
-## 1.1.25 (2023-12-04)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.18` to version `1.2.19`.
-- Upgraded `azure-core` from `1.45.0` to version `1.45.1`.
-
-## 1.1.24 (2023-11-20)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.44.1` to version `1.45.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.17` to version `1.2.18`.
-
-## 1.1.23 (2023-10-20)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.43.0` to version `1.44.1`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.16` to version `1.2.17`.
-
-## 1.1.22 (2023-09-22)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.42.0` to version `1.43.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.15` to version `1.2.16`.
-
-## 1.1.21 (2023-08-18)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.41.0` to version `1.42.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.14` to version `1.2.15`.
-
-## 1.1.20 (2023-07-25)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.40.0` to version `1.41.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.14` to version `1.2.15`.
-
-## 1.1.19 (2023-06-20)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.39.0` to version `1.40.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.12` to version `1.2.13`.
-
-## 1.1.18 (2023-05-23)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-mixedreality-authentication` from `1.2.11` to version `1.2.12`.
-- Upgraded `azure-core` from `1.38.0` to version `1.39.0`.
-
-## 1.1.17 (2023-04-21)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.37.0` to version `1.38.0`.
-
-## 1.1.16 (2023-03-16)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.36.0` to version `1.37.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.10` to `1.2.11`.
-
-## 1.1.15 (2023-03-07)
-### Other Changes
-#### Dependency Updates
-- Updated `azure-core` to `1.36.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.10`.
-
-## 1.1.14 (2023-02-07)
-### Other Changes
-#### Dependency Updates
-- Updated `azure-core` to `1.35.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.9`.
-
-## 1.1.13 (2022-11-09)
-### Other Changes
-#### Dependency Updates
-- Updated `azure-core` to `1.34.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.8`.
-
-## 1.1.12 (2022-10-24)
-### Other Changes
-#### Dependency Updates
-- Updated `azure-core` to `1.33.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.7`.
-
-## 1.1.11 (2022-09-12)
-### Other Changes
-#### Dependency Updates
-- Updated `azure-core` to `1.32.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.6`.
-
-## 1.1.10 (2022-08-16)
-
-### Other Changes
-#### Dependency Updates
-- Updated `azure-core` to `1.31.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.5`.
-
-## 1.1.9 (2022-07-12)
-- Updated `azure-core` to `1.30.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.4`.
-
-## 1.1.8 (2022-07-05)
-- Updated `azure-core` to `1.29.1`.
-- Updated `azure-mixedreality-authentication` to `1.2.3`.
-
-## 1.1.7 (2022-06-07)
-- Updated `azure-core` to `1.28.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.2`.
-
-## 1.1.6 (2022-04-06)
-
-### Other Changes
-
-#### Dependency Updates
-
-- Upgraded `azure-core` from `1.26.0` to version `1.27.0`.
-- Upgraded `azure-mixedreality-authentication` from `1.2.0` to version `1.2.1`.
-
-## 1.1.5 (2022-03-10)
-
-### Other Changes
-
-#### Dependency updates
-- Updated `azure-core` to `1.26.0`.
-- Updated `azure-mixedreality-authentication` to `1.2.0`.
-
-## 1.1.3 (2022-01-25)
-
-### Other Changes
-
-#### Dependency updates
-- Updated azure-core to 1.24.1.
-- Updated azure-identity to 1.4.3.
-
-## 1.1.2 (2021-11-17)
-
-### Other Changes
-- The SDK now uses a 2s polling interval when waiting for a Standard sized rendering VM. For Premium, 10s is still used.
-
-#### Dependency updates
-- Updated azure-core to 1.22.0.
-- Updated azure-identity to 1.4.1.
-
-## 1.1.1 (2021-10-07)
-
-### Other Changes
-
-#### Dependency updates
-- Updated azure-core to 1.21.0.
-- Updated azure-core-http-netty to 1.11.1.
-
-## 1.1.0 (2021-09-17)
-
-### Other changes
-- Minor logging change to ensure MS-CV values are not redacted from the log by default.
-
-#### Dependency updates
-
-- Updated azure-core to 1.20.0.
-- Updated azure-core-http-netty to 1.11.0.
-
-## 1.0.0 (2021-03-05)
-* Release client.
-
-## 1.0.0-beta.1 (2021-02-23)
-
-This is the initial release of Azure Mixed Reality RemoteRendering library. For more information, please see the [README][read_me] and [samples][samples].
-
-This is a Public Preview version, so breaking changes are possible in subsequent releases as we improve the product. To provide feedback, please submit an issue in our [Azure SDK for Java GitHub repo](https://github.com/Azure/azure-sdk-for-java/issues).
-
-<!-- LINKS -->
-[read_me]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/remoterendering/azure-mixedreality-remoterendering/README.md
-[samples]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering
-## 1.1.4 (2021-02-15)
-
-### Other Changes
-
-#### Dependency updates
-- Updated `azure-core` to `1.25.0`.
-- Updated `azure-mixedreality-authentication` to `1.1.5`.
-
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/README.md b/sdk/remoterendering/azure-mixedreality-remoterendering/README.md
deleted file mode 100644
index 77ed5679dc56..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/README.md
+++ /dev/null
@@ -1,397 +0,0 @@
-# Azure Remote Rendering client library for Java
-
-Azure Remote Rendering (ARR) is a service that enables you to render high-quality, interactive 3D content in the cloud and stream it in real time to devices, such as the HoloLens 2.
-
-This SDK offers functionality to convert assets to the format expected by the runtime, and also to manage
-the lifetime of remote rendering sessions.
-
-> NOTE: Once a session is running, a client application will connect to it using one of the "runtime SDKs".
-> These SDKs are designed to best support the needs of an interactive application doing 3d rendering.
-> They are available in [.NET][dotnet_api] and [C++][cpp_api].
-
-[Source code][source_code] | [API reference documentation][api_reference_doc] | [Product Documentation][product_documentation]
-
-## Getting started
-
-### Prerequisites
-- [Java Development Kit (JDK)][jdk_link], version 8 or later.
-- [Azure Subscription][azure_subscription]
-- [Azure Remote Rendering account][remote_rendering_account] to use this package.
-
-### Include the package
-
-#### Include the BOM file
-
-Please include the azure-sdk-bom to your project to take dependency on the General Availability (GA) version of the library. In the following snippet, replace the {bom_version_to_target} placeholder with the version number.
-To learn more about the BOM, see the [AZURE SDK BOM README](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/boms/azure-sdk-bom/README.md).
-
-```xml
-<dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-sdk-bom</artifactId>
-            <version>{bom_version_to_target}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-    </dependencies>
-</dependencyManagement>
-```
-and then include the direct dependency in the dependencies section without the version tag as shown below.
-
-```xml
-<dependencies>
-  <dependency>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-mixedreality-remoterendering</artifactId>
-  </dependency>
-</dependencies>
-```
-
-#### Include direct dependency
-
-**Note:** This version targets Azure Remote Rendering service API version v2021-01-01.
-
-Add the following Maven dependency:
-
-[//]: # ({x-version-update-start;com.azure:azure-mixedreality-remoterendering;dependency})
-```xml
-<dependency>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-mixedreality-remoterendering</artifactId>
-    <version>1.1.36</version>
-</dependency>
-```
-[//]: # ({x-version-update-end})
-
-### Authenticate the client
-
-Constructing a remote rendering client requires an authenticated account, and a remote rendering endpoint.
-An account consists of its accountId and an account domain.
-For an account created in the eastus region, the account domain will have the form "eastus.mixedreality.azure.com".
-There are several forms of authentication:
-
-- Account Key authentication
-  - Account keys enable you to get started quickly with using Azure Remote Rendering. But before you deploy your application
-    to production, we recommend that you update your app to use Azure AD authentication.
-- Azure Active Directory (AD) token authentication
-  - If you're building an enterprise application and your company is using Azure AD as its identity system, you can use
-    user-based Azure AD authentication in your app. You then grant access to your Azure Remote Rendering accounts by using
-    your existing Azure AD security groups. You can also grant access directly to users in your organization.
-  - Otherwise, we recommend that you obtain Azure AD tokens from a web service that supports your app. We recommend this
-    method for production applications because it allows you to avoid embedding the credentials for access to Azure Spatial
-    Anchors in your client application.
-
-See [here][how_to_authenticate] for detailed instructions and information.
-
-In all the following examples, the client is constructed with a `RemoteRenderingClientBuilder` object.
-The parameters are always the same, except for the credential object, which is explained in each example.
-The `remoteRenderingEndpoint` parameter is a URL that determines the region in which the service performs its work.
-An example is `https://remoterendering.eastus2.mixedreality.azure.com`.
-
-> NOTE: For converting assets, it is preferable to pick a region close to the storage containing the assets.
-
-> NOTE: For rendering, it is strongly recommended that you pick the closest region to the devices using the service. 
-> The time taken to communicate with the server impacts the quality of the experience.
-
-#### Authenticating with account key authentication
-
-Use the `AzureKeyCredential` object to use an account identifier and account key to authenticate:
-
-```java readme-sample-createClientWithAccountKey
-AzureKeyCredential credential = new AzureKeyCredential(environment.getAccountKey());
-
-RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-    .accountId(environment.getAccountId())
-    .accountDomain(environment.getAccountDomain())
-    .endpoint(environment.getServiceEndpoint())
-    .credential(credential)
-    .buildClient();
-```
-
-#### Authenticating with an AAD client secret
-
-Use the `ClientSecretCredential` object to perform client secret authentication.
-
-```java readme-sample-createClientWithAAD
-ClientSecretCredential credential = new ClientSecretCredentialBuilder()
-    .tenantId(environment.getTenantId())
-    .clientId(environment.getClientId())
-    .clientSecret(environment.getClientSecret())
-    .authorityHost("https://login.microsoftonline.com/" + environment.getTenantId())
-    .build();
-
-RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-    .accountId(environment.getAccountId())
-    .accountDomain(environment.getAccountDomain())
-    .endpoint(environment.getServiceEndpoint())
-    .credential(credential)
-    .buildClient();
-```
-
-#### Authenticating a user using device code authentication
-
-Use the `DeviceCodeCredential` object to perform device code authentication.
-
-```java readme-sample-createClientWithDeviceCode
-DeviceCodeCredential credential = new DeviceCodeCredentialBuilder()
-    .challengeConsumer((DeviceCodeInfo deviceCodeInfo) -> {
-        logger.info(deviceCodeInfo.getMessage());
-    })
-    .clientId(environment.getClientId())
-    .tenantId(environment.getTenantId())
-    .authorityHost("https://login.microsoftonline.com/" + environment.getTenantId())
-    .build();
-
-RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-    .accountId(environment.getAccountId())
-    .accountDomain(environment.getAccountDomain())
-    .endpoint(environment.getServiceEndpoint())
-    .credential(credential)
-    .buildClient();
-```
-
-See [here](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki/Device-Code-Flow) for more
-information about using device code authentication flow.
-
-#### Interactive authentication with DefaultAzureCredential
-
-Use the `DefaultAzureCredential` object:
-
-```java readme-sample-createClientWithDefaultAzureCredential
-DefaultAzureCredential credential = new DefaultAzureCredentialBuilder().build();
-
-RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-    .accountId(environment.getAccountId())
-    .accountDomain(environment.getAccountDomain())
-    .endpoint(environment.getServiceEndpoint())
-    .credential(credential)
-    .buildClient();
-```
-
-#### Authenticating with a static access token
-
-You can pass a Mixed Reality access token as an `AccessToken` previously retrieved from the
-[Mixed Reality STS service][sts_sdk]
-to be used with a Mixed Reality client library:
-
-```java readme-sample-createClientWithStaticAccessToken
-// GetMixedRealityAccessTokenFromWebService is a hypothetical method that retrieves
-// a Mixed Reality access token from a web service. The web service would use the
-// MixedRealityStsClient and credentials to obtain an access token to be returned
-// to the client.
-AccessToken accessToken = getMixedRealityAccessTokenFromWebService();
-
-RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-    .accountId(environment.getAccountId())
-    .accountDomain(environment.getAccountDomain())
-    .endpoint(environment.getServiceEndpoint())
-    .accessToken(accessToken)
-    .buildClient();
-```
-
-## Key concepts
-
-### RemoteRenderingClient
-
-The `RemoteRenderingClient` is the client library used to access the RemoteRenderingService.
-It provides methods to create and manage asset conversions and rendering sessions.
-
-## Examples
-
-- [Convert a simple asset](#convert-a-simple-asset)
-- [Convert a more complex asset](#convert-a-more-complex-asset)
-- [Get the output when an asset conversion has finished](#get-the-output-when-an-asset-conversion-has-finished)
-- [List conversions](#list-conversions)
-- [Create a session](#create-a-rendering-session)
-- [Extend the lease time of a session](#extend-the-lease-time-of-a-session)
-- [List sessions](#list-rendering-sessions)
-- [Stop a session](#stop-a-session)
-
-### Convert a simple asset
-
-We assume that a RemoteRenderingClient has been constructed as described in the [Authenticate the Client](#authenticate-the-client) section.
-The following snippet describes how to request that "box.fbx", found at the root of the blob container at the given URL, gets converted.
-
-```java readme-sample-convertSimpleAsset
-AssetConversionOptions conversionOptions = new AssetConversionOptions()
-    .setInputStorageContainerUrl(getStorageURL())
-    .setInputRelativeAssetPath("box.fbx")
-    .setOutputStorageContainerUrl(getStorageURL());
-
-// A randomly generated UUID is a good choice for a conversionId.
-String conversionId = UUID.randomUUID().toString();
-
-SyncPoller<AssetConversion, AssetConversion> conversionOperation = client.beginConversion(conversionId, conversionOptions);
-```
-
-The output files will be placed beside the input asset.
-
-### Convert a more complex asset
-
-Assets can reference other files, and blob containers can contain files belonging to many different assets.
-In this example, we show how prefixes can be used to organize your blobs and how to convert an asset to take account of that organization.
-Assume that the blob container at `inputStorageURL` contains many files, including "Bicycle/bicycle.gltf", "Bicycle/bicycle.bin" and "Bicycle/saddleTexture.jpg".
-(So the prefix "Bicycle" is acting very like a folder.)
-We want to convert the gltf so that it has access to the other files which share the prefix, without requiring the conversion service to access any other files.
-To keep things tidy, we also want the output files to be written to a different storage container and given a common prefix: "ConvertedBicycle".
-The code is as follows:
-
-```java readme-sample-convertMoreComplexAsset
-AssetConversionOptions conversionOptions = new AssetConversionOptions()
-    .setInputStorageContainerUrl(inputStorageURL)
-    .setInputRelativeAssetPath("bicycle.gltf")
-    .setInputBlobPrefix("Bicycle")
-    .setOutputStorageContainerUrl(outputStorageURL)
-    .setOutputBlobPrefix("ConvertedBicycle");
-
-String conversionId = UUID.randomUUID().toString();
-
-SyncPoller<AssetConversion, AssetConversion> conversionOperation = client.beginConversion(conversionId, conversionOptions);
-```
-
-> NOTE: when a prefix is given in the input options, then the input file parameter is assumed to be relative to that prefix.
-> The same applies to the output file parameter in output options.
-
-### Get the output when an asset conversion has finished
-
-Converting an asset can take anywhere from seconds to hours.
-This code uses an existing conversionOperation and polls regularly until the conversion has finished or failed.
-The default polling period is 10 seconds.
-Note that a conversionOperation can be constructed from the conversionId of an existing conversion and a client.
-
-```java readme-sample-convertMoreComplexAssetCheckStatus
-AssetConversion conversion = conversionOperation.getFinalResult();
-if (conversion.getStatus() == AssetConversionStatus.SUCCEEDED) {
-    logger.info("Conversion succeeded: Output written to {}", conversion.getOutputAssetUrl());
-} else if (conversion.getStatus() == AssetConversionStatus.FAILED) {
-    logger.error("Conversion failed: {} {}", conversion.getError().getCode(), conversion.getError().getMessage());
-} else {
-    logger.error("Unexpected conversion status: {}", conversion.getStatus());
-}
-```
-
-### List conversions
-
-You can get information about your conversions using the `listConversions` method.
-This method may return conversions which have yet to start, conversions which are running and conversions which have finished.
-In this example, we just list the output URLs of successful conversions started in the last day.
-
-### Create a rendering session
-
-We assume that a RemoteRenderingClient has been constructed as described in the [Authenticate the Client](#authenticate-the-client) section.
-The following snippet describes how to request that a new rendering session be started.
-
-```java readme-sample-createRenderingSession
-BeginSessionOptions options = new BeginSessionOptions()
-    .setMaxLeaseTime(Duration.ofMinutes(30))
-    .setSize(RenderingSessionSize.STANDARD);
-
-// A randomly generated GUID is a good choice for a sessionId.
-String sessionId = UUID.randomUUID().toString();
-
-SyncPoller<RenderingSession, RenderingSession> startSessionOperation = client.beginSession(sessionId, options);
-```
-
-### Extend the lease time of a session
-
-If a session is approaching its maximum lease time, but you want to keep it alive, you will need to make a call to increase
-its maximum lease time.
-This example shows how to query the current properties and then extend the lease if it will expire soon.
-
-> NOTE: The runtime SDKs also offer this functionality, and in many typical scenarios, you would use them to
-> extend the session lease.
-
-```java readme-sample-queryAndUpdateASession
-RenderingSession currentSession = client.getSession(sessionId);
-
-Duration sessionTimeAlive = Duration.between(OffsetDateTime.now(), currentSession.getCreationTime()).abs();
-if (currentSession.getMaxLeaseTime().minus(sessionTimeAlive).toMinutes() < 2) {
-    Duration newLeaseTime = currentSession.getMaxLeaseTime().plus(Duration.ofMinutes(30));
-    UpdateSessionOptions longerLeaseOptions = new UpdateSessionOptions().maxLeaseTime(newLeaseTime);
-    client.updateSession(sessionId, longerLeaseOptions);
-}
-```
-
-### List rendering sessions
-
-You can get information about your sessions using the `listSessions` method.
-This method may return sessions which have yet to start and sessions which are ready.
-
-```java readme-sample-listRenderingSessions
-for (RenderingSession session : client.listSessions()) {
-    if (session.getStatus() == RenderingSessionStatus.STARTING) {
-        logger.info("Session {} is starting.");
-    } else if (session.getStatus() == RenderingSessionStatus.READY) {
-        logger.info("Session {} is ready at host {}", session.getId(), session.getHostname());
-    } else if (session.getStatus() == RenderingSessionStatus.ERROR) {
-        logger.error("Session {} encountered an error: {} {}", session.getId(), session.getError().getCode(), session.getError().getMessage());
-    } else {
-        logger.error("Session {} has unexpected status {}", session.getId(), session.getStatus());
-    }
-}
-```
-
-### Stop a session
-
-The following code will stop a running session with given id.
-
-```java readme-sample-stopASession
-client.endSession(sessionId);
-```
-
-## Troubleshooting
-
-For general troubleshooting advice concerning Azure Remote Rendering, see [the Troubleshoot page][troubleshoot] for remote rendering at learn.microsoft.com.
-
-The client methods will throw exceptions if the request cannot be made.
-However, in the case of both conversions and sessions, the requests can succeed but the requested operation may not be successful.
-In this case, no exception will be thrown, but the returned objects can be inspected to understand what happened.
-
-If the asset in a conversion is invalid, the conversion operation will return an AssetConversion object
-with a Failed status and carrying a RemoteRenderingServiceError with details.
-Once the conversion service is able to process the file, an &lt;assetName&gt;.result.json file will be written to the output container.
-If the input asset is invalid, then that file will contain a more detailed description of the problem.
-
-Similarly, sometimes when a session is requested, the session ends up in an error state.
-The startSessionOperation method will return a RenderingSession object, but that object will have an Error status and carry a
-RemoteRenderingServiceError with details.
-
-## Next steps
-
-- Read the [Product documentation](https://learn.microsoft.com/azure/remote-rendering/)
-- Learn about the runtime SDKs:
-  - .NET: https://learn.microsoft.com/dotnet/api/microsoft.azure.remoterendering
-  - C++: https://learn.microsoft.com/cpp/api/remote-rendering/
-
-## Contributing
-
-This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License
-Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution.
-For details, visit [https://cla.microsoft.com](https://cla.microsoft.com).
-
-When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the
-PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this
-once across all repos using our CLA.
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
-[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-<!-- LINKS -->
-[azure_subscription]: https://azure.microsoft.com/free
-[jdk_link]: https://learn.microsoft.com/java/azure/jdk/?view=azure-java-stable
-[performance_tuning]: https://github.com/Azure/azure-sdk-for-java/wiki/Performance-Tuning
-[source_code]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/remoterendering/azure-mixedreality-remoterendering/src
-[remote_rendering_account]: https://learn.microsoft.com/azure/remote-rendering/how-tos/create-an-account
-[LogLevels]: https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/core/azure-core/src/main/java/com/azure/core/util/logging/ClientLogger.java
-[product_documentation]: https://learn.microsoft.com/azure/remote-rendering/
-[cpp_api]: https://learn.microsoft.com/cpp/api/remote-rendering/
-[dotnet_api]: https://learn.microsoft.com/dotnet/api/microsoft.azure.remoterendering
-[how_to_authenticate]: https://learn.microsoft.com/azure/remote-rendering/how-tos/authentication
-[sts_sdk]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/mixedreality/azure-mixedreality-authentication
-[troubleshoot]: https://learn.microsoft.com/azure/remote-rendering/resources/troubleshoot
-[api_reference_doc]: https://learn.microsoft.com/rest/api/mixedreality/
-
-
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/assets.json b/sdk/remoterendering/azure-mixedreality-remoterendering/assets.json
deleted file mode 100644
index 76f6f9fde170..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/assets.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "AssetsRepo": "Azure/azure-sdk-assets",
-  "AssetsRepoPrefixPath": "java",
-  "TagPrefix": "java/remoterendering/azure-mixedreality-remoterendering",
-  "Tag": "java/remoterendering/azure-mixedreality-remoterendering_24381ef748"
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/checkstyle-suppressions.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/checkstyle-suppressions.xml
deleted file mode 100644
index b7821e70c492..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd">
-<!-- This file is generated by the /eng/scripts/linting_suppression_generator.py script. -->
-
-<suppressions>
-  <suppress files="com.azure.mixedreality.remoterendering.implementation.MixedRealityRemoteRenderingImplBuilder.java" checks="io.clientcore.linting.extensions.checkstyle.checks.ServiceClientBuilderCheck" />
-</suppressions>
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
deleted file mode 100644
index 4b1fdb0ba89a..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../parents/azure-client-sdk-parent</relativePath>
-  </parent>
-
-  <groupId>com.azure</groupId>
-  <artifactId>azure-mixedreality-remoterendering</artifactId>
-  <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-mixedreality-remoterendering;current} -->
-
-  <name>Microsoft Azure SDK for Remote Rendering</name>
-  <description>This package contains Microsoft Azure SDK for Remote Rendering.</description>
-
-  <distributionManagement>
-    <site>
-      <id>azure-java-build-docs</id>
-      <url>${site.url}/site/${project.artifactId}</url>
-    </site>
-  </distributionManagement>
-
-  <scm>
-    <url>https://github.com/Azure/azure-sdk-for-java</url>
-  </scm>
-
-  <properties>
-    <spotbugs.skip>false</spotbugs.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core</artifactId>
-      <version>1.57.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-mixedreality-authentication</artifactId>
-      <version>1.2.36</version> <!-- {x-version-update;com.azure:azure-mixedreality-authentication;dependency} -->
-    </dependency>
-
-    <!-- Test dependencies -->
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-test</artifactId>
-      <version>1.27.0-beta.13</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-http-netty</artifactId>
-      <version>1.16.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/spotbugs-exclude.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/spotbugs-exclude.xml
deleted file mode 100644
index b1c0a0302d65..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/spotbugs-exclude.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<FindBugsFilter xmlns="https://github.com/spotbugs/filter/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
-</FindBugsFilter>
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClient.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClient.java
deleted file mode 100644
index b893e15303e2..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClient.java
+++ /dev/null
@@ -1,595 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.annotation.ReturnType;
-import com.azure.core.annotation.ServiceClient;
-import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.PagedFlux;
-import com.azure.core.http.rest.PagedResponseBase;
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.Context;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.core.util.polling.LongRunningOperationStatus;
-import com.azure.core.util.polling.PollResponse;
-import com.azure.mixedreality.remoterendering.implementation.MixedRealityRemoteRenderingImpl;
-import com.azure.mixedreality.remoterendering.implementation.models.CreateConversionSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.SessionProperties;
-import com.azure.mixedreality.remoterendering.implementation.models.ConversionSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.ConversionInputSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.ConversionOutputSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.UpdateSessionSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.CreateSessionSettings;
-import com.azure.mixedreality.remoterendering.models.AssetConversion;
-import com.azure.mixedreality.remoterendering.models.AssetConversionStatus;
-import com.azure.mixedreality.remoterendering.models.BeginSessionOptions;
-import com.azure.mixedreality.remoterendering.models.AssetConversionOptions;
-import com.azure.mixedreality.remoterendering.models.RemoteRenderingServiceError;
-import com.azure.mixedreality.remoterendering.models.RenderingSession;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionSize;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionStatus;
-import com.azure.mixedreality.remoterendering.models.UpdateSessionOptions;
-import reactor.core.publisher.Mono;
-import com.azure.core.util.polling.PollerFlux;
-
-import java.time.Duration;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import static com.azure.core.util.FluxUtil.withContext;
-import static com.azure.core.util.FluxUtil.monoError;
-
-/** A builder for creating a new instance of the MixedRealityRemoteRendering type. */
-@ServiceClient(builder = RemoteRenderingClientBuilder.class, isAsync = true)
-public final class RemoteRenderingAsyncClient {
-    private static final Duration CONVERSION_POLLING_INTERVAL = Duration.ofSeconds(10);
-    private static final Duration STANDARD_SESSION_POLLING_INTERVAL = Duration.ofSeconds(2);
-    private static final Duration DEFAULT_SESSION_POLLING_INTERVAL = Duration.ofSeconds(10);
-
-    private final ClientLogger logger = new ClientLogger(RemoteRenderingAsyncClient.class);
-
-    private final UUID accountId;
-    private final MixedRealityRemoteRenderingImpl impl;
-
-    RemoteRenderingAsyncClient(MixedRealityRemoteRenderingImpl impl, UUID accountId) {
-        this.accountId = accountId;
-        this.impl = impl;
-    }
-
-    /**
-     * Creates a new rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux<RenderingSession, RenderingSession> beginSession(String sessionId) {
-        return beginSession(sessionId, new BeginSessionOptions());
-    }
-
-    /**
-     * Creates a new rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Settings for the session to be created.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux<RenderingSession, RenderingSession> beginSession(String sessionId, BeginSessionOptions options) {
-        return beginSessionInternal(sessionId, options, Context.NONE);
-    }
-
-    PollerFlux<RenderingSession, RenderingSession> beginSessionInternal(String sessionId, BeginSessionOptions options,
-        Context context) {
-        Objects.requireNonNull(sessionId, "'sessionId' cannot be null.");
-        Objects.requireNonNull(options, "'options' cannot be null.");
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        if (sessionId.isEmpty()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'sessionId' cannot be an empty string."));
-        }
-
-        return new PollerFlux<>(
-            (options.getSize() == RenderingSessionSize.STANDARD)
-                ? STANDARD_SESSION_POLLING_INTERVAL
-                : DEFAULT_SESSION_POLLING_INTERVAL,
-            pollingContext -> impl.getRemoteRenderings()
-                .createSessionWithResponseAsync(accountId, sessionId, ModelTranslator.toGenerated(options), context)
-                .map(r -> ModelTranslator.fromGenerated(r.getValue())),
-            pollingContext -> {
-                Mono<RenderingSession> response = impl.getRemoteRenderings()
-                    .getSessionWithResponseAsync(accountId, sessionId, context)
-                    .map(r -> ModelTranslator.fromGenerated(r.getValue()));
-                return response.map(session -> {
-                    final RenderingSessionStatus sessionStatus = session.getStatus();
-                    LongRunningOperationStatus lroStatus;
-                    if (sessionStatus == RenderingSessionStatus.STARTING) {
-                        lroStatus = LongRunningOperationStatus.IN_PROGRESS;
-                    } else if (sessionStatus == RenderingSessionStatus.ERROR) {
-                        lroStatus = LongRunningOperationStatus.FAILED;
-                    } else if (sessionStatus == RenderingSessionStatus.READY) {
-                        lroStatus = LongRunningOperationStatus.SUCCESSFULLY_COMPLETED;
-                    } else if (sessionStatus == RenderingSessionStatus.STOPPED) {
-                        lroStatus = LongRunningOperationStatus.USER_CANCELLED;
-                    } else {
-                        lroStatus = LongRunningOperationStatus.FAILED;
-                    }
-                    return new PollResponse<>(lroStatus, session);
-                });
-            },
-            (pollingContext, pollResponse) -> impl.getRemoteRenderings()
-                .stopSessionWithResponseAsync(accountId, sessionId, context)
-                .then(Mono.just(pollingContext.getLatestResponse().getValue())),
-            pollingContext -> Mono.just(pollingContext.getLatestResponse().getValue()));
-    }
-
-    /**
-     * Gets properties of a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<RenderingSession> getSession(String sessionId) {
-        return getSessionWithResponse(sessionId).map(Response::getValue);
-    }
-
-    /**
-     * Gets properties of a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<RenderingSession>> getSessionWithResponse(String sessionId) {
-        try {
-            return withContext(context -> getSessionInternal(sessionId, context));
-        } catch (RuntimeException exception) {
-            return monoError(this.logger, exception);
-        }
-    }
-
-    Mono<Response<RenderingSession>> getSessionInternal(String sessionId, Context context) {
-        Objects.requireNonNull(sessionId, "'sessionId' cannot be null.");
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        if (sessionId.isEmpty()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'sessionId' cannot be an empty string."));
-        }
-
-        return impl.getRemoteRenderings()
-            .getSessionWithResponseAsync(accountId, sessionId, context)
-            .map(ModelTranslator::fromGenerated);
-    }
-
-    /**
-     * Updates a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Options for the session to be updated.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<RenderingSession> updateSession(String sessionId, UpdateSessionOptions options) {
-        return updateSessionWithResponse(sessionId, options).map(Response::getValue);
-    }
-
-    /**
-     * Updates a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Options for the session to be updated.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<RenderingSession>> updateSessionWithResponse(String sessionId, UpdateSessionOptions options) {
-        try {
-            return withContext(context -> updateSessionInternal(sessionId, options, context));
-        } catch (RuntimeException exception) {
-            return monoError(this.logger, exception);
-        }
-    }
-
-    Mono<Response<RenderingSession>> updateSessionInternal(String sessionId, UpdateSessionOptions options,
-        Context context) {
-        Objects.requireNonNull(sessionId, "'sessionId' cannot be null.");
-        Objects.requireNonNull(options, "'options' cannot be null.");
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        if (sessionId.isEmpty()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'sessionId' cannot be an empty string."));
-        }
-
-        return impl.getRemoteRenderings()
-            .updateSessionWithResponseAsync(accountId, sessionId, ModelTranslator.toGenerated(options), context)
-            .map(ModelTranslator::fromGenerated);
-    }
-
-    /**
-     * Stops a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return nothing on completion.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> endSession(String sessionId) {
-        return endSessionWithResponse(sessionId).then();
-    }
-
-    /**
-     * Stops a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return nothing on completion.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Void>> endSessionWithResponse(String sessionId) {
-        try {
-            return withContext(context -> endSessionInternal(sessionId, context));
-        } catch (RuntimeException exception) {
-            return monoError(this.logger, exception);
-        }
-    }
-
-    Mono<Response<Void>> endSessionInternal(String sessionId, Context context) {
-        Objects.requireNonNull(sessionId, "'sessionId' cannot be null.");
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        if (sessionId.isEmpty()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'sessionId' cannot be an empty string."));
-        }
-
-        return impl.getRemoteRenderings().stopSessionWithResponseAsync(accountId, sessionId, context).map(r -> r);
-    }
-
-    /**
-     * Get a list of all rendering sessions.
-     *
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all rendering sessions.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<RenderingSession> listSessions() {
-        return listSessionsInternal(Context.NONE);
-    }
-
-    PagedFlux<RenderingSession> listSessionsInternal(Context context) {
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        return new PagedFlux<>(() -> impl.getRemoteRenderings()
-            .listSessionsSinglePageAsync(accountId, context)
-            .map(p -> new PagedResponseBase<HttpRequest, RenderingSession>(p.getRequest(), p.getStatusCode(),
-                p.getHeaders(), p.getValue().stream().map(ModelTranslator::fromGenerated).collect(Collectors.toList()),
-                p.getContinuationToken(), null)),
-            continuationToken -> impl.getRemoteRenderings()
-                .listSessionsNextSinglePageAsync(continuationToken, context)
-                .map(p -> new PagedResponseBase<HttpRequest, RenderingSession>(p.getRequest(), p.getStatusCode(),
-                    p.getHeaders(),
-                    p.getValue().stream().map(ModelTranslator::fromGenerated).collect(Collectors.toList()),
-                    p.getContinuationToken(), null)));
-    }
-
-    /**
-     * Starts a conversion using an asset stored in an Azure Blob Storage account. If the remote rendering account has
-     * been linked with the storage account no Shared Access Signatures (storageContainerReadListSas,
-     * storageContainerWriteSas) for storage access need to be provided. Documentation how to link your Azure Remote
-     * Rendering account with the Azure Blob Storage account can be found in the
-     * [documentation](https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts).
-     *
-     * <p>All files in the input container starting with the blobPrefix will be retrieved to perform the conversion. To
-     * cut down on conversion times only necessary files should be available under the blobPrefix.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @param options The conversion options.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux<AssetConversion, AssetConversion> beginConversion(String conversionId,
-        AssetConversionOptions options) {
-        return beginConversionInternal(conversionId, options, Context.NONE);
-    }
-
-    PollerFlux<AssetConversion, AssetConversion> beginConversionInternal(String conversionId,
-        AssetConversionOptions options, Context context) {
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        return new PollerFlux<>(CONVERSION_POLLING_INTERVAL,
-            pollingContext -> impl.getRemoteRenderings()
-                .createConversionWithResponseAsync(accountId, conversionId,
-                    new CreateConversionSettings(ModelTranslator.toGenerated(options)), context)
-                .map(c -> ModelTranslator.fromGenerated(c.getValue())),
-            pollingContext -> {
-                Mono<AssetConversion> response = impl.getRemoteRenderings()
-                    .getConversionWithResponseAsync(accountId, conversionId, context)
-                    .map(c -> ModelTranslator.fromGenerated(c.getValue()));
-                return response.map(conversion -> {
-                    final AssetConversionStatus conversionStatus = conversion.getStatus();
-                    LongRunningOperationStatus lroStatus;
-                    if ((conversionStatus == AssetConversionStatus.RUNNING)
-                        || (conversionStatus == AssetConversionStatus.NOT_STARTED)) {
-                        lroStatus = LongRunningOperationStatus.IN_PROGRESS;
-                    } else if (conversionStatus == AssetConversionStatus.FAILED) {
-                        lroStatus = LongRunningOperationStatus.FAILED;
-                    } else if (conversionStatus == AssetConversionStatus.SUCCEEDED) {
-                        lroStatus = LongRunningOperationStatus.SUCCESSFULLY_COMPLETED;
-                    } else if (conversionStatus == AssetConversionStatus.CANCELLED) {
-                        lroStatus = LongRunningOperationStatus.USER_CANCELLED;
-                    } else {
-                        lroStatus = LongRunningOperationStatus.FAILED;
-                    }
-                    return new PollResponse<>(lroStatus, conversion);
-                });
-            }, (pollingContext, pollResponse) -> Mono.error(new RuntimeException("Cancellation is not supported.")),
-            pollingContext -> Mono.just(pollingContext.getLatestResponse().getValue()));
-    }
-
-    /**
-     * Gets the status of a previously created asset conversion.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<AssetConversion> getConversion(String conversionId) {
-        return getConversionWithResponse(conversionId).map(Response::getValue);
-    }
-
-    /**
-     * Gets the status of a previously created asset conversion.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<AssetConversion>> getConversionWithResponse(String conversionId) {
-        try {
-            return withContext(context -> getConversionInternal(conversionId, context));
-        } catch (RuntimeException exception) {
-            return monoError(this.logger, exception);
-        }
-    }
-
-    Mono<Response<AssetConversion>> getConversionInternal(String conversionId, Context context) {
-        Objects.requireNonNull(conversionId, "'conversionId' cannot be null.");
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        if (conversionId.isEmpty()) {
-            throw logger.logExceptionAsError(new IllegalArgumentException("'conversionId' cannot be an empty string."));
-        }
-
-        return impl.getRemoteRenderings()
-            .getConversionWithResponseAsync(accountId, conversionId, context)
-            .map(ModelTranslator::fromGenerated);
-    }
-
-    /**
-     * Gets a list of all conversions.
-     *
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<AssetConversion> listConversions() {
-        return listConversionsInternal(Context.NONE);
-    }
-
-    PagedFlux<AssetConversion> listConversionsInternal(Context context) {
-        Objects.requireNonNull(context, "'context' cannot be null.");
-
-        return new PagedFlux<>(() -> impl.getRemoteRenderings()
-            .listConversionsSinglePageAsync(accountId, context)
-            .map(p -> new PagedResponseBase<HttpRequest, AssetConversion>(p.getRequest(), p.getStatusCode(),
-                p.getHeaders(), p.getValue().stream().map(ModelTranslator::fromGenerated).collect(Collectors.toList()),
-                p.getContinuationToken(), null)),
-            continuationToken -> impl.getRemoteRenderings()
-                .listConversionsNextSinglePageAsync(continuationToken, context)
-                .map(p -> new PagedResponseBase<HttpRequest, AssetConversion>(p.getRequest(), p.getStatusCode(),
-                    p.getHeaders(),
-                    p.getValue().stream().map(ModelTranslator::fromGenerated).collect(Collectors.toList()),
-                    p.getContinuationToken(), null)));
-    }
-
-    private static class ModelTranslator {
-
-        private static <T, Y> Response<T> fromGenerated(Response<Y> response) {
-            if (response == null) {
-                return null;
-            }
-            return new Response<T>() {
-
-                private final T value = fromGeneratedGeneric(response.getValue());
-
-                @Override
-                public int getStatusCode() {
-                    return response.getStatusCode();
-                }
-
-                @Override
-                public HttpHeaders getHeaders() {
-                    return response.getHeaders();
-                }
-
-                @Override
-                public HttpRequest getRequest() {
-                    return response.getRequest();
-                }
-
-                @Override
-                public T getValue() {
-                    return this.value;
-                }
-            };
-        }
-
-        @SuppressWarnings("unchecked")
-        private static <T, Y> T fromGeneratedGeneric(Y value) {
-            if (value == null) {
-                return null;
-            } else if (value instanceof com.azure.mixedreality.remoterendering.implementation.models.Conversion) {
-                return (T) fromGenerated(
-                    (com.azure.mixedreality.remoterendering.implementation.models.Conversion) value);
-            } else if (value instanceof SessionProperties) {
-                return (T) fromGenerated((SessionProperties) value);
-            } else if (value instanceof com.azure.mixedreality.remoterendering.implementation.models.Error) {
-                return (T) fromGenerated((com.azure.mixedreality.remoterendering.implementation.models.Error) value);
-            } else if (value instanceof com.azure.mixedreality.remoterendering.implementation.models.ConversionSettings) {
-                return (T) fromGenerated(
-                    (com.azure.mixedreality.remoterendering.implementation.models.ConversionSettings) value);
-            } else {
-                // throw?
-                return null;
-            }
-        }
-
-        private static AssetConversion
-            fromGenerated(com.azure.mixedreality.remoterendering.implementation.models.Conversion conversion) {
-            if (conversion == null) {
-                return null;
-            }
-            return new AssetConversion(conversion.getId(), fromGenerated(conversion.getSettings()),
-                conversion.getOutput() != null ? conversion.getOutput().getOutputAssetUri() : null,
-                fromGenerated(conversion.getError()),
-                AssetConversionStatus.fromString(conversion.getStatus().toString()), conversion.getCreationTime());
-        }
-
-        private static RenderingSession fromGenerated(SessionProperties sessionProperties) {
-            if (sessionProperties == null) {
-                return null;
-            }
-            return new RenderingSession(sessionProperties.getId(),
-                Optional.ofNullable(sessionProperties.getArrInspectorPort()).orElse(0),
-                Optional.ofNullable(sessionProperties.getHandshakePort()).orElse(0),
-                Duration.ofMinutes(Optional.ofNullable(sessionProperties.getElapsedTimeMinutes()).orElse(0)),
-                sessionProperties.getHostname(),
-                Duration.ofMinutes(Optional.ofNullable(sessionProperties.getMaxLeaseTimeMinutes()).orElse(0)),
-                RenderingSessionSize.fromString(sessionProperties.getSize().toString()),
-                RenderingSessionStatus.fromString(sessionProperties.getStatus().toString()),
-                Optional.ofNullable(sessionProperties.getTeraflops()).orElse(0.0f),
-                fromGenerated(sessionProperties.getError()), sessionProperties.getCreationTime());
-        }
-
-        private static RemoteRenderingServiceError
-            fromGenerated(com.azure.mixedreality.remoterendering.implementation.models.Error error) {
-            if (error == null) {
-                return null;
-            }
-            return new RemoteRenderingServiceError(error.getCode(), error.getMessage(), error.getTarget(),
-                fromGenerated(error.getInnerError()),
-                (error.getDetails() != null)
-                    ? error.getDetails().stream().map(ModelTranslator::fromGenerated).collect(Collectors.toList())
-                    : null);
-        }
-
-        private static AssetConversionOptions
-            fromGenerated(com.azure.mixedreality.remoterendering.implementation.models.ConversionSettings settings) {
-            if (settings == null) {
-                return null;
-            }
-            return new AssetConversionOptions().setInputBlobPrefix(settings.getInputLocation().getBlobPrefix())
-                .setInputRelativeAssetPath(settings.getInputLocation().getRelativeInputAssetPath())
-                .setInputStorageContainerReadListSas(settings.getInputLocation().getStorageContainerReadListSas())
-                .setInputStorageContainerUrl(settings.getInputLocation().getStorageContainerUri())
-
-                .setOutputAssetFilename(settings.getOutputLocation().getOutputAssetFilename())
-                .setOutputBlobPrefix(settings.getOutputLocation().getBlobPrefix())
-                .setOutputStorageContainerUrl(settings.getOutputLocation().getStorageContainerUri())
-                .setOutputStorageContainerWriteSas(settings.getOutputLocation().getStorageContainerWriteSas());
-        }
-
-        private static ConversionSettings toGenerated(AssetConversionOptions conversionOptions) {
-            if (conversionOptions == null) {
-                return null;
-            }
-            return new ConversionSettings(
-                new ConversionInputSettings(conversionOptions.getInputStorageContainerUrl(),
-                    conversionOptions.getInputRelativeAssetPath())
-                        .setStorageContainerReadListSas(conversionOptions.getInputStorageContainerReadListSas())
-                        .setBlobPrefix(conversionOptions.getInputBlobPrefix()),
-                new ConversionOutputSettings(conversionOptions.getOutputStorageContainerUrl())
-                    .setStorageContainerWriteSas(conversionOptions.getOutputStorageContainerWriteSas())
-                    .setBlobPrefix(conversionOptions.getOutputBlobPrefix())
-                    .setOutputAssetFilename(conversionOptions.getOutputAssetFilename()));
-        }
-
-        private static UpdateSessionSettings toGenerated(UpdateSessionOptions options) {
-            if (options == null) {
-                return null;
-            }
-            return new UpdateSessionSettings((int) options.getMaxLeaseTime().toMinutes());
-        }
-
-        private static CreateSessionSettings toGenerated(BeginSessionOptions options) {
-            if (options == null) {
-                return null;
-            }
-            return new CreateSessionSettings((int) options.getMaxLeaseTime().toMinutes(),
-                com.azure.mixedreality.remoterendering.implementation.models.SessionSize
-                    .fromString(options.getSize().toString()));
-        }
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingClient.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingClient.java
deleted file mode 100644
index cf0f38bad8c8..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingClient.java
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.annotation.ReturnType;
-import com.azure.core.annotation.ServiceClient;
-import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.Context;
-import com.azure.core.util.polling.SyncPoller;
-import com.azure.mixedreality.remoterendering.models.AssetConversion;
-import com.azure.mixedreality.remoterendering.models.BeginSessionOptions;
-import com.azure.mixedreality.remoterendering.models.AssetConversionOptions;
-import com.azure.mixedreality.remoterendering.models.RenderingSession;
-import com.azure.mixedreality.remoterendering.models.UpdateSessionOptions;
-
-/** Client to communicate with remote rendering service. */
-@ServiceClient(builder = RemoteRenderingClientBuilder.class)
-public final class RemoteRenderingClient {
-    private final RemoteRenderingAsyncClient client;
-
-    RemoteRenderingClient(RemoteRenderingAsyncClient client) {
-        this.client = client;
-    }
-
-    /**
-     * Creates a new rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Options for the session to be created.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<RenderingSession, RenderingSession> beginSession(String sessionId, BeginSessionOptions options) {
-        return client.beginSession(sessionId, options).getSyncPoller();
-    }
-
-    /**
-     * Creates a new rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<RenderingSession, RenderingSession> beginSession(String sessionId) {
-        return beginSession(sessionId, new BeginSessionOptions());
-    }
-
-    /**
-     * Creates a new rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Options for the session to be created.
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<RenderingSession, RenderingSession> beginSession(String sessionId, BeginSessionOptions options,
-        Context context) {
-        return client.beginSessionInternal(sessionId, options, context).getSyncPoller();
-    }
-
-    /**
-     * Gets properties of a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public RenderingSession getSession(String sessionId) {
-        return client.getSession(sessionId).block();
-    }
-
-    /**
-     * Gets properties of a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RenderingSession> getSessionWithResponse(String sessionId, Context context) {
-        return client.getSessionInternal(sessionId, context).block();
-    }
-
-    /**
-     * Updates a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Options for the session to be updated.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public RenderingSession updateSession(String sessionId, UpdateSessionOptions options) {
-        return client.updateSession(sessionId, options).block();
-    }
-
-    /**
-     * Updates a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param options Options for the session to be updated.
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the rendering session.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<RenderingSession> updateSessionWithResponse(String sessionId, UpdateSessionOptions options,
-        Context context) {
-        return client.updateSessionInternal(sessionId, options, context).block();
-    }
-
-    /**
-     * Stops a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public void endSession(String sessionId) {
-        client.endSession(sessionId).block();
-    }
-
-    /**
-     * Stops a particular rendering session.
-     *
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     *     sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and
-     *     cannot contain more than 256 characters.
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return The response.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<Void> endSessionWithResponse(String sessionId, Context context) {
-        return client.endSessionInternal(sessionId, context).block();
-    }
-
-    /**
-     * Get a list of all rendering sessions.
-     *
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all rendering sessions.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<RenderingSession> listSessions() {
-        return new PagedIterable<>(client.listSessions());
-    }
-
-    /**
-     * Get a list of all rendering sessions.
-     *
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all rendering sessions.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<RenderingSession> listSessions(Context context) {
-        return new PagedIterable<>(client.listSessionsInternal(context));
-    }
-
-    /**
-     * Starts a conversion using an asset stored in an Azure Blob Storage account. If the remote rendering account has
-     * been linked with the storage account no Shared Access Signatures (storageContainerReadListSas,
-     * storageContainerWriteSas) for storage access need to be provided. Documentation how to link your Azure Remote
-     * Rendering account with the Azure Blob Storage account can be found in the
-     * [documentation](https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts).
-     *
-     * <p>All files in the input container starting with the blobPrefix will be retrieved to perform the conversion. To
-     * cut down on conversion times only necessary files should be available under the blobPrefix.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @param options The conversion options.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<AssetConversion, AssetConversion> beginConversion(String conversionId,
-        AssetConversionOptions options) {
-        return client.beginConversion(conversionId, options).getSyncPoller();
-    }
-
-    /**
-     * Starts a conversion using an asset stored in an Azure Blob Storage account. If the remote rendering account has
-     * been linked with the storage account no Shared Access Signatures (storageContainerReadListSas,
-     * storageContainerWriteSas) for storage access need to be provided. Documentation how to link your Azure Remote
-     * Rendering account with the Azure Blob Storage account can be found in the
-     * [documentation](https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts).
-     *
-     * <p>All files in the input container starting with the blobPrefix will be retrieved to perform the conversion. To
-     * cut down on conversion times only necessary files should be available under the blobPrefix.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @param options The conversion options.
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller<AssetConversion, AssetConversion> beginConversion(String conversionId,
-        AssetConversionOptions options, Context context) {
-        return client.beginConversionInternal(conversionId, options, context).getSyncPoller();
-    }
-
-    /**
-     * Gets the status of a previously created asset conversion.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public AssetConversion getConversion(String conversionId) {
-        return client.getConversion(conversionId).block();
-    }
-
-    /**
-     * Gets the status of a previously created asset conversion.
-     *
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     *     can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain
-     *     more than 256 characters.
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the conversion.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Response<AssetConversion> getConversionWithResponse(String conversionId, Context context) {
-        return client.getConversionInternal(conversionId, context).block();
-    }
-
-    /**
-     * Gets a list of all conversions.
-     *
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<AssetConversion> listConversions() {
-        return new PagedIterable<>(client.listConversions());
-    }
-
-    /**
-     * Gets a list of all conversions.
-     *
-     * @param context The context to use.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedIterable<AssetConversion> listConversions(Context context) {
-        return new PagedIterable<>(client.listConversionsInternal(context));
-    }
-
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientBuilder.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientBuilder.java
deleted file mode 100644
index 6b3cbae240a5..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientBuilder.java
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.annotation.ServiceClientBuilder;
-import com.azure.core.credential.AccessToken;
-import com.azure.core.credential.AzureKeyCredential;
-import com.azure.core.credential.TokenCredential;
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.HttpHeader;
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.policy.AddHeadersPolicy;
-import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
-import com.azure.core.http.policy.HttpLogOptions;
-import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.core.http.policy.RetryPolicy;
-import com.azure.core.util.ClientOptions;
-import com.azure.core.util.Configuration;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.mixedreality.authentication.MixedRealityStsAsyncClient;
-import com.azure.mixedreality.remoterendering.implementation.MixedRealityRemoteRenderingImplBuilder;
-import com.azure.mixedreality.authentication.MixedRealityStsClientBuilder;
-import reactor.core.publisher.Mono;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
-
-/** A builder for creating instances of RemoteRenderingClient and RemoteRenderingAsyncClient. */
-@ServiceClientBuilder(serviceClients = { RemoteRenderingClient.class, RemoteRenderingAsyncClient.class })
-public final class RemoteRenderingClientBuilder {
-
-    private final ClientLogger logger = new ClientLogger(RemoteRenderingClientBuilder.class);
-
-    private final MixedRealityRemoteRenderingImplBuilder builder;
-    private UUID accountId;
-    private final MixedRealityStsClientBuilder stsBuilder;
-    private RemoteRenderingServiceVersion apiVersion;
-    private AccessToken accessToken;
-    private String endpoint;
-    private ClientOptions clientOptions;
-    private HttpLogOptions httpLogOptions;
-
-    /** Constructs a new RemoteRenderingClientBuilder instance. */
-    public RemoteRenderingClientBuilder() {
-        builder = new MixedRealityRemoteRenderingImplBuilder();
-        stsBuilder = new MixedRealityStsClientBuilder();
-    }
-
-    /** Builds and returns a RemoteRenderingClient instance from the provided parameters.
-     *
-     * @return the RemoteRenderingClient instance.
-     */
-    public RemoteRenderingClient buildClient() {
-        return new RemoteRenderingClient(buildAsyncClient());
-    }
-
-    /** Builds and returns a RemoteRenderingAsyncClient instance from the provided parameters.
-     *
-     * @return the RemoteRenderingAsyncClient instance.
-     */
-    public RemoteRenderingAsyncClient buildAsyncClient() {
-        String scope = this.endpoint.replaceFirst("/$", "") + "/.default";
-        if (accessToken == null) {
-            MixedRealityStsAsyncClient stsClient = stsBuilder.buildAsyncClient();
-            builder.addPolicy(new BearerTokenAuthenticationPolicy(r -> stsClient.getToken(), scope));
-        } else {
-            builder.addPolicy(new BearerTokenAuthenticationPolicy(r -> Mono.just(this.accessToken), scope));
-        }
-
-        if (clientOptions != null) {
-            List<HttpHeader> httpHeaderList = new ArrayList<HttpHeader>();
-            clientOptions.getHeaders()
-                .forEach(header -> httpHeaderList.add(new HttpHeader(header.getName(), header.getValue())));
-            builder.addPolicy(new AddHeadersPolicy(new HttpHeaders(httpHeaderList)));
-
-            // generated code uses deprecated httpLogOptions.getApplicationId(), so we set that here.
-            if (httpLogOptions == null) {
-                httpLogOptions = new HttpLogOptions();
-                httpLogOptions.addAllowedHeaderName("MS-CV");
-                builder.httpLogOptions(httpLogOptions);
-            }
-            httpLogOptions.setApplicationId(clientOptions.getApplicationId());
-        }
-
-        return new RemoteRenderingAsyncClient(builder.buildClient(), accountId);
-    }
-
-    /**
-     * Sets the accountId.
-     *
-     * @param accountId the accountId value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder accountId(String accountId) {
-        Objects.requireNonNull(accountId, "'accountId' cannot be null.");
-
-        try {
-            this.accountId = UUID.fromString(accountId);
-        } catch (IllegalArgumentException ex) {
-            throw logger.logExceptionAsError(
-                new IllegalArgumentException("The 'accountId' must be a UUID formatted value.", ex));
-        }
-
-        this.stsBuilder.accountId(accountId);
-        return this;
-    }
-
-    /**
-     * Sets the accountDomain.
-     *
-     * @param accountDomain the accountDomain value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder accountDomain(String accountDomain) {
-        Objects.requireNonNull(accountDomain, "'accountDomain' cannot be null.");
-
-        if (accountDomain.isEmpty()) {
-            throw logger
-                .logExceptionAsError(new IllegalArgumentException("'accountDomain' cannot be an empty string."));
-        }
-
-        this.stsBuilder.accountDomain(accountDomain);
-        return this;
-    }
-
-    /**
-     * Sets the accountKeyCredential to use for authentication.
-     *
-     * @param accountKeyCredential the accountKeyCredential value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder credential(AzureKeyCredential accountKeyCredential) {
-        this.stsBuilder
-            .credential(Objects.requireNonNull(accountKeyCredential, "'accountKeyCredential' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Use a {@link TokenCredential} for authentication.
-     *
-     * @param tokenCredential The {@link TokenCredential} used to authenticate HTTP requests.
-     * @return the RemoteRenderingClientBuilder.
-     * @throws NullPointerException If {@code tokenCredential} is null.
-     */
-    public RemoteRenderingClientBuilder credential(TokenCredential tokenCredential) {
-        this.stsBuilder.credential(Objects.requireNonNull(tokenCredential, "'tokenCredential' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Use a {@link AccessToken} for authentication.
-     *
-     * @param accessToken An access token used to access the specified Azure Remote Rendering account
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder accessToken(AccessToken accessToken) {
-        this.accessToken = Objects.requireNonNull(accessToken, "'accessToken' cannot be null.");
-        return this;
-    }
-
-    /**
-     * Sets the Remote Rendering service endpoint.
-     * <p>
-     * For converting assets, it is preferable to pick a region close to the storage containing the assets.
-     * For rendering, it is strongly recommended that you pick the closest region to the devices using the service.
-     * The time taken to communicate with the server impacts the quality of the experience.
-     *
-     * @param endpoint the host value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder endpoint(String endpoint) {
-        Objects.requireNonNull(endpoint, "'endpoint' cannot be null.");
-        builder.endpoint(endpoint);
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    /**
-     * Sets The HTTP client used to send the request.
-     *
-     * @param httpClient the httpClient value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder httpClient(HttpClient httpClient) {
-        builder.httpClient(Objects.requireNonNull(httpClient, "'httpClient' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Sets The logging configuration for HTTP requests and responses.
-     *
-     * @param httpLogOptions the httpLogOptions value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
-        Objects.requireNonNull(httpLogOptions, "'httpLogOptions' cannot be null.");
-
-        builder.httpLogOptions(httpLogOptions);
-        this.httpLogOptions = httpLogOptions;
-        return this;
-    }
-
-    /**
-     * Sets The HTTP pipeline to send requests through.
-     *
-     * @param pipeline the pipeline value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder pipeline(HttpPipeline pipeline) {
-        builder.pipeline(Objects.requireNonNull(pipeline, "'pipeline' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Sets The retry policy that will attempt to retry failed requests, if applicable.
-     *
-     * @param retryPolicy the retryPolicy value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder retryPolicy(RetryPolicy retryPolicy) {
-        builder.retryPolicy(Objects.requireNonNull(retryPolicy, "'retryPolicy' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Sets The configuration store that is used during construction of the service client.
-     *
-     * @param configuration the configuration value.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder configuration(Configuration configuration) {
-        builder.configuration(Objects.requireNonNull(configuration, "'configuration' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Adds a custom Http pipeline policy.
-     *
-     * @param customPolicy The custom Http pipeline policy to add.
-     * @return the RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder addPolicy(HttpPipelinePolicy customPolicy) {
-        builder.addPolicy(Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null."));
-        return this;
-    }
-
-    /**
-     * Sets the {@link RemoteRenderingServiceVersion} that is used when making API requests.
-     * <p>
-     * If a service version is not provided, the service version that will be used will be the latest known service
-     * version based on the version of the client library being used. If no service version is specified, updating to a
-     * newer version the client library will have the result of potentially moving to a newer service version.
-     *
-     * @param version {@link RemoteRenderingServiceVersion} of the service to be used when making requests.
-     * @return The RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder serviceVersion(RemoteRenderingServiceVersion version) {
-        this.apiVersion = Objects.requireNonNull(version, "'version' cannot be null.");
-        return this;
-    }
-
-    /**
-     * Sets the {@link ClientOptions} which enables various options to be set on the client.
-     *
-     * @param clientOptions the {@link ClientOptions} to be set on the client.
-     * @return The RemoteRenderingClientBuilder.
-     */
-    public RemoteRenderingClientBuilder clientOptions(ClientOptions clientOptions) {
-        Objects.requireNonNull(clientOptions, "'clientOptions' cannot be null.");
-        this.stsBuilder.clientOptions(clientOptions);
-        this.clientOptions = clientOptions;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingServiceVersion.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingServiceVersion.java
deleted file mode 100644
index 4826436fcbb1..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/RemoteRenderingServiceVersion.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.util.ServiceVersion;
-
-/**
- * The versions of the RemoteRenderingService supported by this client library.
- */
-public enum RemoteRenderingServiceVersion implements ServiceVersion {
-    /**
-     * Service version {@code 2021-01-01}.
-     */
-    V2021_01_01("2021-01-01");
-
-    private final String version;
-
-    RemoteRenderingServiceVersion(String version) {
-        this.version = version;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getVersion() {
-        return this.version;
-    }
-
-    /**
-     * Gets the latest service version supported by this client library.
-     *
-     * @return the latest {@link RemoteRenderingServiceVersion}
-     */
-    public static RemoteRenderingServiceVersion getLatest() {
-        return V2021_01_01;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/MixedRealityRemoteRenderingImpl.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/MixedRealityRemoteRenderingImpl.java
deleted file mode 100644
index ac70ca017d90..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/MixedRealityRemoteRenderingImpl.java
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation;
-
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.policy.RetryPolicy;
-import com.azure.core.http.policy.UserAgentPolicy;
-import com.azure.core.util.serializer.JacksonAdapter;
-import com.azure.core.util.serializer.SerializerAdapter;
-
-/**
- * Initializes a new instance of the MixedRealityRemoteRendering type.
- */
-public final class MixedRealityRemoteRenderingImpl {
-    /**
-     * The endpoint to use e.g. https://remoterendering.eastus.mixedreality.azure.com. A list can be found at
-     * https://docs.microsoft.com/azure/remote-rendering/reference/regions.
-     */
-    private final String endpoint;
-
-    /**
-     * Gets The endpoint to use e.g. https://remoterendering.eastus.mixedreality.azure.com. A list can be found at
-     * https://docs.microsoft.com/azure/remote-rendering/reference/regions.
-     * 
-     * @return the endpoint value.
-     */
-    public String getEndpoint() {
-        return this.endpoint;
-    }
-
-    /**
-     * Api Version.
-     */
-    private final String apiVersion;
-
-    /**
-     * Gets Api Version.
-     * 
-     * @return the apiVersion value.
-     */
-    public String getApiVersion() {
-        return this.apiVersion;
-    }
-
-    /**
-     * The HTTP pipeline to send requests through.
-     */
-    private final HttpPipeline httpPipeline;
-
-    /**
-     * Gets The HTTP pipeline to send requests through.
-     * 
-     * @return the httpPipeline value.
-     */
-    public HttpPipeline getHttpPipeline() {
-        return this.httpPipeline;
-    }
-
-    /**
-     * The serializer to serialize an object into a string.
-     */
-    private final SerializerAdapter serializerAdapter;
-
-    /**
-     * Gets The serializer to serialize an object into a string.
-     * 
-     * @return the serializerAdapter value.
-     */
-    public SerializerAdapter getSerializerAdapter() {
-        return this.serializerAdapter;
-    }
-
-    /**
-     * The RemoteRenderingsImpl object to access its operations.
-     */
-    private final RemoteRenderingsImpl remoteRenderings;
-
-    /**
-     * Gets the RemoteRenderingsImpl object to access its operations.
-     * 
-     * @return the RemoteRenderingsImpl object.
-     */
-    public RemoteRenderingsImpl getRemoteRenderings() {
-        return this.remoteRenderings;
-    }
-
-    /**
-     * Initializes an instance of MixedRealityRemoteRendering client.
-     * 
-     * @param endpoint The endpoint to use e.g. https://remoterendering.eastus.mixedreality.azure.com. A list can be
-     * found at https://docs.microsoft.com/azure/remote-rendering/reference/regions.
-     * @param apiVersion Api Version.
-     */
-    MixedRealityRemoteRenderingImpl(String endpoint, String apiVersion) {
-        this(new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy()).build(),
-            JacksonAdapter.createDefaultSerializerAdapter(), endpoint, apiVersion);
-    }
-
-    /**
-     * Initializes an instance of MixedRealityRemoteRendering client.
-     * 
-     * @param httpPipeline The HTTP pipeline to send requests through.
-     * @param endpoint The endpoint to use e.g. https://remoterendering.eastus.mixedreality.azure.com. A list can be
-     * found at https://docs.microsoft.com/azure/remote-rendering/reference/regions.
-     * @param apiVersion Api Version.
-     */
-    MixedRealityRemoteRenderingImpl(HttpPipeline httpPipeline, String endpoint, String apiVersion) {
-        this(httpPipeline, JacksonAdapter.createDefaultSerializerAdapter(), endpoint, apiVersion);
-    }
-
-    /**
-     * Initializes an instance of MixedRealityRemoteRendering client.
-     * 
-     * @param httpPipeline The HTTP pipeline to send requests through.
-     * @param serializerAdapter The serializer to serialize an object into a string.
-     * @param endpoint The endpoint to use e.g. https://remoterendering.eastus.mixedreality.azure.com. A list can be
-     * found at https://docs.microsoft.com/azure/remote-rendering/reference/regions.
-     * @param apiVersion Api Version.
-     */
-    MixedRealityRemoteRenderingImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, String endpoint,
-        String apiVersion) {
-        this.httpPipeline = httpPipeline;
-        this.serializerAdapter = serializerAdapter;
-        this.endpoint = endpoint;
-        this.apiVersion = apiVersion;
-        this.remoteRenderings = new RemoteRenderingsImpl(this);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/MixedRealityRemoteRenderingImplBuilder.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/MixedRealityRemoteRenderingImplBuilder.java
deleted file mode 100644
index 38934d23390e..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/MixedRealityRemoteRenderingImplBuilder.java
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.ServiceClientBuilder;
-import com.azure.core.client.traits.ConfigurationTrait;
-import com.azure.core.client.traits.EndpointTrait;
-import com.azure.core.client.traits.HttpTrait;
-import com.azure.core.client.traits.TokenCredentialTrait;
-import com.azure.core.credential.TokenCredential;
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.HttpPipelinePosition;
-import com.azure.core.http.policy.AddDatePolicy;
-import com.azure.core.http.policy.AddHeadersFromContextPolicy;
-import com.azure.core.http.policy.AddHeadersPolicy;
-import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
-import com.azure.core.http.policy.HttpLogOptions;
-import com.azure.core.http.policy.HttpLoggingPolicy;
-import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.core.http.policy.HttpPolicyProviders;
-import com.azure.core.http.policy.RequestIdPolicy;
-import com.azure.core.http.policy.RetryOptions;
-import com.azure.core.http.policy.RetryPolicy;
-import com.azure.core.http.policy.UserAgentPolicy;
-import com.azure.core.util.ClientOptions;
-import com.azure.core.util.Configuration;
-import com.azure.core.util.CoreUtils;
-import com.azure.core.util.builder.ClientBuilderUtil;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.core.util.serializer.JacksonAdapter;
-import com.azure.core.util.serializer.SerializerAdapter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * A builder for creating a new instance of the MixedRealityRemoteRendering type.
- */
-@ServiceClientBuilder(serviceClients = { MixedRealityRemoteRenderingImpl.class })
-public final class MixedRealityRemoteRenderingImplBuilder implements HttpTrait<MixedRealityRemoteRenderingImplBuilder>,
-    ConfigurationTrait<MixedRealityRemoteRenderingImplBuilder>,
-    TokenCredentialTrait<MixedRealityRemoteRenderingImplBuilder>,
-    EndpointTrait<MixedRealityRemoteRenderingImplBuilder> {
-    @Generated
-    private static final String SDK_NAME = "name";
-
-    @Generated
-    private static final String SDK_VERSION = "version";
-
-    @Generated
-    private static final Map<String, String> PROPERTIES
-        = CoreUtils.getProperties("azure-mixedreality-remoterendering.properties");
-
-    @Generated
-    private final List<HttpPipelinePolicy> pipelinePolicies;
-
-    /**
-     * Create an instance of the MixedRealityRemoteRenderingImplBuilder.
-     */
-    @Generated
-    public MixedRealityRemoteRenderingImplBuilder() {
-        this.pipelinePolicies = new ArrayList<>();
-    }
-
-    /*
-     * The HTTP client used to send the request.
-     */
-    @Generated
-    private HttpClient httpClient;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder httpClient(HttpClient httpClient) {
-        this.httpClient = httpClient;
-        return this;
-    }
-
-    /*
-     * The HTTP pipeline to send requests through.
-     */
-    @Generated
-    private HttpPipeline pipeline;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder pipeline(HttpPipeline pipeline) {
-        if (this.pipeline != null && pipeline == null) {
-            LOGGER.atInfo().log("HttpPipeline is being set to 'null' when it was previously configured.");
-        }
-        this.pipeline = pipeline;
-        return this;
-    }
-
-    /*
-     * The logging configuration for HTTP requests and responses.
-     */
-    @Generated
-    private HttpLogOptions httpLogOptions;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder httpLogOptions(HttpLogOptions httpLogOptions) {
-        this.httpLogOptions = httpLogOptions;
-        return this;
-    }
-
-    /*
-     * The client options such as application ID and custom headers to set on a request.
-     */
-    @Generated
-    private ClientOptions clientOptions;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder clientOptions(ClientOptions clientOptions) {
-        this.clientOptions = clientOptions;
-        return this;
-    }
-
-    /*
-     * The retry options to configure retry policy for failed requests.
-     */
-    @Generated
-    private RetryOptions retryOptions;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder retryOptions(RetryOptions retryOptions) {
-        this.retryOptions = retryOptions;
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder addPolicy(HttpPipelinePolicy customPolicy) {
-        Objects.requireNonNull(customPolicy, "'customPolicy' cannot be null.");
-        pipelinePolicies.add(customPolicy);
-        return this;
-    }
-
-    /*
-     * The configuration store that is used during construction of the service client.
-     */
-    @Generated
-    private Configuration configuration;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder configuration(Configuration configuration) {
-        this.configuration = configuration;
-        return this;
-    }
-
-    /*
-     * The TokenCredential used for authentication.
-     */
-    @Generated
-    private TokenCredential tokenCredential;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder credential(TokenCredential tokenCredential) {
-        this.tokenCredential = tokenCredential;
-        return this;
-    }
-
-    /*
-     * The service endpoint
-     */
-    @Generated
-    private String endpoint;
-
-    /**
-     * {@inheritDoc}.
-     */
-    @Generated
-    @Override
-    public MixedRealityRemoteRenderingImplBuilder endpoint(String endpoint) {
-        this.endpoint = endpoint;
-        return this;
-    }
-
-    /*
-     * Api Version
-     */
-    @Generated
-    private String apiVersion;
-
-    /**
-     * Sets Api Version.
-     * 
-     * @param apiVersion the apiVersion value.
-     * @return the MixedRealityRemoteRenderingImplBuilder.
-     */
-    @Generated
-    public MixedRealityRemoteRenderingImplBuilder apiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-        return this;
-    }
-
-    /*
-     * The serializer to serialize an object into a string
-     */
-    @Generated
-    private SerializerAdapter serializerAdapter;
-
-    /**
-     * Sets The serializer to serialize an object into a string.
-     * 
-     * @param serializerAdapter the serializerAdapter value.
-     * @return the MixedRealityRemoteRenderingImplBuilder.
-     */
-    @Generated
-    public MixedRealityRemoteRenderingImplBuilder serializerAdapter(SerializerAdapter serializerAdapter) {
-        this.serializerAdapter = serializerAdapter;
-        return this;
-    }
-
-    /*
-     * The retry policy that will attempt to retry failed requests, if applicable.
-     */
-    @Generated
-    private RetryPolicy retryPolicy;
-
-    /**
-     * Sets The retry policy that will attempt to retry failed requests, if applicable.
-     * 
-     * @param retryPolicy the retryPolicy value.
-     * @return the MixedRealityRemoteRenderingImplBuilder.
-     */
-    @Generated
-    public MixedRealityRemoteRenderingImplBuilder retryPolicy(RetryPolicy retryPolicy) {
-        this.retryPolicy = retryPolicy;
-        return this;
-    }
-
-    /**
-     * Builds an instance of MixedRealityRemoteRenderingImpl with the provided parameters.
-     * 
-     * @return an instance of MixedRealityRemoteRenderingImpl.
-     */
-    @Generated
-    public MixedRealityRemoteRenderingImpl buildClient() {
-        this.validateClient();
-        HttpPipeline localPipeline = (pipeline != null) ? pipeline : createHttpPipeline();
-        String localApiVersion = (apiVersion != null) ? apiVersion : "2021-01-01";
-        SerializerAdapter localSerializerAdapter
-            = (serializerAdapter != null) ? serializerAdapter : JacksonAdapter.createDefaultSerializerAdapter();
-        MixedRealityRemoteRenderingImpl client = new MixedRealityRemoteRenderingImpl(localPipeline,
-            localSerializerAdapter, this.endpoint, localApiVersion);
-        return client;
-    }
-
-    @Generated
-    private void validateClient() {
-        // This method is invoked from 'buildInnerClient'/'buildClient' method.
-        // Developer can customize this method, to validate that the necessary conditions are met for the new client.
-        Objects.requireNonNull(endpoint, "'endpoint' cannot be null.");
-    }
-
-    @Generated
-    private HttpPipeline createHttpPipeline() {
-        Configuration buildConfiguration
-            = (configuration == null) ? Configuration.getGlobalConfiguration() : configuration;
-        HttpLogOptions localHttpLogOptions = this.httpLogOptions == null ? new HttpLogOptions() : this.httpLogOptions;
-        ClientOptions localClientOptions = this.clientOptions == null ? new ClientOptions() : this.clientOptions;
-        List<HttpPipelinePolicy> policies = new ArrayList<>();
-        String clientName = PROPERTIES.getOrDefault(SDK_NAME, "UnknownName");
-        String clientVersion = PROPERTIES.getOrDefault(SDK_VERSION, "UnknownVersion");
-        String applicationId = CoreUtils.getApplicationId(localClientOptions, localHttpLogOptions);
-        policies.add(new UserAgentPolicy(applicationId, clientName, clientVersion, buildConfiguration));
-        policies.add(new RequestIdPolicy());
-        policies.add(new AddHeadersFromContextPolicy());
-        HttpHeaders headers = CoreUtils.createHttpHeadersFromClientOptions(localClientOptions);
-        if (headers != null) {
-            policies.add(new AddHeadersPolicy(headers));
-        }
-        this.pipelinePolicies.stream()
-            .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_CALL)
-            .forEach(p -> policies.add(p));
-        HttpPolicyProviders.addBeforeRetryPolicies(policies);
-        policies.add(ClientBuilderUtil.validateAndGetRetryPolicy(retryPolicy, retryOptions, new RetryPolicy()));
-        policies.add(new AddDatePolicy());
-        if (tokenCredential != null) {
-            policies.add(new BearerTokenAuthenticationPolicy(tokenCredential, String.format("%s/.default", endpoint)));
-        }
-        this.pipelinePolicies.stream()
-            .filter(p -> p.getPipelinePosition() == HttpPipelinePosition.PER_RETRY)
-            .forEach(p -> policies.add(p));
-        HttpPolicyProviders.addAfterRetryPolicies(policies);
-        policies.add(new HttpLoggingPolicy(localHttpLogOptions));
-        HttpPipeline httpPipeline = new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
-            .httpClient(httpClient)
-            .clientOptions(localClientOptions)
-            .build();
-        return httpPipeline;
-    }
-
-    private static final ClientLogger LOGGER = new ClientLogger(MixedRealityRemoteRenderingImplBuilder.class);
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/RemoteRenderingsImpl.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/RemoteRenderingsImpl.java
deleted file mode 100644
index e24250790a6c..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/RemoteRenderingsImpl.java
+++ /dev/null
@@ -1,1121 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation;
-
-import com.azure.core.annotation.BodyParam;
-import com.azure.core.annotation.ExpectedResponses;
-import com.azure.core.annotation.Get;
-import com.azure.core.annotation.HeaderParam;
-import com.azure.core.annotation.Host;
-import com.azure.core.annotation.HostParam;
-import com.azure.core.annotation.Patch;
-import com.azure.core.annotation.PathParam;
-import com.azure.core.annotation.Post;
-import com.azure.core.annotation.Put;
-import com.azure.core.annotation.QueryParam;
-import com.azure.core.annotation.ReturnType;
-import com.azure.core.annotation.ServiceInterface;
-import com.azure.core.annotation.ServiceMethod;
-import com.azure.core.annotation.UnexpectedResponseExceptionType;
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.http.rest.PagedFlux;
-import com.azure.core.http.rest.PagedResponse;
-import com.azure.core.http.rest.PagedResponseBase;
-import com.azure.core.http.rest.Response;
-import com.azure.core.http.rest.ResponseBase;
-import com.azure.core.http.rest.RestProxy;
-import com.azure.core.util.Context;
-import com.azure.core.util.FluxUtil;
-import com.azure.mixedreality.remoterendering.implementation.models.Conversion;
-import com.azure.mixedreality.remoterendering.implementation.models.ConversionList;
-import com.azure.mixedreality.remoterendering.implementation.models.CreateConversionSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.CreateSessionSettings;
-import com.azure.mixedreality.remoterendering.implementation.models.ErrorResponseException;
-import com.azure.mixedreality.remoterendering.implementation.models.RemoteRenderingsCreateConversionHeaders;
-import com.azure.mixedreality.remoterendering.implementation.models.RemoteRenderingsCreateSessionHeaders;
-import com.azure.mixedreality.remoterendering.implementation.models.RemoteRenderingsGetConversionHeaders;
-import com.azure.mixedreality.remoterendering.implementation.models.RemoteRenderingsListConversionsHeaders;
-import com.azure.mixedreality.remoterendering.implementation.models.RemoteRenderingsListConversionsNextHeaders;
-import com.azure.mixedreality.remoterendering.implementation.models.RemoteRenderingsStopSessionHeaders;
-import com.azure.mixedreality.remoterendering.implementation.models.SessionProperties;
-import com.azure.mixedreality.remoterendering.implementation.models.SessionsList;
-import com.azure.mixedreality.remoterendering.implementation.models.UpdateSessionSettings;
-import java.util.UUID;
-import reactor.core.publisher.Mono;
-
-/**
- * An instance of this class provides access to all the operations defined in RemoteRenderings.
- */
-public final class RemoteRenderingsImpl {
-    /**
-     * The proxy service used to perform REST calls.
-     */
-    private final RemoteRenderingsService service;
-
-    /**
-     * The service client containing this operation class.
-     */
-    private final MixedRealityRemoteRenderingImpl client;
-
-    /**
-     * Initializes an instance of RemoteRenderingsImpl.
-     * 
-     * @param client the instance of the service client containing this operation class.
-     */
-    RemoteRenderingsImpl(MixedRealityRemoteRenderingImpl client) {
-        this.service
-            = RestProxy.create(RemoteRenderingsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
-        this.client = client;
-    }
-
-    /**
-     * The interface defining all the services for MixedRealityRemoteRenderingRemoteRenderings to be used by the proxy
-     * service to perform REST calls.
-     */
-    @Host("{endpoint}")
-    @ServiceInterface(name = "MixedRealityRemoteRenderingRemoteRenderings")
-    public interface RemoteRenderingsService {
-        @Put("/accounts/{account_id}/conversions/{conversion_id}")
-        @ExpectedResponses({ 200, 201 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 400, 409, 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(ErrorResponseException.class)
-        Mono<ResponseBase<RemoteRenderingsCreateConversionHeaders, Conversion>> createConversion(
-            @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
-            @PathParam("account_id") UUID accountId, @PathParam("conversion_id") String conversionId,
-            @BodyParam("application/json") CreateConversionSettings body, @HeaderParam("Accept") String accept,
-            Context context);
-
-        @Put("/accounts/{account_id}/conversions/{conversion_id}")
-        @ExpectedResponses({ 200, 201 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 400, 409, 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(ErrorResponseException.class)
-        Mono<Response<Conversion>> createConversionNoCustomHeaders(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("conversion_id") String conversionId,
-            @BodyParam("application/json") CreateConversionSettings body, @HeaderParam("Accept") String accept,
-            Context context);
-
-        @Get("/accounts/{account_id}/conversions/{conversion_id}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 404, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<ResponseBase<RemoteRenderingsGetConversionHeaders, Conversion>> getConversion(
-            @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
-            @PathParam("account_id") UUID accountId, @PathParam("conversion_id") String conversionId,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Get("/accounts/{account_id}/conversions/{conversion_id}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 404, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<Conversion>> getConversionNoCustomHeaders(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("conversion_id") String conversionId, @HeaderParam("Accept") String accept, Context context);
-
-        @Get("/accounts/{account_id}/conversions")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<ResponseBase<RemoteRenderingsListConversionsHeaders, ConversionList>> listConversions(
-            @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
-            @PathParam("account_id") UUID accountId, @HeaderParam("Accept") String accept, Context context);
-
-        @Get("/accounts/{account_id}/conversions")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<ConversionList>> listConversionsNoCustomHeaders(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Put("/accounts/{account_id}/sessions/{session_id}")
-        @ExpectedResponses({ 200, 201 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 400, 409, 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(ErrorResponseException.class)
-        Mono<ResponseBase<RemoteRenderingsCreateSessionHeaders, SessionProperties>> createSession(
-            @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
-            @PathParam("account_id") UUID accountId, @PathParam("session_id") String sessionId,
-            @BodyParam("application/json") CreateSessionSettings body, @HeaderParam("Accept") String accept,
-            Context context);
-
-        @Put("/accounts/{account_id}/sessions/{session_id}")
-        @ExpectedResponses({ 200, 201 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 400, 409, 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(ErrorResponseException.class)
-        Mono<Response<SessionProperties>> createSessionNoCustomHeaders(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("session_id") String sessionId, @BodyParam("application/json") CreateSessionSettings body,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Get("/accounts/{account_id}/sessions/{session_id}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 404, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<SessionProperties>> getSession(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("session_id") String sessionId, @HeaderParam("Accept") String accept, Context context);
-
-        @Patch("/accounts/{account_id}/sessions/{session_id}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 422, 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 404, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<SessionProperties>> updateSession(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("session_id") String sessionId, @BodyParam("application/json") UpdateSessionSettings body,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Post("/accounts/{account_id}/sessions/{session_id}/:stop")
-        @ExpectedResponses({ 204 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 404, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<ResponseBase<RemoteRenderingsStopSessionHeaders, Void>> stopSession(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("session_id") String sessionId, @HeaderParam("Accept") String accept, Context context);
-
-        @Post("/accounts/{account_id}/sessions/{session_id}/:stop")
-        @ExpectedResponses({ 204 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 404, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<Void>> stopSessionNoCustomHeaders(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @PathParam("session_id") String sessionId, @HeaderParam("Accept") String accept, Context context);
-
-        @Get("/accounts/{account_id}/sessions")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<SessionsList>> listSessions(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @PathParam("account_id") UUID accountId,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Get("{nextLink}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<ResponseBase<RemoteRenderingsListConversionsNextHeaders, ConversionList>> listConversionsNext(
-            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Get("{nextLink}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<ConversionList>> listConversionsNextNoCustomHeaders(
-            @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("Accept") String accept, Context context);
-
-        @Get("{nextLink}")
-        @ExpectedResponses({ 200 })
-        @UnexpectedResponseExceptionType(value = ErrorResponseException.class, code = { 500 })
-        @UnexpectedResponseExceptionType(value = HttpResponseException.class, code = { 401, 403, 429 })
-        @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono<Response<SessionsList>> listSessionsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
-    }
-
-    /**
-     * Creates a conversion using an asset stored in an Azure Blob Storage account.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param body Request body configuring the settings for an asset conversion.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of the conversion along with {@link ResponseBase} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsCreateConversionHeaders, Conversion>>
-        createConversionWithResponseAsync(UUID accountId, String conversionId, CreateConversionSettings body) {
-        return FluxUtil
-            .withContext(context -> createConversionWithResponseAsync(accountId, conversionId, body, context));
-    }
-
-    /**
-     * Creates a conversion using an asset stored in an Azure Blob Storage account.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param body Request body configuring the settings for an asset conversion.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of the conversion along with {@link ResponseBase} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsCreateConversionHeaders, Conversion>> createConversionWithResponseAsync(
-        UUID accountId, String conversionId, CreateConversionSettings body, Context context) {
-        final String accept = "application/json";
-        return service.createConversion(this.client.getEndpoint(), this.client.getApiVersion(), accountId, conversionId,
-            body, accept, context);
-    }
-
-    /**
-     * Creates a conversion using an asset stored in an Azure Blob Storage account.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param body Request body configuring the settings for an asset conversion.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of the conversion on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Conversion> createConversionAsync(UUID accountId, String conversionId, CreateConversionSettings body) {
-        return createConversionWithResponseAsync(accountId, conversionId, body)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Creates a conversion using an asset stored in an Azure Blob Storage account.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param body Request body configuring the settings for an asset conversion.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of the conversion on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Conversion> createConversionAsync(UUID accountId, String conversionId, CreateConversionSettings body,
-        Context context) {
-        return createConversionWithResponseAsync(accountId, conversionId, body, context)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Creates a conversion using an asset stored in an Azure Blob Storage account.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param body Request body configuring the settings for an asset conversion.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of the conversion along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Conversion>> createConversionNoCustomHeadersWithResponseAsync(UUID accountId,
-        String conversionId, CreateConversionSettings body) {
-        return FluxUtil.withContext(
-            context -> createConversionNoCustomHeadersWithResponseAsync(accountId, conversionId, body, context));
-    }
-
-    /**
-     * Creates a conversion using an asset stored in an Azure Blob Storage account.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param body Request body configuring the settings for an asset conversion.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of the conversion along with {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Conversion>> createConversionNoCustomHeadersWithResponseAsync(UUID accountId,
-        String conversionId, CreateConversionSettings body, Context context) {
-        final String accept = "application/json";
-        return service.createConversionNoCustomHeaders(this.client.getEndpoint(), this.client.getApiVersion(),
-            accountId, conversionId, body, accept, context);
-    }
-
-    /**
-     * Gets the status of a particular conversion.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a particular conversion along with {@link ResponseBase} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsGetConversionHeaders, Conversion>>
-        getConversionWithResponseAsync(UUID accountId, String conversionId) {
-        return FluxUtil.withContext(context -> getConversionWithResponseAsync(accountId, conversionId, context));
-    }
-
-    /**
-     * Gets the status of a particular conversion.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a particular conversion along with {@link ResponseBase} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsGetConversionHeaders, Conversion>>
-        getConversionWithResponseAsync(UUID accountId, String conversionId, Context context) {
-        final String accept = "application/json";
-        return service.getConversion(this.client.getEndpoint(), this.client.getApiVersion(), accountId, conversionId,
-            accept, context);
-    }
-
-    /**
-     * Gets the status of a particular conversion.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a particular conversion on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Conversion> getConversionAsync(UUID accountId, String conversionId) {
-        return getConversionWithResponseAsync(accountId, conversionId).flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Gets the status of a particular conversion.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a particular conversion on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Conversion> getConversionAsync(UUID accountId, String conversionId, Context context) {
-        return getConversionWithResponseAsync(accountId, conversionId, context)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Gets the status of a particular conversion.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a particular conversion along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Conversion>> getConversionNoCustomHeadersWithResponseAsync(UUID accountId,
-        String conversionId) {
-        return FluxUtil
-            .withContext(context -> getConversionNoCustomHeadersWithResponseAsync(accountId, conversionId, context));
-    }
-
-    /**
-     * Gets the status of a particular conversion.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param conversionId An ID uniquely identifying the conversion for the given account. The ID is case sensitive,
-     * can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more
-     * than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the status of a particular conversion along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Conversion>> getConversionNoCustomHeadersWithResponseAsync(UUID accountId, String conversionId,
-        Context context) {
-        final String accept = "application/json";
-        return service.getConversionNoCustomHeaders(this.client.getEndpoint(), this.client.getApiVersion(), accountId,
-            conversionId, accept, context);
-    }
-
-    /**
-     * Gets a list of all conversions.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions along with {@link PagedResponse} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PagedResponse<Conversion>> listConversionsSinglePageAsync(UUID accountId, Context context) {
-        final String accept = "application/json";
-        return service
-            .listConversions(this.client.getEndpoint(), this.client.getApiVersion(), accountId, accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().getConversions(), res.getValue().getNextLink(), res.getDeserializedHeaders()));
-    }
-
-    /**
-     * Gets a list of all conversions.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions as paginated response with {@link PagedFlux}.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<Conversion> listConversionsAsync(UUID accountId, Context context) {
-        return new PagedFlux<>(() -> listConversionsSinglePageAsync(accountId, context),
-            nextLink -> listConversionsNextSinglePageAsync(nextLink, context));
-    }
-
-    /**
-     * Gets a list of all conversions.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions along with {@link PagedResponse} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PagedResponse<Conversion>> listConversionsNoCustomHeadersSinglePageAsync(UUID accountId,
-        Context context) {
-        final String accept = "application/json";
-        return service
-            .listConversionsNoCustomHeaders(this.client.getEndpoint(), this.client.getApiVersion(), accountId, accept,
-                context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().getConversions(), res.getValue().getNextLink(), null));
-    }
-
-    /**
-     * Gets a list of all conversions.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all conversions as paginated response with {@link PagedFlux}.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<Conversion> listConversionsNoCustomHeadersAsync(UUID accountId, Context context) {
-        return new PagedFlux<>(() -> listConversionsNoCustomHeadersSinglePageAsync(accountId, context),
-            nextLink -> listConversionsNextSinglePageAsync(nextLink, context));
-    }
-
-    /**
-     * Creates a new rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings of the session to be created.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session along with {@link ResponseBase} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsCreateSessionHeaders, SessionProperties>>
-        createSessionWithResponseAsync(UUID accountId, String sessionId, CreateSessionSettings body) {
-        return FluxUtil.withContext(context -> createSessionWithResponseAsync(accountId, sessionId, body, context));
-    }
-
-    /**
-     * Creates a new rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings of the session to be created.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session along with {@link ResponseBase} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsCreateSessionHeaders, SessionProperties>>
-        createSessionWithResponseAsync(UUID accountId, String sessionId, CreateSessionSettings body, Context context) {
-        final String accept = "application/json";
-        return service.createSession(this.client.getEndpoint(), this.client.getApiVersion(), accountId, sessionId, body,
-            accept, context);
-    }
-
-    /**
-     * Creates a new rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings of the session to be created.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SessionProperties> createSessionAsync(UUID accountId, String sessionId, CreateSessionSettings body) {
-        return createSessionWithResponseAsync(accountId, sessionId, body)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Creates a new rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings of the session to be created.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SessionProperties> createSessionAsync(UUID accountId, String sessionId, CreateSessionSettings body,
-        Context context) {
-        return createSessionWithResponseAsync(accountId, sessionId, body, context)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Creates a new rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings of the session to be created.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<SessionProperties>> createSessionNoCustomHeadersWithResponseAsync(UUID accountId,
-        String sessionId, CreateSessionSettings body) {
-        return FluxUtil
-            .withContext(context -> createSessionNoCustomHeadersWithResponseAsync(accountId, sessionId, body, context));
-    }
-
-    /**
-     * Creates a new rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings of the session to be created.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws ErrorResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 400, 409, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<SessionProperties>> createSessionNoCustomHeadersWithResponseAsync(UUID accountId,
-        String sessionId, CreateSessionSettings body, Context context) {
-        final String accept = "application/json";
-        return service.createSessionNoCustomHeaders(this.client.getEndpoint(), this.client.getApiVersion(), accountId,
-            sessionId, body, accept, context);
-    }
-
-    /**
-     * Gets the properties of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a particular rendering session along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<SessionProperties>> getSessionWithResponseAsync(UUID accountId, String sessionId) {
-        return FluxUtil.withContext(context -> getSessionWithResponseAsync(accountId, sessionId, context));
-    }
-
-    /**
-     * Gets the properties of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a particular rendering session along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<SessionProperties>> getSessionWithResponseAsync(UUID accountId, String sessionId,
-        Context context) {
-        final String accept = "application/json";
-        return service.getSession(this.client.getEndpoint(), this.client.getApiVersion(), accountId, sessionId, accept,
-            context);
-    }
-
-    /**
-     * Gets the properties of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a particular rendering session on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SessionProperties> getSessionAsync(UUID accountId, String sessionId) {
-        return getSessionWithResponseAsync(accountId, sessionId).flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Gets the properties of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a particular rendering session on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SessionProperties> getSessionAsync(UUID accountId, String sessionId, Context context) {
-        return getSessionWithResponseAsync(accountId, sessionId, context)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Updates the max lease time of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings used to update the session.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 422, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<SessionProperties>> updateSessionWithResponseAsync(UUID accountId, String sessionId,
-        UpdateSessionSettings body) {
-        return FluxUtil.withContext(context -> updateSessionWithResponseAsync(accountId, sessionId, body, context));
-    }
-
-    /**
-     * Updates the max lease time of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings used to update the session.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 422, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session along with {@link Response} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<SessionProperties>> updateSessionWithResponseAsync(UUID accountId, String sessionId,
-        UpdateSessionSettings body, Context context) {
-        final String accept = "application/json";
-        return service.updateSession(this.client.getEndpoint(), this.client.getApiVersion(), accountId, sessionId, body,
-            accept, context);
-    }
-
-    /**
-     * Updates the max lease time of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings used to update the session.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 422, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SessionProperties> updateSessionAsync(UUID accountId, String sessionId, UpdateSessionSettings body) {
-        return updateSessionWithResponseAsync(accountId, sessionId, body)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Updates the max lease time of a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param body Settings used to update the session.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 422, 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the properties of a rendering session on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<SessionProperties> updateSessionAsync(UUID accountId, String sessionId, UpdateSessionSettings body,
-        Context context) {
-        return updateSessionWithResponseAsync(accountId, sessionId, body, context)
-            .flatMap(res -> Mono.justOrEmpty(res.getValue()));
-    }
-
-    /**
-     * Stops a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link ResponseBase} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsStopSessionHeaders, Void>> stopSessionWithResponseAsync(UUID accountId,
-        String sessionId) {
-        return FluxUtil.withContext(context -> stopSessionWithResponseAsync(accountId, sessionId, context));
-    }
-
-    /**
-     * Stops a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link ResponseBase} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<ResponseBase<RemoteRenderingsStopSessionHeaders, Void>> stopSessionWithResponseAsync(UUID accountId,
-        String sessionId, Context context) {
-        final String accept = "application/json";
-        return service.stopSession(this.client.getEndpoint(), this.client.getApiVersion(), accountId, sessionId, accept,
-            context);
-    }
-
-    /**
-     * Stops a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> stopSessionAsync(UUID accountId, String sessionId) {
-        return stopSessionWithResponseAsync(accountId, sessionId).flatMap(ignored -> Mono.empty());
-    }
-
-    /**
-     * Stops a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return A {@link Mono} that completes when a successful response is received.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Void> stopSessionAsync(UUID accountId, String sessionId, Context context) {
-        return stopSessionWithResponseAsync(accountId, sessionId, context).flatMap(ignored -> Mono.empty());
-    }
-
-    /**
-     * Stops a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Void>> stopSessionNoCustomHeadersWithResponseAsync(UUID accountId, String sessionId) {
-        return FluxUtil
-            .withContext(context -> stopSessionNoCustomHeadersWithResponseAsync(accountId, sessionId, context));
-    }
-
-    /**
-     * Stops a particular rendering session.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param sessionId An ID uniquely identifying the rendering session for the given account. The ID is case
-     * sensitive, can contain any combination of alphanumeric characters including hyphens and underscores, and cannot
-     * contain more than 256 characters.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 404, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link Response} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<Response<Void>> stopSessionNoCustomHeadersWithResponseAsync(UUID accountId, String sessionId,
-        Context context) {
-        final String accept = "application/json";
-        return service.stopSessionNoCustomHeaders(this.client.getEndpoint(), this.client.getApiVersion(), accountId,
-            sessionId, accept, context);
-    }
-
-    /**
-     * Gets a list of all rendering sessions.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all rendering sessions along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PagedResponse<SessionProperties>> listSessionsSinglePageAsync(UUID accountId, Context context) {
-        final String accept = "application/json";
-        return service.listSessions(this.client.getEndpoint(), this.client.getApiVersion(), accountId, accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().getSessions(), res.getValue().getNextLink(), null));
-    }
-
-    /**
-     * Gets a list of all rendering sessions.
-     * 
-     * @param accountId The Azure Remote Rendering account ID.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a list of all rendering sessions as paginated response with {@link PagedFlux}.
-     */
-    @ServiceMethod(returns = ReturnType.COLLECTION)
-    public PagedFlux<SessionProperties> listSessionsAsync(UUID accountId, Context context) {
-        return new PagedFlux<>(() -> listSessionsSinglePageAsync(accountId, context),
-            nextLink -> listSessionsNextSinglePageAsync(nextLink, context));
-    }
-
-    /**
-     * Get the next page of items.
-     * 
-     * @param nextLink The URL to get the next list of items.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of conversions along with {@link PagedResponse} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PagedResponse<Conversion>> listConversionsNextSinglePageAsync(String nextLink, Context context) {
-        final String accept = "application/json";
-        return service.listConversionsNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().getConversions(), res.getValue().getNextLink(), res.getDeserializedHeaders()));
-    }
-
-    /**
-     * Get the next page of items.
-     * 
-     * @param nextLink The URL to get the next list of items.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return list of conversions along with {@link PagedResponse} on successful completion of {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PagedResponse<Conversion>> listConversionsNextNoCustomHeadersSinglePageAsync(String nextLink,
-        Context context) {
-        final String accept = "application/json";
-        return service.listConversionsNextNoCustomHeaders(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().getConversions(), res.getValue().getNextLink(), null));
-    }
-
-    /**
-     * Get the next page of items.
-     * 
-     * @param nextLink The URL to get the next list of items.
-     * @param context The context to associate with this operation.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ErrorResponseException thrown if the request is rejected by server on status code 500.
-     * @throws HttpResponseException thrown if the request is rejected by server on status code 401, 403, 429.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the result of a list sessions request along with {@link PagedResponse} on successful completion of
-     * {@link Mono}.
-     */
-    @ServiceMethod(returns = ReturnType.SINGLE)
-    public Mono<PagedResponse<SessionProperties>> listSessionsNextSinglePageAsync(String nextLink, Context context) {
-        final String accept = "application/json";
-        return service.listSessionsNext(nextLink, this.client.getEndpoint(), accept, context)
-            .map(res -> new PagedResponseBase<>(res.getRequest(), res.getStatusCode(), res.getHeaders(),
-                res.getValue().getSessions(), res.getValue().getNextLink(), null));
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/Conversion.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/Conversion.java
deleted file mode 100644
index b8dee5e5932d..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/Conversion.java
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.core.util.CoreUtils;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The properties of the conversion.
- */
-@Immutable
-public final class Conversion implements JsonSerializable<Conversion> {
-    /*
-     * The ID of the conversion supplied when the conversion was created.
-     */
-    @Generated
-    private final String id;
-
-    /*
-     * Conversion settings describe the origin of input files and destination of output files.
-     */
-    @Generated
-    private final ConversionSettings settings;
-
-    /*
-     * Information about the output of a successful conversion. Only present when the status of the conversion is
-     * 'Succeeded'.
-     */
-    @Generated
-    private ConversionOutput output;
-
-    /*
-     * The error object containing details about the conversion failure.
-     */
-    @Generated
-    private final Error error;
-
-    /*
-     * The status of the conversion. Terminal states are 'Cancelled', 'Failed', and 'Succeeded'.
-     */
-    @Generated
-    private final ConversionStatus status;
-
-    /*
-     * The time when the conversion was created. Date and time in ISO 8601 format.
-     */
-    @Generated
-    private final OffsetDateTime creationTime;
-
-    /**
-     * Creates an instance of Conversion class.
-     * 
-     * @param id the id value to set.
-     * @param settings the settings value to set.
-     * @param error the error value to set.
-     * @param status the status value to set.
-     * @param creationTime the creationTime value to set.
-     */
-    @Generated
-    public Conversion(String id, ConversionSettings settings, Error error, ConversionStatus status,
-        OffsetDateTime creationTime) {
-        this.id = id;
-        this.settings = settings;
-        this.error = error;
-        this.status = status;
-        this.creationTime = creationTime;
-    }
-
-    /**
-     * Get the id property: The ID of the conversion supplied when the conversion was created.
-     * 
-     * @return the id value.
-     */
-    @Generated
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the settings property: Conversion settings describe the origin of input files and destination of output
-     * files.
-     * 
-     * @return the settings value.
-     */
-    @Generated
-    public ConversionSettings getSettings() {
-        return this.settings;
-    }
-
-    /**
-     * Get the output property: Information about the output of a successful conversion. Only present when the status of
-     * the conversion is 'Succeeded'.
-     * 
-     * @return the output value.
-     */
-    @Generated
-    public ConversionOutput getOutput() {
-        return this.output;
-    }
-
-    /**
-     * Get the error property: The error object containing details about the conversion failure.
-     * 
-     * @return the error value.
-     */
-    @Generated
-    public Error getError() {
-        return this.error;
-    }
-
-    /**
-     * Get the status property: The status of the conversion. Terminal states are 'Cancelled', 'Failed', and
-     * 'Succeeded'.
-     * 
-     * @return the status value.
-     */
-    @Generated
-    public ConversionStatus getStatus() {
-        return this.status;
-    }
-
-    /**
-     * Get the creationTime property: The time when the conversion was created. Date and time in ISO 8601 format.
-     * 
-     * @return the creationTime value.
-     */
-    @Generated
-    public OffsetDateTime getCreationTime() {
-        return this.creationTime;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", this.id);
-        jsonWriter.writeJsonField("settings", this.settings);
-        jsonWriter.writeJsonField("error", this.error);
-        jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString());
-        jsonWriter.writeStringField("creationTime",
-            this.creationTime == null ? null : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.creationTime));
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of Conversion from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of Conversion if the JsonReader was pointing to an instance of it, or null if it was pointing
-     * to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the Conversion.
-     */
-    @Generated
-    public static Conversion fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean idFound = false;
-            String id = null;
-            boolean settingsFound = false;
-            ConversionSettings settings = null;
-            boolean errorFound = false;
-            Error error = null;
-            boolean statusFound = false;
-            ConversionStatus status = null;
-            boolean creationTimeFound = false;
-            OffsetDateTime creationTime = null;
-            ConversionOutput output = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("id".equals(fieldName)) {
-                    id = reader.getString();
-                    idFound = true;
-                } else if ("settings".equals(fieldName)) {
-                    settings = ConversionSettings.fromJson(reader);
-                    settingsFound = true;
-                } else if ("error".equals(fieldName)) {
-                    error = Error.fromJson(reader);
-                    errorFound = true;
-                } else if ("status".equals(fieldName)) {
-                    status = ConversionStatus.fromString(reader.getString());
-                    statusFound = true;
-                } else if ("creationTime".equals(fieldName)) {
-                    creationTime = reader
-                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
-                    creationTimeFound = true;
-                } else if ("output".equals(fieldName)) {
-                    output = ConversionOutput.fromJson(reader);
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (idFound && settingsFound && errorFound && statusFound && creationTimeFound) {
-                Conversion deserializedConversion = new Conversion(id, settings, error, status, creationTime);
-                deserializedConversion.output = output;
-
-                return deserializedConversion;
-            }
-            List<String> missingProperties = new ArrayList<>();
-            if (!idFound) {
-                missingProperties.add("id");
-            }
-            if (!settingsFound) {
-                missingProperties.add("settings");
-            }
-            if (!errorFound) {
-                missingProperties.add("error");
-            }
-            if (!statusFound) {
-                missingProperties.add("status");
-            }
-            if (!creationTimeFound) {
-                missingProperties.add("creationTime");
-            }
-
-            throw new IllegalStateException(
-                "Missing required property/properties: " + String.join(", ", missingProperties));
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionInputSettings.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionInputSettings.java
deleted file mode 100644
index 0912378aebe7..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionInputSettings.java
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Conversion input settings describe the origin of conversion input.
- */
-@Fluent
-public final class ConversionInputSettings implements JsonSerializable<ConversionInputSettings> {
-    /*
-     * The URI of the Azure blob storage container containing the input model.
-     */
-    @Generated
-    private final String storageContainerUri;
-
-    /*
-     * An Azure blob storage container shared access signature giving read and list access to the storage container.
-     * Optional. If not provided, the Azure Remote Rendering account needs to be linked with the storage account
-     * containing the blob container. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts for details.
-     * For security purposes this field will never be filled out in responses bodies.
-     */
-    @Generated
-    private String storageContainerReadListSas;
-
-    /*
-     * Only Blobs starting with this prefix will be downloaded to perform the conversion. Optional. If not provided, all
-     * Blobs from the container will be downloaded.
-     */
-    @Generated
-    private String blobPrefix;
-
-    /*
-     * The relative path starting at blobPrefix (or at the container root if blobPrefix is not provided) to the input
-     * model. Must point to a file with a supported file format ending. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/conversion/model-conversion for details.
-     */
-    @Generated
-    private final String relativeInputAssetPath;
-
-    /**
-     * Creates an instance of ConversionInputSettings class.
-     * 
-     * @param storageContainerUri the storageContainerUri value to set.
-     * @param relativeInputAssetPath the relativeInputAssetPath value to set.
-     */
-    @Generated
-    public ConversionInputSettings(String storageContainerUri, String relativeInputAssetPath) {
-        this.storageContainerUri = storageContainerUri;
-        this.relativeInputAssetPath = relativeInputAssetPath;
-    }
-
-    /**
-     * Get the storageContainerUri property: The URI of the Azure blob storage container containing the input model.
-     * 
-     * @return the storageContainerUri value.
-     */
-    @Generated
-    public String getStorageContainerUri() {
-        return this.storageContainerUri;
-    }
-
-    /**
-     * Get the storageContainerReadListSas property: An Azure blob storage container shared access signature giving read
-     * and list access to the storage container. Optional. If not provided, the Azure Remote Rendering account needs to
-     * be linked with the storage account containing the blob container. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts for details.
-     * For security purposes this field will never be filled out in responses bodies.
-     * 
-     * @return the storageContainerReadListSas value.
-     */
-    @Generated
-    public String getStorageContainerReadListSas() {
-        return this.storageContainerReadListSas;
-    }
-
-    /**
-     * Set the storageContainerReadListSas property: An Azure blob storage container shared access signature giving read
-     * and list access to the storage container. Optional. If not provided, the Azure Remote Rendering account needs to
-     * be linked with the storage account containing the blob container. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts for details.
-     * For security purposes this field will never be filled out in responses bodies.
-     * 
-     * @param storageContainerReadListSas the storageContainerReadListSas value to set.
-     * @return the ConversionInputSettings object itself.
-     */
-    @Generated
-    public ConversionInputSettings setStorageContainerReadListSas(String storageContainerReadListSas) {
-        this.storageContainerReadListSas = storageContainerReadListSas;
-        return this;
-    }
-
-    /**
-     * Get the blobPrefix property: Only Blobs starting with this prefix will be downloaded to perform the conversion.
-     * Optional. If not provided, all Blobs from the container will be downloaded.
-     * 
-     * @return the blobPrefix value.
-     */
-    @Generated
-    public String getBlobPrefix() {
-        return this.blobPrefix;
-    }
-
-    /**
-     * Set the blobPrefix property: Only Blobs starting with this prefix will be downloaded to perform the conversion.
-     * Optional. If not provided, all Blobs from the container will be downloaded.
-     * 
-     * @param blobPrefix the blobPrefix value to set.
-     * @return the ConversionInputSettings object itself.
-     */
-    @Generated
-    public ConversionInputSettings setBlobPrefix(String blobPrefix) {
-        this.blobPrefix = blobPrefix;
-        return this;
-    }
-
-    /**
-     * Get the relativeInputAssetPath property: The relative path starting at blobPrefix (or at the container root if
-     * blobPrefix is not provided) to the input model. Must point to a file with a supported file format ending. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/conversion/model-conversion for details.
-     * 
-     * @return the relativeInputAssetPath value.
-     */
-    @Generated
-    public String getRelativeInputAssetPath() {
-        return this.relativeInputAssetPath;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("storageContainerUri", this.storageContainerUri);
-        jsonWriter.writeStringField("relativeInputAssetPath", this.relativeInputAssetPath);
-        jsonWriter.writeStringField("storageContainerReadListSas", this.storageContainerReadListSas);
-        jsonWriter.writeStringField("blobPrefix", this.blobPrefix);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ConversionInputSettings from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ConversionInputSettings if the JsonReader was pointing to an instance of it, or null if it
-     * was pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the ConversionInputSettings.
-     */
-    @Generated
-    public static ConversionInputSettings fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean storageContainerUriFound = false;
-            String storageContainerUri = null;
-            boolean relativeInputAssetPathFound = false;
-            String relativeInputAssetPath = null;
-            String storageContainerReadListSas = null;
-            String blobPrefix = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("storageContainerUri".equals(fieldName)) {
-                    storageContainerUri = reader.getString();
-                    storageContainerUriFound = true;
-                } else if ("relativeInputAssetPath".equals(fieldName)) {
-                    relativeInputAssetPath = reader.getString();
-                    relativeInputAssetPathFound = true;
-                } else if ("storageContainerReadListSas".equals(fieldName)) {
-                    storageContainerReadListSas = reader.getString();
-                } else if ("blobPrefix".equals(fieldName)) {
-                    blobPrefix = reader.getString();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (storageContainerUriFound && relativeInputAssetPathFound) {
-                ConversionInputSettings deserializedConversionInputSettings
-                    = new ConversionInputSettings(storageContainerUri, relativeInputAssetPath);
-                deserializedConversionInputSettings.storageContainerReadListSas = storageContainerReadListSas;
-                deserializedConversionInputSettings.blobPrefix = blobPrefix;
-
-                return deserializedConversionInputSettings;
-            }
-            List<String> missingProperties = new ArrayList<>();
-            if (!storageContainerUriFound) {
-                missingProperties.add("storageContainerUri");
-            }
-            if (!relativeInputAssetPathFound) {
-                missingProperties.add("relativeInputAssetPath");
-            }
-
-            throw new IllegalStateException(
-                "Missing required property/properties: " + String.join(", ", missingProperties));
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionList.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionList.java
deleted file mode 100644
index 4ef852fd62ac..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionList.java
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * List of conversions.
- */
-@Immutable
-public final class ConversionList implements JsonSerializable<ConversionList> {
-    /*
-     * The list of conversions.
-     */
-    @Generated
-    private final List<Conversion> conversions;
-
-    /*
-     * If more conversions are available this field will contain a URL where the next batch of conversions can be
-     * requested. This URL will need the same authentication as all calls to the Azure Remote Rendering API.
-     */
-    @Generated
-    private String nextLink;
-
-    /**
-     * Creates an instance of ConversionList class.
-     * 
-     * @param conversions the conversions value to set.
-     */
-    @Generated
-    public ConversionList(List<Conversion> conversions) {
-        this.conversions = conversions;
-    }
-
-    /**
-     * Get the conversions property: The list of conversions.
-     * 
-     * @return the conversions value.
-     */
-    @Generated
-    public List<Conversion> getConversions() {
-        return this.conversions;
-    }
-
-    /**
-     * Get the nextLink property: If more conversions are available this field will contain a URL where the next batch
-     * of conversions can be requested. This URL will need the same authentication as all calls to the Azure Remote
-     * Rendering API.
-     * 
-     * @return the nextLink value.
-     */
-    @Generated
-    public String getNextLink() {
-        return this.nextLink;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeArrayField("conversions", this.conversions, (writer, element) -> writer.writeJson(element));
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ConversionList from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ConversionList if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the ConversionList.
-     */
-    @Generated
-    public static ConversionList fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean conversionsFound = false;
-            List<Conversion> conversions = null;
-            String nextLink = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("conversions".equals(fieldName)) {
-                    conversions = reader.readArray(reader1 -> Conversion.fromJson(reader1));
-                    conversionsFound = true;
-                } else if ("@nextLink".equals(fieldName)) {
-                    nextLink = reader.getString();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (conversionsFound) {
-                ConversionList deserializedConversionList = new ConversionList(conversions);
-                deserializedConversionList.nextLink = nextLink;
-
-                return deserializedConversionList;
-            }
-            throw new IllegalStateException("Missing required property: conversions");
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionOutput.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionOutput.java
deleted file mode 100644
index d9e9dc707ee7..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionOutput.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-
-/**
- * Information about the output of a successful conversion. Only present when the status of the conversion is
- * 'Succeeded'.
- */
-@Immutable
-public final class ConversionOutput implements JsonSerializable<ConversionOutput> {
-    /*
-     * URI of the asset generated by the conversion process.
-     */
-    @Generated
-    private String outputAssetUri;
-
-    /**
-     * Creates an instance of ConversionOutput class.
-     */
-    @Generated
-    public ConversionOutput() {
-    }
-
-    /**
-     * Get the outputAssetUri property: URI of the asset generated by the conversion process.
-     * 
-     * @return the outputAssetUri value.
-     */
-    @Generated
-    public String getOutputAssetUri() {
-        return this.outputAssetUri;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ConversionOutput from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ConversionOutput if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IOException If an error occurs while reading the ConversionOutput.
-     */
-    @Generated
-    public static ConversionOutput fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            ConversionOutput deserializedConversionOutput = new ConversionOutput();
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("outputAssetUri".equals(fieldName)) {
-                    deserializedConversionOutput.outputAssetUri = reader.getString();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-
-            return deserializedConversionOutput;
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionOutputSettings.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionOutputSettings.java
deleted file mode 100644
index 908cfd4cd06a..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionOutputSettings.java
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-
-/**
- * Conversion output settings describe the destination of conversion output.
- */
-@Fluent
-public final class ConversionOutputSettings implements JsonSerializable<ConversionOutputSettings> {
-    /*
-     * The URI of the Azure blob storage container where the result of the conversion should be written to.
-     */
-    @Generated
-    private final String storageContainerUri;
-
-    /*
-     * An Azure blob storage container shared access signature giving write access to the storage container. Optional.
-     * If not provided, the Azure Remote Rendering account needs to be linked with the storage account containing the
-     * blob container. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts for details.
-     * For security purposes this field will never be filled out in responses bodies.
-     */
-    @Generated
-    private String storageContainerWriteSas;
-
-    /*
-     * A prefix which gets prepended in front of all files produced by the conversion process. Will be treated as a
-     * virtual folder. Optional. If not provided, output files will be stored at the container root.
-     */
-    @Generated
-    private String blobPrefix;
-
-    /*
-     * The file name of the output asset. Must end in '.arrAsset'. Optional. If not provided, file name will the same
-     * name as the input asset, with '.arrAsset' extension
-     */
-    @Generated
-    private String outputAssetFilename;
-
-    /**
-     * Creates an instance of ConversionOutputSettings class.
-     * 
-     * @param storageContainerUri the storageContainerUri value to set.
-     */
-    @Generated
-    public ConversionOutputSettings(String storageContainerUri) {
-        this.storageContainerUri = storageContainerUri;
-    }
-
-    /**
-     * Get the storageContainerUri property: The URI of the Azure blob storage container where the result of the
-     * conversion should be written to.
-     * 
-     * @return the storageContainerUri value.
-     */
-    @Generated
-    public String getStorageContainerUri() {
-        return this.storageContainerUri;
-    }
-
-    /**
-     * Get the storageContainerWriteSas property: An Azure blob storage container shared access signature giving write
-     * access to the storage container. Optional. If not provided, the Azure Remote Rendering account needs to be linked
-     * with the storage account containing the blob container. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts for details.
-     * For security purposes this field will never be filled out in responses bodies.
-     * 
-     * @return the storageContainerWriteSas value.
-     */
-    @Generated
-    public String getStorageContainerWriteSas() {
-        return this.storageContainerWriteSas;
-    }
-
-    /**
-     * Set the storageContainerWriteSas property: An Azure blob storage container shared access signature giving write
-     * access to the storage container. Optional. If not provided, the Azure Remote Rendering account needs to be linked
-     * with the storage account containing the blob container. See
-     * https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account#link-storage-accounts for details.
-     * For security purposes this field will never be filled out in responses bodies.
-     * 
-     * @param storageContainerWriteSas the storageContainerWriteSas value to set.
-     * @return the ConversionOutputSettings object itself.
-     */
-    @Generated
-    public ConversionOutputSettings setStorageContainerWriteSas(String storageContainerWriteSas) {
-        this.storageContainerWriteSas = storageContainerWriteSas;
-        return this;
-    }
-
-    /**
-     * Get the blobPrefix property: A prefix which gets prepended in front of all files produced by the conversion
-     * process. Will be treated as a virtual folder. Optional. If not provided, output files will be stored at the
-     * container root.
-     * 
-     * @return the blobPrefix value.
-     */
-    @Generated
-    public String getBlobPrefix() {
-        return this.blobPrefix;
-    }
-
-    /**
-     * Set the blobPrefix property: A prefix which gets prepended in front of all files produced by the conversion
-     * process. Will be treated as a virtual folder. Optional. If not provided, output files will be stored at the
-     * container root.
-     * 
-     * @param blobPrefix the blobPrefix value to set.
-     * @return the ConversionOutputSettings object itself.
-     */
-    @Generated
-    public ConversionOutputSettings setBlobPrefix(String blobPrefix) {
-        this.blobPrefix = blobPrefix;
-        return this;
-    }
-
-    /**
-     * Get the outputAssetFilename property: The file name of the output asset. Must end in '.arrAsset'. Optional. If
-     * not provided, file name will the same name as the input asset, with '.arrAsset' extension.
-     * 
-     * @return the outputAssetFilename value.
-     */
-    @Generated
-    public String getOutputAssetFilename() {
-        return this.outputAssetFilename;
-    }
-
-    /**
-     * Set the outputAssetFilename property: The file name of the output asset. Must end in '.arrAsset'. Optional. If
-     * not provided, file name will the same name as the input asset, with '.arrAsset' extension.
-     * 
-     * @param outputAssetFilename the outputAssetFilename value to set.
-     * @return the ConversionOutputSettings object itself.
-     */
-    @Generated
-    public ConversionOutputSettings setOutputAssetFilename(String outputAssetFilename) {
-        this.outputAssetFilename = outputAssetFilename;
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("storageContainerUri", this.storageContainerUri);
-        jsonWriter.writeStringField("storageContainerWriteSas", this.storageContainerWriteSas);
-        jsonWriter.writeStringField("blobPrefix", this.blobPrefix);
-        jsonWriter.writeStringField("outputAssetFilename", this.outputAssetFilename);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ConversionOutputSettings from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ConversionOutputSettings if the JsonReader was pointing to an instance of it, or null if
-     * it was pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the ConversionOutputSettings.
-     */
-    @Generated
-    public static ConversionOutputSettings fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean storageContainerUriFound = false;
-            String storageContainerUri = null;
-            String storageContainerWriteSas = null;
-            String blobPrefix = null;
-            String outputAssetFilename = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("storageContainerUri".equals(fieldName)) {
-                    storageContainerUri = reader.getString();
-                    storageContainerUriFound = true;
-                } else if ("storageContainerWriteSas".equals(fieldName)) {
-                    storageContainerWriteSas = reader.getString();
-                } else if ("blobPrefix".equals(fieldName)) {
-                    blobPrefix = reader.getString();
-                } else if ("outputAssetFilename".equals(fieldName)) {
-                    outputAssetFilename = reader.getString();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (storageContainerUriFound) {
-                ConversionOutputSettings deserializedConversionOutputSettings
-                    = new ConversionOutputSettings(storageContainerUri);
-                deserializedConversionOutputSettings.storageContainerWriteSas = storageContainerWriteSas;
-                deserializedConversionOutputSettings.blobPrefix = blobPrefix;
-                deserializedConversionOutputSettings.outputAssetFilename = outputAssetFilename;
-
-                return deserializedConversionOutputSettings;
-            }
-            throw new IllegalStateException("Missing required property: storageContainerUri");
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionSettings.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionSettings.java
deleted file mode 100644
index b60e224e69bc..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionSettings.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Conversion settings describe the origin of input files and destination of output files.
- */
-@Immutable
-public final class ConversionSettings implements JsonSerializable<ConversionSettings> {
-    /*
-     * Conversion input settings describe the origin of conversion input.
-     */
-    @Generated
-    private final ConversionInputSettings inputLocation;
-
-    /*
-     * Conversion output settings describe the destination of conversion output.
-     */
-    @Generated
-    private final ConversionOutputSettings outputLocation;
-
-    /**
-     * Creates an instance of ConversionSettings class.
-     * 
-     * @param inputLocation the inputLocation value to set.
-     * @param outputLocation the outputLocation value to set.
-     */
-    @Generated
-    public ConversionSettings(ConversionInputSettings inputLocation, ConversionOutputSettings outputLocation) {
-        this.inputLocation = inputLocation;
-        this.outputLocation = outputLocation;
-    }
-
-    /**
-     * Get the inputLocation property: Conversion input settings describe the origin of conversion input.
-     * 
-     * @return the inputLocation value.
-     */
-    @Generated
-    public ConversionInputSettings getInputLocation() {
-        return this.inputLocation;
-    }
-
-    /**
-     * Get the outputLocation property: Conversion output settings describe the destination of conversion output.
-     * 
-     * @return the outputLocation value.
-     */
-    @Generated
-    public ConversionOutputSettings getOutputLocation() {
-        return this.outputLocation;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeJsonField("inputLocation", this.inputLocation);
-        jsonWriter.writeJsonField("outputLocation", this.outputLocation);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ConversionSettings from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ConversionSettings if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the ConversionSettings.
-     */
-    @Generated
-    public static ConversionSettings fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean inputLocationFound = false;
-            ConversionInputSettings inputLocation = null;
-            boolean outputLocationFound = false;
-            ConversionOutputSettings outputLocation = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("inputLocation".equals(fieldName)) {
-                    inputLocation = ConversionInputSettings.fromJson(reader);
-                    inputLocationFound = true;
-                } else if ("outputLocation".equals(fieldName)) {
-                    outputLocation = ConversionOutputSettings.fromJson(reader);
-                    outputLocationFound = true;
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (inputLocationFound && outputLocationFound) {
-                return new ConversionSettings(inputLocation, outputLocation);
-            }
-            List<String> missingProperties = new ArrayList<>();
-            if (!inputLocationFound) {
-                missingProperties.add("inputLocation");
-            }
-            if (!outputLocationFound) {
-                missingProperties.add("outputLocation");
-            }
-
-            throw new IllegalStateException(
-                "Missing required property/properties: " + String.join(", ", missingProperties));
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionStatus.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionStatus.java
deleted file mode 100644
index b27e2579c79d..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ConversionStatus.java
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.util.ExpandableStringEnum;
-import java.util.Collection;
-
-/**
- * The status of the conversion. Terminal states are 'Cancelled', 'Failed', and 'Succeeded'.
- */
-public final class ConversionStatus extends ExpandableStringEnum<ConversionStatus> {
-    /**
-     * The conversion was created but hasn't started.
-     */
-    @Generated
-    public static final ConversionStatus NOT_STARTED = fromString("NotStarted");
-
-    /**
-     * The conversion is running.
-     */
-    @Generated
-    public static final ConversionStatus RUNNING = fromString("Running");
-
-    /**
-     * The conversion was cancelled. This is a terminal state.
-     */
-    @Generated
-    public static final ConversionStatus CANCELLED = fromString("Cancelled");
-
-    /**
-     * The conversion has failed. Check the 'error' field for more details. This is a terminal state.
-     */
-    @Generated
-    public static final ConversionStatus FAILED = fromString("Failed");
-
-    /**
-     * The conversion has succeeded. Check the 'output' field for output asset location. This is a terminal state.
-     */
-    @Generated
-    public static final ConversionStatus SUCCEEDED = fromString("Succeeded");
-
-    /**
-     * Creates a new instance of ConversionStatus value.
-     * 
-     * @deprecated Use the {@link #fromString(String)} factory method.
-     */
-    @Generated
-    @Deprecated
-    public ConversionStatus() {
-    }
-
-    /**
-     * Creates or finds a ConversionStatus from its string representation.
-     * 
-     * @param name a name to look for.
-     * @return the corresponding ConversionStatus.
-     */
-    @Generated
-    public static ConversionStatus fromString(String name) {
-        return fromString(name, ConversionStatus.class);
-    }
-
-    /**
-     * Gets known ConversionStatus values.
-     * 
-     * @return known ConversionStatus values.
-     */
-    @Generated
-    public static Collection<ConversionStatus> values() {
-        return values(ConversionStatus.class);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/CreateConversionSettings.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/CreateConversionSettings.java
deleted file mode 100644
index 453258a7c012..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/CreateConversionSettings.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-
-/**
- * Request to start a conversion.
- */
-@Immutable
-public final class CreateConversionSettings implements JsonSerializable<CreateConversionSettings> {
-    /*
-     * Conversion settings describe the origin of input files and destination of output files.
-     */
-    @Generated
-    private final ConversionSettings settings;
-
-    /**
-     * Creates an instance of CreateConversionSettings class.
-     * 
-     * @param settings the settings value to set.
-     */
-    @Generated
-    public CreateConversionSettings(ConversionSettings settings) {
-        this.settings = settings;
-    }
-
-    /**
-     * Get the settings property: Conversion settings describe the origin of input files and destination of output
-     * files.
-     * 
-     * @return the settings value.
-     */
-    @Generated
-    public ConversionSettings getSettings() {
-        return this.settings;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeJsonField("settings", this.settings);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of CreateConversionSettings from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of CreateConversionSettings if the JsonReader was pointing to an instance of it, or null if
-     * it was pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the CreateConversionSettings.
-     */
-    @Generated
-    public static CreateConversionSettings fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean settingsFound = false;
-            ConversionSettings settings = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("settings".equals(fieldName)) {
-                    settings = ConversionSettings.fromJson(reader);
-                    settingsFound = true;
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (settingsFound) {
-                return new CreateConversionSettings(settings);
-            }
-            throw new IllegalStateException("Missing required property: settings");
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/CreateSessionSettings.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/CreateSessionSettings.java
deleted file mode 100644
index fa9633657a0d..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/CreateSessionSettings.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Settings of the session to be created.
- */
-@Immutable
-public final class CreateSessionSettings implements JsonSerializable<CreateSessionSettings> {
-    /*
-     * The time in minutes the session will run after reaching the 'Ready' state. It has to be between 0 and 1440.
-     */
-    @Generated
-    private final int maxLeaseTimeMinutes;
-
-    /*
-     * The size of the server used for the rendering session. The size impacts the number of polygons the server can
-     * render. Refer to https://docs.microsoft.com/azure/remote-rendering/reference/vm-sizes for details.
-     */
-    @Generated
-    private final SessionSize size;
-
-    /**
-     * Creates an instance of CreateSessionSettings class.
-     * 
-     * @param maxLeaseTimeMinutes the maxLeaseTimeMinutes value to set.
-     * @param size the size value to set.
-     */
-    @Generated
-    public CreateSessionSettings(int maxLeaseTimeMinutes, SessionSize size) {
-        this.maxLeaseTimeMinutes = maxLeaseTimeMinutes;
-        this.size = size;
-    }
-
-    /**
-     * Get the maxLeaseTimeMinutes property: The time in minutes the session will run after reaching the 'Ready' state.
-     * It has to be between 0 and 1440.
-     * 
-     * @return the maxLeaseTimeMinutes value.
-     */
-    @Generated
-    public int getMaxLeaseTimeMinutes() {
-        return this.maxLeaseTimeMinutes;
-    }
-
-    /**
-     * Get the size property: The size of the server used for the rendering session. The size impacts the number of
-     * polygons the server can render. Refer to https://docs.microsoft.com/azure/remote-rendering/reference/vm-sizes for
-     * details.
-     * 
-     * @return the size value.
-     */
-    @Generated
-    public SessionSize getSize() {
-        return this.size;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeIntField("maxLeaseTimeMinutes", this.maxLeaseTimeMinutes);
-        jsonWriter.writeStringField("size", this.size == null ? null : this.size.toString());
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of CreateSessionSettings from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of CreateSessionSettings if the JsonReader was pointing to an instance of it, or null if it
-     * was pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the CreateSessionSettings.
-     */
-    @Generated
-    public static CreateSessionSettings fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean maxLeaseTimeMinutesFound = false;
-            int maxLeaseTimeMinutes = 0;
-            boolean sizeFound = false;
-            SessionSize size = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("maxLeaseTimeMinutes".equals(fieldName)) {
-                    maxLeaseTimeMinutes = reader.getInt();
-                    maxLeaseTimeMinutesFound = true;
-                } else if ("size".equals(fieldName)) {
-                    size = SessionSize.fromString(reader.getString());
-                    sizeFound = true;
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (maxLeaseTimeMinutesFound && sizeFound) {
-                return new CreateSessionSettings(maxLeaseTimeMinutes, size);
-            }
-            List<String> missingProperties = new ArrayList<>();
-            if (!maxLeaseTimeMinutesFound) {
-                missingProperties.add("maxLeaseTimeMinutes");
-            }
-            if (!sizeFound) {
-                missingProperties.add("size");
-            }
-
-            throw new IllegalStateException(
-                "Missing required property/properties: " + String.join(", ", missingProperties));
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/Error.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/Error.java
deleted file mode 100644
index 16aab3a4e4d6..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/Error.java
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The error object containing details of why the request failed.
- */
-@Immutable
-public final class Error implements JsonSerializable<Error> {
-    /*
-     * Error code.
-     */
-    @Generated
-    private final String code;
-
-    /*
-     * A human-readable representation of the error.
-     */
-    @Generated
-    private final String message;
-
-    /*
-     * An array of details about specific errors that led to this reported error.
-     */
-    @Generated
-    private List<Error> details;
-
-    /*
-     * The target of the particular error (e.g., the name of the property in error).
-     */
-    @Generated
-    private String target;
-
-    /*
-     * An object containing more specific information than the current object about the error.
-     */
-    @Generated
-    private Error innerError;
-
-    /**
-     * Creates an instance of Error class.
-     * 
-     * @param code the code value to set.
-     * @param message the message value to set.
-     */
-    @Generated
-    public Error(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    /**
-     * Get the code property: Error code.
-     * 
-     * @return the code value.
-     */
-    @Generated
-    public String getCode() {
-        return this.code;
-    }
-
-    /**
-     * Get the message property: A human-readable representation of the error.
-     * 
-     * @return the message value.
-     */
-    @Generated
-    public String getMessage() {
-        return this.message;
-    }
-
-    /**
-     * Get the details property: An array of details about specific errors that led to this reported error.
-     * 
-     * @return the details value.
-     */
-    @Generated
-    public List<Error> getDetails() {
-        return this.details;
-    }
-
-    /**
-     * Get the target property: The target of the particular error (e.g., the name of the property in error).
-     * 
-     * @return the target value.
-     */
-    @Generated
-    public String getTarget() {
-        return this.target;
-    }
-
-    /**
-     * Get the innerError property: An object containing more specific information than the current object about the
-     * error.
-     * 
-     * @return the innerError value.
-     */
-    @Generated
-    public Error getInnerError() {
-        return this.innerError;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("code", this.code);
-        jsonWriter.writeStringField("message", this.message);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of Error from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of Error if the JsonReader was pointing to an instance of it, or null if it was pointing to
-     * JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the Error.
-     */
-    @Generated
-    public static Error fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean codeFound = false;
-            String code = null;
-            boolean messageFound = false;
-            String message = null;
-            List<Error> details = null;
-            String target = null;
-            Error innerError = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("code".equals(fieldName)) {
-                    code = reader.getString();
-                    codeFound = true;
-                } else if ("message".equals(fieldName)) {
-                    message = reader.getString();
-                    messageFound = true;
-                } else if ("details".equals(fieldName)) {
-                    details = reader.readArray(reader1 -> Error.fromJson(reader1));
-                } else if ("target".equals(fieldName)) {
-                    target = reader.getString();
-                } else if ("innerError".equals(fieldName)) {
-                    innerError = Error.fromJson(reader);
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (codeFound && messageFound) {
-                Error deserializedError = new Error(code, message);
-                deserializedError.details = details;
-                deserializedError.target = target;
-                deserializedError.innerError = innerError;
-
-                return deserializedError;
-            }
-            List<String> missingProperties = new ArrayList<>();
-            if (!codeFound) {
-                missingProperties.add("code");
-            }
-            if (!messageFound) {
-                missingProperties.add("message");
-            }
-
-            throw new IllegalStateException(
-                "Missing required property/properties: " + String.join(", ", missingProperties));
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ErrorResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ErrorResponse.java
deleted file mode 100644
index 96bec5d04988..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ErrorResponse.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-
-/**
- * The error response containing details of why the request failed.
- */
-@Immutable
-public final class ErrorResponse implements JsonSerializable<ErrorResponse> {
-    /*
-     * The error object containing details of why the request failed.
-     */
-    @Generated
-    private final Error error;
-
-    /**
-     * Creates an instance of ErrorResponse class.
-     * 
-     * @param error the error value to set.
-     */
-    @Generated
-    public ErrorResponse(Error error) {
-        this.error = error;
-    }
-
-    /**
-     * Get the error property: The error object containing details of why the request failed.
-     * 
-     * @return the error value.
-     */
-    @Generated
-    public Error getError() {
-        return this.error;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeJsonField("error", this.error);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of ErrorResponse from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of ErrorResponse if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the ErrorResponse.
-     */
-    @Generated
-    public static ErrorResponse fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean errorFound = false;
-            Error error = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("error".equals(fieldName)) {
-                    error = Error.fromJson(reader);
-                    errorFound = true;
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (errorFound) {
-                return new ErrorResponse(error);
-            }
-            throw new IllegalStateException("Missing required property: error");
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ErrorResponseException.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ErrorResponseException.java
deleted file mode 100644
index 64c3caaa2e6a..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/ErrorResponseException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.http.HttpResponse;
-
-/**
- * Exception thrown for an invalid response with ErrorResponse information.
- */
-public final class ErrorResponseException extends HttpResponseException {
-    /**
-     * Initializes a new instance of the ErrorResponseException class.
-     * 
-     * @param message the exception message or the response content if a message is not available.
-     * @param response the HTTP response.
-     */
-    public ErrorResponseException(String message, HttpResponse response) {
-        super(message, response);
-    }
-
-    /**
-     * Initializes a new instance of the ErrorResponseException class.
-     * 
-     * @param message the exception message or the response content if a message is not available.
-     * @param response the HTTP response.
-     * @param value the deserialized response value.
-     */
-    public ErrorResponseException(String message, HttpResponse response, ErrorResponse value) {
-        super(message, response, value);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public ErrorResponse getValue() {
-        return (ErrorResponse) super.getValue();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateConversionHeaders.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateConversionHeaders.java
deleted file mode 100644
index a6602c439d85..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateConversionHeaders.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.HttpHeaders;
-
-/**
- * The RemoteRenderingsCreateConversionHeaders model.
- */
-@Fluent
-public final class RemoteRenderingsCreateConversionHeaders {
-    /*
-     * The MS-CV property.
-     */
-    @Generated
-    private String msCV;
-
-    private static final HttpHeaderName MS_CV = HttpHeaderName.fromString("MS-CV");
-
-    // HttpHeaders containing the raw property values.
-    /**
-     * Creates an instance of RemoteRenderingsCreateConversionHeaders class.
-     * 
-     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
-     */
-    public RemoteRenderingsCreateConversionHeaders(HttpHeaders rawHeaders) {
-        this.msCV = rawHeaders.getValue(MS_CV);
-    }
-
-    /**
-     * Get the msCV property: The MS-CV property.
-     * 
-     * @return the msCV value.
-     */
-    @Generated
-    public String getMsCV() {
-        return this.msCV;
-    }
-
-    /**
-     * Set the msCV property: The MS-CV property.
-     * 
-     * @param msCV the msCV value to set.
-     * @return the RemoteRenderingsCreateConversionHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsCreateConversionHeaders setMsCV(String msCV) {
-        this.msCV = msCV;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateConversionResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateConversionResponse.java
deleted file mode 100644
index 408d358e6baf..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateConversionResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.ResponseBase;
-
-/**
- * Contains all response data for the createConversion operation.
- */
-public final class RemoteRenderingsCreateConversionResponse
-    extends ResponseBase<RemoteRenderingsCreateConversionHeaders, Conversion> {
-    /**
-     * Creates an instance of RemoteRenderingsCreateConversionResponse.
-     * 
-     * @param request the request which resulted in this RemoteRenderingsCreateConversionResponse.
-     * @param statusCode the status code of the HTTP response.
-     * @param rawHeaders the raw headers of the HTTP response.
-     * @param value the deserialized value of the HTTP response.
-     * @param headers the deserialized headers of the HTTP response.
-     */
-    public RemoteRenderingsCreateConversionResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders,
-        Conversion value, RemoteRenderingsCreateConversionHeaders headers) {
-        super(request, statusCode, rawHeaders, value, headers);
-    }
-
-    /**
-     * Gets the deserialized response body.
-     * 
-     * @return the deserialized response body.
-     */
-    @Override
-    public Conversion getValue() {
-        return super.getValue();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateSessionHeaders.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateSessionHeaders.java
deleted file mode 100644
index 61ebf48ea591..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateSessionHeaders.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.HttpHeaders;
-
-/**
- * The RemoteRenderingsCreateSessionHeaders model.
- */
-@Fluent
-public final class RemoteRenderingsCreateSessionHeaders {
-    /*
-     * The MS-CV property.
-     */
-    @Generated
-    private String msCV;
-
-    private static final HttpHeaderName MS_CV = HttpHeaderName.fromString("MS-CV");
-
-    // HttpHeaders containing the raw property values.
-    /**
-     * Creates an instance of RemoteRenderingsCreateSessionHeaders class.
-     * 
-     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
-     */
-    public RemoteRenderingsCreateSessionHeaders(HttpHeaders rawHeaders) {
-        this.msCV = rawHeaders.getValue(MS_CV);
-    }
-
-    /**
-     * Get the msCV property: The MS-CV property.
-     * 
-     * @return the msCV value.
-     */
-    @Generated
-    public String getMsCV() {
-        return this.msCV;
-    }
-
-    /**
-     * Set the msCV property: The MS-CV property.
-     * 
-     * @param msCV the msCV value to set.
-     * @return the RemoteRenderingsCreateSessionHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsCreateSessionHeaders setMsCV(String msCV) {
-        this.msCV = msCV;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateSessionResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateSessionResponse.java
deleted file mode 100644
index d71f8c5f8b51..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsCreateSessionResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.ResponseBase;
-
-/**
- * Contains all response data for the createSession operation.
- */
-public final class RemoteRenderingsCreateSessionResponse
-    extends ResponseBase<RemoteRenderingsCreateSessionHeaders, SessionProperties> {
-    /**
-     * Creates an instance of RemoteRenderingsCreateSessionResponse.
-     * 
-     * @param request the request which resulted in this RemoteRenderingsCreateSessionResponse.
-     * @param statusCode the status code of the HTTP response.
-     * @param rawHeaders the raw headers of the HTTP response.
-     * @param value the deserialized value of the HTTP response.
-     * @param headers the deserialized headers of the HTTP response.
-     */
-    public RemoteRenderingsCreateSessionResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders,
-        SessionProperties value, RemoteRenderingsCreateSessionHeaders headers) {
-        super(request, statusCode, rawHeaders, value, headers);
-    }
-
-    /**
-     * Gets the deserialized response body.
-     * 
-     * @return the deserialized response body.
-     */
-    @Override
-    public SessionProperties getValue() {
-        return super.getValue();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsGetConversionHeaders.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsGetConversionHeaders.java
deleted file mode 100644
index 012216582f42..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsGetConversionHeaders.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.HttpHeaders;
-
-/**
- * The RemoteRenderingsGetConversionHeaders model.
- */
-@Fluent
-public final class RemoteRenderingsGetConversionHeaders {
-    /*
-     * The Retry-After property.
-     */
-    @Generated
-    private Integer retryAfter;
-
-    /*
-     * The MS-CV property.
-     */
-    @Generated
-    private String msCV;
-
-    private static final HttpHeaderName MS_CV = HttpHeaderName.fromString("MS-CV");
-
-    // HttpHeaders containing the raw property values.
-    /**
-     * Creates an instance of RemoteRenderingsGetConversionHeaders class.
-     * 
-     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
-     */
-    public RemoteRenderingsGetConversionHeaders(HttpHeaders rawHeaders) {
-        String retryAfter = rawHeaders.getValue(HttpHeaderName.RETRY_AFTER);
-        if (retryAfter != null) {
-            this.retryAfter = Integer.parseInt(retryAfter);
-        } else {
-            this.retryAfter = null;
-        }
-        this.msCV = rawHeaders.getValue(MS_CV);
-    }
-
-    /**
-     * Get the retryAfter property: The Retry-After property.
-     * 
-     * @return the retryAfter value.
-     */
-    @Generated
-    public Integer getRetryAfter() {
-        return this.retryAfter;
-    }
-
-    /**
-     * Set the retryAfter property: The Retry-After property.
-     * 
-     * @param retryAfter the retryAfter value to set.
-     * @return the RemoteRenderingsGetConversionHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsGetConversionHeaders setRetryAfter(Integer retryAfter) {
-        this.retryAfter = retryAfter;
-        return this;
-    }
-
-    /**
-     * Get the msCV property: The MS-CV property.
-     * 
-     * @return the msCV value.
-     */
-    @Generated
-    public String getMsCV() {
-        return this.msCV;
-    }
-
-    /**
-     * Set the msCV property: The MS-CV property.
-     * 
-     * @param msCV the msCV value to set.
-     * @return the RemoteRenderingsGetConversionHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsGetConversionHeaders setMsCV(String msCV) {
-        this.msCV = msCV;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsGetConversionResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsGetConversionResponse.java
deleted file mode 100644
index 2cc7c884589a..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsGetConversionResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.ResponseBase;
-
-/**
- * Contains all response data for the getConversion operation.
- */
-public final class RemoteRenderingsGetConversionResponse
-    extends ResponseBase<RemoteRenderingsGetConversionHeaders, Conversion> {
-    /**
-     * Creates an instance of RemoteRenderingsGetConversionResponse.
-     * 
-     * @param request the request which resulted in this RemoteRenderingsGetConversionResponse.
-     * @param statusCode the status code of the HTTP response.
-     * @param rawHeaders the raw headers of the HTTP response.
-     * @param value the deserialized value of the HTTP response.
-     * @param headers the deserialized headers of the HTTP response.
-     */
-    public RemoteRenderingsGetConversionResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders,
-        Conversion value, RemoteRenderingsGetConversionHeaders headers) {
-        super(request, statusCode, rawHeaders, value, headers);
-    }
-
-    /**
-     * Gets the deserialized response body.
-     * 
-     * @return the deserialized response body.
-     */
-    @Override
-    public Conversion getValue() {
-        return super.getValue();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsHeaders.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsHeaders.java
deleted file mode 100644
index e3a69b0df1ee..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsHeaders.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.HttpHeaders;
-
-/**
- * The RemoteRenderingsListConversionsHeaders model.
- */
-@Fluent
-public final class RemoteRenderingsListConversionsHeaders {
-    /*
-     * The MS-CV property.
-     */
-    @Generated
-    private String msCV;
-
-    private static final HttpHeaderName MS_CV = HttpHeaderName.fromString("MS-CV");
-
-    // HttpHeaders containing the raw property values.
-    /**
-     * Creates an instance of RemoteRenderingsListConversionsHeaders class.
-     * 
-     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
-     */
-    public RemoteRenderingsListConversionsHeaders(HttpHeaders rawHeaders) {
-        this.msCV = rawHeaders.getValue(MS_CV);
-    }
-
-    /**
-     * Get the msCV property: The MS-CV property.
-     * 
-     * @return the msCV value.
-     */
-    @Generated
-    public String getMsCV() {
-        return this.msCV;
-    }
-
-    /**
-     * Set the msCV property: The MS-CV property.
-     * 
-     * @param msCV the msCV value to set.
-     * @return the RemoteRenderingsListConversionsHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsListConversionsHeaders setMsCV(String msCV) {
-        this.msCV = msCV;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsNextHeaders.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsNextHeaders.java
deleted file mode 100644
index 5dfdf008ddd5..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsNextHeaders.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.HttpHeaders;
-
-/**
- * The RemoteRenderingsListConversionsNextHeaders model.
- */
-@Fluent
-public final class RemoteRenderingsListConversionsNextHeaders {
-    /*
-     * The MS-CV property.
-     */
-    @Generated
-    private String msCV;
-
-    private static final HttpHeaderName MS_CV = HttpHeaderName.fromString("MS-CV");
-
-    // HttpHeaders containing the raw property values.
-    /**
-     * Creates an instance of RemoteRenderingsListConversionsNextHeaders class.
-     * 
-     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
-     */
-    public RemoteRenderingsListConversionsNextHeaders(HttpHeaders rawHeaders) {
-        this.msCV = rawHeaders.getValue(MS_CV);
-    }
-
-    /**
-     * Get the msCV property: The MS-CV property.
-     * 
-     * @return the msCV value.
-     */
-    @Generated
-    public String getMsCV() {
-        return this.msCV;
-    }
-
-    /**
-     * Set the msCV property: The MS-CV property.
-     * 
-     * @param msCV the msCV value to set.
-     * @return the RemoteRenderingsListConversionsNextHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsListConversionsNextHeaders setMsCV(String msCV) {
-        this.msCV = msCV;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsNextResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsNextResponse.java
deleted file mode 100644
index 4b36c7d0aef5..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsNextResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.ResponseBase;
-
-/**
- * Contains all response data for the listConversionsNext operation.
- */
-public final class RemoteRenderingsListConversionsNextResponse
-    extends ResponseBase<RemoteRenderingsListConversionsNextHeaders, ConversionList> {
-    /**
-     * Creates an instance of RemoteRenderingsListConversionsNextResponse.
-     * 
-     * @param request the request which resulted in this RemoteRenderingsListConversionsNextResponse.
-     * @param statusCode the status code of the HTTP response.
-     * @param rawHeaders the raw headers of the HTTP response.
-     * @param value the deserialized value of the HTTP response.
-     * @param headers the deserialized headers of the HTTP response.
-     */
-    public RemoteRenderingsListConversionsNextResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders,
-        ConversionList value, RemoteRenderingsListConversionsNextHeaders headers) {
-        super(request, statusCode, rawHeaders, value, headers);
-    }
-
-    /**
-     * Gets the deserialized response body.
-     * 
-     * @return the deserialized response body.
-     */
-    @Override
-    public ConversionList getValue() {
-        return super.getValue();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsResponse.java
deleted file mode 100644
index 712e372b6368..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsListConversionsResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.ResponseBase;
-
-/**
- * Contains all response data for the listConversions operation.
- */
-public final class RemoteRenderingsListConversionsResponse
-    extends ResponseBase<RemoteRenderingsListConversionsHeaders, ConversionList> {
-    /**
-     * Creates an instance of RemoteRenderingsListConversionsResponse.
-     * 
-     * @param request the request which resulted in this RemoteRenderingsListConversionsResponse.
-     * @param statusCode the status code of the HTTP response.
-     * @param rawHeaders the raw headers of the HTTP response.
-     * @param value the deserialized value of the HTTP response.
-     * @param headers the deserialized headers of the HTTP response.
-     */
-    public RemoteRenderingsListConversionsResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders,
-        ConversionList value, RemoteRenderingsListConversionsHeaders headers) {
-        super(request, statusCode, rawHeaders, value, headers);
-    }
-
-    /**
-     * Gets the deserialized response body.
-     * 
-     * @return the deserialized response body.
-     */
-    @Override
-    public ConversionList getValue() {
-        return super.getValue();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsStopSessionHeaders.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsStopSessionHeaders.java
deleted file mode 100644
index 64af1c9cfd98..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsStopSessionHeaders.java
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.HttpHeaders;
-
-/**
- * The RemoteRenderingsStopSessionHeaders model.
- */
-@Fluent
-public final class RemoteRenderingsStopSessionHeaders {
-    /*
-     * The MS-CV property.
-     */
-    @Generated
-    private String msCV;
-
-    private static final HttpHeaderName MS_CV = HttpHeaderName.fromString("MS-CV");
-
-    // HttpHeaders containing the raw property values.
-    /**
-     * Creates an instance of RemoteRenderingsStopSessionHeaders class.
-     * 
-     * @param rawHeaders The raw HttpHeaders that will be used to create the property values.
-     */
-    public RemoteRenderingsStopSessionHeaders(HttpHeaders rawHeaders) {
-        this.msCV = rawHeaders.getValue(MS_CV);
-    }
-
-    /**
-     * Get the msCV property: The MS-CV property.
-     * 
-     * @return the msCV value.
-     */
-    @Generated
-    public String getMsCV() {
-        return this.msCV;
-    }
-
-    /**
-     * Set the msCV property: The MS-CV property.
-     * 
-     * @param msCV the msCV value to set.
-     * @return the RemoteRenderingsStopSessionHeaders object itself.
-     */
-    @Generated
-    public RemoteRenderingsStopSessionHeaders setMsCV(String msCV) {
-        this.msCV = msCV;
-        return this;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsStopSessionResponse.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsStopSessionResponse.java
deleted file mode 100644
index 746c56347435..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/RemoteRenderingsStopSessionResponse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
-import com.azure.core.http.rest.ResponseBase;
-
-/**
- * Contains all response data for the stopSession operation.
- */
-public final class RemoteRenderingsStopSessionResponse extends ResponseBase<RemoteRenderingsStopSessionHeaders, Void> {
-    /**
-     * Creates an instance of RemoteRenderingsStopSessionResponse.
-     * 
-     * @param request the request which resulted in this RemoteRenderingsStopSessionResponse.
-     * @param statusCode the status code of the HTTP response.
-     * @param rawHeaders the raw headers of the HTTP response.
-     * @param value the deserialized value of the HTTP response.
-     * @param headers the deserialized headers of the HTTP response.
-     */
-    public RemoteRenderingsStopSessionResponse(HttpRequest request, int statusCode, HttpHeaders rawHeaders, Void value,
-        RemoteRenderingsStopSessionHeaders headers) {
-        super(request, statusCode, rawHeaders, value, headers);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionProperties.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionProperties.java
deleted file mode 100644
index bdcf6fbbcd44..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionProperties.java
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.core.util.CoreUtils;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The properties of a rendering session.
- */
-@Immutable
-public final class SessionProperties implements JsonSerializable<SessionProperties> {
-    /*
-     * The ID of the session supplied when the session was created.
-     */
-    @Generated
-    private final String id;
-
-    /*
-     * The TCP port at which the Azure Remote Rendering Inspector tool is hosted.
-     */
-    @Generated
-    private Integer arrInspectorPort;
-
-    /*
-     * The TCP port used for the handshake when establishing a connection.
-     */
-    @Generated
-    private Integer handshakePort;
-
-    /*
-     * Amount of time in minutes the session is or was in the 'Ready' state. Time is rounded down to a full minute.
-     */
-    @Generated
-    private Integer elapsedTimeMinutes;
-
-    /*
-     * The hostname under which the rendering session is reachable.
-     */
-    @Generated
-    private String hostname;
-
-    /*
-     * The time in minutes the session will run after reaching the 'Ready' state.
-     */
-    @Generated
-    private Integer maxLeaseTimeMinutes;
-
-    /*
-     * The size of the server used for the rendering session. The size impacts the number of polygons the server can
-     * render. Refer to https://docs.microsoft.com/azure/remote-rendering/reference/vm-sizes for details.
-     */
-    @Generated
-    private final SessionSize size;
-
-    /*
-     * The status of the rendering session. Terminal states are 'Error', 'Expired', and 'Stopped'.
-     */
-    @Generated
-    private final SessionStatus status;
-
-    /*
-     * The computational power of the rendering session GPU measured in teraflops.
-     */
-    @Generated
-    private Float teraflops;
-
-    /*
-     * The error object containing details about the rendering session startup failure.
-     */
-    @Generated
-    private Error error;
-
-    /*
-     * The time when the rendering session was created. Date and time in ISO 8601 format.
-     */
-    @Generated
-    private OffsetDateTime creationTime;
-
-    /**
-     * Creates an instance of SessionProperties class.
-     * 
-     * @param id the id value to set.
-     * @param size the size value to set.
-     * @param status the status value to set.
-     */
-    @Generated
-    public SessionProperties(String id, SessionSize size, SessionStatus status) {
-        this.id = id;
-        this.size = size;
-        this.status = status;
-    }
-
-    /**
-     * Get the id property: The ID of the session supplied when the session was created.
-     * 
-     * @return the id value.
-     */
-    @Generated
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the arrInspectorPort property: The TCP port at which the Azure Remote Rendering Inspector tool is hosted.
-     * 
-     * @return the arrInspectorPort value.
-     */
-    @Generated
-    public Integer getArrInspectorPort() {
-        return this.arrInspectorPort;
-    }
-
-    /**
-     * Get the handshakePort property: The TCP port used for the handshake when establishing a connection.
-     * 
-     * @return the handshakePort value.
-     */
-    @Generated
-    public Integer getHandshakePort() {
-        return this.handshakePort;
-    }
-
-    /**
-     * Get the elapsedTimeMinutes property: Amount of time in minutes the session is or was in the 'Ready' state. Time
-     * is rounded down to a full minute.
-     * 
-     * @return the elapsedTimeMinutes value.
-     */
-    @Generated
-    public Integer getElapsedTimeMinutes() {
-        return this.elapsedTimeMinutes;
-    }
-
-    /**
-     * Get the hostname property: The hostname under which the rendering session is reachable.
-     * 
-     * @return the hostname value.
-     */
-    @Generated
-    public String getHostname() {
-        return this.hostname;
-    }
-
-    /**
-     * Get the maxLeaseTimeMinutes property: The time in minutes the session will run after reaching the 'Ready' state.
-     * 
-     * @return the maxLeaseTimeMinutes value.
-     */
-    @Generated
-    public Integer getMaxLeaseTimeMinutes() {
-        return this.maxLeaseTimeMinutes;
-    }
-
-    /**
-     * Get the size property: The size of the server used for the rendering session. The size impacts the number of
-     * polygons the server can render. Refer to https://docs.microsoft.com/azure/remote-rendering/reference/vm-sizes for
-     * details.
-     * 
-     * @return the size value.
-     */
-    @Generated
-    public SessionSize getSize() {
-        return this.size;
-    }
-
-    /**
-     * Get the status property: The status of the rendering session. Terminal states are 'Error', 'Expired', and
-     * 'Stopped'.
-     * 
-     * @return the status value.
-     */
-    @Generated
-    public SessionStatus getStatus() {
-        return this.status;
-    }
-
-    /**
-     * Get the teraflops property: The computational power of the rendering session GPU measured in teraflops.
-     * 
-     * @return the teraflops value.
-     */
-    @Generated
-    public Float getTeraflops() {
-        return this.teraflops;
-    }
-
-    /**
-     * Get the error property: The error object containing details about the rendering session startup failure.
-     * 
-     * @return the error value.
-     */
-    @Generated
-    public Error getError() {
-        return this.error;
-    }
-
-    /**
-     * Get the creationTime property: The time when the rendering session was created. Date and time in ISO 8601 format.
-     * 
-     * @return the creationTime value.
-     */
-    @Generated
-    public OffsetDateTime getCreationTime() {
-        return this.creationTime;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeStringField("id", this.id);
-        jsonWriter.writeStringField("size", this.size == null ? null : this.size.toString());
-        jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString());
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of SessionProperties from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of SessionProperties if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the SessionProperties.
-     */
-    @Generated
-    public static SessionProperties fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean idFound = false;
-            String id = null;
-            boolean sizeFound = false;
-            SessionSize size = null;
-            boolean statusFound = false;
-            SessionStatus status = null;
-            Integer arrInspectorPort = null;
-            Integer handshakePort = null;
-            Integer elapsedTimeMinutes = null;
-            String hostname = null;
-            Integer maxLeaseTimeMinutes = null;
-            Float teraflops = null;
-            Error error = null;
-            OffsetDateTime creationTime = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("id".equals(fieldName)) {
-                    id = reader.getString();
-                    idFound = true;
-                } else if ("size".equals(fieldName)) {
-                    size = SessionSize.fromString(reader.getString());
-                    sizeFound = true;
-                } else if ("status".equals(fieldName)) {
-                    status = SessionStatus.fromString(reader.getString());
-                    statusFound = true;
-                } else if ("arrInspectorPort".equals(fieldName)) {
-                    arrInspectorPort = reader.getNullable(JsonReader::getInt);
-                } else if ("handshakePort".equals(fieldName)) {
-                    handshakePort = reader.getNullable(JsonReader::getInt);
-                } else if ("elapsedTimeMinutes".equals(fieldName)) {
-                    elapsedTimeMinutes = reader.getNullable(JsonReader::getInt);
-                } else if ("hostname".equals(fieldName)) {
-                    hostname = reader.getString();
-                } else if ("maxLeaseTimeMinutes".equals(fieldName)) {
-                    maxLeaseTimeMinutes = reader.getNullable(JsonReader::getInt);
-                } else if ("teraflops".equals(fieldName)) {
-                    teraflops = reader.getNullable(JsonReader::getFloat);
-                } else if ("error".equals(fieldName)) {
-                    error = Error.fromJson(reader);
-                } else if ("creationTime".equals(fieldName)) {
-                    creationTime = reader
-                        .getNullable(nonNullReader -> CoreUtils.parseBestOffsetDateTime(nonNullReader.getString()));
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (idFound && sizeFound && statusFound) {
-                SessionProperties deserializedSessionProperties = new SessionProperties(id, size, status);
-                deserializedSessionProperties.arrInspectorPort = arrInspectorPort;
-                deserializedSessionProperties.handshakePort = handshakePort;
-                deserializedSessionProperties.elapsedTimeMinutes = elapsedTimeMinutes;
-                deserializedSessionProperties.hostname = hostname;
-                deserializedSessionProperties.maxLeaseTimeMinutes = maxLeaseTimeMinutes;
-                deserializedSessionProperties.teraflops = teraflops;
-                deserializedSessionProperties.error = error;
-                deserializedSessionProperties.creationTime = creationTime;
-
-                return deserializedSessionProperties;
-            }
-            List<String> missingProperties = new ArrayList<>();
-            if (!idFound) {
-                missingProperties.add("id");
-            }
-            if (!sizeFound) {
-                missingProperties.add("size");
-            }
-            if (!statusFound) {
-                missingProperties.add("status");
-            }
-
-            throw new IllegalStateException(
-                "Missing required property/properties: " + String.join(", ", missingProperties));
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionSize.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionSize.java
deleted file mode 100644
index 72905aceb0e8..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionSize.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.util.ExpandableStringEnum;
-import java.util.Collection;
-
-/**
- * The size of the server used for the rendering session. The size impacts the number of polygons the server can render.
- * Refer to https://docs.microsoft.com/azure/remote-rendering/reference/vm-sizes for details.
- */
-public final class SessionSize extends ExpandableStringEnum<SessionSize> {
-    /**
-     * Standard rendering session size.
-     */
-    @Generated
-    public static final SessionSize STANDARD = fromString("Standard");
-
-    /**
-     * Premium rendering session size.
-     */
-    @Generated
-    public static final SessionSize PREMIUM = fromString("Premium");
-
-    /**
-     * Creates a new instance of SessionSize value.
-     * 
-     * @deprecated Use the {@link #fromString(String)} factory method.
-     */
-    @Generated
-    @Deprecated
-    public SessionSize() {
-    }
-
-    /**
-     * Creates or finds a SessionSize from its string representation.
-     * 
-     * @param name a name to look for.
-     * @return the corresponding SessionSize.
-     */
-    @Generated
-    public static SessionSize fromString(String name) {
-        return fromString(name, SessionSize.class);
-    }
-
-    /**
-     * Gets known SessionSize values.
-     * 
-     * @return known SessionSize values.
-     */
-    @Generated
-    public static Collection<SessionSize> values() {
-        return values(SessionSize.class);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionStatus.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionStatus.java
deleted file mode 100644
index 77dc8d0a5bdc..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionStatus.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.util.ExpandableStringEnum;
-import java.util.Collection;
-
-/**
- * The status of the rendering session. Terminal states are 'Error', 'Expired', and 'Stopped'.
- */
-public final class SessionStatus extends ExpandableStringEnum<SessionStatus> {
-    /**
-     * The rendering session has encountered an error, and is unusable. This is a terminal state.
-     */
-    @Generated
-    public static final SessionStatus ERROR = fromString("Error");
-
-    /**
-     * The rendering session enters the 'Expired' state when it has been in the 'Ready' state longer than its lease
-     * time. This is a terminal state.
-     */
-    @Generated
-    public static final SessionStatus EXPIRED = fromString("Expired");
-
-    /**
-     * The rendering session is starting, but not accepting incoming connections yet.
-     */
-    @Generated
-    public static final SessionStatus STARTING = fromString("Starting");
-
-    /**
-     * The rendering session is ready for incoming connections.
-     */
-    @Generated
-    public static final SessionStatus READY = fromString("Ready");
-
-    /**
-     * The rendering session has been stopped with the 'Stop Session' operation. This is a terminal state.
-     */
-    @Generated
-    public static final SessionStatus STOPPED = fromString("Stopped");
-
-    /**
-     * Creates a new instance of SessionStatus value.
-     * 
-     * @deprecated Use the {@link #fromString(String)} factory method.
-     */
-    @Generated
-    @Deprecated
-    public SessionStatus() {
-    }
-
-    /**
-     * Creates or finds a SessionStatus from its string representation.
-     * 
-     * @param name a name to look for.
-     * @return the corresponding SessionStatus.
-     */
-    @Generated
-    public static SessionStatus fromString(String name) {
-        return fromString(name, SessionStatus.class);
-    }
-
-    /**
-     * Gets known SessionStatus values.
-     * 
-     * @return known SessionStatus values.
-     */
-    @Generated
-    public static Collection<SessionStatus> values() {
-        return values(SessionStatus.class);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionsList.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionsList.java
deleted file mode 100644
index dd92e3e85e95..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/SessionsList.java
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * The result of a list sessions request.
- */
-@Immutable
-public final class SessionsList implements JsonSerializable<SessionsList> {
-    /*
-     * The list of rendering sessions. Does not include sessions in 'Stopped' state.
-     */
-    @Generated
-    private final List<SessionProperties> sessions;
-
-    /*
-     * If more rendering sessions are available this field will contain a URL where the next batch of sessions can be
-     * requested. This URL will need the same authentication as all calls to the Azure Remote Rendering API.
-     */
-    @Generated
-    private String nextLink;
-
-    /**
-     * Creates an instance of SessionsList class.
-     * 
-     * @param sessions the sessions value to set.
-     */
-    @Generated
-    public SessionsList(List<SessionProperties> sessions) {
-        this.sessions = sessions;
-    }
-
-    /**
-     * Get the sessions property: The list of rendering sessions. Does not include sessions in 'Stopped' state.
-     * 
-     * @return the sessions value.
-     */
-    @Generated
-    public List<SessionProperties> getSessions() {
-        return this.sessions;
-    }
-
-    /**
-     * Get the nextLink property: If more rendering sessions are available this field will contain a URL where the next
-     * batch of sessions can be requested. This URL will need the same authentication as all calls to the Azure Remote
-     * Rendering API.
-     * 
-     * @return the nextLink value.
-     */
-    @Generated
-    public String getNextLink() {
-        return this.nextLink;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeArrayField("sessions", this.sessions, (writer, element) -> writer.writeJson(element));
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of SessionsList from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of SessionsList if the JsonReader was pointing to an instance of it, or null if it was
-     * pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the SessionsList.
-     */
-    @Generated
-    public static SessionsList fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean sessionsFound = false;
-            List<SessionProperties> sessions = null;
-            String nextLink = null;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("sessions".equals(fieldName)) {
-                    sessions = reader.readArray(reader1 -> SessionProperties.fromJson(reader1));
-                    sessionsFound = true;
-                } else if ("@nextLink".equals(fieldName)) {
-                    nextLink = reader.getString();
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (sessionsFound) {
-                SessionsList deserializedSessionsList = new SessionsList(sessions);
-                deserializedSessionsList.nextLink = nextLink;
-
-                return deserializedSessionsList;
-            }
-            throw new IllegalStateException("Missing required property: sessions");
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/UpdateSessionSettings.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/UpdateSessionSettings.java
deleted file mode 100644
index aa747c6bac7f..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/UpdateSessionSettings.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-package com.azure.mixedreality.remoterendering.implementation.models;
-
-import com.azure.core.annotation.Generated;
-import com.azure.core.annotation.Immutable;
-import com.azure.json.JsonReader;
-import com.azure.json.JsonSerializable;
-import com.azure.json.JsonToken;
-import com.azure.json.JsonWriter;
-import java.io.IOException;
-
-/**
- * Settings used to update the session.
- */
-@Immutable
-public final class UpdateSessionSettings implements JsonSerializable<UpdateSessionSettings> {
-    /*
-     * Update to the time the session will run after it reached the 'Ready' state. It has to be larger than the current
-     * value of maxLeaseTimeMinutes and less than 1440.
-     */
-    @Generated
-    private final int maxLeaseTimeMinutes;
-
-    /**
-     * Creates an instance of UpdateSessionSettings class.
-     * 
-     * @param maxLeaseTimeMinutes the maxLeaseTimeMinutes value to set.
-     */
-    @Generated
-    public UpdateSessionSettings(int maxLeaseTimeMinutes) {
-        this.maxLeaseTimeMinutes = maxLeaseTimeMinutes;
-    }
-
-    /**
-     * Get the maxLeaseTimeMinutes property: Update to the time the session will run after it reached the 'Ready' state.
-     * It has to be larger than the current value of maxLeaseTimeMinutes and less than 1440.
-     * 
-     * @return the maxLeaseTimeMinutes value.
-     */
-    @Generated
-    public int getMaxLeaseTimeMinutes() {
-        return this.maxLeaseTimeMinutes;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Generated
-    @Override
-    public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.writeStartObject();
-        jsonWriter.writeIntField("maxLeaseTimeMinutes", this.maxLeaseTimeMinutes);
-        return jsonWriter.writeEndObject();
-    }
-
-    /**
-     * Reads an instance of UpdateSessionSettings from the JsonReader.
-     * 
-     * @param jsonReader The JsonReader being read.
-     * @return An instance of UpdateSessionSettings if the JsonReader was pointing to an instance of it, or null if it
-     * was pointing to JSON null.
-     * @throws IllegalStateException If the deserialized JSON object was missing any required properties.
-     * @throws IOException If an error occurs while reading the UpdateSessionSettings.
-     */
-    @Generated
-    public static UpdateSessionSettings fromJson(JsonReader jsonReader) throws IOException {
-        return jsonReader.readObject(reader -> {
-            boolean maxLeaseTimeMinutesFound = false;
-            int maxLeaseTimeMinutes = 0;
-            while (reader.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = reader.getFieldName();
-                reader.nextToken();
-
-                if ("maxLeaseTimeMinutes".equals(fieldName)) {
-                    maxLeaseTimeMinutes = reader.getInt();
-                    maxLeaseTimeMinutesFound = true;
-                } else {
-                    reader.skipChildren();
-                }
-            }
-            if (maxLeaseTimeMinutesFound) {
-                return new UpdateSessionSettings(maxLeaseTimeMinutes);
-            }
-            throw new IllegalStateException("Missing required property: maxLeaseTimeMinutes");
-        });
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/package-info.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/package-info.java
deleted file mode 100644
index 334a1215d0fc..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/models/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-/**
- * Package containing the data models for MixedRealityRemoteRendering.
- * Describing the [Azure Remote Rendering](https://docs.microsoft.com/azure/remote-rendering/) REST API for rendering
- * sessions and asset conversions.
- * 
- * All requests to these APIs must be authenticated using the Secure Token Service as described in the [Azure Remote
- * rendering documentation chapter about
- * authentication](https://docs.microsoft.com/azure/remote-rendering/how-tos/tokens).
- */
-package com.azure.mixedreality.remoterendering.implementation.models;
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/package-info.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/package-info.java
deleted file mode 100644
index ac13c28c5612..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/implementation/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-
-/**
- * Package containing the implementations for MixedRealityRemoteRendering.
- * Describing the [Azure Remote Rendering](https://docs.microsoft.com/azure/remote-rendering/) REST API for rendering
- * sessions and asset conversions.
- * 
- * All requests to these APIs must be authenticated using the Secure Token Service as described in the [Azure Remote
- * rendering documentation chapter about
- * authentication](https://docs.microsoft.com/azure/remote-rendering/how-tos/tokens).
- */
-package com.azure.mixedreality.remoterendering.implementation;
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversion.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversion.java
deleted file mode 100644
index 117102a307d5..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversion.java
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.annotation.Immutable;
-
-import java.time.OffsetDateTime;
-
-/** Holds properties of a conversion. */
-@Immutable
-public final class AssetConversion {
-    private final String id;
-    private final AssetConversionOptions options;
-    private final String outputAssetUrl;
-    private final RemoteRenderingServiceError error;
-    private final AssetConversionStatus conversionStatus;
-    private final OffsetDateTime creationTime;
-
-    /**
-     * Constructs a new AssetConversion object.
-     *
-     * @param id The id of the conversion supplied when the conversion was created.
-     * @param options Options for where to retrieve input files from and where to write output files.
-     * @param outputAssetUrl URL of the asset generated by the conversion process. Only present when the status of
-     *                       the conversion is 'Succeeded'.
-     * @param error The error object containing details about the conversion failure.
-     * @param conversionStatus The status of the conversion. Terminal states are CANCELLED, FAILED, or SUCCEEDED.
-     * @param creationTime The time when the conversion was created. Date and time in ISO 8601 format.
-     */
-    public AssetConversion(String id, AssetConversionOptions options, String outputAssetUrl,
-        RemoteRenderingServiceError error, AssetConversionStatus conversionStatus, OffsetDateTime creationTime) {
-        this.id = id;
-        this.options = options;
-        this.outputAssetUrl = outputAssetUrl;
-        this.error = error;
-        this.conversionStatus = conversionStatus;
-        this.creationTime = creationTime;
-    }
-
-    /**
-     * Get the id property: The id of the conversion supplied when the conversion was created.
-     *
-     * @return the id value.
-     */
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the conversion options: Options for where to retrieve input files from and where to write output files.
-     * Supplied when creating the conversion.
-     *
-     * @return the conversion options value.
-     */
-    public AssetConversionOptions getOptions() {
-        return this.options;
-    }
-
-    /**
-     * Get the outputAssetUrl property: URL of the asset generated by the conversion process. Only present when the status of
-     * the conversion is 'Succeeded'.
-     *
-     * @return the outputAssetUrl value.
-     */
-    public String getOutputAssetUrl() {
-        return this.outputAssetUrl;
-    }
-
-    /**
-     * Get the error property: The error object containing details about the conversion failure.
-     *
-     * @return the error value.
-     */
-    public RemoteRenderingServiceError getError() {
-        return this.error;
-    }
-
-    /**
-     * Get the status property: The status of the conversion. Terminal states are CANCELLED, FAILED, or SUCCEEDED.
-     *
-     * @return the status value.
-     */
-    public AssetConversionStatus getStatus() {
-        return this.conversionStatus;
-    }
-
-    /**
-     * Get the creationTime property: The time when the conversion was created. Date and time in ISO 8601 format.
-     *
-     * @return the creationTime value.
-     */
-    public OffsetDateTime getCreationTime() {
-        return this.creationTime;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversionOptions.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversionOptions.java
deleted file mode 100644
index 46681c7e7121..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversionOptions.java
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.annotation.Fluent;
-
-/** Options for a conversion. */
-@Fluent
-public final class AssetConversionOptions {
-
-    private String inputStorageContainerUrl;
-    private String inputStorageContainerReadListSas;
-    private String inputBlobPrefix;
-    private String inputRelativeAssetPath;
-
-    private String outputStorageContainerUrl;
-    private String outputStorageContainerWriteSas;
-    private String outputBlobPrefix;
-    private String outputAssetFilename;
-
-    /**
-     * Creates options for a conversion.
-     */
-    public AssetConversionOptions() {
-
-    }
-
-    // input setters
-    /**
-     * Set the inputStorageContainerUrl property: The URL of the Azure blob storage container containing the input model.
-     *
-     * @param inputStorageContainerUrl the inputStorageContainerUrl value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setInputStorageContainerUrl(String inputStorageContainerUrl) {
-        this.inputStorageContainerUrl = inputStorageContainerUrl;
-        return this;
-    }
-
-    /**
-     * Set the inputStorageContainerReadListSas property: A Azure blob storage container shared access signature giving read
-     * and list access to the storage container. Optional. If not is not provided the Azure Remote Rendering rendering
-     * account needs to be linked with the storage account containing the blob container.
-     *
-     * @param inputStorageContainerReadListSas the inputStorageContainerReadListSas value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setInputStorageContainerReadListSas(String inputStorageContainerReadListSas) {
-        this.inputStorageContainerReadListSas = inputStorageContainerReadListSas;
-        return this;
-    }
-
-    /**
-     * Set the inputBlobPrefix property: Only Blobs starting with this prefix will be downloaded to perform the conversion.
-     *
-     * @param inputBlobPrefix the inputBlobPrefix value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setInputBlobPrefix(String inputBlobPrefix) {
-        this.inputBlobPrefix = inputBlobPrefix;
-        return this;
-    }
-
-    /**
-     * Set the inputRelativeAssetPath property: The relative path starting at blobPrefix (or at the container root if
-     * blobPrefix is not specified) to the input model. Must point to file with a supported file format ending.
-     *
-     * @param inputRelativeAssetPath the inputRelativeAssetPath value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setInputRelativeAssetPath(String inputRelativeAssetPath) {
-        this.inputRelativeAssetPath = inputRelativeAssetPath;
-        return this;
-    }
-
-    // input getters
-    /**
-     * Get the inputStorageContainerUrl property: The URL of the Azure blob storage container containing the input model.
-     *
-     * @return the inputStorageContainerUrl value.
-     */
-    public String getInputStorageContainerUrl() {
-        return this.inputStorageContainerUrl;
-    }
-
-    /**
-     * Get the inputStorageContainerReadListSas property: A Azure blob storage container shared access signature giving read
-     * and list access to the storage container. Optional. If not is not provided the Azure Remote Rendering rendering
-     * account needs to be linked with the storage account containing the blob container.
-     *
-     * @return the inputStorageContainerReadListSas value.
-     */
-    public String getInputStorageContainerReadListSas() {
-        return this.inputStorageContainerReadListSas;
-    }
-
-    /**
-     * Get the inputBlobPrefix property: Only Blobs starting with this prefix will be downloaded to perform the conversion.
-     *
-     * @return the inputBlobPrefix value.
-     */
-    public String getInputBlobPrefix() {
-        return this.inputBlobPrefix;
-    }
-
-    /**
-     * Get the inputRelativeAssetPath property: The relative path starting at blobPrefix (or at the container root if
-     * blobPrefix is not specified) to the input model. Must point to file with a supported file format ending.
-     *
-     * @return the inputRelativeAssetPath value.
-     */
-    public String getInputRelativeAssetPath() {
-        return this.inputRelativeAssetPath;
-    }
-
-    // output setters
-    /**
-     * Set the outputStorageContainerUrl property: The URL of the Azure blob storage container where the result of the
-     * conversion should be written to.
-     *
-     * @param outputStorageContainerUrl the outputStorageContainerUrl value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setOutputStorageContainerUrl(String outputStorageContainerUrl) {
-        this.outputStorageContainerUrl = outputStorageContainerUrl;
-        return this;
-    }
-
-    /**
-     * Set the storageContainerWriteSas property: A Azure blob storage container shared access signature giving write
-     * access to the storage container. Optional. If not is not provided the Azure Remote Rendering rendering account
-     * needs to be linked with the storage account containing the blob container.
-     *
-     * @param outputStorageContainerWriteSas the storageContainerWriteSas value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setOutputStorageContainerWriteSas(String outputStorageContainerWriteSas) {
-        this.outputStorageContainerWriteSas = outputStorageContainerWriteSas;
-        return this;
-    }
-
-    /**
-     * Set the blobPrefix property: A prefix which gets prepended in front of all files produced by the conversion
-     * process. Will be treated as a virtual folder.
-     *
-     * @param outputBlobPrefix the blobPrefix value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setOutputBlobPrefix(String outputBlobPrefix) {
-        this.outputBlobPrefix = outputBlobPrefix;
-        return this;
-    }
-
-    /**
-     * Set the outputAssetFilename property: The file name of the output asset. Must end in '.arrAsset'.
-     *
-     * @param outputAssetFilename the outputAssetFilename value to set.
-     * @return the ConversionOptionsBuilder object itself.
-     */
-    public AssetConversionOptions setOutputAssetFilename(String outputAssetFilename) {
-        this.outputAssetFilename = outputAssetFilename;
-        return this;
-    }
-
-    // output getters
-    /**
-     * Get the outputStorageContainerUrl property: The URL of the Azure blob storage container where the result of the
-     * conversion should be written to.
-     *
-     * @return the outputStorageContainerUrl value.
-     */
-    public String getOutputStorageContainerUrl() {
-        return this.outputStorageContainerUrl;
-    }
-
-    /**
-     * Get the outputStorageContainerWriteSas property: A Azure blob storage container shared access signature giving write
-     * access to the storage container. Optional. If it is not provided the Azure Remote Rendering rendering account
-     * needs to be linked with the storage account containing the blob container.
-     *
-     * @return the outputStorageContainerWriteSas value.
-     */
-    public String getOutputStorageContainerWriteSas() {
-        return this.outputStorageContainerWriteSas;
-    }
-
-    /**
-     * Get the outputBlobPrefix property: A prefix which gets prepended in front of all files produced by the conversion
-     * process. Will be treated as a virtual folder.
-     *
-     * @return the outputBlobPrefix value.
-     */
-    public String getOutputBlobPrefix() {
-        return this.outputBlobPrefix;
-    }
-
-    /**
-     * Get the outputAssetFilename property: The file name of the output asset. Must end in '.arrAsset'.
-     *
-     * @return the outputAssetFilename value.
-     */
-    public String getOutputAssetFilename() {
-        return this.outputAssetFilename;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversionStatus.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversionStatus.java
deleted file mode 100644
index d4935e2a6dc9..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/AssetConversionStatus.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-
-import java.util.Collection;
-
-/** The status of a conversion. */
-public final class AssetConversionStatus extends ExpandableStringEnum<AssetConversionStatus> {
-    /** Static value NotStarted for AssetConversionStatus. */
-    public static final AssetConversionStatus NOT_STARTED = fromString("NotStarted");
-
-    /** Static value Running for AssetConversionStatus. */
-    public static final AssetConversionStatus RUNNING = fromString("Running");
-
-    /** Static value Cancelled for AssetConversionStatus. */
-    public static final AssetConversionStatus CANCELLED = fromString("Cancelled");
-
-    /** Static value Failed for AssetConversionStatus. */
-    public static final AssetConversionStatus FAILED = fromString("Failed");
-
-    /** Static value Succeeded for AssetConversionStatus. */
-    public static final AssetConversionStatus SUCCEEDED = fromString("Succeeded");
-
-    /**
-     * Creates a new instance of {@link AssetConversionStatus} without a {@link #toString()} value.
-     * <p>
-     * This constructor shouldn't be called as it will produce a {@link AssetConversionStatus} which doesn't
-     * have a String enum value.
-     *
-     * @deprecated Use one of the constants or the {@link #fromString(String)} factory method.
-     */
-    @Deprecated
-    public AssetConversionStatus() {
-
-    }
-
-    /**
-     * Creates or finds a AssetConversionStatus from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding AssetConversionStatus.
-     */
-    public static AssetConversionStatus fromString(String name) {
-        return fromString(name, AssetConversionStatus.class);
-    }
-
-    /**
-     * Gets known AssetConversionStatus values.
-     *
-     * @return known AssetConversionStatus values.
-     */
-    public static Collection<AssetConversionStatus> values() {
-        return values(AssetConversionStatus.class);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/BeginSessionOptions.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/BeginSessionOptions.java
deleted file mode 100644
index 4104d4209f8e..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/BeginSessionOptions.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.annotation.Fluent;
-
-import java.time.Duration;
-
-/** Options for a session to be created. */
-@Fluent
-public final class BeginSessionOptions {
-
-    private Duration maxLeaseTime = Duration.ofMinutes(10);
-    private RenderingSessionSize size = RenderingSessionSize.STANDARD;
-
-    /**
-     * Creates options for a session to be created.
-     */
-    public BeginSessionOptions() {
-
-    }
-
-    /**
-     * Set the maxLeaseTime property: The time the session will run after reaching the 'Ready' state.
-     *
-     * @param maxLeaseTime the maxLeaseTime value
-     * @return this BeginSessionOptions object.
-     */
-    public BeginSessionOptions setMaxLeaseTime(Duration maxLeaseTime) {
-        this.maxLeaseTime = maxLeaseTime;
-        return this;
-    }
-
-    /**
-     * Set the size property: Size of the server used for the rendering session. Remote Rendering with Standard size
-     * server has a maximum scene size of 20 million polygons. Remote Rendering with Premium size does not enforce a
-     * hard maximum, but performance may be degraded if your content exceeds the rendering capabilities of the service.
-     *
-     * @param size the size value
-     * @return this BeginSessionOptions object.
-     */
-    public BeginSessionOptions setSize(RenderingSessionSize size) {
-        this.size = size;
-        return this;
-    }
-
-    /**
-     * Get the maxLeaseTime property: The time the session will run after reaching the 'Ready' state.
-     *
-     * @return the maxLeaseTime value.
-     */
-    public Duration getMaxLeaseTime() {
-        return this.maxLeaseTime;
-    }
-
-    /**
-     * Get the size property: Size of the server used for the rendering session. Remote Rendering with Standard size
-     * server has a maximum scene size of 20 million polygons. Remote Rendering with Premium size does not enforce a
-     * hard maximum, but performance may be degraded if your content exceeds the rendering capabilities of the service.
-     *
-     * @return the size value.
-     */
-    public RenderingSessionSize getSize() {
-        return this.size;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RemoteRenderingServiceError.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RemoteRenderingServiceError.java
deleted file mode 100644
index 13cedfdc30ec..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RemoteRenderingServiceError.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.annotation.Immutable;
-
-import java.util.List;
-
-/** Represents an error in the service. */
-@Immutable
-public final class RemoteRenderingServiceError {
-    private final String code;
-    private final String message;
-    private final String target;
-    private final RemoteRenderingServiceError innerError;
-    private final List<RemoteRenderingServiceError> rootErrors;
-
-    /**
-     * Constructs a new RemoteRenderingServiceError object.
-     *
-     * @param code The error code.
-     * @param message The human-readable representation of the error.
-     * @param target The target of the particular error (e.g., the name of the property in error).
-     * @param innerError An object containing more specific information than the current object about the error.
-     * @param rootErrors The list of errors that led to this reported error.
-     */
-    public RemoteRenderingServiceError(String code, String message, String target,
-        RemoteRenderingServiceError innerError, List<RemoteRenderingServiceError> rootErrors) {
-        this.code = code;
-        this.message = message;
-        this.target = target;
-        this.innerError = innerError;
-        this.rootErrors = rootErrors;
-    }
-
-    /**
-     * Get the code property: Error code.
-     *
-     * @return the code value.
-     */
-    public String getCode() {
-        return this.code;
-    }
-
-    /**
-     * Get the message property: A human-readable representation of the error.
-     *
-     * @return the message value.
-     */
-    public String getMessage() {
-        return this.message;
-    }
-
-    /**
-     * Get the target property: The target of the particular error (e.g., the name of the property in error).
-     *
-     * @return the target value.
-     */
-    public String getTarget() {
-        return this.target;
-    }
-
-    /**
-     * Get the innerError property: An object containing more specific information than the current object about the
-     * error.
-     *
-     * @return the innerError value.
-     */
-    public RemoteRenderingServiceError getInnerError() {
-        return this.innerError;
-    }
-
-    /**
-     * List of errors that led to this reported error.
-     *
-     * @return the list of errors.
-     */
-    public List<RemoteRenderingServiceError> listRootErrors() {
-        return this.rootErrors;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSession.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSession.java
deleted file mode 100644
index b78ac38444ea..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSession.java
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.annotation.Immutable;
-
-import java.time.Duration;
-import java.time.OffsetDateTime;
-
-/** Holds the properties of a rendering session. */
-@Immutable
-public final class RenderingSession {
-    private final String id;
-    private final int arrInspectorPort;
-    private final int handshakePort;
-    private final Duration elapsedTime;
-    private final String hostname;
-    private final Duration maxLeaseTime;
-    private final RenderingSessionSize sessionSize;
-    private final RenderingSessionStatus sessionStatus;
-    private final float teraflops;
-    private final RemoteRenderingServiceError error;
-    private final OffsetDateTime creationTime;
-
-    /**
-     * Constructs a new RenderingSession object.
-     *
-     * @param id The id of the session supplied when the conversion was created.
-     * @param arrInspectorPort The TCP port at which the Azure Remote Rendering Inspector tool is hosted.
-     * @param handshakePort The TCP port used for the handshake.
-     * @param elapsedTime Amount of time the session is or has been in Ready state. Time is rounded down to a full minute.
-     * @param hostname The hostname under which the rendering session is reachable.
-     * @param maxLeaseTime The time the session will run after reaching the 'Ready' state.
-     * @param sessionSize Size of the server used for the rendering session. Remote Rendering with Standard size
-     *                    server has a maximum scene size of 20 million polygons. Remote Rendering with Premium size does not enforce a
-     *                    hard maximum, but performance may be degraded if your content exceeds the rendering capabilities of the service.
-     * @param sessionStatus The status of the rendering session. Once the status reached the 'Ready' state it can be
-     *                      connected to. The terminal state is 'Stopped'.
-     * @param teraflops The computational power of the rendering session GPU measured in Teraflops.
-     * @param error The error object containing details about the rendering session startup failure.
-     * @param creationTime The time when the rendering session was created. Date and time in ISO 8601 format.
-     */
-    public RenderingSession(String id, int arrInspectorPort, int handshakePort, Duration elapsedTime, String hostname,
-        Duration maxLeaseTime, RenderingSessionSize sessionSize, RenderingSessionStatus sessionStatus, float teraflops,
-        RemoteRenderingServiceError error, OffsetDateTime creationTime) {
-        this.id = id;
-        this.arrInspectorPort = arrInspectorPort;
-        this.handshakePort = handshakePort;
-        this.elapsedTime = elapsedTime;
-        this.hostname = hostname;
-        this.maxLeaseTime = maxLeaseTime;
-        this.sessionSize = sessionSize;
-        this.sessionStatus = sessionStatus;
-        this.teraflops = teraflops;
-        this.error = error;
-        this.creationTime = creationTime;
-    }
-
-    /**
-     * Get the id property: The id of the session supplied when the conversion was created.
-     *
-     * @return the id value.
-     */
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the arrInspectorPort property: The TCP port at which the Azure Remote Rendering Inspector tool is hosted.
-     *
-     * @return the arrInspectorPort value.
-     */
-    public int getArrInspectorPort() {
-        return this.arrInspectorPort;
-    }
-
-    /**
-     * Get the handshakePort property: The TCP port used for the handshake.
-     *
-     * @return the handshakePort value.
-     */
-    public int getHandshakePort() {
-        return this.handshakePort;
-    }
-
-    /**
-     * Get the elapsedTime property: Amount of time the session is or has been in Ready state. Time is
-     * rounded down to a full minute.
-     *
-     * @return the elapsedTime value.
-     */
-    public Duration getElapsedTime() {
-        return elapsedTime;
-    }
-
-    /**
-     * Get the hostname property: The hostname under which the rendering session is reachable.
-     *
-     * @return the hostname value.
-     */
-    public String getHostname() {
-        return this.hostname;
-    }
-
-    /**
-     * Get the maxLeaseTime property: The time the session will run after reaching the 'Ready' state.
-     *
-     * @return the maxLeaseTime value.
-     */
-    public Duration getMaxLeaseTime() {
-        return this.maxLeaseTime;
-    }
-
-    /**
-     * Get the size property: Size of the server used for the rendering session. Remote Rendering with Standard size
-     * server has a maximum scene size of 20 million polygons. Remote Rendering with Premium size does not enforce a
-     * hard maximum, but performance may be degraded if your content exceeds the rendering capabilities of the service.
-     *
-     * @return the size value.
-     */
-    public RenderingSessionSize getSize() {
-        return this.sessionSize;
-    }
-
-    /**
-     * Get the status property: The status of the rendering session. Once the status reached the 'Ready' state it can be
-     * connected to. The terminal state is 'Stopped'.
-     *
-     * @return the status value.
-     */
-    public RenderingSessionStatus getStatus() {
-        return this.sessionStatus;
-    }
-
-    /**
-     * Get the teraflops property: The computational power of the rendering session GPU measured in Teraflops.
-     *
-     * @return the teraflops value.
-     */
-    public float getTeraflops() {
-        return this.teraflops;
-    }
-
-    /**
-     * Get the error property: The error object containing details about the rendering session startup failure.
-     *
-     * @return the error value.
-     */
-    public RemoteRenderingServiceError getError() {
-        return this.error;
-    }
-
-    /**
-     * Get the creationTime property: The time when the rendering session was created. Date and time in ISO 8601 format.
-     *
-     * @return the creationTime value.
-     */
-    public OffsetDateTime getCreationTime() {
-        return this.creationTime;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSessionSize.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSessionSize.java
deleted file mode 100644
index 133c4b54dc22..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSessionSize.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-
-import java.util.Collection;
-
-/** The size of a rendering session. */
-public final class RenderingSessionSize extends ExpandableStringEnum<RenderingSessionSize> {
-    /** Static value Standard for SessionSize. */
-    public static final RenderingSessionSize STANDARD = fromString("Standard");
-
-    /** Static value Premium for SessionSize. */
-    public static final RenderingSessionSize PREMIUM = fromString("Premium");
-
-    /**
-     * Creates a new instance of {@link RenderingSessionSize} without a {@link #toString()} value.
-     * <p>
-     * This constructor shouldn't be called as it will produce a {@link RenderingSessionSize} which doesn't
-     * have a String enum value.
-     *
-     * @deprecated Use one of the constants or the {@link #fromString(String)} factory method.
-     */
-    @Deprecated
-    public RenderingSessionSize() {
-
-    }
-
-    /**
-     * Creates or finds a SessionSize from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding SessionSize.
-     */
-    public static RenderingSessionSize fromString(String name) {
-        return fromString(name, RenderingSessionSize.class);
-    }
-
-    /**
-     * Gets known SessionSize values.
-     *
-     * @return known SessionSize values.
-     */
-    public static Collection<RenderingSessionSize> values() {
-        return values(RenderingSessionSize.class);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSessionStatus.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSessionStatus.java
deleted file mode 100644
index d44944691c61..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/RenderingSessionStatus.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.util.ExpandableStringEnum;
-
-import java.util.Collection;
-
-/** The status of a rendering session. */
-public final class RenderingSessionStatus extends ExpandableStringEnum<RenderingSessionStatus> {
-    /** Static value Error for SessionStatus. */
-    public static final RenderingSessionStatus ERROR = fromString("Error");
-
-    /** Static value Expired for SessionStatus. */
-    public static final RenderingSessionStatus EXPIRED = fromString("Expired");
-
-    /** Static value Starting for SessionStatus. */
-    public static final RenderingSessionStatus STARTING = fromString("Starting");
-
-    /** Static value Ready for SessionStatus. */
-    public static final RenderingSessionStatus READY = fromString("Ready");
-
-    /** Static value Stopped for SessionStatus. */
-    public static final RenderingSessionStatus STOPPED = fromString("Stopped");
-
-    /**
-     * Creates a new instance of {@link RenderingSessionStatus} without a {@link #toString()} value.
-     * <p>
-     * This constructor shouldn't be called as it will produce a {@link RenderingSessionStatus} which doesn't
-     * have a String enum value.
-     *
-     * @deprecated Use one of the constants or the {@link #fromString(String)} factory method.
-     */
-    @Deprecated
-    public RenderingSessionStatus() {
-
-    }
-
-    /**
-     * Creates or finds a SessionStatus from its string representation.
-     *
-     * @param name a name to look for.
-     * @return the corresponding SessionStatus.
-     */
-    public static RenderingSessionStatus fromString(String name) {
-        return fromString(name, RenderingSessionStatus.class);
-    }
-
-    /**
-     * Gets known SessionStatus values.
-     *
-     * @return known SessionStatus values.
-     */
-    public static Collection<RenderingSessionStatus> values() {
-        return values(RenderingSessionStatus.class);
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/UpdateSessionOptions.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/UpdateSessionOptions.java
deleted file mode 100644
index f310763b6e7c..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/UpdateSessionOptions.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering.models;
-
-import com.azure.core.annotation.Fluent;
-
-import java.time.Duration;
-
-/** Options for updating an existing rendering session. */
-@Fluent
-public final class UpdateSessionOptions {
-    /*
-     * Update to the time the session will run after it reached the 'Ready'
-     * state. It has to be bigger than the current value of
-     * maxLeaseTimeMinutes.
-     */
-    private Duration maxLeaseTime = Duration.ofMinutes(10);
-
-    /**
-     * Creates options for updating an existing rendering session.
-     */
-    public UpdateSessionOptions() {
-
-    }
-
-    /**
-     * Set the maxLeaseTime property: Update to the time the session will run after it reached the 'Ready' state.
-     * It has to be bigger than the current value of maxLeaseTime.
-     *
-     * @param maxLeaseTime the maxLeaseTime value
-     * @return this UpdateSessionOptions object.
-     */
-    public UpdateSessionOptions maxLeaseTime(Duration maxLeaseTime) {
-        this.maxLeaseTime = maxLeaseTime;
-        return this;
-    }
-
-    /**
-     * Get the maxLeaseTimeMinutes property: Update to the time the session will run after it reached the 'Ready' state.
-     * It has to be bigger than the current value of maxLeaseTime.
-     *
-     * @return the maxLeaseTimeMinutes value.
-     */
-    public Duration getMaxLeaseTime() {
-        return this.maxLeaseTime;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/package-info.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/package-info.java
deleted file mode 100644
index 9b8816c87681..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/models/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-/**
- * This package contains model classes for the Remote Rendering project.
- */
-package com.azure.mixedreality.remoterendering.models;
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/package-info.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/package-info.java
deleted file mode 100644
index 1c4bf65f0e77..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/com/azure/mixedreality/remoterendering/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-/**
- * This package contains classes for the Remote Rendering project.
- */
-package com.azure.mixedreality.remoterendering;
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/module-info.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/module-info.java
deleted file mode 100644
index 39ecd22b74aa..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/main/java/module-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-module com.azure.mixedreality.remoterendering {
-    requires transitive com.azure.core;
-    requires com.azure.mixedreality.authentication;
-
-    opens com.azure.mixedreality.remoterendering.implementation.models to com.azure.core;
-
-    exports com.azure.mixedreality.remoterendering;
-    exports com.azure.mixedreality.remoterendering.models;
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ConvertMoreComplexAsset.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ConvertMoreComplexAsset.java
deleted file mode 100644
index 6aa739e9cadd..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ConvertMoreComplexAsset.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-// These tests assume that the storage account is accessible from the remote rendering account.
-// See https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account
-// Since the roles can take a while to propagate, we do not live test these samples.
-
-import com.azure.core.util.polling.SyncPoller;
-import com.azure.mixedreality.remoterendering.models.AssetConversion;
-import com.azure.mixedreality.remoterendering.models.AssetConversionOptions;
-import com.azure.mixedreality.remoterendering.models.AssetConversionStatus;
-
-import java.util.UUID;
-
-/**
- * Sample class demonstrating how to convert a complex asset.
- */
-public class ConvertMoreComplexAsset extends SampleBase {
-
-    /**
-     * Main method to invoke this demo about how to convert a complex asset.
-     *
-     * @param args Unused arguments to the program.
-     */
-    public static void main(String[] args) {
-        new ConvertMoreComplexAsset().convertMoreComplexAsset();
-    }
-
-    /**
-     * Sample method demonstrating how to convert a complex asset.
-     */
-    public void convertMoreComplexAsset() {
-        // In a real world scenario you'd want these to be different.
-        String inputStorageURL = getStorageURL();
-        String outputStorageURL = getStorageURL();
-
-        // BEGIN: readme-sample-convertMoreComplexAsset
-        AssetConversionOptions conversionOptions = new AssetConversionOptions()
-            .setInputStorageContainerUrl(inputStorageURL)
-            .setInputRelativeAssetPath("bicycle.gltf")
-            .setInputBlobPrefix("Bicycle")
-            .setOutputStorageContainerUrl(outputStorageURL)
-            .setOutputBlobPrefix("ConvertedBicycle");
-
-        String conversionId = UUID.randomUUID().toString();
-
-        SyncPoller<AssetConversion, AssetConversion> conversionOperation = client.beginConversion(conversionId, conversionOptions);
-        // END: readme-sample-convertMoreComplexAsset
-
-        // BEGIN: readme-sample-convertMoreComplexAssetCheckStatus
-        AssetConversion conversion = conversionOperation.getFinalResult();
-        if (conversion.getStatus() == AssetConversionStatus.SUCCEEDED) {
-            logger.info("Conversion succeeded: Output written to {}", conversion.getOutputAssetUrl());
-        } else if (conversion.getStatus() == AssetConversionStatus.FAILED) {
-            logger.error("Conversion failed: {} {}", conversion.getError().getCode(), conversion.getError().getMessage());
-        } else {
-            logger.error("Unexpected conversion status: {}", conversion.getStatus());
-        }
-        // END: readme-sample-convertMoreComplexAssetCheckStatus
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ConvertSimpleAsset.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ConvertSimpleAsset.java
deleted file mode 100644
index 5a7cf5a13482..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ConvertSimpleAsset.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.util.polling.SyncPoller;
-import com.azure.mixedreality.remoterendering.models.AssetConversion;
-import com.azure.mixedreality.remoterendering.models.AssetConversionOptions;
-import com.azure.mixedreality.remoterendering.models.AssetConversionStatus;
-
-import java.util.UUID;
-
-/**
- * Sample class demonstrating how to convert a simple asset.
- */
-public class ConvertSimpleAsset extends SampleBase {
-    /**
-     * Main method to invoke this demo about how to convert a simple asset.
-     *
-     * @param args Unused arguments to the program.
-     */
-    public static void main(String[] args) {
-        new ConvertSimpleAsset().convertSimpleAsset();
-    }
-
-    /**
-     * Sample method demonstrating how to convert a simple asset.
-     */
-    public void convertSimpleAsset() {
-        // BEGIN: readme-sample-convertSimpleAsset
-        AssetConversionOptions conversionOptions = new AssetConversionOptions()
-            .setInputStorageContainerUrl(getStorageURL())
-            .setInputRelativeAssetPath("box.fbx")
-            .setOutputStorageContainerUrl(getStorageURL());
-
-        // A randomly generated UUID is a good choice for a conversionId.
-        String conversionId = UUID.randomUUID().toString();
-
-        SyncPoller<AssetConversion, AssetConversion> conversionOperation = client.beginConversion(conversionId, conversionOptions);
-        // END: readme-sample-convertSimpleAsset
-
-        AssetConversion conversion = conversionOperation.getFinalResult();
-        if (conversion.getStatus() == AssetConversionStatus.SUCCEEDED) {
-            logger.info("Conversion succeeded: Output written to {}", conversion.getOutputAssetUrl());
-        } else if (conversion.getStatus() == AssetConversionStatus.FAILED) {
-            logger.error("Conversion failed: {} {}", conversion.getError().getCode(), conversion.getError().getMessage());
-        } else {
-            logger.error("Unexpected conversion status: {}", conversion.getStatus());
-        }
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/CreateClients.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/CreateClients.java
deleted file mode 100644
index b6745c2faac0..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/CreateClients.java
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.credential.AccessToken;
-import com.azure.core.credential.AzureKeyCredential;
-import com.azure.core.util.logging.ClientLogger;
-import com.azure.identity.ClientSecretCredential;
-import com.azure.identity.ClientSecretCredentialBuilder;
-import com.azure.identity.DefaultAzureCredential;
-import com.azure.identity.DefaultAzureCredentialBuilder;
-import com.azure.identity.DeviceCodeCredential;
-import com.azure.identity.DeviceCodeCredentialBuilder;
-import com.azure.identity.DeviceCodeInfo;
-
-import java.time.OffsetDateTime;
-
-/**
- * Sample class demonstrating the different ways to authenticate and create a client instance.
- * createClientWithAccountKey() is used in all samples.
- */
-public class CreateClients {
-
-    final ClientLogger logger = new ClientLogger(CreateClients.class);
-
-    private final SampleEnvironment environment = new SampleEnvironment();
-
-    /**
-     * Obtains a client with an AzureKeyCredential.
-     *
-     * @return the RemoteRenderingClient.
-     */
-    public RemoteRenderingClient createClientWithAccountKey() {
-        // BEGIN: readme-sample-createClientWithAccountKey
-        AzureKeyCredential credential = new AzureKeyCredential(environment.getAccountKey());
-
-        RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-            .accountId(environment.getAccountId())
-            .accountDomain(environment.getAccountDomain())
-            .endpoint(environment.getServiceEndpoint())
-            .credential(credential)
-            .buildClient();
-        // END: readme-sample-createClientWithAccountKey
-
-        return client;
-    }
-
-    /**
-     * Obtains a client with an AAD client secret.
-     *
-     * @return the RemoteRenderingClient.
-     */
-    public RemoteRenderingClient createClientWithAAD() {
-        // BEGIN: readme-sample-createClientWithAAD
-        ClientSecretCredential credential = new ClientSecretCredentialBuilder()
-            .tenantId(environment.getTenantId())
-            .clientId(environment.getClientId())
-            .clientSecret(environment.getClientSecret())
-            .authorityHost("https://login.microsoftonline.com/" + environment.getTenantId())
-            .build();
-
-        RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-            .accountId(environment.getAccountId())
-            .accountDomain(environment.getAccountDomain())
-            .endpoint(environment.getServiceEndpoint())
-            .credential(credential)
-            .buildClient();
-        // END: readme-sample-createClientWithAAD
-
-        return client;
-    }
-
-    /**
-     * Obtains a client with a device code.
-     *
-     * @return the RemoteRenderingClient.
-     */
-    public RemoteRenderingClient createClientWithDeviceCode() {
-        // BEGIN: readme-sample-createClientWithDeviceCode
-        DeviceCodeCredential credential = new DeviceCodeCredentialBuilder()
-            .challengeConsumer((DeviceCodeInfo deviceCodeInfo) -> {
-                logger.info(deviceCodeInfo.getMessage());
-            })
-            .clientId(environment.getClientId())
-            .tenantId(environment.getTenantId())
-            .authorityHost("https://login.microsoftonline.com/" + environment.getTenantId())
-            .build();
-
-        RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-            .accountId(environment.getAccountId())
-            .accountDomain(environment.getAccountDomain())
-            .endpoint(environment.getServiceEndpoint())
-            .credential(credential)
-            .buildClient();
-        // END: readme-sample-createClientWithDeviceCode
-
-        return client;
-    }
-
-    /**
-     * Obtains a client with a default azure credential.
-     *
-     * @return the RemoteRenderingClient.
-     */
-    public RemoteRenderingClient createClientWithDefaultAzureCredential() {
-        // BEGIN: readme-sample-createClientWithDefaultAzureCredential
-        DefaultAzureCredential credential = new DefaultAzureCredentialBuilder().build();
-
-        RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-            .accountId(environment.getAccountId())
-            .accountDomain(environment.getAccountDomain())
-            .endpoint(environment.getServiceEndpoint())
-            .credential(credential)
-            .buildClient();
-        // END: readme-sample-createClientWithDefaultAzureCredential
-
-        return client;
-    }
-
-    /**
-     * getMixedRealityAccessTokenFromWebService is a hypothetical method that retrieves
-     * a Mixed Reality access token from a web service. The web service would use the
-     * MixedRealityStsClient and credentials to obtain an access token to be returned
-     * to the client.
-     *
-     * @return returns the AccessToken.
-     */
-    private AccessToken getMixedRealityAccessTokenFromWebService() {
-        return new AccessToken("TokenObtainedFromStsClientRunningInWebservice", OffsetDateTime.MAX);
-    }
-
-    /**
-     * Obtains a client with a static access token.
-     *
-     * @return the RemoteRenderingClient.
-     */
-    public RemoteRenderingClient createClientWithStaticAccessToken() {
-        // BEGIN: readme-sample-createClientWithStaticAccessToken
-        // GetMixedRealityAccessTokenFromWebService is a hypothetical method that retrieves
-        // a Mixed Reality access token from a web service. The web service would use the
-        // MixedRealityStsClient and credentials to obtain an access token to be returned
-        // to the client.
-        AccessToken accessToken = getMixedRealityAccessTokenFromWebService();
-
-        RemoteRenderingClient client = new RemoteRenderingClientBuilder()
-            .accountId(environment.getAccountId())
-            .accountDomain(environment.getAccountDomain())
-            .endpoint(environment.getServiceEndpoint())
-            .accessToken(accessToken)
-            .buildClient();
-        // END: readme-sample-createClientWithStaticAccessToken
-
-        return client;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/CreateRenderingSession.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/CreateRenderingSession.java
deleted file mode 100644
index 6faa266b98ed..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/CreateRenderingSession.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.util.polling.SyncPoller;
-import com.azure.mixedreality.remoterendering.models.BeginSessionOptions;
-import com.azure.mixedreality.remoterendering.models.RenderingSession;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionSize;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionStatus;
-
-import java.time.Duration;
-import java.util.UUID;
-
-/**
- * Sample class demonstrating how to create a rendering session.
- */
-public class CreateRenderingSession extends SampleBase {
-    /**
-     * Main method to invoke this demo about how to create a rendering session.
-     *
-     * @param args Unused arguments to the program.
-     */
-    public static void main(String[] args) {
-        new CreateRenderingSession().createRenderingSession();
-    }
-
-    /**
-     * Sample method demonstrating how to create a rendering session.
-     *
-     * To avoid launching too many sessions during testing, we rely on the live tests.
-     */
-    public void createRenderingSession() {
-        // BEGIN: readme-sample-createRenderingSession
-        BeginSessionOptions options = new BeginSessionOptions()
-            .setMaxLeaseTime(Duration.ofMinutes(30))
-            .setSize(RenderingSessionSize.STANDARD);
-
-        // A randomly generated GUID is a good choice for a sessionId.
-        String sessionId = UUID.randomUUID().toString();
-
-        SyncPoller<RenderingSession, RenderingSession> startSessionOperation = client.beginSession(sessionId, options);
-        // END: readme-sample-createRenderingSession
-
-        RenderingSession session = startSessionOperation.getFinalResult();
-        if (session.getStatus() == RenderingSessionStatus.READY) {
-            logger.error("Session {} is ready.", session.getId());
-        } else if (session.getStatus() == RenderingSessionStatus.ERROR) {
-            logger.error("Session {} encountered an error: {} {}", session.getId(), session.getError().getCode(), session.getError().getMessage());
-        } else {
-            logger.error("Got unexpected session status: {}", session.getStatus());
-        }
-
-        // Use the session here.
-        // ...
-
-        // The session will automatically timeout, but in this sample we also demonstrate how to shut it down explicitly.
-        // BEGIN: readme-sample-stopASession
-        client.endSession(sessionId);
-        // END: readme-sample-stopASession
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ListConversions.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ListConversions.java
deleted file mode 100644
index c0bb7b822677..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ListConversions.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.mixedreality.remoterendering.models.AssetConversion;
-import com.azure.mixedreality.remoterendering.models.AssetConversionStatus;
-
-import java.time.OffsetDateTime;
-
-/**
- * Sample class demonstrating how to list conversions.
- */
-public class ListConversions extends SampleBase {
-
-    /**
-     * Main method to invoke this demo about how to list conversions.
-     * Note: This test assume DRAM is set up, so we do not run them live.
-     *
-     * @param args Unused arguments to the program.
-     */
-    public static void main(String[] args) {
-        new ListConversions().listConversions();
-    }
-
-    /**
-     * Sample method demonstrating how to list conversions.
-     */
-    public void listConversions() {
-        logger.info("Successful conversions since yesterday:");
-
-        // BEGIN: readme-sample-listConversions
-        for (AssetConversion conversion : client.listConversions()) {
-            if ((conversion.getStatus() == AssetConversionStatus.SUCCEEDED)
-                && (conversion.getCreationTime().isAfter(OffsetDateTime.now().minusDays(1)))) {
-                logger.info("Output Asset URL: {}", conversion.getOutputAssetUrl());
-            }
-        }
-        // END: readme-sample-listConversions
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ListRenderingSessions.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ListRenderingSessions.java
deleted file mode 100644
index b6e67db35691..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/ListRenderingSessions.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.mixedreality.remoterendering.models.BeginSessionOptions;
-import com.azure.mixedreality.remoterendering.models.RenderingSession;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionSize;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionStatus;
-
-import java.time.Duration;
-import java.util.UUID;
-
-/**
- * Sample class demonstrating how to list rendering sessions.
- */
-public class ListRenderingSessions extends SampleBase {
-
-    /**
-     * Main method to invoke this demo about how to list rendering sessions.
-     *
-     * @param args Unused arguments to the program.
-     */
-    public static void main(String[] args) {
-        new ListRenderingSessions().listRenderingSessions();
-    }
-
-    /**
-     * Sample method demonstrating how to list rendering sessions.
-     *
-     * To avoid launching too many sessions during testing, we rely on the live tests.
-     */
-    public void listRenderingSessions()  {
-        // Ensure there's at least one session to query.
-        String sessionId = UUID.randomUUID().toString();
-
-        BeginSessionOptions options = new BeginSessionOptions()
-            .setMaxLeaseTime(Duration.ofMinutes(30))
-            .setSize(RenderingSessionSize.STANDARD);
-
-        client.beginSession(sessionId, options);
-        try {
-            Thread.sleep(10000);
-        } catch (InterruptedException ignored) {
-        }
-
-        // BEGIN: readme-sample-listRenderingSessions
-        for (RenderingSession session : client.listSessions()) {
-            if (session.getStatus() == RenderingSessionStatus.STARTING) {
-                logger.info("Session {} is starting.");
-            } else if (session.getStatus() == RenderingSessionStatus.READY) {
-                logger.info("Session {} is ready at host {}", session.getId(), session.getHostname());
-            } else if (session.getStatus() == RenderingSessionStatus.ERROR) {
-                logger.error("Session {} encountered an error: {} {}", session.getId(), session.getError().getCode(), session.getError().getMessage());
-            } else {
-                logger.error("Session {} has unexpected status {}", session.getId(), session.getStatus());
-            }
-        }
-        // END: readme-sample-listRenderingSessions
-
-        client.endSession(sessionId);
-    }
-
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/QueryAndUpdateASession.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/QueryAndUpdateASession.java
deleted file mode 100644
index d1c598e964cf..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/QueryAndUpdateASession.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.mixedreality.remoterendering.models.BeginSessionOptions;
-import com.azure.mixedreality.remoterendering.models.RenderingSession;
-import com.azure.mixedreality.remoterendering.models.RenderingSessionSize;
-import com.azure.mixedreality.remoterendering.models.UpdateSessionOptions;
-
-import java.time.Duration;
-import java.time.OffsetDateTime;
-import java.util.UUID;
-
-/**
- * Sample class demonstrating how to query and update a rendering session.
- */
-public class QueryAndUpdateASession extends SampleBase {
-
-    /**
-     * Main method to invoke this demo about how to query and update a rendering session.
-     *
-     * @param args Unused arguments to the program.
-     */
-    public static void main(String[] args) {
-        new QueryAndUpdateASession().queryAndUpdateASession();
-    }
-
-    /**
-     * Sample method demonstrating how to query and update a rendering session.
-     *
-     * To avoid launching too many sessions during testing, we rely on the live tests.
-     */
-    public void queryAndUpdateASession() {
-        String sessionId = UUID.randomUUID().toString();
-
-        BeginSessionOptions options = new BeginSessionOptions()
-            .setMaxLeaseTime(Duration.ofMinutes(30))
-            .setSize(RenderingSessionSize.STANDARD);
-
-        client.beginSession(sessionId, options).getFinalResult();
-
-        // BEGIN: readme-sample-queryAndUpdateASession
-        RenderingSession currentSession = client.getSession(sessionId);
-
-        Duration sessionTimeAlive = Duration.between(OffsetDateTime.now(), currentSession.getCreationTime()).abs();
-        if (currentSession.getMaxLeaseTime().minus(sessionTimeAlive).toMinutes() < 2) {
-            Duration newLeaseTime = currentSession.getMaxLeaseTime().plus(Duration.ofMinutes(30));
-            UpdateSessionOptions longerLeaseOptions = new UpdateSessionOptions().maxLeaseTime(newLeaseTime);
-            client.updateSession(sessionId, longerLeaseOptions);
-        }
-        // END: readme-sample-queryAndUpdateASession
-
-        client.endSession(sessionId);
-    }
-
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/SampleBase.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/SampleBase.java
deleted file mode 100644
index 0d55cecd2c9c..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/SampleBase.java
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.util.logging.ClientLogger;
-
-/**
- * Base class for all samples.
- */
-public class SampleBase {
-    final SampleEnvironment environment = new SampleEnvironment();
-    final RemoteRenderingClient client = new CreateClients().createClientWithAccountKey();
-    final ClientLogger logger = new ClientLogger(SampleBase.class);
-
-    /**
-     * Get the storage URL used in samples.
-     *
-     * @return the storage URL.
-     */
-    String getStorageURL() {
-        return "https://" + environment.getStorageAccountName() + ".blob.core.windows.net/" + environment.getBlobContainerName();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/SampleEnvironment.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/SampleEnvironment.java
deleted file mode 100644
index 095e29c3d531..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/samples/java/com/azure/mixedreality/remoterendering/SampleEnvironment.java
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// These tests assume that the storage account is accessible from the remote rendering account.
-// See https://docs.microsoft.com/azure/remote-rendering/how-tos/create-an-account
-// Since the roles can take a while to propagate, we do not live test these samples.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.util.Configuration;
-
-/**
- * Sample class holding all the parameters and values needed in a Remote Rendering application.
- * Used by all samples.
- */
-public class SampleEnvironment {
-
-    private final String accountId = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_ACCOUNT_ID");
-    private final String accountDomain = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_ACCOUNT_DOMAIN");
-    private final String accountKey = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_ACCOUNT_KEY");
-    private final String storageAccountName = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_STORAGE_ACCOUNT_NAME");
-    private final String storageAccountKey = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_STORAGE_ACCOUNT_KEY");
-    private final String blobContainerName = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_BLOB_CONTAINER_NAME");
-    private final String blobContainerSasToken = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_SAS_TOKEN");
-    private final String serviceEndpoint = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_SERVICE_ENDPOINT");
-
-    private final String tenantId = Configuration.getGlobalConfiguration().get("REMOTERENDERING_TENANT_ID");
-    private final String clientId = Configuration.getGlobalConfiguration().get("REMOTERENDERING_CLIENT_ID");
-    private final String clientSecret = Configuration.getGlobalConfiguration().get("REMOTERENDERING_CLIENT_SECRET");
-
-    /**
-     * Get the accountId used in samples.
-     *
-     * @return the accountId.
-     */
-    public String getAccountId() {
-        return accountId;
-    }
-
-    /**
-     * Get the accountDomain used in samples.
-     *
-     * @return the accountDomain.
-     */
-    public String getAccountDomain() {
-        return accountDomain;
-    }
-
-    /**
-     * Get the accountKey used in samples.
-     *
-     * @return the accountKey.
-     */
-    public String getAccountKey() {
-        return accountKey;
-    }
-
-    /**
-     * Get the storageAccountName used in samples.
-     *
-     * @return the storageAccountName.
-     */
-    public String getStorageAccountName() {
-        return storageAccountName;
-    }
-
-    /**
-     * Get the storageAccountKey used in samples.
-     *
-     * @return the storageAccountKey.
-     */
-    public String getStorageAccountKey() {
-        return storageAccountKey;
-    }
-
-    /**
-     * Get the blobContainerName used in samples.
-     *
-     * @return the blobContainerName.
-     */
-    public String getBlobContainerName() {
-        return blobContainerName;
-    }
-
-    /**
-     * Get the blobContainerSasToken used in samples.
-     *
-     * @return the blobContainerSasToken.
-     */
-    public String getBlobContainerSasToken() {
-        return blobContainerSasToken;
-    }
-
-    /**
-     * Get the serviceEndpoint used in samples.
-     *
-     * @return the serviceEndpoint.
-     */
-    public String getServiceEndpoint() {
-        return serviceEndpoint;
-    }
-
-    /**
-     * Get the tenantId used in samples.
-     *
-     * @return the tenantId.
-     */
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    /**
-     * Get the clientId used in samples.
-     *
-     * @return the clientId.
-     */
-    public String getClientId() {
-        return clientId;
-    }
-
-    /**
-     * Get the clientSecret used in samples.
-     *
-     * @return the clientSecret.
-     */
-    public String getClientSecret() {
-        return clientSecret;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClientTest.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClientTest.java
deleted file mode 100644
index ac8f039a0f4e..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingAsyncClientTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.util.polling.AsyncPollResponse;
-import com.azure.core.util.polling.LongRunningOperationStatus;
-import com.azure.core.util.polling.PollerFlux;
-import com.azure.mixedreality.remoterendering.implementation.models.ErrorResponseException;
-import com.azure.mixedreality.remoterendering.models.*;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import com.azure.core.http.HttpClient;
-import reactor.core.publisher.Flux;
-import reactor.test.StepVerifier;
-
-import java.time.Duration;
-import java.util.Locale;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class RemoteRenderingAsyncClientTest extends RemoteRenderingTestBase {
-    private static final String DISPLAY_NAME_WITH_ARGUMENTS = "{displayName} with [{arguments}]";
-
-    private RemoteRenderingAsyncClient getClient(HttpClient httpClient) {
-        return new RemoteRenderingClientBuilder().accountId(super.getAccountId())
-            .accountDomain(super.getAccountDomain())
-            .credential(super.getAccountKey())
-            .endpoint(super.getServiceEndpoint())
-            .pipeline(super.getHttpPipeline(httpClient))
-            .buildAsyncClient();
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void conversionTest(HttpClient httpClient) {
-        RemoteRenderingAsyncClient client = getClient(httpClient);
-
-        AssetConversionOptions conversionOptions
-            = new AssetConversionOptions().setInputStorageContainerUrl(getStorageUrl())
-                .setInputRelativeAssetPath("testBox.fbx")
-                .setInputBlobPrefix("Input")
-                .setInputStorageContainerReadListSas(getBlobContainerSasToken())
-                .setOutputStorageContainerUrl(getStorageUrl())
-                .setOutputBlobPrefix("Output")
-                .setOutputStorageContainerWriteSas(getBlobContainerSasToken());
-
-        String conversionId = getRandomId("asyncConversionTest");
-
-        PollerFlux<AssetConversion, AssetConversion> poller
-            = setPollerFluxPollInterval(client.beginConversion(conversionId, conversionOptions));
-
-        Flux<AsyncPollResponse<AssetConversion, AssetConversion>> terminalPoller = poller.map(response -> {
-            AssetConversion conversion = response.getValue();
-            assertEquals(conversionId, conversion.getId());
-            assertEquals(conversionOptions.getInputRelativeAssetPath(),
-                conversion.getOptions().getInputRelativeAssetPath());
-            assertNotEquals(AssetConversionStatus.FAILED, conversion.getStatus());
-            return response;
-        })
-            .filter(response -> ((response.getStatus() != LongRunningOperationStatus.NOT_STARTED)
-                && (response.getStatus() != LongRunningOperationStatus.IN_PROGRESS)));
-
-        StepVerifier.create(terminalPoller).assertNext(response -> {
-            assertEquals(response.getStatus(), LongRunningOperationStatus.SUCCESSFULLY_COMPLETED);
-
-            AssetConversion conversion = response.getValue();
-            assertEquals(conversion.getStatus(), AssetConversionStatus.SUCCEEDED);
-            assertTrue(conversion.getOutputAssetUrl().endsWith("Output/testBox.arrAsset"));
-        }).verifyComplete();
-
-        StepVerifier.create(client.getConversion(conversionId)).assertNext(conversion -> {
-            assertEquals(conversion.getStatus(), AssetConversionStatus.SUCCEEDED);
-            assertTrue(conversion.getOutputAssetUrl().endsWith("Output/testBox.arrAsset"));
-        }).verifyComplete();
-
-        Boolean foundConversion
-            = client.listConversions().any(conversion -> conversion.getId().equals(conversionId)).block();
-        assertNotNull(foundConversion);
-        assertTrue(foundConversion);
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void failedConversionNoAccessTest(HttpClient httpClient) {
-        RemoteRenderingAsyncClient client = getClient(httpClient);
-
-        // Don't provide SAS tokens.
-        AssetConversionOptions conversionOptions
-            = new AssetConversionOptions().setInputStorageContainerUrl(getStorageUrl())
-                .setInputRelativeAssetPath("testBox.fbx")
-                .setInputBlobPrefix("Input")
-                .setOutputStorageContainerUrl(getStorageUrl())
-                .setOutputBlobPrefix("Output");
-
-        String conversionId = getRandomId("failedConversionNoAccessAsync");
-
-        PollerFlux<AssetConversion, AssetConversion> poller
-            = setPollerFluxPollInterval(client.beginConversion(conversionId, conversionOptions));
-
-        StepVerifier.create(poller).expectErrorMatches(error -> {
-            // Error accessing connected storage account due to insufficient permissions. Check if the Mixed Reality resource has correct permissions assigned
-            return (error instanceof HttpResponseException)
-                && error.getMessage().contains(RESPONSE_CODE_403)
-                && error.getMessage().toLowerCase(Locale.ROOT).contains("storage")
-                && error.getMessage().toLowerCase(Locale.ROOT).contains("permissions");
-        }).verify();
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void failedConversionMissingAssetTest(HttpClient httpClient) {
-        RemoteRenderingAsyncClient client = getClient(httpClient);
-
-        AssetConversionOptions conversionOptions
-            = new AssetConversionOptions().setInputStorageContainerUrl(getStorageUrl())
-                .setInputRelativeAssetPath("boxWhichDoesNotExist.fbx")
-                .setInputBlobPrefix("Input")
-                .setInputStorageContainerReadListSas(getBlobContainerSasToken())
-                .setOutputStorageContainerUrl(getStorageUrl())
-                .setOutputBlobPrefix("Output")
-                .setOutputStorageContainerWriteSas(getBlobContainerSasToken());
-
-        String conversionId = getRandomId("failedConversionMissingAssetAsync");
-
-        PollerFlux<AssetConversion, AssetConversion> poller
-            = setPollerFluxPollInterval(client.beginConversion(conversionId, conversionOptions));
-
-        Flux<AsyncPollResponse<AssetConversion, AssetConversion>> terminalPoller = poller.map(response -> {
-            AssetConversion conversion = response.getValue();
-            assertEquals(conversionId, conversion.getId());
-            assertEquals(conversionOptions.getInputRelativeAssetPath(),
-                conversion.getOptions().getInputRelativeAssetPath());
-            assertNotEquals(AssetConversionStatus.SUCCEEDED, conversion.getStatus());
-            return response;
-        })
-            .filter(response -> ((response.getStatus() != LongRunningOperationStatus.NOT_STARTED)
-                && (response.getStatus() != LongRunningOperationStatus.IN_PROGRESS)));
-
-        StepVerifier.create(terminalPoller).assertNext(response -> {
-            assertEquals(response.getStatus(), LongRunningOperationStatus.FAILED);
-
-            AssetConversion conversion = response.getValue();
-
-            assertEquals(AssetConversionStatus.FAILED, conversion.getStatus());
-            assertNotNull(conversion.getError());
-            assertEquals(conversion.getError().getCode(), "InputContainerError");
-            // Message: "Could not find the asset file in the storage account. Please make sure all paths and names are correct and the file is uploaded to storage."
-            assertNotNull(conversion.getError().getMessage());
-            assertTrue(conversion.getError()
-                .getMessage()
-                .toLowerCase(Locale.ROOT)
-                .contains("could not find the asset file in the storage account"));
-        }).verifyComplete();
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void sessionTest(HttpClient httpClient) {
-
-        final long firstExpectedLeaseTimeMinutes = 4;
-        final long secondExpectedLeaseTimeMinutes = 5;
-
-        RemoteRenderingAsyncClient client = getClient(httpClient);
-
-        BeginSessionOptions options
-            = new BeginSessionOptions().setMaxLeaseTime(Duration.ofMinutes(firstExpectedLeaseTimeMinutes))
-                .setSize(RenderingSessionSize.STANDARD);
-
-        String sessionId = getRandomId("asyncSessionTest2");
-
-        PollerFlux<RenderingSession, RenderingSession> sessionPoller
-            = setPollerFluxPollInterval(client.beginSession(sessionId, options));
-
-        Flux<AsyncPollResponse<RenderingSession, RenderingSession>> terminalPoller = sessionPoller.map(response -> {
-            RenderingSession session = response.getValue();
-            assertEquals(sessionId, session.getId());
-            assertNotEquals(RenderingSessionStatus.ERROR, session.getStatus());
-            return response;
-        })
-            .filter(response -> ((response.getStatus() != LongRunningOperationStatus.NOT_STARTED)
-                && (response.getStatus() != LongRunningOperationStatus.IN_PROGRESS)));
-
-        StepVerifier.create(terminalPoller).assertNext(response -> {
-            assertEquals(response.getStatus(), LongRunningOperationStatus.SUCCESSFULLY_COMPLETED);
-
-            RenderingSession readyRenderingSession = response.getValue();
-            assertEquals(readyRenderingSession.getStatus(), RenderingSessionStatus.READY);
-
-            assertEquals(firstExpectedLeaseTimeMinutes, readyRenderingSession.getMaxLeaseTime().toMinutes());
-            assertNotNull(readyRenderingSession.getHostname());
-            assertNotEquals(readyRenderingSession.getArrInspectorPort(), 0);
-        }).verifyComplete();
-
-        StepVerifier.create(client.getSession(sessionId)).assertNext(session -> {
-            assertEquals(session.getStatus(), RenderingSessionStatus.READY);
-            assertNotNull(session.getHostname());
-            assertNotEquals(session.getArrInspectorPort(), 0);
-        }).verifyComplete();
-
-        UpdateSessionOptions updateOptions
-            = new UpdateSessionOptions().maxLeaseTime(Duration.ofMinutes(secondExpectedLeaseTimeMinutes));
-
-        StepVerifier.create(client.updateSession(sessionId, updateOptions))
-            .assertNext(session -> assertEquals(secondExpectedLeaseTimeMinutes, session.getMaxLeaseTime().toMinutes()))
-            .verifyComplete();
-
-        Boolean foundSession = client.listSessions().any(session -> session.getId().equals(sessionId)).block();
-        assertNotNull(foundSession);
-        assertTrue(foundSession);
-
-        client.endSession(sessionId).block();
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void failedSessionTest(HttpClient httpClient) {
-        RemoteRenderingAsyncClient client = getClient(httpClient);
-        BeginSessionOptions options
-            = new BeginSessionOptions().setMaxLeaseTime(Duration.ofMinutes(-4)).setSize(RenderingSessionSize.STANDARD);
-
-        String sessionId = getRandomId("failedSessionTestAsync");
-
-        PollerFlux<RenderingSession, RenderingSession> poller
-            = setPollerFluxPollInterval(client.beginSession(sessionId, options));
-
-        StepVerifier.create(poller).expectErrorMatches(error -> {
-            // The maxLeaseTimeMinutes value cannot be negative
-            return (error instanceof ErrorResponseException)
-                && error.getMessage().contains(RESPONSE_CODE_400)
-                && error.getMessage().toLowerCase(Locale.ROOT).contains("lease")
-                && error.getMessage().toLowerCase(Locale.ROOT).contains("negative");
-        }).verify();
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientTest.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientTest.java
deleted file mode 100644
index 2cd6a14262f4..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingClientTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.exception.HttpResponseException;
-import com.azure.core.http.HttpClient;
-import com.azure.core.util.polling.SyncPoller;
-import com.azure.mixedreality.remoterendering.implementation.models.ErrorResponseException;
-import com.azure.mixedreality.remoterendering.models.*;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.time.Duration;
-import java.util.Locale;
-import java.util.concurrent.atomic.AtomicReference;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class RemoteRenderingClientTest extends RemoteRenderingTestBase {
-    private static final String DISPLAY_NAME_WITH_ARGUMENTS = "{displayName} with [{arguments}]";
-
-    private RemoteRenderingClient getClient(HttpClient httpClient) {
-        return new RemoteRenderingClientBuilder().accountId(super.getAccountId())
-            .accountDomain(super.getAccountDomain())
-            .credential(super.getAccountKey())
-            .endpoint(super.getServiceEndpoint())
-            .pipeline(super.getHttpPipeline(httpClient))
-            .buildClient();
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void conversionTest(HttpClient httpClient) {
-        RemoteRenderingClient client = getClient(httpClient);
-
-        AssetConversionOptions conversionOptions
-            = new AssetConversionOptions().setInputStorageContainerUrl(getStorageUrl())
-                .setInputRelativeAssetPath("testBox.fbx")
-                .setInputBlobPrefix("Input")
-                .setInputStorageContainerReadListSas(getBlobContainerSasToken())
-                .setOutputStorageContainerUrl(getStorageUrl())
-                .setOutputBlobPrefix("Output")
-                .setOutputStorageContainerWriteSas(getBlobContainerSasToken());
-
-        String conversionId = getRandomId("conversionTest");
-
-        SyncPoller<AssetConversion, AssetConversion> conversionPoller
-            = setSyncPollerPollInterval(client.beginConversion(conversionId, conversionOptions));
-
-        AssetConversion conversion0 = conversionPoller.poll().getValue();
-
-        assertEquals(conversionId, conversion0.getId());
-        assertEquals(conversionOptions.getInputRelativeAssetPath(),
-            conversion0.getOptions().getInputRelativeAssetPath());
-        assertNotEquals(AssetConversionStatus.FAILED, conversion0.getStatus());
-
-        AssetConversion conversion = client.getConversion(conversionId);
-        assertEquals(conversionId, conversion.getId());
-        assertNotEquals(AssetConversionStatus.FAILED, conversion.getStatus());
-
-        AssetConversion conversion2 = conversionPoller.waitForCompletion().getValue();
-
-        assertEquals(conversionId, conversion2.getId());
-        assertEquals(AssetConversionStatus.SUCCEEDED, conversion2.getStatus());
-        assertTrue(conversion2.getOutputAssetUrl().endsWith("Output/testBox.arrAsset"));
-
-        AtomicReference<Boolean> foundConversion = new AtomicReference<Boolean>(false);
-
-        // iterate over each page
-        client.listConversions().forEach(c -> {
-            if (c.getId().equals(conversionId)) {
-                foundConversion.set(true);
-            }
-        });
-
-        assertTrue(foundConversion.get());
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void failedConversionNoAccessTest(HttpClient httpClient) {
-        RemoteRenderingClient client = getClient(httpClient);
-
-        // Don't provide SAS tokens.
-        AssetConversionOptions conversionOptions
-            = new AssetConversionOptions().setInputStorageContainerUrl(getStorageUrl())
-                .setInputRelativeAssetPath("testBox.fbx")
-                .setInputBlobPrefix("Input")
-                .setOutputStorageContainerUrl(getStorageUrl())
-                .setOutputBlobPrefix("Output");
-
-        String conversionId = getRandomId("failedConversionNoAccess");
-
-        HttpResponseException ex
-            = assertThrows(HttpResponseException.class, () -> client.beginConversion(conversionId, conversionOptions));
-
-        assertTrue(ex.getMessage().contains(RESPONSE_CODE_403));
-
-        // Error accessing connected storage account due to insufficient permissions. Check if the Mixed Reality resource has correct permissions assigned
-        assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("storage"));
-        assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("permissions"));
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void failedConversionMissingAssetTest(HttpClient httpClient) {
-        RemoteRenderingClient client = getClient(httpClient);
-
-        AssetConversionOptions conversionOptions
-            = new AssetConversionOptions().setInputStorageContainerUrl(getStorageUrl())
-                .setInputRelativeAssetPath("boxWhichDoesNotExist.fbx")
-                .setInputBlobPrefix("Input")
-                .setInputStorageContainerReadListSas(getBlobContainerSasToken())
-                .setOutputStorageContainerUrl(getStorageUrl())
-                .setOutputBlobPrefix("Output")
-                .setOutputStorageContainerWriteSas(getBlobContainerSasToken());
-
-        String conversionId = getRandomId("failedConversionMissingAsset");
-
-        SyncPoller<AssetConversion, AssetConversion> conversionPoller
-            = setSyncPollerPollInterval(client.beginConversion(conversionId, conversionOptions));
-
-        AssetConversion conversion = conversionPoller.waitForCompletion().getValue();
-
-        assertEquals(conversionId, conversion.getId());
-
-        assertEquals(AssetConversionStatus.FAILED, conversion.getStatus());
-        assertNotNull(conversion.getError());
-        assertEquals(conversion.getError().getCode(), "InputContainerError");
-        // Message: "Could not find the asset file in the storage account. Please make sure all paths and names are correct and the file is uploaded to storage."
-        assertNotNull(conversion.getError().getMessage());
-        assertTrue(conversion.getError()
-            .getMessage()
-            .toLowerCase(Locale.ROOT)
-            .contains("could not find the asset file in the storage account"));
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void sessionTest(HttpClient httpClient) {
-        RemoteRenderingClient client = getClient(httpClient);
-        BeginSessionOptions options
-            = new BeginSessionOptions().setMaxLeaseTime(Duration.ofMinutes(4)).setSize(RenderingSessionSize.STANDARD);
-
-        String sessionId = getRandomId("sessionTest2");
-
-        SyncPoller<RenderingSession, RenderingSession> sessionPoller
-            = setSyncPollerPollInterval(client.beginSession(sessionId, options));
-
-        RenderingSession session0 = sessionPoller.poll().getValue();
-
-        assertEquals(sessionId, session0.getId());
-
-        RenderingSession sessionProperties = client.getSession(sessionId);
-        assertEquals(session0.getCreationTime(), sessionProperties.getCreationTime());
-
-        UpdateSessionOptions updateOptions = new UpdateSessionOptions().maxLeaseTime(Duration.ofMinutes(5));
-        RenderingSession updatedSession = client.updateSession(sessionId, updateOptions);
-        assertEquals(updatedSession.getMaxLeaseTime().toMinutes(), 5);
-
-        RenderingSession readyRenderingSession = sessionPoller.getFinalResult();
-        assertTrue((readyRenderingSession.getMaxLeaseTime().toMinutes() == 4)
-            || (readyRenderingSession.getMaxLeaseTime().toMinutes() == 5));
-        assertNotNull(readyRenderingSession.getHostname());
-        assertNotEquals(readyRenderingSession.getArrInspectorPort(), 0);
-
-        UpdateSessionOptions updateOptions2 = new UpdateSessionOptions().maxLeaseTime(Duration.ofMinutes(6));
-        assertEquals(6, updateOptions2.getMaxLeaseTime().toMinutes());
-
-        assertTrue(client.listSessions().stream().anyMatch(s -> s.getId().equals(sessionId)));
-
-        client.endSession(sessionId);
-    }
-
-    @ParameterizedTest(name = DISPLAY_NAME_WITH_ARGUMENTS)
-    @MethodSource("getHttpClients")
-    public void failedSessionTest(HttpClient httpClient) {
-        RemoteRenderingClient client = getClient(httpClient);
-        BeginSessionOptions options
-            = new BeginSessionOptions().setMaxLeaseTime(Duration.ofMinutes(-4)).setSize(RenderingSessionSize.STANDARD);
-
-        String sessionId = getRandomId("failedSessionTest");
-
-        ErrorResponseException ex
-            = assertThrows(ErrorResponseException.class, () -> client.beginSession(sessionId, options));
-
-        assertTrue(ex.getMessage().contains(RESPONSE_CODE_400));
-
-        // The maxLeaseTimeMinutes value cannot be negative
-        assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("lease"));
-        assertTrue(ex.getMessage().toLowerCase(Locale.ROOT).contains("negative"));
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingTestBase.java b/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingTestBase.java
deleted file mode 100644
index 3b48a656aaec..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/src/test/java/com/azure/mixedreality/remoterendering/RemoteRenderingTestBase.java
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package com.azure.mixedreality.remoterendering;
-
-import com.azure.core.credential.AzureKeyCredential;
-import com.azure.core.http.HttpClient;
-import com.azure.core.http.HttpPipeline;
-import com.azure.core.http.HttpPipelineBuilder;
-import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
-import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.core.test.TestProxyTestBase;
-import com.azure.core.test.models.BodilessMatcher;
-import com.azure.core.test.models.CustomMatcher;
-import com.azure.core.test.models.TestProxyRequestMatcher;
-import com.azure.core.test.models.TestProxySanitizer;
-import com.azure.core.test.models.TestProxySanitizerType;
-import com.azure.core.util.Configuration;
-import com.azure.core.util.polling.PollerFlux;
-import com.azure.core.util.polling.SyncPoller;
-import com.azure.mixedreality.authentication.MixedRealityStsAsyncClient;
-import com.azure.mixedreality.authentication.MixedRealityStsClientBuilder;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
-
-public class RemoteRenderingTestBase extends TestProxyTestBase {
-    static final String RESPONSE_CODE_400 = "400";
-    static final String RESPONSE_CODE_403 = "403";
-
-    private final String accountId = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_ACCOUNT_ID");
-    private final String accountDomain
-        = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_ACCOUNT_DOMAIN");
-    private final String accountKey = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_ACCOUNT_KEY");
-    private final String storageAccountName
-        = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_STORAGE_ACCOUNT_NAME");
-    private final String storageAccountKey
-        = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_STORAGE_ACCOUNT_KEY");
-    private final String blobContainerName
-        = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_BLOB_CONTAINER_NAME");
-    private final String blobContainerSasToken
-        = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_SAS_TOKEN");
-    private final String serviceEndpoint
-        = Configuration.getGlobalConfiguration().get("REMOTERENDERING_ARR_SERVICE_ENDPOINT");
-
-    // NOT REAL ACCOUNT DETAILS
-    private final String playbackAccountId = "495e4326-898f-4adf-b8b3-08349992ec3c";
-    private final String playbackAccountDomain = "mixedreality.azure.com";
-    private final String playbackAccountKey = "Sanitized";
-    private final String playbackStorageAccountName = "sdkTest";
-    private final String playbackStorageAccountKey = "Sanitized";
-    private final String playbackBlobContainerName = "test";
-    private final String playbackBlobContainerSasToken = "Sanitized";
-    private final String playbackServiceEndpoint = "https://mixedreality.azure.com";
-
-    HttpPipeline getHttpPipeline(HttpClient httpClient) {
-        final List<HttpPipelinePolicy> policies = new ArrayList<>();
-
-        String scope = getServiceEndpoint().replaceFirst("/$", "") + "/.default";
-
-        if (!interceptorManager.isPlaybackMode()) {
-            MixedRealityStsAsyncClient stsClient = new MixedRealityStsClientBuilder().accountId(getAccountId())
-                .accountDomain(getAccountDomain())
-                .credential(getAccountKey())
-                .buildAsyncClient();
-            policies.add(new BearerTokenAuthenticationPolicy(r -> stsClient.getToken(), scope));
-        }
-
-        if (interceptorManager.isRecordMode()) {
-            List<TestProxySanitizer> customSanitizers = new ArrayList<>();
-            customSanitizers.add(
-                new TestProxySanitizer("$..storageContainerUri", null, "REDACTED", TestProxySanitizerType.BODY_KEY));
-            customSanitizers.add(new TestProxySanitizer("$..storageContainerReadListSas", null, "REDACTED",
-                TestProxySanitizerType.BODY_KEY));
-            customSanitizers.add(new TestProxySanitizer("$..storageContainerWriteSas", null, "REDACTED",
-                TestProxySanitizerType.BODY_KEY));
-            interceptorManager.addSanitizers(customSanitizers);
-            policies.add(interceptorManager.getRecordPolicy());
-        }
-
-        if (interceptorManager.isPlaybackMode()) {
-            List<TestProxyRequestMatcher> customMatchers = new ArrayList<>();
-            customMatchers.add(new BodilessMatcher());
-            customMatchers.add(new CustomMatcher().setExcludedHeaders(Collections.singletonList("Authorization")));
-            interceptorManager.addMatchers(customMatchers);
-        }
-
-        if (!interceptorManager.isLiveMode()) {
-            // Remove `operation-location`, `id` and `name` sanitizers from the list of common sanitizers.
-            interceptorManager.removeSanitizers("AZSDK2003", "AZSDK2030", "AZSDK3430");
-        }
-        return new HttpPipelineBuilder().policies(policies.toArray(new HttpPipelinePolicy[0]))
-            .httpClient(interceptorManager.isPlaybackMode() ? interceptorManager.getPlaybackClient() : httpClient)
-            .build();
-    }
-
-    String getAccountDomain() {
-        return interceptorManager.isPlaybackMode() ? this.playbackAccountDomain : this.accountDomain;
-    }
-
-    String getAccountId() {
-
-        return interceptorManager.isPlaybackMode() ? this.playbackAccountId : this.accountId;
-    }
-
-    AzureKeyCredential getAccountKey() {
-        String accountKeyValue = interceptorManager.isPlaybackMode() ? this.playbackAccountKey : this.accountKey;
-
-        return new AzureKeyCredential(accountKeyValue);
-    }
-
-    String getStorageUrl() {
-        String storageAccount
-            = interceptorManager.isPlaybackMode() ? this.playbackStorageAccountName : this.storageAccountName;
-
-        String blobContainer
-            = interceptorManager.isPlaybackMode() ? this.playbackBlobContainerName : this.blobContainerName;
-
-        return "https://" + storageAccount + ".blob.core.windows.net/" + blobContainer;
-    }
-
-    String getBlobContainerSasToken() {
-
-        return interceptorManager.isPlaybackMode() ? this.playbackBlobContainerSasToken : this.blobContainerSasToken;
-    }
-
-    String getServiceEndpoint() {
-
-        return interceptorManager.isPlaybackMode() ? this.playbackServiceEndpoint : this.serviceEndpoint;
-    }
-
-    String getRandomId(String playback) {
-        if (!interceptorManager.isPlaybackMode() && !interceptorManager.isRecordMode()) {
-            return UUID.randomUUID().toString();
-        } else {
-            return playback;
-        }
-    }
-
-    <T, U> SyncPoller<T, U> setSyncPollerPollInterval(SyncPoller<T, U> syncPoller) {
-        return interceptorManager.isPlaybackMode() ? syncPoller.setPollInterval(Duration.ofMillis(1)) : syncPoller;
-    }
-
-    <T, U> PollerFlux<T, U> setPollerFluxPollInterval(PollerFlux<T, U> pollerFlux) {
-        return interceptorManager.isPlaybackMode() ? pollerFlux.setPollInterval(Duration.ofMillis(1)) : pollerFlux;
-    }
-}
diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/swagger/autorest.md b/sdk/remoterendering/azure-mixedreality-remoterendering/swagger/autorest.md
deleted file mode 100644
index b3758d634c62..000000000000
--- a/sdk/remoterendering/azure-mixedreality-remoterendering/swagger/autorest.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Azure App Configuration Tutorial for Java
-
-> see https://aka.ms/autorest
-
-## Generation
-
-You can update the codegen by running the following commands:
-
-```bash
-cd sdk/remoterendering/azure-mixedreality-remoterendering/swagger
-autorest autorest.md
-```
-
-### Code generation settings
-``` yaml
-input-file: "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/2a65b0a2bbd9113b91c889f187d8778c2725c0b9/specification/mixedreality/data-plane/Microsoft.MixedReality/stable/2021-01-01/mr-arr.json"
-java: true
-use: '@autorest/java@4.1.52'
-output-folder: ..\
-generate-client-as-impl: true
-namespace: com.azure.mixedreality.remoterendering
-sync-methods: none
-license-header: MICROSOFT_MIT_SMALL
-models-subpackage: implementation.models
-artifact-id: azure-mixedreality-remoterendering
-credential-types: tokencredential
-required-fields-as-ctor-args: true
-```
diff --git a/sdk/remoterendering/ci.yml b/sdk/remoterendering/ci.yml
deleted file mode 100644
index aa533a44759f..000000000000
--- a/sdk/remoterendering/ci.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
-
-trigger:
-  branches:
-    include:
-      - main
-      - hotfix/*
-      - release/*
-  paths:
-    include:
-      - sdk/remoterendering/
-    exclude:
-      - sdk/remoterendering/pom.xml
-      - sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
-
-pr:
-  branches:
-    include:
-      - main
-      - feature/*
-      - hotfix/*
-      - release/*
-  paths:
-    include:
-      - sdk/remoterendering/
-    exclude:
-      - sdk/remoterendering/pom.xml
-      - sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
-
-extends:
-  template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
-  parameters:
-    ServiceDirectory: remoterendering
-    Artifacts:
-      - name: azure-mixedreality-remoterendering
-        groupId: com.azure
-        safeName: azuremixedrealityremoterendering
diff --git a/sdk/remoterendering/pom.xml b/sdk/remoterendering/pom.xml
deleted file mode 100644
index bd145111fe3a..000000000000
--- a/sdk/remoterendering/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved.
-     Licensed under the MIT License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.azure</groupId>
-  <artifactId>azure-mixedreality-remoterendering-services</artifactId>
-  <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-    <module>azure-mixedreality-remoterendering</module>
-  </modules>
-</project>
diff --git a/sdk/remoterendering/test-resources-post.ps1 b/sdk/remoterendering/test-resources-post.ps1
deleted file mode 100644
index d6d8d8465acd..000000000000
--- a/sdk/remoterendering/test-resources-post.ps1
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# This script is used to generate the Test Configuration file for Storage live tests.
-# It is invoked by the https://github.com/Azure/azure-sdk-for-java/blob/main/eng/common/New-TestResources.ps1
-# script after the ARM template, defined in https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/remoterendering/test-resources.json,
-# is finished being deployed. The ARM template is responsible for creating the Storage accounts needed for live tests.
-
-param (
-    [hashtable] $DeploymentOutputs,
-    [string] $TenantId,
-    [string] $TestApplicationId,
-    [string] $TestApplicationSecret
-)
-
-# outputs from the ARM deployment passed in from New-TestResources
-$StorageAccountName = $DeploymentOutputs['REMOTERENDERING_ARR_STORAGE_ACCOUNT_NAME']
-$StorageAccountKey = $DeploymentOutputs['REMOTERENDERING_ARR_STORAGE_ACCOUNT_KEY']
-$BlobContainerName = $DeploymentOutputs['REMOTERENDERING_ARR_BLOB_CONTAINER_NAME']
-
-$LocalFilePath = Join-Path $PSScriptRoot "TestResources\testBox.fbx"
-$TargetBlob = "Input/testBox.fbx"
-
-Write-Verbose ( "Copying test asset to blob storage")
-
-$StorageContext = New-AzStorageContext -StorageAccountName $StorageAccountName -StorageAccountKey $StorageAccountKey
-
-$blob = Set-AzStorageBlobContent -File $LocalFilePath -Blob $TargetBlob -Container $BlobContainerName -Context $StorageContext -Force
-
-Write-Verbose ("Test asset successfully copied to blob storage")
diff --git a/sdk/remoterendering/test-resources.json b/sdk/remoterendering/test-resources.json
deleted file mode 100644
index 92885c1e7ba8..000000000000
--- a/sdk/remoterendering/test-resources.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-    "contentVersion": "1.0.0.0",
-  "parameters": {
-    "baseName": {
-      "type": "string",
-      "defaultValue": "[resourceGroup().name]",
-      "metadata": {
-        "description": "The base resource name."
-      }
-    },
-    "tenantId": {
-      "type": "string",
-      "defaultValue": "72f988bf-86f1-41af-91ab-2d7cd011db47",
-      "metadata": {
-        "description": "The tenant ID to which the application and resources belong."
-      }
-    },
-    "location": {
-      "type": "string",
-      "defaultValue": "[resourceGroup().location]",
-      "metadata": {
-        "description": "The location of the resource. By default, this is the same as the resource group."
-      }
-    },
-    "baseTime": {
-      "type": "string",
-      "defaultValue": "[utcNow('u')]"
-    }
-  },
-  "variables": {
-    "apiVersion": "2020-05-01",
-    "arrApiVersion": "2021-03-01-preview",
-    "arrAccountName": "[concat(parameters('baseName'), '-arr-account')]",
-    "storageApiVersion": "2019-06-01",
-    "storageAccountName": "[parameters('baseName')]",
-    "blobContainerName": "test",
-    "blobContainerResourceName": "[concat(variables('storageAccountName'), '/default/', variables('blobContainerName'))]",
-    "sasProperties": {
-      "signedPermission": "rwl",
-      "signedExpiry": "[dateTimeAdd(parameters('baseTime'), 'P1D')]",
-      "signedResource": "c",
-      "canonicalizedResource": "[concat('/blob/', variables('storageAccountName'), '/', variables('blobContainerName'))]"
-    }
-  },
-    "resources": [
-        {
-            "type": "Microsoft.MixedReality/remoteRenderingAccounts",
-            "name": "[variables('arrAccountName')]",
-            "apiVersion": "[variables('arrApiVersion')]",
-            "location": "[parameters('location')]",
-            "properties": {},
-            "identity": { "type": "systemAssigned" }
-        },
-        {
-            "type": "Microsoft.Storage/storageAccounts",
-            "apiVersion": "[variables('storageApiVersion')]",
-            "name": "[variables('storageAccountName')]",
-            "location": "[parameters('location')]",
-            "sku": {
-                "name": "Standard_RAGRS",
-                "tier": "Standard"
-            },
-            "kind": "StorageV2",
-            "properties": {
-                "supportsHttpsTrafficOnly": true,
-                "encryption": {
-                    "keySource": "Microsoft.Storage",
-                    "services": {
-                        "blob": {
-                            "enabled": true
-                        }
-                    },
-                },
-                "accessTier": "Hot"
-            }
-        },
-        {
-          "type": "Microsoft.Storage/storageAccounts/blobServices/containers",
-          "apiVersion": "[variables('storageApiVersion')]",
-          "name": "[variables('blobContainerResourceName')]",
-          "dependsOn": [
-            "[variables('storageAccountName')]"
-          ]
-        }
-    ],
-    "outputs": {
-        "REMOTERENDERING_ARR_ACCOUNT_ID": {
-            "type": "string",
-            "value": "[reference(variables('arrAccountName')).accountId]"
-        },
-        "REMOTERENDERING_ARR_ACCOUNT_DOMAIN": {
-          "type": "string",
-          "value": "[reference(variables('arrAccountName')).accountDomain]"
-        },
-        "REMOTERENDERING_ARR_ACCOUNT_KEY": {
-          "type": "string",
-          "value": "[listKeys(resourceId('Microsoft.MixedReality/remoteRenderingAccounts', variables('arrAccountName')), variables('arrApiVersion')).primaryKey]"
-        },
-        "REMOTERENDERING_ARR_STORAGE_ACCOUNT_NAME": {
-          "type": "string",
-          "value": "[variables('storageAccountName')]"
-        },
-        "REMOTERENDERING_ARR_STORAGE_ACCOUNT_KEY": {
-          "type": "string",
-          "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), variables('storageApiVersion')).keys[0].value]"
-        },
-      "REMOTERENDERING_ARR_BLOB_CONTAINER_NAME": {
-        "type": "string",
-        "value": "[variables('blobContainerName')]"
-      },
-      "REMOTERENDERING_ARR_SAS_TOKEN": {
-        "type": "string",
-        "value": "[listServiceSas(variables('storageAccountName'), variables('storageApiVersion'), variables('sasProperties')).serviceSasToken]"
-      },
-      "REMOTERENDERING_ARR_SERVICE_ENDPOINT": {
-        "type": "string",
-        "value": "[concat('https://remoterendering.', parameters('location'), '.mixedreality.azure.com')]"
-      }
-    }
-}
diff --git a/sdk/remoterendering/tests.yml b/sdk/remoterendering/tests.yml
deleted file mode 100644
index c670833e7a30..000000000000
--- a/sdk/remoterendering/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-trigger: none
-
-extends:
-  template: /eng/pipelines/templates/stages/archetype-sdk-tests.yml
-  parameters:
-    ServiceDirectory: remoterendering
-    Location: eastus2
-    Artifacts:
-      - name: azure-mixedreality-remoterendering
-        groupId: com.azure
-        safeName: azuremixedrealityremoterendering
diff --git a/sdk/reservations/azure-resourcemanager-reservations/pom.xml b/sdk/reservations/azure-resourcemanager-reservations/pom.xml
index 702488d49c28..9ae1672112c0 100644
--- a/sdk/reservations/azure-resourcemanager-reservations/pom.xml
+++ b/sdk/reservations/azure-resourcemanager-reservations/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/resourceconnector/azure-resourcemanager-resourceconnector/pom.xml b/sdk/resourceconnector/azure-resourcemanager-resourceconnector/pom.xml
index 47fc6c146d39..013266eab449 100644
--- a/sdk/resourceconnector/azure-resourcemanager-resourceconnector/pom.xml
+++ b/sdk/resourceconnector/azure-resourcemanager-resourceconnector/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml
index 199ba745e1b8..489512b7b941 100644
--- a/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml
+++ b/sdk/resourcegraph/azure-resourcemanager-resourcegraph/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml b/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml
index 1fd9ea09d929..636e6cf152af 100644
--- a/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml
+++ b/sdk/resourcehealth/azure-resourcemanager-resourcehealth/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/resourcemanager/README.md b/sdk/resourcemanager/README.md
index 27d3a2fc8732..811bafec2a80 100644
--- a/sdk/resourcemanager/README.md
+++ b/sdk/resourcemanager/README.md
@@ -130,7 +130,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-identity</artifactId>
-  <version>1.18.0</version>
+  <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/resourcemanager/api-specs.json b/sdk/resourcemanager/api-specs.json
index 2e99bb5be863..d967389c3529 100644
--- a/sdk/resourcemanager/api-specs.json
+++ b/sdk/resourcemanager/api-specs.json
@@ -70,7 +70,7 @@
     "dir": "../containerservice/azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
-    "args": "--tag=package-2025-07 --modelerfour.lenient-model-deduplication --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku --enable-sync-stack=false"
+    "args": "--tag=package-preview-2025-08 --modelerfour.lenient-model-deduplication --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku --enable-sync-stack=false"
   },
   "containerservice-hybrid": {
     "dir": "../resourcemanagerhybrid/azure-resourcemanager-containerservice",
@@ -175,7 +175,7 @@
     "dir": "../network/azure-resourcemanager-network",
     "source": "specification/network/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.network",
-    "args": "--tag=package-2024-07-01 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture,ApplicationGateway,ApplicationGatewayListener --enable-sync-stack=false",
+    "args": "--tag=package-2024-10-01 --add-inner=ApplicationGatewayIpConfiguration,ApplicationGatewayPathRule,ApplicationGatewayProbe,ApplicationGatewayRedirectConfiguration,ApplicationGatewayRequestRoutingRule,ApplicationGatewaySslCertificate,ApplicationGatewayUrlPathMap,ApplicationGatewayAuthenticationCertificate,VirtualNetworkGatewayIpConfiguration,ConnectionMonitor,PacketCapture,ApplicationGateway,ApplicationGatewayListener --enable-sync-stack=false",
     "note": "Run DeprecateApplicationGatewaySku to deprecate v1 sku/tier in ApplicationGatewaySku."
   },
   "network-hybrid": {
diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
index 344a29be747a..a56f01686c76 100644
--- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
+++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.jcraft</groupId>
diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java
index e2ddb9e18176..8d02b6f90210 100644
--- a/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java
+++ b/sdk/resourcemanager/azure-resourcemanager-samples/src/test/java/com/azure/resourcemanager/samples/SqlSampleTests.java
@@ -34,7 +34,11 @@ public void testManageSqlDatabaseInElasticPool() {
         Assertions.assertTrue(ManageSqlDatabaseInElasticPool.runSample(azureResourceManager));
     }
 
+    /**
+     * CI playback run timeout.
+     */
     @Test
+    @DoNotRecord(skipInPlayback = true)
     public void testManageSqlDatabasesAcrossDifferentDataCenters() {
         Assertions.assertTrue(ManageSqlDatabasesAcrossDifferentDataCenters.runSample(azureResourceManager));
     }
diff --git a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml
index a8b2ac32daf0..d41ab593b335 100644
--- a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml
+++ b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/resourcemanager/azure-resourcemanager/CHANGELOG.md b/sdk/resourcemanager/azure-resourcemanager/CHANGELOG.md
index a7b6e8d5c3f4..5523cc774a92 100644
--- a/sdk/resourcemanager/azure-resourcemanager/CHANGELOG.md
+++ b/sdk/resourcemanager/azure-resourcemanager/CHANGELOG.md
@@ -2,14 +2,28 @@
 
 ## 2.55.0-beta.1 (Unreleased)
 
-### Features Added
+### azure-resourcemanager-containerservice
 
-### Breaking Changes
+#### Dependency Updates
 
-### Bugs Fixed
+- Updated `api-version` to `2025-08-01`.
+
+### azure-resourcemanager-network
+
+#### Bugs Fixed
+
+- Fixed a bug that `ApplicationGateway.availabilityZones()` throws exception.
+
+#### Dependency Updates
+
+- Updated `api-version` to `2024-10-01`.
 
 ### Other Changes
 
+#### Dependency Updates
+
+- Updated core dependency from resources.
+
 ## 2.55.0 (2025-09-30)
 
 ### azure-resourcemanager-network
diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml
index 0303807cbd84..877544ffca98 100644
--- a/sdk/resourcemanager/azure-resourcemanager/pom.xml
+++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.53.4</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.54.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
@@ -142,7 +142,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-containerservice</artifactId>
-      <version>2.54.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;dependency} -->
+      <version>2.55.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerservice;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsAbortLatestOperationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsAbortLatestOperationSamples.java
index 13d7d999c20a..35cd07b112e4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsAbortLatestOperationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsAbortLatestOperationSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsAbortLatestOperationSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsAbortOperation.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsCreateOrUpdateSamples.java
index 47c048e17a46..f6c27a44b75a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsCreateOrUpdateSamples.java
@@ -34,7 +34,7 @@
 public final class AgentPoolsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_EnableFIPS.json
      */
     /**
@@ -58,7 +58,7 @@ public static void createAgentPoolWithFIPSEnabledOS(com.azure.resourcemanager.Az
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPools_Update.json
      */
     /**
@@ -87,7 +87,7 @@ public static void updateAgentPool(com.azure.resourcemanager.AzureResourceManage
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_GPUMIG.json
      */
     /**
@@ -127,7 +127,7 @@ public static void createAgentPoolWithGPUMIG(com.azure.resourcemanager.AzureReso
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_WindowsOSSKU.json
      */
     /**
@@ -151,7 +151,7 @@ public static void createAgentPoolWithWindowsOSSKU(com.azure.resourcemanager.Azu
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_DedicatedHostGroup.json
      */
     /**
@@ -175,7 +175,7 @@ public static void createAgentPoolWithDedicatedHostGroup(com.azure.resourcemanag
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_Update.json
      */
     /**
@@ -204,7 +204,7 @@ public static void createUpdateAgentPool(com.azure.resourcemanager.AzureResource
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_WindowsDisableOutboundNAT.json
      */
     /**
@@ -230,7 +230,7 @@ public static void createUpdateAgentPool(com.azure.resourcemanager.AzureResource
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPools_Start.json
      */
     /**
@@ -250,7 +250,7 @@ public static void startAgentPool(com.azure.resourcemanager.AzureResourceManager
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_Spot.json
      */
     /**
@@ -278,7 +278,7 @@ public static void createSpotAgentPool(com.azure.resourcemanager.AzureResourceMa
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_Ephemeral.json
      */
     /**
@@ -303,7 +303,7 @@ public static void createAgentPoolWithEphemeralOSDisk(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_EnableEncryptionAtHost.json
      */
     /**
@@ -328,7 +328,7 @@ public static void createAgentPoolWithEphemeralOSDisk(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_EnableUltraSSD.json
      */
     /**
@@ -352,7 +352,7 @@ public static void createAgentPoolWithUltraSSDEnabled(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_WasmWasi.json
      */
     /**
@@ -379,7 +379,7 @@ public static void createAgentPoolWithUltraSSDEnabled(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_Snapshot.json
      */
     /**
@@ -404,7 +404,7 @@ public static void createAgentPoolUsingAnAgentPoolSnapshot(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_PPG.json
      */
     /**
@@ -428,7 +428,7 @@ public static void createAgentPoolWithPPG(com.azure.resourcemanager.AzureResourc
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_CustomNodeConfig.json
      */
     /**
@@ -468,7 +468,7 @@ public static void createAgentPoolWithPPG(com.azure.resourcemanager.AzureResourc
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPools_Stop.json
      */
     /**
@@ -488,7 +488,7 @@ public static void stopAgentPool(com.azure.resourcemanager.AzureResourceManager
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_MessageOfTheDay.json
      */
     /**
@@ -514,7 +514,7 @@ public static void createAgentPoolWithMessageOfTheDay(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_CRG.json
      */
     /**
@@ -539,7 +539,7 @@ public static void createAgentPoolWithMessageOfTheDay(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_OSSKU.json
      */
     /**
@@ -579,7 +579,7 @@ public static void createAgentPoolWithOSSKU(com.azure.resourcemanager.AzureResou
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsCreate_TypeVirtualMachines.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteMachinesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteMachinesSamples.java
index c47a4494424e..5314488700e5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteMachinesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteMachinesSamples.java
@@ -13,7 +13,7 @@
 public final class AgentPoolsDeleteMachinesSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsDeleteMachines.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteSamples.java
index a9c913ae7779..9d470a3a3c8f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetAvailableAgentPoolVersionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetAvailableAgentPoolVersionsSamples.java
index 8da04e4aaaf5..9b441d051d22 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetAvailableAgentPoolVersionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetAvailableAgentPoolVersionsSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsGetAvailableAgentPoolVersionsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsGetAgentPoolAvailableVersions.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetSamples.java
index 06210df65888..8b13e59cd74b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetUpgradeProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetUpgradeProfileSamples.java
index 207c2553a232..3a525834a608 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetUpgradeProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsGetUpgradeProfileSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsGetUpgradeProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsGetUpgradeProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsListSamples.java
index b1678b88a483..f1d135b0c977 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsListSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsUpgradeNodeImageVersionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsUpgradeNodeImageVersionSamples.java
index d5863ca96862..13bc337d7d7c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsUpgradeNodeImageVersionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/AgentPoolsUpgradeNodeImageVersionSamples.java
@@ -10,7 +10,7 @@
 public final class AgentPoolsUpgradeNodeImageVersionSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * AgentPoolsUpgradeNodeImageVersion.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesGetSamples.java
index 76a1bb1f12e2..8b742dfc7594 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesGetSamples.java
@@ -10,7 +10,7 @@
 public final class MachinesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MachineGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesListSamples.java
index b786dd8f3c13..143fc773f538 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MachinesListSamples.java
@@ -10,7 +10,7 @@
 public final class MachinesListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MachineList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsCreateOrUpdateSamples.java
index a7f7e3ffd97a..bb32ce040a9e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsCreateOrUpdateSamples.java
@@ -23,7 +23,7 @@
 public final class MaintenanceConfigurationsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsCreate_Update.json
      */
     /**
@@ -46,7 +46,7 @@ public static void createUpdateMaintenanceConfiguration(com.azure.resourcemanage
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsCreate_Update_MaintenanceWindow.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsDeleteSamples.java
index 80e41899c5ab..38692f87d133 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class MaintenanceConfigurationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsDelete.json
      */
     /**
@@ -28,7 +28,7 @@ public static void deleteMaintenanceConfiguration(com.azure.resourcemanager.Azur
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsDelete_MaintenanceWindow.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsGetSamples.java
index 98519fb333b0..b762fbc93916 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsGetSamples.java
@@ -10,7 +10,7 @@
 public final class MaintenanceConfigurationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsGet.json
      */
     /**
@@ -28,7 +28,7 @@ public static void getMaintenanceConfiguration(com.azure.resourcemanager.AzureRe
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsGet_MaintenanceWindow.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsListByManagedClusterSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsListByManagedClusterSamples.java
index 79124996696b..41c014d412e8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsListByManagedClusterSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/MaintenanceConfigurationsListByManagedClusterSamples.java
@@ -10,7 +10,7 @@
 public final class MaintenanceConfigurationsListByManagedClusterSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsList_MaintenanceWindow.json
      */
     /**
@@ -29,7 +29,7 @@ public static void listMaintenanceConfigurationsConfiguredWithMaintenanceWindowB
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * MaintenanceConfigurationsList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersAbortLatestOperationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersAbortLatestOperationSamples.java
index bcdb6ee31040..7c338daa4f97 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersAbortLatestOperationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersAbortLatestOperationSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersAbortLatestOperationSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersAbortOperation.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersCreateOrUpdateSamples.java
index d433f64fedac..adf2824b8ec5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersCreateOrUpdateSamples.java
@@ -70,7 +70,7 @@
 public final class ManagedClustersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_CRG.json
      */
     /**
@@ -121,7 +121,7 @@ public final class ManagedClustersCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_CustomCATrustCertificates.json
      */
     /**
@@ -172,7 +172,7 @@ public final class ManagedClustersCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_DualStackNetworking.json
      */
     /**
@@ -234,7 +234,7 @@ public final class ManagedClustersCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_PodIdentity.json
      */
     /**
@@ -285,7 +285,7 @@ public final class ManagedClustersCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_UserAssignedNATGateway.json
      */
     /**
@@ -333,7 +333,7 @@ public static void createManagedClusterWithUserAssignedNATGatewayAsOutboundType(
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_Update.json
      */
     /**
@@ -396,7 +396,7 @@ public static void createUpdateManagedCluster(com.azure.resourcemanager.AzureRes
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_PrivateClusterFQDNSubdomain.json
      */
     /**
@@ -447,7 +447,7 @@ public static void createUpdateManagedCluster(com.azure.resourcemanager.AzureRes
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_ManagedNATGateway.json
      */
     /**
@@ -497,7 +497,7 @@ public static void createManagedClusterWithAKSManagedNATGatewayAsOutboundType(
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_Premium.json
      */
     /**
@@ -546,7 +546,7 @@ public static void createManagedClusterWithLongTermSupport(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_NodePublicIPPrefix.json
      */
     /**
@@ -597,7 +597,7 @@ public static void createManagedClusterWithLongTermSupport(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_EnableEncryptionAtHost.json
      */
     /**
@@ -647,7 +647,7 @@ public static void createManagedClusterWithLongTermSupport(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_PrivateClusterPublicFQDN.json
      */
     /**
@@ -697,7 +697,7 @@ public static void createManagedClusterWithLongTermSupport(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_HTTPProxy.json
      */
     /**
@@ -750,7 +750,7 @@ public static void createManagedClusterWithLongTermSupport(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_DedicatedHostGroup.json
      */
     /**
@@ -800,7 +800,7 @@ public static void createManagedClusterWithLongTermSupport(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_EnabledFIPS.json
      */
     /**
@@ -849,7 +849,7 @@ public static void createManagedClusterWithFIPSEnabledOS(com.azure.resourcemanag
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_SecurityProfile.json
      */
     /**
@@ -894,7 +894,7 @@ public static void createManagedClusterWithFIPSEnabledOS(com.azure.resourcemanag
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_PPG.json
      */
     /**
@@ -944,7 +944,7 @@ public static void createManagedClusterWithPPG(com.azure.resourcemanager.AzureRe
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_IngressProfile_WebAppRouting.json
      */
     /**
@@ -987,7 +987,7 @@ public static void createManagedClusterWithWebAppRoutingIngressProfileConfigured
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_UpdateWithAHUB.json
      */
     /**
@@ -1041,7 +1041,7 @@ public static void createUpdateManagedClusterWithEnableAHUB(com.azure.resourcema
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_DisableRunCommand.json
      */
     /**
@@ -1090,7 +1090,7 @@ public static void createUpdateManagedClusterWithEnableAHUB(com.azure.resourcema
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_Snapshot.json
      */
     /**
@@ -1142,7 +1142,7 @@ public static void createUpdateManagedClusterWithEnableAHUB(com.azure.resourcema
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_AzureServiceMesh.json
      */
     /**
@@ -1211,7 +1211,7 @@ public static void createUpdateManagedClusterWithEnableAHUB(com.azure.resourcema
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_AzureKeyvaultSecretsProvider.json
      */
     /**
@@ -1267,7 +1267,7 @@ public static void createManagedClusterWithAzureKeyVaultSecretsProviderAddon(
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_OSSKU.json
      */
     /**
@@ -1320,7 +1320,7 @@ public static void createManagedClusterWithOSSKU(com.azure.resourcemanager.Azure
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_UpdateWithEnableAzureRBAC.json
      */
     /**
@@ -1371,7 +1371,7 @@ public static void createManagedClusterWithOSSKU(com.azure.resourcemanager.Azure
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_EnableUltraSSD.json
      */
     /**
@@ -1420,7 +1420,7 @@ public static void createManagedClusterWithUltraSSDEnabled(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_UpdateWindowsGmsa.json
      */
     /**
@@ -1475,7 +1475,7 @@ public static void createManagedClusterWithUltraSSDEnabled(com.azure.resourceman
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersCreate_GPUMIG.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersDeleteSamples.java
index 98f67cad02ff..f570fe32c0a1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersDelete.json
      */
     /**
@@ -23,6 +23,6 @@ public static void deleteManagedCluster(com.azure.resourcemanager.AzureResourceM
             .manager()
             .serviceClient()
             .getManagedClusters()
-            .delete("rg1", "clustername1", null, com.azure.core.util.Context.NONE);
+            .delete("rg1", "clustername1");
     }
 }
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetAccessProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetAccessProfileSamples.java
index 634c9a853c45..94820de518fd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetAccessProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetAccessProfileSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersGetAccessProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersGetAccessProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetByResourceGroupSamples.java
index 370b3c4405cc..9e5508446aa3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetCommandResultSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetCommandResultSamples.java
index fb70ae74eeb7..0e93804036ac 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetCommandResultSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetCommandResultSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersGetCommandResultSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * RunCommandResultFailed.json
      */
     /**
@@ -29,7 +29,7 @@ public static void commandFailedResult(com.azure.resourcemanager.AzureResourceMa
 
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * RunCommandResultSucceed.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshRevisionProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshRevisionProfileSamples.java
index 0c42293a6223..c8d0a628d7fc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshRevisionProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshRevisionProfileSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersGetMeshRevisionProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersGet_MeshRevisionProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshUpgradeProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshUpgradeProfileSamples.java
index 80dabbe77bea..4833e0bc43f1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshUpgradeProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetMeshUpgradeProfileSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersGetMeshUpgradeProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersGet_MeshUpgradeProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetUpgradeProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetUpgradeProfileSamples.java
index 367884b2249c..e93797880415 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetUpgradeProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersGetUpgradeProfileSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersGetUpgradeProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersGetUpgradeProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListByResourceGroupSamples.java
index 854297934f82..da9919a8188f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterAdminCredentialsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterAdminCredentialsSamples.java
index d4448d109755..7a9820c67600 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterAdminCredentialsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterAdminCredentialsSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListClusterAdminCredentialsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersListClusterAdminCredentials.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterMonitoringUserCredentialsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterMonitoringUserCredentialsSamples.java
index 439fead38991..41d0c9269912 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterMonitoringUserCredentialsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterMonitoringUserCredentialsSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListClusterMonitoringUserCredentialsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersListClusterMonitoringUserCredentials.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterUserCredentialsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterUserCredentialsSamples.java
index c6485e34a826..23d5a059a0f4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterUserCredentialsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListClusterUserCredentialsSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListClusterUserCredentialsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersListClusterUserCredentials.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListKubernetesVersionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListKubernetesVersionsSamples.java
index fcface8da4a7..681fc1ccaaa4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListKubernetesVersionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListKubernetesVersionsSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListKubernetesVersionsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * KubernetesVersions_List.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshRevisionProfilesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshRevisionProfilesSamples.java
index 36d011852073..91070a638bc2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshRevisionProfilesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshRevisionProfilesSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListMeshRevisionProfilesSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersList_MeshRevisionProfiles.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshUpgradeProfilesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshUpgradeProfilesSamples.java
index b9bb770a67b2..ed8691e1231c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshUpgradeProfilesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListMeshUpgradeProfilesSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListMeshUpgradeProfilesSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersList_MeshUpgradeProfiles.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListOutboundNetworkDependenciesEndpointsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListOutboundNetworkDependenciesEndpointsSamples.java
index 9f9ecc23157f..758e8a9ba90b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListOutboundNetworkDependenciesEndpointsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListOutboundNetworkDependenciesEndpointsSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListOutboundNetworkDependenciesEndpointsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * OutboundNetworkDependenciesEndpointsList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListSamples.java
index f8fb1665b430..a5166ae2ed8e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersListSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetAadProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetAadProfileSamples.java
index c3cd3cc6c983..402b21d56ea1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetAadProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetAadProfileSamples.java
@@ -12,7 +12,7 @@
 public final class ManagedClustersResetAadProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersResetAADProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetServicePrincipalProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetServicePrincipalProfileSamples.java
index 90d2204a38cc..f93224215721 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetServicePrincipalProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersResetServicePrincipalProfileSamples.java
@@ -12,7 +12,7 @@
 public final class ManagedClustersResetServicePrincipalProfileSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersResetServicePrincipalProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateClusterCertificatesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateClusterCertificatesSamples.java
index 27c7521eee61..faf45578a518 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateClusterCertificatesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateClusterCertificatesSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersRotateClusterCertificatesSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersRotateClusterCertificates.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateServiceAccountSigningKeysSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateServiceAccountSigningKeysSamples.java
index f73fb639f2b3..a489f9a1ee50 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateServiceAccountSigningKeysSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRotateServiceAccountSigningKeysSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersRotateServiceAccountSigningKeysSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersRotateServiceAccountSigningKeys.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRunCommandSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRunCommandSamples.java
index 9ff1cb461d0a..ae5cf7c34a78 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRunCommandSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersRunCommandSamples.java
@@ -12,7 +12,7 @@
 public final class ManagedClustersRunCommandSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * RunCommandRequest.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStartSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStartSamples.java
index 3bccfb95abc4..b0e2d41fb05d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStartSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStartSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersStartSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersStart.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStopSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStopSamples.java
index 09c281bb3bbb..e4952395d613 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStopSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersStopSamples.java
@@ -10,7 +10,7 @@
 public final class ManagedClustersStopSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersStop.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersUpdateTagsSamples.java
index 65022f1eed70..a9bcdf3ffe7e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ManagedClustersUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class ManagedClustersUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ManagedClustersUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/OperationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/OperationsListSamples.java
index 89bb6820a46d..38b9dbd431d4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/OperationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/OperationsListSamples.java
@@ -10,7 +10,7 @@
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * Operation_List.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsDeleteSamples.java
index 269b0d1b2893..d602ec7838d9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * PrivateEndpointConnectionsDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsGetSamples.java
index aca97844bcf7..63794b3504fb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * PrivateEndpointConnectionsGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsListSamples.java
index be0aa8de7341..f649e00fedcf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsListSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointConnectionsListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * PrivateEndpointConnectionsList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsUpdateSamples.java
index b7f1aec60747..946f593df692 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateEndpointConnectionsUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class PrivateEndpointConnectionsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * PrivateEndpointConnectionsUpdate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateLinkResourcesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateLinkResourcesListSamples.java
index 2fa260f71c32..db9f33aac8fa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateLinkResourcesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/PrivateLinkResourcesListSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkResourcesListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * PrivateLinkResourcesList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ResolvePrivateLinkServiceIdPostSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ResolvePrivateLinkServiceIdPostSamples.java
index 1aab4a0d4138..307f61bfcd8d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ResolvePrivateLinkServiceIdPostSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/ResolvePrivateLinkServiceIdPostSamples.java
@@ -12,7 +12,7 @@
 public final class ResolvePrivateLinkServiceIdPostSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * ResolvePrivateLinkServiceId.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsCreateOrUpdateSamples.java
index 7411b0298b43..1ad2cc36bc79 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class SnapshotsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * SnapshotsCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsDeleteSamples.java
index 9134ca226f13..17b5c30c55dc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * SnapshotsDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsGetByResourceGroupSamples.java
index efcad4b8a859..a883cccaefc1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * SnapshotsGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListByResourceGroupSamples.java
index b7ab701c8761..6a8709a5e123 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * SnapshotsListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListSamples.java
index e27916b661b0..0f072b3a4ccd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsListSamples.java
@@ -10,7 +10,7 @@
 public final class SnapshotsListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * SnapshotsList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsUpdateTagsSamples.java
index 34c2276046f7..b0c2e6252471 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/SnapshotsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class SnapshotsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * SnapshotsUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsCreateOrUpdateSamples.java
index c2982777b311..71aa41914325 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class TrustedAccessRoleBindingsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * TrustedAccessRoleBindings_CreateOrUpdate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsDeleteSamples.java
index c791f38ffa8e..6b41582968e6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class TrustedAccessRoleBindingsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * TrustedAccessRoleBindings_Delete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsGetSamples.java
index b813ff2aabae..dee1b4dbf437 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsGetSamples.java
@@ -10,7 +10,7 @@
 public final class TrustedAccessRoleBindingsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * TrustedAccessRoleBindings_Get.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsListSamples.java
index c7ec476b2720..13f599a6de04 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRoleBindingsListSamples.java
@@ -10,7 +10,7 @@
 public final class TrustedAccessRoleBindingsListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * TrustedAccessRoleBindings_List.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRolesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRolesListSamples.java
index 153ee771522e..929d7c103a4c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRolesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/containerservice/generated/TrustedAccessRolesListSamples.java
@@ -10,7 +10,7 @@
 public final class TrustedAccessRolesListSamples {
     /*
      * x-ms-original-file:
-     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-07-01/examples/
+     * specification/containerservice/resource-manager/Microsoft.ContainerService/aks/stable/2025-08-01/examples/
      * TrustedAccessRoles_List.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsCreateOrUpdateSamples.java
index 9c470d60232b..981f1472f460 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class AdminRuleCollectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerAdminRuleCollectionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsDeleteSamples.java
index 368d39670dda..cb06517929b7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AdminRuleCollectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerAdminRuleCollectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsGetSamples.java
index 929c13ec1406..579e711ee12c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AdminRuleCollectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerAdminRuleCollectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsListSamples.java
index 54c46fe303ea..a34d6c78ca28 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRuleCollectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AdminRuleCollectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerAdminRuleCollectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesCreateOrUpdateSamples.java
index 344f42bfbb61..4593a0fbcc16 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
  */
 public final class AdminRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerAdminRulePut_NetworkGroupSource.json
      */
     /**
@@ -50,7 +50,7 @@ public final class AdminRulesCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerAdminRulePut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerAdminRulePut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesDeleteSamples.java
index 04ed33625b14..ed3f9531da4a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class AdminRulesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerAdminRuleDelete
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerAdminRuleDelete
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesGetSamples.java
index 1ff2e9ee7ebd..aaa8326e0d05 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AdminRulesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerDefaultAdminRuleGet.json
      */
     /**
@@ -28,7 +28,7 @@ public static void getsSecurityDefaultAdminRule(com.azure.resourcemanager.AzureR
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerAdminRuleGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerAdminRuleGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesListSamples.java
index c97abd3ddb68..6892d73c7ab9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AdminRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class AdminRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerAdminRuleList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerAdminRuleList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsDeleteSamples.java
index 423af9f3b948..56d0a1fe843d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewayPrivateEndpointConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayPrivateEndpointConnectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsGetSamples.java
index 007e40763b69..b7e2cc562932 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewayPrivateEndpointConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayPrivateEndpointConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsListSamples.java
index 600495928b2c..bf2e4f13256d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewayPrivateEndpointConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayPrivateEndpointConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsUpdateSamples.java
index e560283fb55b..29c3006949b4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateEndpointConnectionsUpdateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class ApplicationGatewayPrivateEndpointConnectionsUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayPrivateEndpointConnectionUpdate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateLinkResourcesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateLinkResourcesListSamples.java
index 43fa49d6b2a2..786e260eb6b7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateLinkResourcesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayPrivateLinkResourcesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewayPrivateLinkResourcesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayPrivateLinkResourceList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsDefaultGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsDefaultGetSamples.java
index 294ba36c0297..cf13ddd281bd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsDefaultGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsDefaultGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewayWafDynamicManifestsDefaultGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * GetApplicationGatewayWafDynamicManifestsDefault.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsGetSamples.java
index 68f29f4372a3..0b6a9c80a9e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewayWafDynamicManifestsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewayWafDynamicManifestsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * GetApplicationGatewayWafDynamicManifests.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthOnDemandSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthOnDemandSamples.java
index 215c3b6de191..bdc58686108f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthOnDemandSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthOnDemandSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ApplicationGatewaysBackendHealthOnDemandSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayBackendHealthTest.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthSamples.java
index 43bf7d521171..4b1a2b5d4379 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysBackendHealthSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysBackendHealthSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayBackendHealthGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysCreateOrUpdateSamples.java
index 4ec5765c5ed7..d7badc7d9b75 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysCreateOrUpdateSamples.java
@@ -49,7 +49,7 @@
 public final class ApplicationGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayCreate.json
      */
     /**
      * Sample code: Create Application Gateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysDeleteSamples.java
index 794b222b89c3..03d177c20078 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayDelete.json
      */
     /**
      * Sample code: Delete ApplicationGateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetByResourceGroupSamples.java
index fdc35343d7da..355056c52245 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayGet.json
      */
     /**
      * Sample code: Get ApplicationGateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetSslPredefinedPolicySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetSslPredefinedPolicySamples.java
index 282de1c36094..eba3cbe61125 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetSslPredefinedPolicySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysGetSslPredefinedPolicySamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysGetSslPredefinedPolicySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableSslOptionsPredefinedPolicyGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableRequestHeadersSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableRequestHeadersSamples.java
index d22f85191002..f64756f229dd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableRequestHeadersSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableRequestHeadersSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysListAvailableRequestHeadersSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableRequestHeadersGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableResponseHeadersSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableResponseHeadersSamples.java
index 043fdc0d7f5e..e9fb03aa12a7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableResponseHeadersSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableResponseHeadersSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysListAvailableResponseHeadersSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableResponseHeadersGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableServerVariablesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableServerVariablesSamples.java
index 01799ea8d500..4848af45d0da 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableServerVariablesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableServerVariablesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysListAvailableServerVariablesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableServerVariablesGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslOptionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslOptionsSamples.java
index cafc35e4a6e4..90624ad2e61e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslOptionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslOptionsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysListAvailableSslOptionsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableSslOptionsGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslPredefinedPoliciesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslPredefinedPoliciesSamples.java
index 46dab4489196..0b92f5650e55 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslPredefinedPoliciesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableSslPredefinedPoliciesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysListAvailableSslPredefinedPoliciesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableSslOptionsPredefinedPoliciesGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableWafRuleSetsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableWafRuleSetsSamples.java
index 1b4e2c41c293..143797ed1fbe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableWafRuleSetsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListAvailableWafRuleSetsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationGatewaysListAvailableWafRuleSetsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationGatewayAvailableWafRuleSetsGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListByResourceGroupSamples.java
index 22c2c4e6228e..ddd841defd74 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationGatewaysListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayList.json
      */
     /**
      * Sample code: Lists all application gateways in a resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListSamples.java
index 26cde178f2ce..7e860c382675 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysListSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationGatewaysListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayListAll.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayListAll.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStartSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStartSamples.java
index 74c1fb39f2a7..5775496fda45 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStartSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStartSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationGatewaysStartSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayStart.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayStart.json
      */
     /**
      * Sample code: Start Application Gateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStopSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStopSamples.java
index b8c40176bc8c..a32f39b63f7f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStopSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysStopSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationGatewaysStopSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayStop.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayStop.json
      */
     /**
      * Sample code: Stop Application Gateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysUpdateTagsSamples.java
index 984ad62e94d8..1630ee18be3f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationGatewaysUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class ApplicationGatewaysUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationGatewayUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationGatewayUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsCreateOrUpdateSamples.java
index 37c71c4d328c..4bc14c8e8eda 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ApplicationSecurityGroupsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationSecurityGroupCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsDeleteSamples.java
index 073e5e888b83..659743b31b71 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationSecurityGroupsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationSecurityGroupDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsGetByResourceGroupSamples.java
index 931b0fa019d6..757047d62fc4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationSecurityGroupsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationSecurityGroupGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationSecurityGroupGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListByResourceGroupSamples.java
index b14fd5bd228b..1411528cb20e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ApplicationSecurityGroupsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ApplicationSecurityGroupList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ApplicationSecurityGroupList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListSamples.java
index 821f6a17a6d3..cfa85ba92b57 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ApplicationSecurityGroupsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationSecurityGroupListAll.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsUpdateTagsSamples.java
index f709d0f69eed..ec67480a66e8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ApplicationSecurityGroupsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ApplicationSecurityGroupsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ApplicationSecurityGroupUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableDelegationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableDelegationsListSamples.java
index 8495e718cb18..b574fbeb6e36 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableDelegationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableDelegationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AvailableDelegationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AvailableDelegationsSubscriptionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableEndpointServicesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableEndpointServicesListSamples.java
index b050632010ed..8b3215985c10 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableEndpointServicesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableEndpointServicesListSamples.java
@@ -10,7 +10,7 @@
 public final class AvailableEndpointServicesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/EndpointServicesList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/EndpointServicesList.json
      */
     /**
      * Sample code: EndpointServicesList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListByResourceGroupSamples.java
index fd3b1bce3ef1..6412cb225e69 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AvailablePrivateEndpointTypesListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AvailablePrivateEndpointTypesResourceGroupGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListSamples.java
index 13cbc239cf94..7aee2b7e630d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailablePrivateEndpointTypesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AvailablePrivateEndpointTypesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AvailablePrivateEndpointTypesGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableResourceGroupDelegationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableResourceGroupDelegationsListSamples.java
index d3e89916ee0b..33df6114ad44 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableResourceGroupDelegationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableResourceGroupDelegationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AvailableResourceGroupDelegationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AvailableDelegationsResourceGroupGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListByResourceGroupSamples.java
index 38047611b8d9..d9e63b959d1a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AvailableServiceAliasesListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AvailableServiceAliasesListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListSamples.java
index 9662bcb76d39..34c733c49514 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AvailableServiceAliasesListSamples.java
@@ -10,7 +10,7 @@
 public final class AvailableServiceAliasesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AvailableServiceAliasesList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AvailableServiceAliasesList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallFqdnTagsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallFqdnTagsListSamples.java
index 41c0e8b7e46b..5c292a7819b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallFqdnTagsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallFqdnTagsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AzureFirewallFqdnTagsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallFqdnTagsListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsCreateOrUpdateSamples.java
index 0e62b5fa0a30..bcd148ec16a2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsCreateOrUpdateSamples.java
@@ -36,7 +36,7 @@
 public final class AzureFirewallsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallPutWithIpGroups.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallPutWithIpGroups.
      * json
      */
     /**
@@ -121,7 +121,7 @@ public static void createAzureFirewallWithIpGroups(com.azure.resourcemanager.Azu
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallPutWithZones.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallPutWithZones.
      * json
      */
     /**
@@ -206,7 +206,7 @@ public static void createAzureFirewallWithZones(com.azure.resourcemanager.AzureR
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallPut.json
      */
     /**
      * Sample code: Create Azure Firewall.
@@ -289,7 +289,7 @@ public static void createAzureFirewall(com.azure.resourcemanager.AzureResourceMa
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallPutWithAdditionalProperties.json
      */
     /**
@@ -376,7 +376,7 @@ public static void createAzureFirewall(com.azure.resourcemanager.AzureResourceMa
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallPutInHub.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallPutInHub.json
      */
     /**
      * Sample code: Create Azure Firewall in virtual Hub.
@@ -405,7 +405,7 @@ public static void createAzureFirewallInVirtualHub(com.azure.resourcemanager.Azu
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallPutWithMgmtSubnet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsDeleteSamples.java
index d95cdad0d613..454f642da04a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class AzureFirewallsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallDelete.json
      */
     /**
      * Sample code: Delete Azure Firewall.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsGetByResourceGroupSamples.java
index ff1a34615fe2..6ed85ec315ce 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AzureFirewallsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallGetWithAdditionalProperties.json
      */
     /**
@@ -27,7 +27,7 @@ public static void getAzureFirewallWithAdditionalProperties(com.azure.resourcema
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallGetWithIpGroups.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallGetWithIpGroups.
      * json
      */
     /**
@@ -45,7 +45,7 @@ public static void getAzureFirewallWithIpGroups(com.azure.resourcemanager.AzureR
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallGetWithZones.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallGetWithZones.
      * json
      */
     /**
@@ -62,7 +62,7 @@ public static void getAzureFirewallWithZones(com.azure.resourcemanager.AzureReso
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallGetWithMgmtSubnet.json
      */
     /**
@@ -80,7 +80,7 @@ public static void getAzureFirewallWithManagementSubnet(com.azure.resourcemanage
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallGet.json
      */
     /**
      * Sample code: Get Azure Firewall.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListByResourceGroupSamples.java
index a914f66ea1ef..600b3d097502 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AzureFirewallsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListLearnedPrefixesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListLearnedPrefixesSamples.java
index 8fdbc2af47b5..3e46e573ce03 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListLearnedPrefixesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListLearnedPrefixesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AzureFirewallsListLearnedPrefixesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallListLearnedIPPrefixes.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListSamples.java
index f62408f8238a..0a7a1fdac894 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class AzureFirewallsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureFirewallListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureOperationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureOperationSamples.java
new file mode 100644
index 000000000000..9d07b1888819
--- /dev/null
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureOperationSamples.java
@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.generated;
+
+import com.azure.resourcemanager.network.models.AzureFirewallNetworkRuleProtocol;
+import com.azure.resourcemanager.network.models.AzureFirewallPacketCaptureFlags;
+import com.azure.resourcemanager.network.models.AzureFirewallPacketCaptureFlagsType;
+import com.azure.resourcemanager.network.models.AzureFirewallPacketCaptureOperationType;
+import com.azure.resourcemanager.network.models.AzureFirewallPacketCaptureRule;
+import com.azure.resourcemanager.network.models.FirewallPacketCaptureParameters;
+import java.util.Arrays;
+
+/**
+ * Samples for AzureFirewalls PacketCaptureOperation.
+ */
+public final class AzureFirewallsPacketCaptureOperationSamples {
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * AzureFirewallPacketCaptureOperation.json
+     */
+    /**
+     * Sample code: AzureFirewallPacketCaptureOperation.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void azureFirewallPacketCaptureOperation(com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getAzureFirewalls()
+            .packetCaptureOperation("rg1", "azureFirewall1",
+                new FirewallPacketCaptureParameters().withDurationInSeconds(300)
+                    .withNumberOfPacketsToCapture(5000)
+                    .withSasUrl("someSASURL")
+                    .withFileName("azureFirewallPacketCapture")
+                    .withProtocol(AzureFirewallNetworkRuleProtocol.ANY)
+                    .withFlags(Arrays.asList(
+                        new AzureFirewallPacketCaptureFlags().withType(AzureFirewallPacketCaptureFlagsType.SYN),
+                        new AzureFirewallPacketCaptureFlags().withType(AzureFirewallPacketCaptureFlagsType.FIN)))
+                    .withFilters(Arrays.asList(
+                        new AzureFirewallPacketCaptureRule().withSources(Arrays.asList("20.1.1.0"))
+                            .withDestinations(Arrays.asList("20.1.2.0"))
+                            .withDestinationPorts(Arrays.asList("4500")),
+                        new AzureFirewallPacketCaptureRule().withSources(Arrays.asList("10.1.1.0", "10.1.1.1"))
+                            .withDestinations(Arrays.asList("10.1.2.0"))
+                            .withDestinationPorts(Arrays.asList("123", "80"))))
+                    .withOperation(AzureFirewallPacketCaptureOperationType.STATUS),
+                com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureSamples.java
index cf3f11153d6b..4e6c30cecc1a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsPacketCaptureSamples.java
@@ -17,7 +17,7 @@
 public final class AzureFirewallsPacketCaptureSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallPacketCapture.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallPacketCapture.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsUpdateTagsSamples.java
index 14f95e1b2992..721e6d1e032b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/AzureFirewallsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class AzureFirewallsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureFirewallUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureFirewallUpdateTags.json
      */
     /**
      * Sample code: Update Azure Firewall Tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsCreateOrUpdateSamples.java
index 39a54367026e..5ec624012b11 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
 public final class BastionHostsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostPutWithPrivateOnly
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostPutWithPrivateOnly
      * .json
      */
     /**
@@ -40,7 +40,7 @@ public static void createBastionHostWithPrivateOnly(com.azure.resourcemanager.Az
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostDeveloperPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostDeveloperPut.json
      */
     /**
      * Sample code: Create Developer Bastion Host.
@@ -63,7 +63,7 @@ public static void createDeveloperBastionHost(com.azure.resourcemanager.AzureRes
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostPut.json
      */
     /**
      * Sample code: Create Bastion Host.
@@ -87,7 +87,7 @@ public static void createBastionHost(com.azure.resourcemanager.AzureResourceMana
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostPutWithZones.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostPutWithZones.json
      */
     /**
      * Sample code: Create Bastion Host With Zones.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsDeleteSamples.java
index 7ecee6199810..f6bbec1b5018 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class BastionHostsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostDeveloperDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostDeveloperDelete.
      * json
      */
     /**
@@ -28,7 +28,7 @@ public static void deleteDeveloperBastionHost(com.azure.resourcemanager.AzureRes
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostDelete.json
      */
     /**
      * Sample code: Delete Bastion Host.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsGetByResourceGroupSamples.java
index 87dc4c29668f..e6112d44b00c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class BastionHostsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostDeveloperGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostDeveloperGet.json
      */
     /**
      * Sample code: Get Developer Bastion Host.
@@ -27,7 +27,7 @@ public static void getDeveloperBastionHost(com.azure.resourcemanager.AzureResour
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostGetWithZones.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostGetWithZones.json
      */
     /**
      * Sample code: Get Bastion Host With Zones.
@@ -44,7 +44,7 @@ public static void getBastionHostWithZones(com.azure.resourcemanager.AzureResour
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostGet.json
      */
     /**
      * Sample code: Get Bastion Host.
@@ -61,7 +61,7 @@ public static void getBastionHost(com.azure.resourcemanager.AzureResourceManager
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostGetWithPrivateOnly
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostGetWithPrivateOnly
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListByResourceGroupSamples.java
index 3e7919db13b4..26cc110808b2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class BastionHostsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * BastionHostListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListSamples.java
index 283c4079bcf5..4e83b4fe415f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsListSamples.java
@@ -10,7 +10,7 @@
 public final class BastionHostsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostListBySubscription
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostListBySubscription
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsUpdateTagsSamples.java
index b1dc7bebe3b4..2893b1a7fd3e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BastionHostsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class BastionHostsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/BastionHostPatch.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/BastionHostPatch.json
      */
     /**
      * Sample code: Patch Bastion Host.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BgpServiceCommunitiesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BgpServiceCommunitiesListSamples.java
index 52c3f7749462..e1d83dd41527 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BgpServiceCommunitiesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/BgpServiceCommunitiesListSamples.java
@@ -10,7 +10,7 @@
 public final class BgpServiceCommunitiesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceCommunityList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceCommunityList.json
      */
     /**
      * Sample code: ServiceCommunityList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsCreateOrUpdateSamples.java
index 02914065f627..e094586bdcf8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class ConfigurationPolicyGroupsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ConfigurationPolicyGroupPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ConfigurationPolicyGroupPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsDeleteSamples.java
index 1289aeff8101..05d587e9594e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConfigurationPolicyGroupsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ConfigurationPolicyGroupDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsGetSamples.java
index 7e8076abf0ae..353732b1ae46 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ConfigurationPolicyGroupsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ConfigurationPolicyGroupGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ConfigurationPolicyGroupGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsListByVpnServerConfigurationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsListByVpnServerConfigurationSamples.java
index bba8f5a59fed..f745628a8398 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsListByVpnServerConfigurationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConfigurationPolicyGroupsListByVpnServerConfigurationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConfigurationPolicyGroupsListByVpnServerConfigurationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ConfigurationPolicyGroupListByVpnServerConfiguration.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsCreateOrUpdateSamples.java
index dd9e95bd20e4..b2bdf39d4028 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsCreateOrUpdateSamples.java
@@ -25,7 +25,7 @@
  */
 public final class ConnectionMonitorsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorCreate.json
      */
     /**
@@ -56,7 +56,7 @@ public static void createConnectionMonitorV1(com.azure.resourcemanager.AzureReso
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorCreateWithArcNetwork.json
      */
     /**
@@ -100,7 +100,7 @@ public static void createConnectionMonitorWithArcNetwork(com.azure.resourcemanag
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorV2Create.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsDeleteSamples.java
index dc07082079f1..d1ff39b6c11c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectionMonitorsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsGetSamples.java
index 00ba8f5bf397..35e17ca906a8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectionMonitorsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsListSamples.java
index 63bfeeaded86..70a8086920a7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectionMonitorsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsStopSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsStopSamples.java
index d26e1fc66487..024d9a485f01 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsStopSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsStopSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectionMonitorsStopSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorStop.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsUpdateTagsSamples.java
index 6cbf5396a77c..3c7687d79fda 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectionMonitorsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ConnectionMonitorsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectionMonitorUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsCreateOrUpdateSamples.java
index d08947945bd8..908aae3e4b59 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsCreateOrUpdateSamples.java
@@ -23,7 +23,7 @@
  */
 public final class ConnectivityConfigurationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectivityConfigurationPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsDeleteSamples.java
index 4e1daa338688..71757f52e5aa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectivityConfigurationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectivityConfigurationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsGetSamples.java
index e8cf9d5fda41..928e308ec639 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectivityConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectivityConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsListSamples.java
index 8f5e40b3d704..4506a69c8184 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ConnectivityConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ConnectivityConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectivityConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesCreateOrUpdateSamples.java
index 301d2bba3d98..1b44eaca964e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class CustomIpPrefixesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CustomIpPrefixCreateCustomizedValues.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesDeleteSamples.java
index e58ab23f632c..928541049416 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class CustomIpPrefixesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CustomIpPrefixDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CustomIpPrefixDelete.json
      */
     /**
      * Sample code: Delete custom IP prefix.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesGetByResourceGroupSamples.java
index 26161c9af67e..7d7225f67954 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class CustomIpPrefixesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CustomIpPrefixGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CustomIpPrefixGet.json
      */
     /**
      * Sample code: Get custom IP prefix.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListByResourceGroupSamples.java
index b1174f64bfc8..d56bb8e02aa7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class CustomIpPrefixesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CustomIpPrefixList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CustomIpPrefixList.json
      */
     /**
      * Sample code: List resource group Custom IP prefixes.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListSamples.java
index b73624f62f36..e5fef9673159 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesListSamples.java
@@ -10,7 +10,7 @@
 public final class CustomIpPrefixesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CustomIpPrefixListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CustomIpPrefixListAll.json
      */
     /**
      * Sample code: List all custom IP prefixes.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesUpdateTagsSamples.java
index f27b5c579762..2e81676d1b28 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/CustomIpPrefixesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class CustomIpPrefixesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CustomIpPrefixUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CustomIpPrefixUpdateTags.json
      */
     /**
      * Sample code: Update public IP address tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesCreateOrUpdateSamples.java
index 3217559cf6bb..fff0a3cc5163 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class DdosCustomPoliciesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosCustomPolicyCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosCustomPolicyCreate.json
      */
     /**
      * Sample code: Create DDoS custom policy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesDeleteSamples.java
index e6cafe7e3fc8..e5eded76b805 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class DdosCustomPoliciesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosCustomPolicyDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosCustomPolicyDelete.json
      */
     /**
      * Sample code: Delete DDoS custom policy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesGetByResourceGroupSamples.java
index 42bb239656e8..1b555cfb033f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class DdosCustomPoliciesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosCustomPolicyGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosCustomPolicyGet.json
      */
     /**
      * Sample code: Get DDoS custom policy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesUpdateTagsSamples.java
index 5418813de651..20596efb25e8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosCustomPoliciesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class DdosCustomPoliciesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosCustomPolicyUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosCustomPolicyUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansCreateOrUpdateSamples.java
index dab8539f53e8..f10844e373b7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class DdosProtectionPlansCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosProtectionPlanCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosProtectionPlanCreate.json
      */
     /**
      * Sample code: Create DDoS protection plan.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansDeleteSamples.java
index ae33f019d16f..16edc6412e42 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class DdosProtectionPlansDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosProtectionPlanDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosProtectionPlanDelete.json
      */
     /**
      * Sample code: Delete DDoS protection plan.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansGetByResourceGroupSamples.java
index 818d69954aca..9e51e35e79e6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class DdosProtectionPlansGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosProtectionPlanGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosProtectionPlanGet.json
      */
     /**
      * Sample code: Get DDoS protection plan.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListByResourceGroupSamples.java
index ac2aaca3612d..c7072ac490cf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class DdosProtectionPlansListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosProtectionPlanList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosProtectionPlanList.json
      */
     /**
      * Sample code: List DDoS protection plans in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListSamples.java
index 0ad053686145..37e190090c71 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansListSamples.java
@@ -10,7 +10,7 @@
 public final class DdosProtectionPlansListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosProtectionPlanListAll.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosProtectionPlanListAll.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansUpdateTagsSamples.java
index 1dc26d562280..3e552312bc1d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DdosProtectionPlansUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class DdosProtectionPlansUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DdosProtectionPlanUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DdosProtectionPlanUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesGetSamples.java
index 4731332e9ca1..87935db907a5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class DefaultSecurityRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DefaultSecurityRuleGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DefaultSecurityRuleGet.json
      */
     /**
      * Sample code: DefaultSecurityRuleGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesListSamples.java
index 596c5e2b4912..16cfe16d206a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DefaultSecurityRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class DefaultSecurityRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DefaultSecurityRuleList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DefaultSecurityRuleList.json
      */
     /**
      * Sample code: DefaultSecurityRuleList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationCreateOrUpdateSamples.java
index d5b0ff8a1390..c39bf9f80ab1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
 public final class DscpConfigurationCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DscpConfigurationCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DscpConfigurationCreate.json
      */
     /**
      * Sample code: Create DSCP Configuration.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationDeleteSamples.java
index be8814aa86e4..f46591e1c4a5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class DscpConfigurationDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DscpConfigurationDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DscpConfigurationDelete.json
      */
     /**
      * Sample code: Delete DSCP Configuration.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationGetByResourceGroupSamples.java
index 0bc55152a4d8..3da413b011dd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class DscpConfigurationGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DscpConfigurationGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DscpConfigurationGet.json
      */
     /**
      * Sample code: Get Dscp Configuration.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListByResourceGroupSamples.java
index 7917877630b2..c88e1302066a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class DscpConfigurationListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DscpConfigurationList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DscpConfigurationList.json
      */
     /**
      * Sample code: Get Dscp Configuration.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListSamples.java
index 382a63b5d2cf..d717dbc881f6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/DscpConfigurationListSamples.java
@@ -10,7 +10,7 @@
 public final class DscpConfigurationListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/DscpConfigurationListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/DscpConfigurationListAll.json
      */
     /**
      * Sample code: List all network interfaces.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsCreateOrUpdateSamples.java
index d77de73b9b10..029c65d3dbae 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ExpressRouteCircuitAuthorizationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitAuthorizationCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsDeleteSamples.java
index b4b0353ae134..ce7ea8dd49dc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitAuthorizationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitAuthorizationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsGetSamples.java
index cbe117dfd56d..7ec742c35748 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitAuthorizationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitAuthorizationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsListSamples.java
index 18f32a85d4d0..f5f04a013934 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitAuthorizationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitAuthorizationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitAuthorizationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsCreateOrUpdateSamples.java
index 804fd279c883..ea5a5d110088 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ExpressRouteCircuitConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitConnectionCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsDeleteSamples.java
index 936c33f13090..3c4984bbc26d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitConnectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsGetSamples.java
index 4f31bbb2adaf..cca1cf1ee0d4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsListSamples.java
index 7ca6a85fd0be..1a7cb53f0e37 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsCreateOrUpdateSamples.java
index ffc2598bf104..084d23765698 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ExpressRouteCircuitPeeringsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitPeeringCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsDeleteSamples.java
index 3e8510122862..153df36ab12d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitPeeringsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitPeeringDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsGetSamples.java
index 8fe4266288c3..6137111cf66e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteCircuitPeeringsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteCircuitPeeringGet
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteCircuitPeeringGet
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsListSamples.java
index e00e69bd0fe8..ea01fe0d8864 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitPeeringsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitPeeringsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitPeeringList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsCreateOrUpdateSamples.java
index 842f9a6f7bb4..08a4518c7373 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsCreateOrUpdateSamples.java
@@ -18,7 +18,7 @@
 public final class ExpressRouteCircuitsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteCircuitCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteCircuitCreate.
      * json
      */
     /**
@@ -47,7 +47,7 @@ public static void createExpressRouteCircuit(com.azure.resourcemanager.AzureReso
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitCreateOnExpressRoutePort.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsDeleteSamples.java
index 6702032f3e2b..7a45b7588d14 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteCircuitsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteCircuitDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteCircuitDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetByResourceGroupSamples.java
index 7c33f7768681..fa890b054fce 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteCircuitsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteCircuitGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteCircuitGet.json
      */
     /**
      * Sample code: Get ExpressRouteCircuit.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetPeeringStatsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetPeeringStatsSamples.java
index 0be50e5c00cd..56b59feca1ab 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetPeeringStatsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetPeeringStatsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitsGetPeeringStatsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitPeeringStats.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetStatsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetStatsSamples.java
index f3c1de40c2db..1036821554e3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetStatsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsGetStatsSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteCircuitsGetStatsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteCircuitStats.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteCircuitStats.json
      */
     /**
      * Sample code: Get ExpressRoute Circuit Traffic Stats.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListArpTableSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListArpTableSamples.java
index a569695ce8cd..2974670ea779 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListArpTableSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListArpTableSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitsListArpTableSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitARPTableList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListByResourceGroupSamples.java
index edde3f695761..e1bf3b43c756 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSamples.java
index 7f9246eaf269..17891e7b812a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitsListRoutesTableSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitRouteTableList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSummarySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSummarySamples.java
index 37cb8d1bc407..fbfcaab014c2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSummarySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListRoutesTableSummarySamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitsListRoutesTableSummarySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitRouteTableSummaryList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListSamples.java
index 765bac1fae61..6196b99c97ea 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCircuitsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCircuitListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsUpdateTagsSamples.java
index 2e705d7f2874..c04e47c62009 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCircuitsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class ExpressRouteCircuitsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteCircuitUpdateTags
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteCircuitUpdateTags
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsCreateOrUpdateSamples.java
index 5533a5a454e2..7d791e5f23af 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
 public final class ExpressRouteConnectionsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteConnectionCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteConnectionCreate.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsDeleteSamples.java
index cc494b4e72e7..01fc9a046532 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteConnectionDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteConnectionDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsGetSamples.java
index ae56f190cebc..2573be4d697f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteConnectionGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteConnectionGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsListSamples.java
index 37e79c2d9d2b..cf8ce0ef7c0e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteConnectionsListSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteConnectionsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteConnectionList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteConnectionList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsCreateOrUpdateSamples.java
index 6d015d1e9b66..b4707416842d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class ExpressRouteCrossConnectionPeeringsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionBgpPeeringCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsDeleteSamples.java
index 68c74ad74cb0..59b3287ab2b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionPeeringsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionBgpPeeringDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsGetSamples.java
index 63c2fc720864..c70b02b765cf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionPeeringsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionBgpPeeringGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsListSamples.java
index cd02cd8a0764..270fbaf51931 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionPeeringsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionPeeringsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionBgpPeeringList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsCreateOrUpdateSamples.java
index bf0cc649336a..bb9d3168e37b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class ExpressRouteCrossConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionUpdate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsGetByResourceGroupSamples.java
index 3c200b59aa79..84bc55fdb3d4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListArpTableSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListArpTableSamples.java
index 6fa542a75f03..91866810d0b5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListArpTableSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListArpTableSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionsListArpTableSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionsArpTable.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListByResourceGroupSamples.java
index 0ca84a30f8aa..3bf958224aac 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSamples.java
index 0b2075bd90fe..b175bc0e10be 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionsListRoutesTableSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionsRouteTable.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSummarySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSummarySamples.java
index 47fb97d3c6d2..cb1f87d74f7b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSummarySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListRoutesTableSummarySamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionsListRoutesTableSummarySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionsRouteTableSummary.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListSamples.java
index 094e844be505..ebce8013b7d3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteCrossConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsUpdateTagsSamples.java
index 2a5d42f46580..71324468ec33 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteCrossConnectionsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ExpressRouteCrossConnectionsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteCrossConnectionUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysCreateOrUpdateSamples.java
index e5d29c32e6f2..c801ffd4e2bd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class ExpressRouteGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteGatewayCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteGatewayCreate.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysDeleteSamples.java
index e42ec605fc01..ebe48559c4d7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteGatewayDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteGatewayDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysGetByResourceGroupSamples.java
index 2cdf8fb320c1..8aa6d1c17e89 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteGatewayGet.json
      */
     /**
      * Sample code: ExpressRouteGatewayGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListByResourceGroupSamples.java
index cef54eed5c5a..e2512526834d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteGatewaysListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteGatewayListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListBySubscriptionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListBySubscriptionSamples.java
index 41a3b88a9895..1727c9b58f6c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListBySubscriptionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysListBySubscriptionSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRouteGatewaysListBySubscriptionSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRouteGatewayListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysUpdateTagsSamples.java
index 76d2bfe6a38d..e05ef91f8ba8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteGatewaysUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class ExpressRouteGatewaysUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteGatewayUpdateTags
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteGatewayUpdateTags
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksGetSamples.java
index fa235d05bf81..136f530b1e63 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksGetSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteLinksGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteLinkGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteLinkGet.json
      */
     /**
      * Sample code: ExpressRouteLinkGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksListSamples.java
index e0e4ee4413c3..9e436d65df6b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteLinksListSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteLinksListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteLinkList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteLinkList.json
      */
     /**
      * Sample code: ExpressRouteLinkGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsCreateOrUpdateSamples.java
index 4b5cdbb581bf..fa2e686f0b58 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ExpressRoutePortAuthorizationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRoutePortAuthorizationCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsDeleteSamples.java
index 1cdf5d021235..92df97dccb74 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRoutePortAuthorizationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRoutePortAuthorizationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsGetSamples.java
index d9e3cc884b45..c50a2bbfeae4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRoutePortAuthorizationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRoutePortAuthorizationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsListSamples.java
index af2a29e0b7b0..21f69b6a091d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortAuthorizationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRoutePortAuthorizationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRoutePortAuthorizationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsCreateOrUpdateSamples.java
index bb9a2201df8e..f620901f3e97 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
 public final class ExpressRoutePortsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortUpdateLink.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortUpdateLink.
      * json
      */
     /**
@@ -41,7 +41,7 @@ public static void expressRoutePortUpdateLink(com.azure.resourcemanager.AzureRes
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortCreate.json
      */
     /**
      * Sample code: ExpressRoutePortCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsDeleteSamples.java
index 93d3cd42cc8d..ceeb043e684e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRoutePortsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortDelete.json
      */
     /**
      * Sample code: ExpressRoutePortDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGenerateLoaSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGenerateLoaSamples.java
index d0d18e191ede..fe76a38b2631 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGenerateLoaSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGenerateLoaSamples.java
@@ -12,7 +12,7 @@
 public final class ExpressRoutePortsGenerateLoaSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/GenerateExpressRoutePortsLOA.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/GenerateExpressRoutePortsLOA.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGetByResourceGroupSamples.java
index 3108e105ce67..def9d8834610 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRoutePortsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortGet.json
      */
     /**
      * Sample code: ExpressRoutePortGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListByResourceGroupSamples.java
index 3787d9527964..1f07307c8926 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ExpressRoutePortsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ExpressRoutePortListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListSamples.java
index f84a5e9665ec..83a1c75553fe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsListSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRoutePortsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortList.json
      */
     /**
      * Sample code: ExpressRoutePortList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsGetSamples.java
index ebc1b1acd1a6..9df71b9d243d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRoutePortsLocationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortsLocationGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortsLocationGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsListSamples.java
index 5248dcc9b017..6bd697b53c66 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsLocationsListSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRoutePortsLocationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortsLocationList
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortsLocationList
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsUpdateTagsSamples.java
index 71f0e3875eee..6d73da140b0a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRoutePortsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class ExpressRoutePortsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRoutePortUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRoutePortUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteProviderPortsLocationListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteProviderPortsLocationListSamples.java
index 52da9fb5a7cb..85bf0f2125c1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteProviderPortsLocationListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteProviderPortsLocationListSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteProviderPortsLocationListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/expressRouteProviderPortList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/expressRouteProviderPortList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteServiceProvidersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteServiceProvidersListSamples.java
index 292b98eab7f2..2c86788aa308 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteServiceProvidersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ExpressRouteServiceProvidersListSamples.java
@@ -10,7 +10,7 @@
 public final class ExpressRouteServiceProvidersListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ExpressRouteProviderList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ExpressRouteProviderList.json
      */
     /**
      * Sample code: List ExpressRoute providers.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesCreateOrUpdateSamples.java
index f5ffca0b5619..65bc17d219f1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesCreateOrUpdateSamples.java
@@ -36,7 +36,7 @@
 public final class FirewallPoliciesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyPut.json
      */
     /**
      * Sample code: Create FirewallPolicy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesDeleteSamples.java
index 61e481af498f..29ff6f4d56b4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class FirewallPoliciesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyDelete.json
      */
     /**
      * Sample code: Delete Firewall Policy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesGetByResourceGroupSamples.java
index a7c008fe83e6..bb90083a1142 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class FirewallPoliciesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyGet.json
      */
     /**
      * Sample code: Get FirewallPolicy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListByResourceGroupSamples.java
index f0a691f82745..77ce5c8ea4ee 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPoliciesListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListSamples.java
index 0723e1af5ad2..86a0e0c0b2ce 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPoliciesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesUpdateTagsSamples.java
index 90c6d689c746..e2d0bdc9bbd7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPoliciesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class FirewallPoliciesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyPatch.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyPatch.json
      */
     /**
      * Sample code: Update FirewallPolicy Tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDeploymentsDeploySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDeploymentsDeploySamples.java
index 8ab2f1459261..7514ca89d2a6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDeploymentsDeploySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDeploymentsDeploySamples.java
@@ -10,7 +10,7 @@
 public final class FirewallPolicyDeploymentsDeploySamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyDraftDeploy.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyDraftDeploy.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsCreateOrUpdateSamples.java
index 9a034c09f215..e6cd429d7aa3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsCreateOrUpdateSamples.java
@@ -30,7 +30,7 @@
 public final class FirewallPolicyDraftsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyDraftPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyDraftPut.json
      */
     /**
      * Sample code: create or update firewall policy draft.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsDeleteSamples.java
index 274fec1e7bcd..5a016dddd8a0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class FirewallPolicyDraftsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyDraftDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyDraftDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsGetSamples.java
index fb17118924e8..3a496926ba72 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyDraftsGetSamples.java
@@ -10,7 +10,7 @@
 public final class FirewallPolicyDraftsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/FirewallPolicyDraftGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/FirewallPolicyDraftGet.json
      */
     /**
      * Sample code: get firewall policy draft.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesFilterValuesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesFilterValuesListSamples.java
index 18d8ac2f7de2..d8a213b5d3b1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesFilterValuesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesFilterValuesListSamples.java
@@ -11,7 +11,7 @@
  */
 public final class FirewallPolicyIdpsSignaturesFilterValuesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyQuerySignatureOverridesFilterValues.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesListSamples.java
index 7155711d05ff..86d9f0830181 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesListSamples.java
@@ -15,7 +15,7 @@
  */
 public final class FirewallPolicyIdpsSignaturesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyQuerySignatureOverrides.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesGetSamples.java
index 2ec04617b60a..d0e4e308ad77 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyIdpsSignaturesOverridesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicySignatureOverridesGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesListSamples.java
index 690ef5d23741..9c30ca3197c9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyIdpsSignaturesOverridesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicySignatureOverridesList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPatchSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPatchSamples.java
index 880ea0b487d5..bbe8ba07ded2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPatchSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPatchSamples.java
@@ -14,7 +14,7 @@
  */
 public final class FirewallPolicyIdpsSignaturesOverridesPatchSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicySignatureOverridesPatch.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPutSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPutSamples.java
index 9172277df80d..37554afaf39e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPutSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyIdpsSignaturesOverridesPutSamples.java
@@ -14,7 +14,7 @@
  */
 public final class FirewallPolicyIdpsSignaturesOverridesPutSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicySignatureOverridesPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsCreateOrUpdateSamples.java
index f860a72e53b0..29dba73bf0e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupDraftsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupDraftPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsDeleteSamples.java
index f8b3686e8856..bf5dd5def736 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupDraftsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupDraftDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsGetSamples.java
index 59034b597fdd..0a7be768280b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupDraftsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupDraftsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupDraftGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsCreateOrUpdateSamples.java
index 469e755644ab..8e56426f986c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsCreateOrUpdateSamples.java
@@ -25,7 +25,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupPut.json
      */
     /**
@@ -54,7 +54,7 @@ public static void createFirewallPolicyRuleCollectionGroup(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithWebCategoriesPut.json
      */
     /**
@@ -85,7 +85,7 @@ public static void createFirewallPolicyRuleCollectionGroup(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyNatRuleCollectionGroupPut.json
      */
     /**
@@ -119,7 +119,7 @@ public static void createFirewallPolicyRuleCollectionGroup(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json
      */
     /**
@@ -150,7 +150,7 @@ public static void createFirewallPolicyRuleCollectionGroup(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithHttpHeadersToInsert.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsDeleteSamples.java
index b8ad518183ee..d83b755e5460 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsGetSamples.java
index 4ed5c5cf3570..8405d8dc5b39 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyNatRuleCollectionGroupGet.json
      */
     /**
@@ -26,7 +26,7 @@ public static void getFirewallPolicyNatRuleCollectionGroup(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithWebCategoriesGet.json
      */
     /**
@@ -44,7 +44,7 @@ public static void getFirewallPolicyNatRuleCollectionGroup(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupGet.json
      */
     /**
@@ -61,7 +61,7 @@ public static void getFirewallPolicyRuleCollectionGroup(com.azure.resourcemanage
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsListSamples.java
index 188b0f4b01be..968ab427a222 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FirewallPolicyRuleCollectionGroupsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class FirewallPolicyRuleCollectionGroupsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupList.json
      */
     /**
@@ -27,7 +27,7 @@ public static void listAllFirewallPolicyRuleCollectionGroupsForAGivenFirewallPol
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithIpGroupsList.json
      */
     /**
@@ -45,7 +45,7 @@ public static void listAllFirewallPolicyRuleCollectionGroupsWithIpGroupsForAGive
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * FirewallPolicyRuleCollectionGroupWithWebCategoriesList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsCreateOrUpdateSamples.java
index ce2ab6c78a6b..1c7e961bbd73 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsCreateOrUpdateSamples.java
@@ -19,7 +19,7 @@
 public final class FlowLogsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherFlowLogCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherFlowLogCreate.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsDeleteSamples.java
index 98602a5a6556..8a3c2a3068eb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class FlowLogsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherFlowLogDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherFlowLogDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsGetSamples.java
index 467bce5e5600..68e3ec749d94 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsGetSamples.java
@@ -10,7 +10,7 @@
 public final class FlowLogsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherFlowLogGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherFlowLogGet.json
      */
     /**
      * Sample code: Get flow log.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsListSamples.java
index 212b4ab95910..cb834b0442be 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsListSamples.java
@@ -10,7 +10,7 @@
 public final class FlowLogsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherFlowLogList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherFlowLogList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsUpdateTagsSamples.java
index ac6e4f12d530..d5c770950657 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/FlowLogsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class FlowLogsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherFlowLogUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesCreateOrUpdateSamples.java
index 6051d77aa725..8723ca1d820d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class HubRouteTablesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/HubRouteTablePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/HubRouteTablePut.json
      */
     /**
      * Sample code: RouteTablePut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesDeleteSamples.java
index 9621873e1aad..38d8e57e0977 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class HubRouteTablesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/HubRouteTableDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/HubRouteTableDelete.json
      */
     /**
      * Sample code: RouteTableDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesGetSamples.java
index dcb411845eba..d809e1162cb0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesGetSamples.java
@@ -10,7 +10,7 @@
 public final class HubRouteTablesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/HubRouteTableGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/HubRouteTableGet.json
      */
     /**
      * Sample code: RouteTableGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesListSamples.java
index e03a06e40ebb..8fbeefd1dc27 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubRouteTablesListSamples.java
@@ -10,7 +10,7 @@
 public final class HubRouteTablesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/HubRouteTableList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/HubRouteTableList.json
      */
     /**
      * Sample code: RouteTableList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsCreateOrUpdateSamples.java
index 2eaaa0a3bba7..bcc84b7d01bc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsCreateOrUpdateSamples.java
@@ -19,7 +19,7 @@
  */
 public final class HubVirtualNetworkConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * HubVirtualNetworkConnectionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsDeleteSamples.java
index 03900c668d67..3fac22090f91 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class HubVirtualNetworkConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * HubVirtualNetworkConnectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsGetSamples.java
index 9e5aa813654a..fc064493ddca 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class HubVirtualNetworkConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * HubVirtualNetworkConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsListSamples.java
index 2593a11eaa17..2c1b5ddb1a02 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/HubVirtualNetworkConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class HubVirtualNetworkConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * HubVirtualNetworkConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesCreateOrUpdateSamples.java
index 053fc758aae7..d59b63f3948a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class InboundNatRulesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/InboundNatRuleCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/InboundNatRuleCreate.json
      */
     /**
      * Sample code: InboundNatRuleCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesDeleteSamples.java
index 7419f0420c6a..4c0d2595ee78 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class InboundNatRulesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/InboundNatRuleDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/InboundNatRuleDelete.json
      */
     /**
      * Sample code: InboundNatRuleDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesGetSamples.java
index 30b5f7c602de..473dae8f9288 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class InboundNatRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/InboundNatRuleGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/InboundNatRuleGet.json
      */
     /**
      * Sample code: InboundNatRuleGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesListSamples.java
index bc20f0f10450..775d947bd8f8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundNatRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class InboundNatRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/InboundNatRuleList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/InboundNatRuleList.json
      */
     /**
      * Sample code: InboundNatRuleList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationCreateOrUpdateSamples.java
index dc64db7a4866..35b31cce3290 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
 public final class InboundSecurityRuleOperationCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/InboundSecurityRulePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/InboundSecurityRulePut.json
      */
     /**
      * Sample code: Create Network Virtual Appliance Inbound Security Rules.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationGetSamples.java
index 6e0ea27d190c..449734e9435b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/InboundSecurityRuleOperationGetSamples.java
@@ -10,7 +10,7 @@
 public final class InboundSecurityRuleOperationGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/InboundSecurityRuleGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/InboundSecurityRuleGet.json
      */
     /**
      * Sample code: Create Network Virtual Appliance Inbound Security Rules.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsCreateOrUpdateSamples.java
index 3553b3c3fccf..635c3d2222cc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class IpAllocationsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpAllocationCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpAllocationCreate.json
      */
     /**
      * Sample code: Create IpAllocation.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsDeleteSamples.java
index 44ad045009b2..64fa7da73f4d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class IpAllocationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpAllocationDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpAllocationDelete.json
      */
     /**
      * Sample code: Delete IpAllocation.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsGetByResourceGroupSamples.java
index 50d796cbd165..ad7fa29a5b1a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class IpAllocationsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpAllocationGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpAllocationGet.json
      */
     /**
      * Sample code: Get IpAllocation.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListByResourceGroupSamples.java
index ba8291e458b7..068ac575fa92 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class IpAllocationsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * IpAllocationListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListSamples.java
index cf1c2312d18a..9a8bbbdeca9c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsListSamples.java
@@ -10,7 +10,7 @@
 public final class IpAllocationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpAllocationList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpAllocationList.json
      */
     /**
      * Sample code: List all IpAllocations.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsUpdateTagsSamples.java
index 022d7363c6c0..b0c9bcc44701 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpAllocationsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class IpAllocationsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpAllocationUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpAllocationUpdateTags.json
      */
     /**
      * Sample code: Update virtual network tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsCreateOrUpdateSamples.java
index 66855023cf7e..733211812263 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class IpGroupsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpGroupsCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpGroupsCreate.json
      */
     /**
      * Sample code: CreateOrUpdate_IpGroups.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsDeleteSamples.java
index 1ae8bda7144e..50258fbeb04c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class IpGroupsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpGroupsDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpGroupsDelete.json
      */
     /**
      * Sample code: Delete_IpGroups.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsGetByResourceGroupSamples.java
index 4397aa476e5b..e53535946a8a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class IpGroupsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpGroupsGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpGroupsGet.json
      */
     /**
      * Sample code: Get_IpGroups.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListByResourceGroupSamples.java
index 4e8d2ebce2cf..49c6fcc97bc5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class IpGroupsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpGroupsListByResourceGroup.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpGroupsListByResourceGroup.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListSamples.java
index a10b7b28851b..c6a2673cbb85 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsListSamples.java
@@ -10,7 +10,7 @@
 public final class IpGroupsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpGroupsListBySubscription.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpGroupsListBySubscription.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsUpdateGroupsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsUpdateGroupsSamples.java
index 6a5841a3d37a..9d4079b3d0bf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsUpdateGroupsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpGroupsUpdateGroupsSamples.java
@@ -14,7 +14,7 @@
 public final class IpGroupsUpdateGroupsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpGroupsUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpGroupsUpdateTags.json
      */
     /**
      * Sample code: Update_IpGroups.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsCreateSamples.java
index bbf42c426d52..3c8b6d50203c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsCreateSamples.java
@@ -14,7 +14,7 @@
 public final class IpamPoolsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpamPools_Create.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpamPools_Create.json
      */
     /**
      * Sample code: IpamPools_Create.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsDeleteSamples.java
index 85baa2baf30e..b25a6d6369b5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class IpamPoolsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpamPools_Delete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpamPools_Delete.json
      */
     /**
      * Sample code: IpamPools_Delete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetPoolUsageSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetPoolUsageSamples.java
index e55eefd36292..851a814885a7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetPoolUsageSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetPoolUsageSamples.java
@@ -10,7 +10,7 @@
 public final class IpamPoolsGetPoolUsageSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpamPools_GetPoolUsage.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpamPools_GetPoolUsage.json
      */
     /**
      * Sample code: IpamPools_GetPoolUsage.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetSamples.java
index 6e64f6e9cb84..f23259c3e3ee 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsGetSamples.java
@@ -10,7 +10,7 @@
 public final class IpamPoolsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpamPools_Get.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpamPools_Get.json
      */
     /**
      * Sample code: IpamPools_Get.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListAssociatedResourcesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListAssociatedResourcesSamples.java
index 568a59c9f3df..45a268922f6e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListAssociatedResourcesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListAssociatedResourcesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class IpamPoolsListAssociatedResourcesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * IpamPools_ListAssociatedResources.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListSamples.java
index a9c677ecf75a..86c08239e218 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsListSamples.java
@@ -10,7 +10,7 @@
 public final class IpamPoolsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpamPools_List.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpamPools_List.json
      */
     /**
      * Sample code: IpamPools_List.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsUpdateSamples.java
index eacaf798010a..fcb185483019 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/IpamPoolsUpdateSamples.java
@@ -10,7 +10,7 @@
 public final class IpamPoolsUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/IpamPools_Update.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/IpamPools_Update.json
      */
     /**
      * Sample code: IpamPools_Update.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsCreateOrUpdateSamples.java
index c7fe11428517..d2344c17e61f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
  */
 public final class LoadBalancerBackendAddressPoolsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LBBackendAddressPoolWithBackendAddressesPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsDeleteSamples.java
index 6f5e233e5fbe..6ff7d012be33 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerBackendAddressPoolsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerBackendAddressPoolDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsGetSamples.java
index 5cfb4d45174b..df6c98f73f7b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerBackendAddressPoolsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerBackendAddressPoolGet.json
      */
     /**
@@ -26,7 +26,7 @@ public static void loadBalancerBackendAddressPoolGet(com.azure.resourcemanager.A
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LBBackendAddressPoolWithBackendAddressesGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsListSamples.java
index 660047e6da3a..8705eb1d5603 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerBackendAddressPoolsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerBackendAddressPoolsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LBBackendAddressPoolListWithBackendAddressesPoolType.json
      */
     /**
@@ -27,7 +27,7 @@ public static void loadBalancerWithBackendAddressPoolContainingBackendAddresses(
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerBackendAddressPoolList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsGetSamples.java
index 96f9fde44b6f..3bf7aa72ed8e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerFrontendIpConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerFrontendIPConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsListSamples.java
index 4ded93166f1e..11f4e60aea92 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerFrontendIpConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerFrontendIpConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerFrontendIPConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesGetSamples.java
index f8fae61471b5..eff4b4e5ab9d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerLoadBalancingRulesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerLoadBalancingRuleGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesHealthSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesHealthSamples.java
index ecce2d6fd4bb..57dd06940f9d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesHealthSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesHealthSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancerLoadBalancingRulesHealthSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerHealth.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerHealth.json
      */
     /**
      * Sample code: Query load balancing rule health.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesListSamples.java
index 6d70b61ddcf5..65e4aef84e68 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerLoadBalancingRulesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerLoadBalancingRulesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerLoadBalancingRuleList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerNetworkInterfacesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerNetworkInterfacesListSamples.java
index 99eabbf9aa07..9e3031dafb46 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerNetworkInterfacesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerNetworkInterfacesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class LoadBalancerNetworkInterfacesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerNetworkInterfaceListVmss.json
      */
     /**
@@ -26,7 +26,7 @@ public static void loadBalancerNetworkInterfaceListVmss(com.azure.resourcemanage
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerNetworkInterfaceListSimple.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesGetSamples.java
index e3159bb6953f..d2b51498630b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancerOutboundRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerOutboundRuleGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerOutboundRuleGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesListSamples.java
index 5b45266a5e94..78b61dacc40d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerOutboundRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancerOutboundRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerOutboundRuleList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerOutboundRuleList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesGetSamples.java
index 367e4e58a038..25a22a9b64c0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesGetSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancerProbesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerProbeGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerProbeGet.json
      */
     /**
      * Sample code: LoadBalancerProbeGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesListSamples.java
index 44759dd22183..98ff3d0b0f58 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancerProbesListSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancerProbesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerProbeList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerProbeList.json
      */
     /**
      * Sample code: LoadBalancerProbeList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersCreateOrUpdateSamples.java
index ba21392e7082..0d9765f4c081 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersCreateOrUpdateSamples.java
@@ -35,7 +35,7 @@
  */
 public final class LoadBalancersCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerCreateWithSyncModePropertyOnPool.json
      */
     /**
@@ -91,7 +91,7 @@ public final class LoadBalancersCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerCreateGatewayLoadBalancerProviderWithTwoBackendPool.json
      */
     /**
@@ -140,7 +140,7 @@ public static void createLoadBalancerWithGatewayLoadBalancerProviderConfiguredWi
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerCreateWithInboundNatPool.json
      */
     /**
@@ -183,7 +183,7 @@ public static void createLoadBalancerWithInboundNatPool(com.azure.resourcemanage
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerCreateWithZones.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerCreateWithZones.
      * json
      */
     /**
@@ -236,7 +236,7 @@ public static void createLoadBalancerWithFrontendIPInZone1(com.azure.resourceman
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerCreateWithOutboundRules.json
      */
     /**
@@ -295,7 +295,7 @@ public static void createLoadBalancerWithOutboundRules(com.azure.resourcemanager
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerCreateGatewayLoadBalancerProviderWithOneBackendPool.json
      */
     /**
@@ -350,7 +350,7 @@ public static void createLoadBalancerWithGatewayLoadBalancerProviderConfiguredWi
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerCreate.json
      */
     /**
      * Sample code: Create load balancer.
@@ -402,7 +402,7 @@ public static void createLoadBalancer(com.azure.resourcemanager.AzureResourceMan
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerCreateGlobalTier.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerCreateGlobalTier.
      * json
      */
     /**
@@ -451,7 +451,7 @@ public static void createLoadBalancerWithGlobalTierAndOneRegionalLoadBalancerInI
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerCreateGatewayLoadBalancerConsumer.json
      */
     /**
@@ -507,7 +507,7 @@ public static void createLoadBalancerWithGatewayLoadBalancerConsumerConfigured(
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerCreateStandardSku
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerCreateStandardSku
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersDeleteSamples.java
index 6c4d3fd0b4b2..769929c79914 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerDelete.json
      */
     /**
      * Sample code: Delete load balancer.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersGetByResourceGroupSamples.java
index 6fa4e5653abe..f95a0e718917 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerGet.json
      */
     /**
      * Sample code: Get load balancer.
@@ -26,7 +26,7 @@ public static void getLoadBalancer(com.azure.resourcemanager.AzureResourceManage
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancerGetInboundNatRulePortMapping.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListByResourceGroupSamples.java
index ffa80650bc1d..17448d9c74b2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerList.json
      */
     /**
      * Sample code: List load balancers in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListInboundNatRulePortMappingsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListInboundNatRulePortMappingsSamples.java
index 8c1331c38b25..4725142b8032 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListInboundNatRulePortMappingsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListInboundNatRulePortMappingsSamples.java
@@ -11,7 +11,7 @@
  */
 public final class LoadBalancersListInboundNatRulePortMappingsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * QueryInboundNatRulePortMapping.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListSamples.java
index 4c6d6ac8785e..b9dc9cb8296f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersListSamples.java
@@ -10,7 +10,7 @@
 public final class LoadBalancersListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerListAll.json
      */
     /**
      * Sample code: List all load balancers.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersMigrateToIpBasedSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersMigrateToIpBasedSamples.java
index 4d8735ef453d..e723156daa63 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersMigrateToIpBasedSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersMigrateToIpBasedSamples.java
@@ -13,7 +13,7 @@
 public final class LoadBalancersMigrateToIpBasedSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/MigrateLoadBalancerToIPBased.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/MigrateLoadBalancerToIPBased.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersSwapPublicIpAddressesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersSwapPublicIpAddressesSamples.java
index 987b6b4cefab..6e503a91d5cd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersSwapPublicIpAddressesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersSwapPublicIpAddressesSamples.java
@@ -14,7 +14,7 @@
  */
 public final class LoadBalancersSwapPublicIpAddressesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * LoadBalancersSwapPublicIpAddresses.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersUpdateTagsSamples.java
index 01c0b86de756..f1d0da76ce2a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LoadBalancersUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class LoadBalancersUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LoadBalancerUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LoadBalancerUpdateTags.json
      */
     /**
      * Sample code: Update load balancer tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysCreateOrUpdateSamples.java
index 6b608d314691..595bcfc7802d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class LocalNetworkGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LocalNetworkGatewayCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LocalNetworkGatewayCreate.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysDeleteSamples.java
index f01e5eea67aa..08d7239caaef 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class LocalNetworkGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LocalNetworkGatewayDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LocalNetworkGatewayDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysGetByResourceGroupSamples.java
index 6577d7fcc849..750edf04d086 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class LocalNetworkGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LocalNetworkGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LocalNetworkGatewayGet.json
      */
     /**
      * Sample code: GetLocalNetworkGateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysListByResourceGroupSamples.java
index 6ecf8a3febc4..ba96a9e2c16e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class LocalNetworkGatewaysListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LocalNetworkGatewayList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LocalNetworkGatewayList.json
      */
     /**
      * Sample code: ListLocalNetworkGateways.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysUpdateTagsSamples.java
index efbf3f5844a9..4047b3106876 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/LocalNetworkGatewaysUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class LocalNetworkGatewaysUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/LocalNetworkGatewayUpdateTags
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/LocalNetworkGatewayUpdateTags
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsCreateOrUpdateSamples.java
index 895f80429ed0..3c84358b8f8f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ManagementGroupNetworkManagerConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionManagementGroupPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsDeleteSamples.java
index dd9ba4c72f75..2ad68f335568 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagementGroupNetworkManagerConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionManagementGroupDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsGetSamples.java
index 49285f6389ae..2c3abae379de 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagementGroupNetworkManagerConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionManagementGroupGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsListSamples.java
index cdab39eb0fd0..455a1373ea6b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ManagementGroupNetworkManagerConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ManagementGroupNetworkManagerConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionManagementGroupList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysCreateOrUpdateSamples.java
index 96efca10290b..cac780eed8fe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
 public final class NatGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayCreateOrUpdate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayCreateOrUpdate.json
      */
     /**
      * Sample code: Create nat gateway.
@@ -38,7 +38,7 @@ public static void createNatGateway(com.azure.resourcemanager.AzureResourceManag
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NatGatewayCreateOrUpdateStandardV2Sku.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysDeleteSamples.java
index 8b7a258c9121..dbd65cd484b3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NatGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayDelete.json
      */
     /**
      * Sample code: Delete nat gateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysGetByResourceGroupSamples.java
index 924515df90ab..aa6f1af4807a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NatGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayGet.json
      */
     /**
      * Sample code: Get nat gateway.
@@ -27,7 +27,7 @@ public static void getNatGateway(com.azure.resourcemanager.AzureResourceManager
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayGetStandardV2Sku.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayGetStandardV2Sku.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListByResourceGroupSamples.java
index dfb516426654..3da4955dd168 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NatGatewaysListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayList.json
      */
     /**
      * Sample code: List nat gateways in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListSamples.java
index 5b6441d75340..4befacbee8fc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysListSamples.java
@@ -10,7 +10,7 @@
 public final class NatGatewaysListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayListAll.json
      */
     /**
      * Sample code: List all nat gateways.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysUpdateTagsSamples.java
index c400a7e1c51e..ac9a4667be2c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatGatewaysUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class NatGatewaysUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatGatewayUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatGatewayUpdateTags.json
      */
     /**
      * Sample code: Update nat gateway tags.
@@ -31,7 +31,7 @@ public static void updateNatGatewayTags(com.azure.resourcemanager.AzureResourceM
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NatGatewayUpdateTagsStandardV2Sku.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesCreateOrUpdateSamples.java
index 45dca2bbf21d..7e0bf3324027 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
 public final class NatRulesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatRulePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatRulePut.json
      */
     /**
      * Sample code: NatRulePut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesDeleteSamples.java
index 3dafcd027d48..ac401343b3fd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NatRulesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatRuleDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatRuleDelete.json
      */
     /**
      * Sample code: NatRuleDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesGetSamples.java
index 79791c492fa3..522d62ba4af1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class NatRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatRuleGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatRuleGet.json
      */
     /**
      * Sample code: NatRuleGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesListByVpnGatewaySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesListByVpnGatewaySamples.java
index 97bdcd394072..45f4ccfe9bb1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesListByVpnGatewaySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NatRulesListByVpnGatewaySamples.java
@@ -10,7 +10,7 @@
 public final class NatRulesListByVpnGatewaySamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NatRuleList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NatRuleList.json
      */
     /**
      * Sample code: NatRuleList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsCreateOrUpdateSamples.java
index 9e7bfab449e5..6aa67c07d0ca 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class NetworkGroupsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerGroupPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerGroupPut.json
      */
     /**
      * Sample code: NetworkGroupsPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsDeleteSamples.java
index 1491d40c7e02..0e6c8f929bc8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkGroupsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerGroupDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerGroupDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsGetSamples.java
index 670106eb14a1..0eafa5d070f1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkGroupsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerGroupGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerGroupGet.json
      */
     /**
      * Sample code: NetworkGroupsGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsListSamples.java
index 11d506234e18..fcaa3bbee3d7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkGroupsListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkGroupsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerGroupList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerGroupList.json
      */
     /**
      * Sample code: NetworkGroupsList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsGetSamples.java
index 79582691f156..e5023b4db4b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfaceIpConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceIPConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsListSamples.java
index 3c940ac3f928..1297ed539a67 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceIpConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfaceIpConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceIPConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceLoadBalancersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceLoadBalancersListSamples.java
index 55109509ba56..90be52c8b0e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceLoadBalancersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceLoadBalancersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfaceLoadBalancersListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceLoadBalancerList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsCreateOrUpdateSamples.java
index 05d6d0b85958..9b116a24693d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class NetworkInterfaceTapConfigurationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceTapConfigurationCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsDeleteSamples.java
index eed7ab6e1fa1..edd04a7864c7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfaceTapConfigurationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceTapConfigurationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsGetSamples.java
index 706091089dec..6cfd4ad6c1b2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfaceTapConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceTapConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsListSamples.java
index f7ac3361658e..dfa95e005fa8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfaceTapConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfaceTapConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceTapConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesCreateOrUpdateSamples.java
index 21911e12802c..4606c140e2f6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
  */
 public final class NetworkInterfacesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceCreateGatewayLoadBalancerConsumer.json
      */
     /**
@@ -43,7 +43,7 @@ public static void createNetworkInterfaceWithGatewayLoadBalancerConsumerConfigur
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkInterfaceCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkInterfaceCreate.json
      */
     /**
      * Sample code: Create network interface.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesDeleteSamples.java
index bb66472abc68..ccb4c16b7cd6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkInterfaceDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkInterfaceDelete.json
      */
     /**
      * Sample code: Delete network interface.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetByResourceGroupSamples.java
index dc75c9b847e4..3bf628456ee4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkInterfaceGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkInterfaceGet.json
      */
     /**
      * Sample code: Get network interface.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetCloudServiceNetworkInterfaceSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetCloudServiceNetworkInterfaceSamples.java
index 283189cc7601..34f891f802db 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetCloudServiceNetworkInterfaceSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetCloudServiceNetworkInterfaceSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesGetCloudServiceNetworkInterfaceSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CloudServiceNetworkInterfaceGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetEffectiveRouteTableSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetEffectiveRouteTableSamples.java
index 6aaaa8fdba78..f27e66d0a6b2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetEffectiveRouteTableSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetEffectiveRouteTableSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesGetEffectiveRouteTableSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceEffectiveRouteTableList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetIpConfigurationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetIpConfigurationSamples.java
index 8f8799a49c90..d2e699d8f16f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetIpConfigurationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetIpConfigurationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesGetVirtualMachineScaleSetIpConfigurationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VmssNetworkInterfaceIpConfigGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetNetworkInterfaceSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetNetworkInterfaceSamples.java
index 624d7b1b8ced..80fc27000198 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetNetworkInterfaceSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesGetVirtualMachineScaleSetNetworkInterfaceSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesGetVirtualMachineScaleSetNetworkInterfaceSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VmssNetworkInterfaceGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VmssNetworkInterfaceGet.json
      */
     /**
      * Sample code: Get virtual machine scale set network interface.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListByResourceGroupSamples.java
index d609ad47c90c..f5aae19ad515 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkInterfaceList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkInterfaceList.json
      */
     /**
      * Sample code: List network interfaces in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceNetworkInterfacesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceNetworkInterfacesSamples.java
index ee4a2755dbb0..c7abecbcdc55 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceNetworkInterfacesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceNetworkInterfacesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesListCloudServiceNetworkInterfacesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CloudServiceNetworkInterfaceList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceRoleInstanceNetworkInterfacesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceRoleInstanceNetworkInterfacesSamples.java
index c213e2811e9c..129571532f5a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceRoleInstanceNetworkInterfacesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListCloudServiceRoleInstanceNetworkInterfacesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesListCloudServiceRoleInstanceNetworkInterfacesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CloudServiceRoleInstanceNetworkInterfaceList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListEffectiveNetworkSecurityGroupsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListEffectiveNetworkSecurityGroupsSamples.java
index 65b14891eb94..cd64273a4108 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListEffectiveNetworkSecurityGroupsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListEffectiveNetworkSecurityGroupsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesListEffectiveNetworkSecurityGroupsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkInterfaceEffectiveNSGList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListSamples.java
index cacc132491d7..589b33114d5b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkInterfaceListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkInterfaceListAll.json
      */
     /**
      * Sample code: List all network interfaces.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetIpConfigurationsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetIpConfigurationsSamples.java
index 1a5a441c4253..5876a4a55853 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetIpConfigurationsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetIpConfigurationsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkInterfacesListVirtualMachineScaleSetIpConfigurationsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VmssNetworkInterfaceIpConfigList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetNetworkInterfacesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetNetworkInterfacesSamples.java
index ce90598c219a..ff76728b53e9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetNetworkInterfacesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetNetworkInterfacesSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesListVirtualMachineScaleSetNetworkInterfacesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VmssNetworkInterfaceList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VmssNetworkInterfaceList.json
      */
     /**
      * Sample code: List virtual machine scale set network interfaces.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetVMNetworkInterfacesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetVMNetworkInterfacesSamples.java
index 5f3dc6e8e1f3..caf0db7d0ffc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetVMNetworkInterfacesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesListVirtualMachineScaleSetVMNetworkInterfacesSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkInterfacesListVirtualMachineScaleSetVMNetworkInterfacesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VmssVmNetworkInterfaceList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VmssVmNetworkInterfaceList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesUpdateTagsSamples.java
index cda1628df999..2cf1e4a425db 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkInterfacesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkInterfacesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkInterfaceUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkInterfaceUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerCommitsPostSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerCommitsPostSamples.java
index b42df771e7f8..1b304c54dc4f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerCommitsPostSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerCommitsPostSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkManagerCommitsPostSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerCommitPost.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerCommitPost.json
      */
     /**
      * Sample code: NetworkManageCommitPost.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerDeploymentStatusOperationListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerDeploymentStatusOperationListSamples.java
index 260743251c7b..5d2788e234b1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerDeploymentStatusOperationListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerDeploymentStatusOperationListSamples.java
@@ -13,7 +13,7 @@
  */
 public final class NetworkManagerDeploymentStatusOperationListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerDeploymentStatusList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsCreateOrUpdateSamples.java
index 48e67f21742d..2f8b11edcc5e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class NetworkManagerRoutingConfigurationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingConfigurationPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsDeleteSamples.java
index 045db9658a44..28b24fca5744 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkManagerRoutingConfigurationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingConfigurationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsGetSamples.java
index c60f71a2240e..ae556d3abc5e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkManagerRoutingConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsListSamples.java
index ea94bee78a80..81b97d23aefb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagerRoutingConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkManagerRoutingConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersCreateOrUpdateSamples.java
index 28a507f76e02..4c4926e44ed5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class NetworkManagersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerPut.json
      */
     /**
      * Sample code: Put Network Manager.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersDeleteSamples.java
index 5499476515e5..59d2a99c794b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkManagersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerDelete.json
      */
     /**
      * Sample code: NetworkManagersDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersGetByResourceGroupSamples.java
index b62c262f9a81..3d263b104eb0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkManagersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerGet.json
      */
     /**
      * Sample code: NetworkManagersGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListByResourceGroupSamples.java
index bab3ba08a1d2..5c2b10822da4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkManagersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerList.json
      */
     /**
      * Sample code: List Network Manager.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListSamples.java
index 3c6aa88df560..c2e8b6f4404d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkManagersListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerListAll.json
      */
     /**
      * Sample code: NetworkManagersList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersPatchSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersPatchSamples.java
index 2ced08b2f760..cf2e662cc8e7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersPatchSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkManagersPatchSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkManagersPatchSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerPatch.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerPatch.json
      */
     /**
      * Sample code: NetworkManagesPatch.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesCreateOrUpdateSamples.java
index d0b7f66c3dd6..fc235b0c6627 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
  */
 public final class NetworkProfilesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkProfileCreateConfigOnly.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesDeleteSamples.java
index 8e721e7c7c41..5fb61b4e702f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkProfilesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkProfileDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkProfileDelete.json
      */
     /**
      * Sample code: Delete network profile.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesGetByResourceGroupSamples.java
index 0dbba5bac316..fea3981cb4cf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkProfilesGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkProfileGetWithContainerNic.json
      */
     /**
@@ -28,7 +28,7 @@ public final class NetworkProfilesGetByResourceGroupSamples {
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkProfileGetConfigOnly.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkProfileGetConfigOnly.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListByResourceGroupSamples.java
index 2387e553661e..4256b77cdbda 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkProfilesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkProfileList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkProfileList.json
      */
     /**
      * Sample code: List resource group network profiles.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListSamples.java
index 4739a51d194f..26f5d5c9606b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkProfilesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkProfileListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkProfileListAll.json
      */
     /**
      * Sample code: List all network profiles.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesUpdateTagsSamples.java
index 4df67a680881..f29f4fdb815c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkProfilesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkProfilesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkProfileUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkProfileUpdateTags.json
      */
     /**
      * Sample code: Update network profile tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsCreateOrUpdateSamples.java
index 81058fb4e0a1..6a42a2aff992 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
  */
 public final class NetworkSecurityGroupsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkSecurityGroupCreateWithRule.json
      */
     /**
@@ -45,7 +45,7 @@ public static void createNetworkSecurityGroupWithRule(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupCreate.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsDeleteSamples.java
index a4726829a733..10044f57976c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityGroupsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsGetByResourceGroupSamples.java
index 6eccda0111c3..90624ec3e1e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityGroupsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupGet.json
      */
     /**
      * Sample code: Get network security group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListByResourceGroupSamples.java
index 921e3aa69846..0ac72e3998fc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityGroupsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupList.json
      */
     /**
      * Sample code: List network security groups in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListSamples.java
index f4aa3140262d..d182d1f9e900 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityGroupsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupListAll.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupListAll.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsUpdateTagsSamples.java
index a41c738150d7..2f1594d5e8fd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityGroupsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class NetworkSecurityGroupsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkSecurityGroupUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesCreateOrUpdateSamples.java
index 0bc61a22b188..8a4db5f7a05d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkSecurityPerimeterAccessRulesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAccessRulePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAccessRulePut.json
      */
     /**
      * Sample code: NspAccessRulePut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesDeleteSamples.java
index c14aaabb236f..c8f53f4ba4b6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterAccessRulesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAccessRuleDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAccessRuleDelete.json
      */
     /**
      * Sample code: NspAccessRulesDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesGetSamples.java
index 93e49479836d..9d836e1164d1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterAccessRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAccessRuleGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAccessRuleGet.json
      */
     /**
      * Sample code: NspAccessRuleGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesListSamples.java
index d3b84b17addb..44a7188843e8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterAccessRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAccessRuleList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAccessRuleList.json
      */
     /**
      * Sample code: NspAccessRulesList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesReconcileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesReconcileSamples.java
index 704c0fd59a08..d8ff4314da8c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesReconcileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAccessRulesReconcileSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkSecurityPerimeterAccessRulesReconcileSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAccessRuleReconcile.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAccessRuleReconcile.json
      */
     /**
      * Sample code: NspAccessRuleReconcile.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociableResourceTypesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociableResourceTypesListSamples.java
index eb61855295ba..ec92b1056844 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociableResourceTypesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociableResourceTypesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkSecurityPerimeterAssociableResourceTypesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PerimeterAssociableResourcesList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsCreateOrUpdateSamples.java
index 8760efd7da10..2a29f6e6695e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkSecurityPerimeterAssociationsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAssociationPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAssociationPut.json
      */
     /**
      * Sample code: NspAssociationPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsDeleteSamples.java
index 5459e57811af..4d87c191ffa3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterAssociationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAssociationDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAssociationDelete.json
      */
     /**
      * Sample code: NspAssociationDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsGetSamples.java
index c866eec7b325..4b317cc2384b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterAssociationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAssociationGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAssociationGet.json
      */
     /**
      * Sample code: NspAssociationGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsListSamples.java
index 4be6b1826c79..11f39853785d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterAssociationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAssociationList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAssociationList.json
      */
     /**
      * Sample code: NspAssociationList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsReconcileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsReconcileSamples.java
index 7f582cc8eeb6..98a4a6431729 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsReconcileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterAssociationsReconcileSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkSecurityPerimeterAssociationsReconcileSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspAssociationReconcile.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspAssociationReconcile.json
      */
     /**
      * Sample code: NspAssociationReconcile.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesDeleteSamples.java
index 58ec88d26e11..eafac4bf69eb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLinkReferencesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkReferenceDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkReferenceDelete.json
      */
     /**
      * Sample code: NspLinkReferenceDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesGetSamples.java
index dc287a73b342..66ab1fd61a09 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLinkReferencesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkReferenceGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkReferenceGet.json
      */
     /**
      * Sample code: NspLinkReferencesGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesListSamples.java
index 6b608a21a19d..db377fd4f886 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinkReferencesListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLinkReferencesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkReferenceList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkReferenceList.json
      */
     /**
      * Sample code: NspLinkReferenceList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksCreateOrUpdateSamples.java
index b0ef81981876..50db2858f6c7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class NetworkSecurityPerimeterLinksCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkPut.json
      */
     /**
      * Sample code: NspLinksPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksDeleteSamples.java
index 39c16a53e66e..76e397b2ed23 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLinksDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkDelete.json
      */
     /**
      * Sample code: NspLinkDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksGetSamples.java
index e3431a74a83a..0673ab7b1ba9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLinksGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkGet.json
      */
     /**
      * Sample code: NspLinksGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksListSamples.java
index cb12dda9716f..3a83ce0402f5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLinksListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLinksListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLinkList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLinkList.json
      */
     /**
      * Sample code: NspLinkList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsCreateOrUpdateSamples.java
index 0abfcf563b4e..320c62d57343 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class NetworkSecurityPerimeterLoggingConfigurationsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLoggingConfigurationPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLoggingConfigurationPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsDeleteSamples.java
index a65d49267fe7..887f664c7413 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLoggingConfigurationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLoggingConfigurationDelete
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLoggingConfigurationDelete
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsGetSamples.java
index bf45842b272e..7d100852c854 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLoggingConfigurationsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLoggingConfigurationGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLoggingConfigurationGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsListSamples.java
index 786c43d0ec54..4fe06c5ad336 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterLoggingConfigurationsListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterLoggingConfigurationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspLoggingConfigurationList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspLoggingConfigurationList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterOperationStatusesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterOperationStatusesGetSamples.java
index bfc4d54f1313..9807895f0246 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterOperationStatusesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterOperationStatusesGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterOperationStatusesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspOperationStatusGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspOperationStatusGet.json
      */
     /**
      * Sample code: NspOperationStatusGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesCreateOrUpdateSamples.java
index bb2b05a46e5f..3185a6b4ee5f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class NetworkSecurityPerimeterProfilesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspProfilePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspProfilePut.json
      */
     /**
      * Sample code: NspProfilesPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesDeleteSamples.java
index acbc9b868606..51af8dbcf4c7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterProfilesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspProfileDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspProfileDelete.json
      */
     /**
      * Sample code: NspProfilesDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesGetSamples.java
index d1d002acb69b..bc0823202cd8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesGetSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterProfilesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspProfileGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspProfileGet.json
      */
     /**
      * Sample code: NspProfilesGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesListSamples.java
index 3f1bdb3da236..73c68324367a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterProfilesListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimeterProfilesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NspProfileList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspProfileList.json
      */
     /**
      * Sample code: NspProfilesList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterServiceTagsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterServiceTagsListSamples.java
new file mode 100644
index 000000000000..1ecc5b492ba4
--- /dev/null
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimeterServiceTagsListSamples.java
@@ -0,0 +1,27 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.generated;
+
+/**
+ * Samples for NetworkSecurityPerimeterServiceTags List.
+ */
+public final class NetworkSecurityPerimeterServiceTagsListSamples {
+    /*
+     * x-ms-original-file:
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NspServiceTagsList.json
+     */
+    /**
+     * Sample code: NSPServiceTagsList.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void nSPServiceTagsList(com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getNetworkSecurityPerimeterServiceTags()
+            .list("westus", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersCreateOrUpdateSamples.java
index f080009b84fd..5f1972b9ac31 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class NetworkSecurityPerimetersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityPerimeterPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityPerimeterPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersDeleteSamples.java
index 05634786704e..5983923e0bfd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkSecurityPerimetersDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkSecurityPerimeterDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersGetByResourceGroupSamples.java
index f73cbce6599f..d41d19197ee8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimetersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityPerimeterGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityPerimeterGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListByResourceGroupSamples.java
index 3fd515ff4d1d..00a573719cc4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkSecurityPerimetersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityPerimeterList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityPerimeterList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListSamples.java
index 9809608ed954..3a4dbc1004b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkSecurityPerimetersListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkSecurityPerimeterListAll.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersPatchSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersPatchSamples.java
index 8f7ad7744277..0a85c3064955 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersPatchSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkSecurityPerimetersPatchSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkSecurityPerimetersPatchSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityPerimeterPatch
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityPerimeterPatch
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsCreateOrUpdateSamples.java
index d0732589e7e8..0c7e18a37a2a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
  */
 public final class NetworkVirtualApplianceConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceConnectionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsDeleteSamples.java
index affa945ef586..efb2d2c0a09a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualApplianceConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceConnectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsGetSamples.java
index 3f7666e9a35b..d4a29ec52e65 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualApplianceConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsListSamples.java
index 6cc9a3908e7c..97fc43dc8948 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualApplianceConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualApplianceConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesCreateOrUpdateSamples.java
index b4af1ed3c217..4166dbd4fded 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesCreateOrUpdateSamples.java
@@ -12,6 +12,9 @@
 import com.azure.resourcemanager.network.models.ManagedServiceIdentityUserAssignedIdentities;
 import com.azure.resourcemanager.network.models.NetworkVirtualAppliancePropertiesFormatNetworkProfile;
 import com.azure.resourcemanager.network.models.NicTypeInRequest;
+import com.azure.resourcemanager.network.models.NvaInVnetSubnetReferenceProperties;
+import com.azure.resourcemanager.network.models.NvaInterfaceConfigurationsProperties;
+import com.azure.resourcemanager.network.models.NvaNicType;
 import com.azure.resourcemanager.network.models.ResourceIdentityType;
 import com.azure.resourcemanager.network.models.VirtualApplianceAdditionalNicProperties;
 import com.azure.resourcemanager.network.models.VirtualApplianceIpConfiguration;
@@ -28,7 +31,126 @@
  */
 public final class NetworkVirtualAppliancesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * NetworkVirtualApplianceVnetAdditionalPublicPut.json
+     */
+    /**
+     * Sample code: Create NVA in VNet with PrivateNic, PublicNic &amp; AdditionalPublicNic.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void createNVAInVNetWithPrivateNicPublicNicAdditionalPublicNic(
+        com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getNetworkVirtualAppliances()
+            .createOrUpdate("rg1", "nva", new NetworkVirtualApplianceInner().withLocation("West US")
+                .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+                .withIdentity(new ManagedServiceIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                    .withUserAssignedIdentities(mapOf(
+                        "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1",
+                        new ManagedServiceIdentityUserAssignedIdentities())))
+                .withNvaSku(new VirtualApplianceSkuProperties().withVendor("Cisco SDWAN")
+                    .withBundledScaleUnit("1")
+                    .withMarketPlaceVersion("latest"))
+                .withBootStrapConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"))
+                .withCloudInitConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"))
+                .withVirtualApplianceAsn(10000L)
+                .withNvaInterfaceConfigurations(Arrays.asList(new NvaInterfaceConfigurationsProperties()
+                    .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                        "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"))
+                    .withType(Arrays.asList(NvaNicType.PRIVATE_NIC))
+                    .withName("dataInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet2"))
+                        .withType(Arrays.asList(NvaNicType.PUBLIC_NIC))
+                        .withName("managementInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet3"))
+                        .withType(Arrays.asList(NvaNicType.ADDITIONAL_PUBLIC_NIC))
+                        .withName("myAdditionalPublicInterface"))),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * NetworkVirtualApplianceVnetNetworkProfilePut.json
+     */
+    /**
+     * Sample code: Create NVA in VNet with PrivateNic &amp; PublicNic, including NetworkProfile.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void createNVAInVNetWithPrivateNicPublicNicIncludingNetworkProfile(
+        com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getNetworkVirtualAppliances()
+            .createOrUpdate("rg1", "nva", new NetworkVirtualApplianceInner().withLocation("West US")
+                .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+                .withIdentity(new ManagedServiceIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                    .withUserAssignedIdentities(mapOf(
+                        "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1",
+                        new ManagedServiceIdentityUserAssignedIdentities())))
+                .withNvaSku(new VirtualApplianceSkuProperties().withVendor("Cisco SDWAN")
+                    .withBundledScaleUnit("1")
+                    .withMarketPlaceVersion("latest"))
+                .withBootStrapConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"))
+                .withCloudInitConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"))
+                .withVirtualApplianceAsn(10000L)
+                .withNetworkProfile(
+                    new NetworkVirtualAppliancePropertiesFormatNetworkProfile()
+                        .withNetworkInterfaceConfigurations(
+                            Arrays
+                                .asList(
+                                    new VirtualApplianceNetworkInterfaceConfiguration()
+                                        .withNicType(NicTypeInRequest.PUBLIC_NIC)
+                                        .withProperties(
+                                            new VirtualApplianceNetworkInterfaceConfigurationProperties()
+                                                .withIpConfigurations(Arrays.asList(
+                                                    new VirtualApplianceIpConfiguration()
+                                                        .withName("myPrimaryPublicIpConfig")
+                                                        .withProperties(new VirtualApplianceIpConfigurationProperties()
+                                                            .withPrimary(true)),
+                                                    new VirtualApplianceIpConfiguration()
+                                                        .withName("myNonPrimaryPublicIpConfig")
+                                                        .withProperties(new VirtualApplianceIpConfigurationProperties()
+                                                            .withPrimary(false))))),
+                                    new VirtualApplianceNetworkInterfaceConfiguration()
+                                        .withNicType(NicTypeInRequest.PRIVATE_NIC)
+                                        .withProperties(new VirtualApplianceNetworkInterfaceConfigurationProperties()
+                                            .withIpConfigurations(Arrays.asList(
+                                                new VirtualApplianceIpConfiguration()
+                                                    .withName("myPrimaryPrivateIpConfig")
+                                                    .withProperties(new VirtualApplianceIpConfigurationProperties()
+                                                        .withPrimary(true)),
+                                                new VirtualApplianceIpConfiguration()
+                                                    .withName("myNonPrimaryPrivateIpConfig")
+                                                    .withProperties(new VirtualApplianceIpConfigurationProperties()
+                                                        .withPrimary(false))))))))
+                .withNvaInterfaceConfigurations(Arrays.asList(new NvaInterfaceConfigurationsProperties()
+                    .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                        "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"))
+                    .withType(Arrays.asList(NvaNicType.PRIVATE_NIC))
+                    .withName("dataInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet2"))
+                        .withType(Arrays.asList(NvaNicType.PUBLIC_NIC))
+                        .withName("managementInterface"))),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSaaSPut.json
      */
     /**
@@ -50,9 +172,141 @@ public static void createSaaSNetworkVirtualAppliance(com.azure.resourcemanager.A
                 com.azure.core.util.Context.NONE);
     }
 
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * NetworkVirtualApplianceVnetAdditionalPrivatePut.json
+     */
+    /**
+     * Sample code: Create NVA in VNet with PrivateNic, PublicNic &amp; AdditionalPrivateNic.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void createNVAInVNetWithPrivateNicPublicNicAdditionalPrivateNic(
+        com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getNetworkVirtualAppliances()
+            .createOrUpdate("rg1", "nva", new NetworkVirtualApplianceInner().withLocation("West US")
+                .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+                .withIdentity(new ManagedServiceIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                    .withUserAssignedIdentities(mapOf(
+                        "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1",
+                        new ManagedServiceIdentityUserAssignedIdentities())))
+                .withNvaSku(new VirtualApplianceSkuProperties().withVendor("Cisco SDWAN")
+                    .withBundledScaleUnit("1")
+                    .withMarketPlaceVersion("latest"))
+                .withBootStrapConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"))
+                .withCloudInitConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"))
+                .withVirtualApplianceAsn(10000L)
+                .withNvaInterfaceConfigurations(Arrays.asList(new NvaInterfaceConfigurationsProperties()
+                    .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                        "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"))
+                    .withType(Arrays.asList(NvaNicType.PRIVATE_NIC))
+                    .withName("dataInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet2"))
+                        .withType(Arrays.asList(NvaNicType.PUBLIC_NIC))
+                        .withName("managementInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet3"))
+                        .withType(Arrays.asList(NvaNicType.ADDITIONAL_PRIVATE_NIC))
+                        .withName("myAdditionalInterface"))),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * NetworkVirtualApplianceVnetIngressPut.json
+     */
+    /**
+     * Sample code: Create NVA in VNet with PrivateNic &amp; PublicNic, including Internet-Ingress.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void createNVAInVNetWithPrivateNicPublicNicIncludingInternetIngress(
+        com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getNetworkVirtualAppliances()
+            .createOrUpdate("rg1", "nva", new NetworkVirtualApplianceInner().withLocation("West US")
+                .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+                .withIdentity(new ManagedServiceIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                    .withUserAssignedIdentities(mapOf(
+                        "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1",
+                        new ManagedServiceIdentityUserAssignedIdentities())))
+                .withNvaSku(new VirtualApplianceSkuProperties().withVendor("Cisco SDWAN")
+                    .withBundledScaleUnit("1")
+                    .withMarketPlaceVersion("latest"))
+                .withBootStrapConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"))
+                .withCloudInitConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"))
+                .withVirtualApplianceAsn(10000L)
+                .withInternetIngressPublicIps(Arrays.asList(new InternetIngressPublicIpsProperties().withId(
+                    "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/slbip")))
+                .withNvaInterfaceConfigurations(Arrays.asList(new NvaInterfaceConfigurationsProperties()
+                    .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                        "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"))
+                    .withType(Arrays.asList(NvaNicType.PRIVATE_NIC))
+                    .withName("dataInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet2"))
+                        .withType(Arrays.asList(NvaNicType.PUBLIC_NIC))
+                        .withName("managementInterface"))),
+                com.azure.core.util.Context.NONE);
+    }
+
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * NetworkVirtualApplianceVnetBasicPut.json
+     */
+    /**
+     * Sample code: Create NVA in VNet with PrivateNic &amp; PublicNic.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void createNVAInVNetWithPrivateNicPublicNic(com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getNetworkVirtualAppliances()
+            .createOrUpdate("rg1", "nva", new NetworkVirtualApplianceInner().withLocation("West US")
+                .withTags(mapOf("key1", "fakeTokenPlaceholder"))
+                .withIdentity(new ManagedServiceIdentity().withType(ResourceIdentityType.USER_ASSIGNED)
+                    .withUserAssignedIdentities(mapOf(
+                        "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1",
+                        new ManagedServiceIdentityUserAssignedIdentities())))
+                .withNvaSku(new VirtualApplianceSkuProperties().withVendor("Cisco SDWAN")
+                    .withBundledScaleUnit("1")
+                    .withMarketPlaceVersion("latest"))
+                .withBootStrapConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"))
+                .withCloudInitConfigurationBlobs(Arrays
+                    .asList("https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"))
+                .withVirtualApplianceAsn(10000L)
+                .withNvaInterfaceConfigurations(Arrays.asList(new NvaInterfaceConfigurationsProperties()
+                    .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                        "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"))
+                    .withType(Arrays.asList(NvaNicType.PRIVATE_NIC))
+                    .withName("dataInterface"),
+                    new NvaInterfaceConfigurationsProperties()
+                        .withSubnet(new NvaInVnetSubnetReferenceProperties().withId(
+                            "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet2"))
+                        .withType(Arrays.asList(NvaNicType.PUBLIC_NIC))
+                        .withName("managementInterface"))),
+                com.azure.core.util.Context.NONE);
+    }
+
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualAppliancePut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkVirtualAppliancePut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesDeleteSamples.java
index 09dc02ed7ecb..5718ddf4eae7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkVirtualAppliancesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceDelete
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkVirtualApplianceDelete
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetBootDiagnosticLogsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetBootDiagnosticLogsSamples.java
index 4d8d6eb13dd5..0d1c01f5d24a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetBootDiagnosticLogsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetBootDiagnosticLogsSamples.java
@@ -11,7 +11,7 @@
  */
 public final class NetworkVirtualAppliancesGetBootDiagnosticLogsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceBootDiagnostics.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetByResourceGroupSamples.java
index 5602a65e266e..379968c0b07f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkVirtualAppliancesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkVirtualApplianceGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListByResourceGroupSamples.java
index c8bd8379699e..552a7044235c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualAppliancesListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListSamples.java
index 884a3e826aa7..3907450d2c58 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualAppliancesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesReimageSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesReimageSamples.java
index dea6667a20fe..07e313c15e80 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesReimageSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesReimageSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualAppliancesReimageSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSpecificReimage.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesRestartSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesRestartSamples.java
index 8c6f2c751c95..f29968a1e70d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesRestartSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesRestartSamples.java
@@ -9,7 +9,7 @@
  */
 public final class NetworkVirtualAppliancesRestartSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSpecificRestart.json
      */
     /**
@@ -27,7 +27,7 @@ public final class NetworkVirtualAppliancesRestartSamples {
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceEmptyRestart.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesUpdateTagsSamples.java
index 4b8d470529b2..e9e1905b9a24 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkVirtualAppliancesUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class NetworkVirtualAppliancesUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCheckConnectivitySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCheckConnectivitySamples.java
index cee9932fe93a..40efcbceb336 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCheckConnectivitySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCheckConnectivitySamples.java
@@ -14,7 +14,7 @@
  */
 public final class NetworkWatchersCheckConnectivitySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherConnectivityCheck.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCreateOrUpdateSamples.java
index 7fa01e64b168..1f383db6edf1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class NetworkWatchersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherCreate.json
      */
     /**
      * Sample code: Create network watcher.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersDeleteSamples.java
index 330fbb54489d..29311d1f41e6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkWatchersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherDelete.json
      */
     /**
      * Sample code: Delete network watcher.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetAzureReachabilityReportSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetAzureReachabilityReportSamples.java
index 080dad50b7f7..e77e986ad4f7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetAzureReachabilityReportSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetAzureReachabilityReportSamples.java
@@ -14,7 +14,7 @@
  */
 public final class NetworkWatchersGetAzureReachabilityReportSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherAzureReachabilityReportGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetByResourceGroupSamples.java
index ff309025855b..6765ab4ef724 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkWatchersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherGet.json
      */
     /**
      * Sample code: Get network watcher.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetFlowLogStatusSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetFlowLogStatusSamples.java
index e49f4686e23e..cae968b350f0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetFlowLogStatusSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetFlowLogStatusSamples.java
@@ -11,7 +11,7 @@
  */
 public final class NetworkWatchersGetFlowLogStatusSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherFlowLogStatusQuery.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNetworkConfigurationDiagnosticSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNetworkConfigurationDiagnosticSamples.java
index cb127edd5145..75d669963c8a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNetworkConfigurationDiagnosticSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNetworkConfigurationDiagnosticSamples.java
@@ -14,7 +14,7 @@
  */
 public final class NetworkWatchersGetNetworkConfigurationDiagnosticSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherNetworkConfigurationDiagnostic.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNextHopSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNextHopSamples.java
index 30c9adc0b06f..f9d036119517 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNextHopSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetNextHopSamples.java
@@ -12,7 +12,7 @@
 public final class NetworkWatchersGetNextHopSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherNextHopGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherNextHopGet.json
      */
     /**
      * Sample code: Get next hop.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTopologySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTopologySamples.java
index b6721a11d5bf..31c3186d94c7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTopologySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTopologySamples.java
@@ -12,7 +12,7 @@
 public final class NetworkWatchersGetTopologySamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherTopologyGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherTopologyGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingResultSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingResultSamples.java
index 16ae0aadd8f5..af3eb883b859 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingResultSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingResultSamples.java
@@ -11,7 +11,7 @@
  */
 public final class NetworkWatchersGetTroubleshootingResultSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherTroubleshootResultQuery.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingSamples.java
index cd2adca485e1..d0706d4f211f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetTroubleshootingSamples.java
@@ -12,7 +12,7 @@
 public final class NetworkWatchersGetTroubleshootingSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherTroubleshootGet
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherTroubleshootGet
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetVMSecurityRulesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetVMSecurityRulesSamples.java
index be4465c55953..d67b8ab6e64c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetVMSecurityRulesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersGetVMSecurityRulesSamples.java
@@ -11,7 +11,7 @@
  */
 public final class NetworkWatchersGetVMSecurityRulesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherSecurityGroupViewGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListAvailableProvidersSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListAvailableProvidersSamples.java
index c46b5c7c3863..128ea858f0b5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListAvailableProvidersSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListAvailableProvidersSamples.java
@@ -12,7 +12,7 @@
  */
 public final class NetworkWatchersListAvailableProvidersSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherAvailableProvidersListGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListByResourceGroupSamples.java
index b4a2da2f3681..1767f83df2dd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkWatchersListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherList.json
      */
     /**
      * Sample code: List network watchers.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListSamples.java
index 6d6008193438..28c4519d97f5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersListSamples.java
@@ -10,7 +10,7 @@
 public final class NetworkWatchersListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherListAll.json
      */
     /**
      * Sample code: List all network watchers.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersSetFlowLogConfigurationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersSetFlowLogConfigurationSamples.java
index 6020d6ab5c56..a03ae7d48ecd 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersSetFlowLogConfigurationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersSetFlowLogConfigurationSamples.java
@@ -16,7 +16,7 @@
  */
 public final class NetworkWatchersSetFlowLogConfigurationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherFlowLogConfigure.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersUpdateTagsSamples.java
index 8dd4faff4c04..9078f4ac4b80 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkWatchersUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherUpdateTags.json
      */
     /**
      * Sample code: Update network watcher tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersVerifyIpFlowSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersVerifyIpFlowSamples.java
index b4d6b4c16668..f4ee4232177a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersVerifyIpFlowSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/NetworkWatchersVerifyIpFlowSamples.java
@@ -14,7 +14,7 @@
 public final class NetworkWatchersVerifyIpFlowSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkWatcherIpFlowVerify.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkWatcherIpFlowVerify.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/OperationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/OperationsListSamples.java
index ac1ee8f647c8..52a7a676fbc4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/OperationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/OperationsListSamples.java
@@ -10,7 +10,7 @@
 public final class OperationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/OperationList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/OperationList.json
      */
     /**
      * Sample code: Get a list of operations for a resource provider.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysCreateOrUpdateSamples.java
index 3efcebef5464..d833657a73dc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysCreateOrUpdateSamples.java
@@ -21,7 +21,7 @@
 public final class P2SVpnGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/P2SVpnGatewayPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/P2SVpnGatewayPut.json
      */
     /**
      * Sample code: P2SVpnGatewayPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDeleteSamples.java
index 3f41b1928754..53b38f86e4ec 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class P2SVpnGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/P2SVpnGatewayDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/P2SVpnGatewayDelete.json
      */
     /**
      * Sample code: P2SVpnGatewayDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDisconnectP2SVpnConnectionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDisconnectP2SVpnConnectionsSamples.java
index 97b36cd0e9f2..afecfe3c8918 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDisconnectP2SVpnConnectionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysDisconnectP2SVpnConnectionsSamples.java
@@ -12,7 +12,7 @@
  */
 public final class P2SVpnGatewaysDisconnectP2SVpnConnectionsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * P2sVpnGatewaysDisconnectP2sVpnConnections.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGenerateVpnProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGenerateVpnProfileSamples.java
index 886e883e469e..196b38b9c31b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGenerateVpnProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGenerateVpnProfileSamples.java
@@ -12,7 +12,7 @@
  */
 public final class P2SVpnGatewaysGenerateVpnProfileSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * P2SVpnGatewayGenerateVpnProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetByResourceGroupSamples.java
index 2463ec4cc026..9615435d1e9b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class P2SVpnGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/P2SVpnGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/P2SVpnGatewayGet.json
      */
     /**
      * Sample code: P2SVpnGatewayGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedSamples.java
index 57a03fe19805..88efd6a6ebe0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedSamples.java
@@ -12,7 +12,7 @@
  */
 public final class P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * P2SVpnGatewayGetConnectionHealthDetailed.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthSamples.java
index 6a91628d7466..2190647e403a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysGetP2SVpnConnectionHealthSamples.java
@@ -9,7 +9,7 @@
  */
 public final class P2SVpnGatewaysGetP2SVpnConnectionHealthSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * P2SVpnGatewayGetConnectionHealth.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListByResourceGroupSamples.java
index 3af6af6c08a0..bd3567e9b566 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class P2SVpnGatewaysListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * P2SVpnGatewayListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListSamples.java
index 9260d7293f52..546a5b7e84e4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysListSamples.java
@@ -10,7 +10,7 @@
 public final class P2SVpnGatewaysListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/P2SVpnGatewayList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/P2SVpnGatewayList.json
      */
     /**
      * Sample code: P2SVpnGatewayListBySubscription.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysResetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysResetSamples.java
index 4b76b8b197e2..877b8da62253 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysResetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysResetSamples.java
@@ -10,7 +10,7 @@
 public final class P2SVpnGatewaysResetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/P2SVpnGatewayReset.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/P2SVpnGatewayReset.json
      */
     /**
      * Sample code: ResetP2SVpnGateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysUpdateTagsSamples.java
index 371a284a4ea2..e711340e0d00 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/P2SVpnGatewaysUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class P2SVpnGatewaysUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/P2SVpnGatewayUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/P2SVpnGatewayUpdateTags.json
      */
     /**
      * Sample code: P2SVpnGatewayUpdate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesCreateSamples.java
index dc13da3d3ba4..eb7fd03878c4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesCreateSamples.java
@@ -15,7 +15,7 @@
  */
 public final class PacketCapturesCreateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherPacketCaptureCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesDeleteSamples.java
index 83b94dfc68ee..089f3410ed47 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PacketCapturesDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherPacketCaptureDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetSamples.java
index 7995edec0b6a..bcfe7f5dedf1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PacketCapturesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherPacketCaptureGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetStatusSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetStatusSamples.java
index 4ecca1c8d45b..1468dba0ff47 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetStatusSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesGetStatusSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PacketCapturesGetStatusSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherPacketCaptureQueryStatus.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesListSamples.java
index b233a28eb6d9..13c6e013b031 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PacketCapturesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherPacketCapturesList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesStopSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesStopSamples.java
index 102b632afe31..d97ce3a2f54b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesStopSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PacketCapturesStopSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PacketCapturesStopSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkWatcherPacketCaptureStop.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsGetSamples.java
index f4ece5f43ca7..a6b06df13264 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PeerExpressRouteCircuitConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PeerExpressRouteCircuitConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsListSamples.java
index 28bf284d3ee5..b39b6acc8c6d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PeerExpressRouteCircuitConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PeerExpressRouteCircuitConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PeerExpressRouteCircuitConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsCreateOrUpdateSamples.java
index d4d2e9b63b50..1a31cd8962a6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class PrivateDnsZoneGroupsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateEndpointDnsZoneGroupCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsDeleteSamples.java
index 1f28e73db56e..cbd5184e3d0f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateDnsZoneGroupsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateEndpointDnsZoneGroupDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsGetSamples.java
index 8196c0fd059f..4e2401cb294c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateDnsZoneGroupsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateEndpointDnsZoneGroupGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsListSamples.java
index 298d94a2d295..30b373f12f78 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateDnsZoneGroupsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateDnsZoneGroupsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateEndpointDnsZoneGroupList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsCreateOrUpdateSamples.java
index dba74088c46a..c987616e7f63 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsCreateOrUpdateSamples.java
@@ -17,7 +17,7 @@
 public final class PrivateEndpointsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointCreateWithASG.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointCreateWithASG.
      * json
      */
     /**
@@ -46,7 +46,7 @@ public final class PrivateEndpointsCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointCreate.json
      */
     /**
      * Sample code: Create private endpoint.
@@ -74,7 +74,7 @@ public static void createPrivateEndpoint(com.azure.resourcemanager.AzureResource
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateEndpointCreateForManualApproval.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsDeleteSamples.java
index 5bb5bcf5fe26..2091bf168507 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointDelete.json
      */
     /**
      * Sample code: Delete private endpoint.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsGetByResourceGroupSamples.java
index cc162c84d4b2..b691159fbdce 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointGetWithASG.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointGetWithASG.
      * json
      */
     /**
@@ -28,7 +28,7 @@ public final class PrivateEndpointsGetByResourceGroupSamples {
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateEndpointGetForManualApproval.json
      */
     /**
@@ -47,7 +47,7 @@ public final class PrivateEndpointsGetByResourceGroupSamples {
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointGet.json
      */
     /**
      * Sample code: Get private endpoint.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListByResourceGroupSamples.java
index 54cc571ddc63..2c7a0c2bf076 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointList.json
      */
     /**
      * Sample code: List private endpoints in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListSamples.java
index 344bbea65fbf..be976e7c15f7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateEndpointsListSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateEndpointsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateEndpointListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateEndpointListAll.json
      */
     /**
      * Sample code: List all private endpoints.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilityByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilityByResourceGroupSamples.java
index 02508f872c25..6dfe9735e19d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilityByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilityByResourceGroupSamples.java
@@ -11,7 +11,7 @@
  */
 public final class PrivateLinkServicesCheckPrivateLinkServiceVisibilityByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CheckPrivateLinkServiceVisibilityByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilitySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilitySamples.java
index fcdef949c89f..aee8f34f6578 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilitySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCheckPrivateLinkServiceVisibilitySamples.java
@@ -11,7 +11,7 @@
  */
 public final class PrivateLinkServicesCheckPrivateLinkServiceVisibilitySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CheckPrivateLinkServiceVisibility.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCreateOrUpdateSamples.java
index 718eaa738465..873e7fb8cae3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesCreateOrUpdateSamples.java
@@ -20,7 +20,7 @@
 public final class PrivateLinkServicesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateLinkServiceCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateLinkServiceCreate.json
      */
     /**
      * Sample code: Create private link service.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeletePrivateEndpointConnectionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeletePrivateEndpointConnectionSamples.java
index fdf7e96d078e..8cf629eedc5f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeletePrivateEndpointConnectionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeletePrivateEndpointConnectionSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkServicesDeletePrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateLinkServiceDeletePrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeleteSamples.java
index 207f626c2920..19bccd62ce53 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkServicesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateLinkServiceDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateLinkServiceDelete.json
      */
     /**
      * Sample code: Delete private link service.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetByResourceGroupSamples.java
index f01055e9371c..7b050d621e0b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkServicesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateLinkServiceGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateLinkServiceGet.json
      */
     /**
      * Sample code: Get private link service.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetPrivateEndpointConnectionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetPrivateEndpointConnectionSamples.java
index 832864695712..6fc7a687908b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetPrivateEndpointConnectionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesGetPrivateEndpointConnectionSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkServicesGetPrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateLinkServiceGetPrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesByResourceGroupSamples.java
index 3fc34ffe09b0..e423b1f070d6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkServicesListAutoApprovedPrivateLinkServicesByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AutoApprovedPrivateLinkServicesResourceGroupGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesSamples.java
index a8fc39d8ad81..8ba6847ccbc0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListAutoApprovedPrivateLinkServicesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkServicesListAutoApprovedPrivateLinkServicesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AutoApprovedPrivateLinkServicesGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListByResourceGroupSamples.java
index 18da3cebcfd1..272172b45a24 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkServicesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateLinkServiceList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateLinkServiceList.json
      */
     /**
      * Sample code: List private link service in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListPrivateEndpointConnectionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListPrivateEndpointConnectionsSamples.java
index 45ed71b8f02f..55211ee74578 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListPrivateEndpointConnectionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListPrivateEndpointConnectionsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PrivateLinkServicesListPrivateEndpointConnectionsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateLinkServiceListPrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListSamples.java
index eaa6d945fb8e..bac55918ccb1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesListSamples.java
@@ -10,7 +10,7 @@
 public final class PrivateLinkServicesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PrivateLinkServiceListAll.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PrivateLinkServiceListAll.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesUpdatePrivateEndpointConnectionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesUpdatePrivateEndpointConnectionSamples.java
index 136afc1ec0ba..bb876174338f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesUpdatePrivateEndpointConnectionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PrivateLinkServicesUpdatePrivateEndpointConnectionSamples.java
@@ -12,7 +12,7 @@
  */
 public final class PrivateLinkServicesUpdatePrivateEndpointConnectionSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PrivateLinkServiceUpdatePrivateEndpointConnection.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesCreateOrUpdateSamples.java
index 5e4b1cdad756..4c09ff9c284c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesCreateOrUpdateSamples.java
@@ -19,7 +19,7 @@
 public final class PublicIpAddressesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressCreateDns.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressCreateDns.json
      */
     /**
      * Sample code: Create public IP address DNS.
@@ -38,7 +38,7 @@ public static void createPublicIPAddressDNS(com.azure.resourcemanager.AzureResou
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpAddressCreateCustomizedValues.json
      */
     /**
@@ -63,7 +63,7 @@ public static void createPublicIPAddressAllocationMethod(com.azure.resourcemanag
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressCreateDefaults
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressCreateDefaults
      * .json
      */
     /**
@@ -81,7 +81,7 @@ public static void createPublicIPAddressDefaults(com.azure.resourcemanager.Azure
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpAddressCreateDnsWithDomainNameLabelScope.json
      */
     /**
@@ -103,7 +103,7 @@ public static void createPublicIPAddressDefaults(com.azure.resourcemanager.Azure
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpAddressCreateDefaultsStandardV2Sku.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDdosProtectionStatusSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDdosProtectionStatusSamples.java
index 9227c4ab72ec..0ef90db3d86a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDdosProtectionStatusSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDdosProtectionStatusSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PublicIpAddressesDdosProtectionStatusSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpAddressGetDdosProtectionStatus.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDeleteSamples.java
index 7e9a9b6e0903..67f19022959d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressDelete.json
      */
     /**
      * Sample code: Delete public IP address.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetByResourceGroupSamples.java
index 47014637b5aa..2d6533c91d77 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressGet.json
      */
     /**
      * Sample code: Get public IP address.
@@ -26,7 +26,7 @@ public static void getPublicIPAddress(com.azure.resourcemanager.AzureResourceMan
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpAddressGetStandardV2Sku.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetCloudServicePublicIpAddressSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetCloudServicePublicIpAddressSamples.java
index a9e6a6147d93..e114e29bc1ac 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetCloudServicePublicIpAddressSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetCloudServicePublicIpAddressSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesGetCloudServicePublicIpAddressSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CloudServicePublicIpGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CloudServicePublicIpGet.json
      */
     /**
      * Sample code: GetVMSSPublicIP.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetVirtualMachineScaleSetPublicIpAddressSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetVirtualMachineScaleSetPublicIpAddressSamples.java
index b4baac7dd2fb..7310e1045acc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetVirtualMachineScaleSetPublicIpAddressSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesGetVirtualMachineScaleSetPublicIpAddressSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesGetVirtualMachineScaleSetPublicIpAddressSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VmssPublicIpGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VmssPublicIpGet.json
      */
     /**
      * Sample code: GetVMSSPublicIP.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListByResourceGroupSamples.java
index 525a7d754ff1..40caa072e102 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressList.json
      */
     /**
      * Sample code: List resource group public IP addresses.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServicePublicIpAddressesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServicePublicIpAddressesSamples.java
index 663fd7a1ff46..155e13f1a74b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServicePublicIpAddressesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServicePublicIpAddressesSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesListCloudServicePublicIpAddressesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CloudServicePublicIpListAll.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CloudServicePublicIpListAll.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServiceRoleInstancePublicIpAddressesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServiceRoleInstancePublicIpAddressesSamples.java
index d3bdac8db70a..dc166c0a9bd3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServiceRoleInstancePublicIpAddressesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListCloudServiceRoleInstancePublicIpAddressesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PublicIpAddressesListCloudServiceRoleInstancePublicIpAddressesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * CloudServiceRoleInstancePublicIpList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListSamples.java
index 7a63873fda73..564e6a9910b5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressListAll.json
      */
     /**
      * Sample code: List all public IP addresses.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetPublicIpAddressesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetPublicIpAddressesSamples.java
index 55fe42593af5..caa374d4f454 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetPublicIpAddressesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetPublicIpAddressesSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesListVirtualMachineScaleSetPublicIpAddressesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VmssPublicIpListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VmssPublicIpListAll.json
      */
     /**
      * Sample code: ListVMSSPublicIP.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetVMPublicIpAddressesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetVMPublicIpAddressesSamples.java
index e72abb020b09..e549d9c99ab5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetVMPublicIpAddressesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesListVirtualMachineScaleSetVMPublicIpAddressesSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpAddressesListVirtualMachineScaleSetVMPublicIpAddressesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VmssVmPublicIpList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VmssVmPublicIpList.json
      */
     /**
      * Sample code: ListVMSSVMPublicIP.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesUpdateTagsSamples.java
index c203a5e6f451..36694e21b6b4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpAddressesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class PublicIpAddressesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpAddressUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpAddressUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesCreateOrUpdateSamples.java
index 59e8cf1f5de5..3613427f0dce 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
  */
 public final class PublicIpPrefixesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpPrefixCreateDefaultsStandardV2Sku.json
      */
     /**
@@ -38,7 +38,7 @@ public final class PublicIpPrefixesCreateOrUpdateSamples {
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpPrefixCreateDefaults.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpPrefixCreateDefaults.
      * json
      */
     /**
@@ -59,7 +59,7 @@ public static void createPublicIPPrefixDefaults(com.azure.resourcemanager.AzureR
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpPrefixCreateCustomizedValues.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesDeleteSamples.java
index 3e0177787381..aa1869767e18 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpPrefixesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpPrefixDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpPrefixDelete.json
      */
     /**
      * Sample code: Delete public IP prefix.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesGetByResourceGroupSamples.java
index 88508cda224c..2029fbcc6274 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class PublicIpPrefixesGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * PublicIpPrefixGetStandardV2Sku.json
      */
     /**
@@ -27,7 +27,7 @@ public static void getPublicIPPrefixWithStandardV2Sku(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpPrefixGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpPrefixGet.json
      */
     /**
      * Sample code: Get public IP prefix.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListByResourceGroupSamples.java
index 3e0f03540d65..edcc7eed4b5d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpPrefixesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpPrefixList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpPrefixList.json
      */
     /**
      * Sample code: List resource group public IP prefixes.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListSamples.java
index 2945bbc9a1d9..c277809f373c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesListSamples.java
@@ -10,7 +10,7 @@
 public final class PublicIpPrefixesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpPrefixListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpPrefixListAll.json
      */
     /**
      * Sample code: List all public IP prefixes.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesUpdateTagsSamples.java
index 54ad77d2ae4d..ec2bf12405aa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/PublicIpPrefixesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class PublicIpPrefixesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/PublicIpPrefixUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/PublicIpPrefixUpdateTags.json
      */
     /**
      * Sample code: Update public IP prefix tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsCreateSamples.java
index d7cfd3cb744e..fe11ece1f0a4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsCreateSamples.java
@@ -16,7 +16,7 @@
 public final class ReachabilityAnalysisIntentsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ReachabilityAnalysisIntentPut
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ReachabilityAnalysisIntentPut
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsDeleteSamples.java
index 0a943851009c..807b5b57e3f7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ReachabilityAnalysisIntentsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ReachabilityAnalysisIntentDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsGetSamples.java
index cb53441acee7..5bae53a4642e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ReachabilityAnalysisIntentsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ReachabilityAnalysisIntentGet
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ReachabilityAnalysisIntentGet
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsListSamples.java
index 9f87e8e82388..61904e51ba07 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisIntentsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ReachabilityAnalysisIntentsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ReachabilityAnalysisIntentList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsCreateSamples.java
index 5653dc3867c8..5ba673500e24 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsCreateSamples.java
@@ -13,7 +13,7 @@
 public final class ReachabilityAnalysisRunsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ReachabilityAnalysisRunPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ReachabilityAnalysisRunPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsDeleteSamples.java
index 301a33767a2a..705f6c341ded 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ReachabilityAnalysisRunsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ReachabilityAnalysisRunDelete
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ReachabilityAnalysisRunDelete
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsGetSamples.java
index a321b5220806..24bbe8f00979 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsGetSamples.java
@@ -10,7 +10,7 @@
 public final class ReachabilityAnalysisRunsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ReachabilityAnalysisRunGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ReachabilityAnalysisRunGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsListSamples.java
index b6a928651f1b..a7fd6dc2214b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ReachabilityAnalysisRunsListSamples.java
@@ -10,7 +10,7 @@
 public final class ReachabilityAnalysisRunsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ReachabilityAnalysisRunList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ReachabilityAnalysisRunList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ResourceNavigationLinksListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ResourceNavigationLinksListSamples.java
index f2de369bd572..1e620502165e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ResourceNavigationLinksListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ResourceNavigationLinksListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ResourceNavigationLinksListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGetResourceNavigationLinks.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesCreateOrUpdateSamples.java
index f3789bb31e35..a38b710f2a2a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class RouteFilterRulesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterRuleCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterRuleCreate.json
      */
     /**
      * Sample code: RouteFilterRuleCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesDeleteSamples.java
index 0a073fcc3b37..16f58faa52ae 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RouteFilterRulesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterRuleDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterRuleDelete.json
      */
     /**
      * Sample code: RouteFilterRuleDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesGetSamples.java
index c8a7282d29a7..eca026eb32ca 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class RouteFilterRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterRuleGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterRuleGet.json
      */
     /**
      * Sample code: RouteFilterRuleGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesListByRouteFilterSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesListByRouteFilterSamples.java
index 1e936d3cf1b2..41d4ec70b438 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesListByRouteFilterSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFilterRulesListByRouteFilterSamples.java
@@ -9,7 +9,7 @@
  */
 public final class RouteFilterRulesListByRouteFilterSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * RouteFilterRuleListByRouteFilter.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersCreateOrUpdateSamples.java
index ff1b614f1d94..75d68a711ddf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersCreateOrUpdateSamples.java
@@ -18,7 +18,7 @@
 public final class RouteFiltersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterCreate.json
      */
     /**
      * Sample code: RouteFilterCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersDeleteSamples.java
index 0f018dc404fe..4dc226a56eeb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RouteFiltersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterDelete.json
      */
     /**
      * Sample code: RouteFilterDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersGetByResourceGroupSamples.java
index 84a349ddcbda..4e9639d8787a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class RouteFiltersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterGet.json
      */
     /**
      * Sample code: RouteFilterGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListByResourceGroupSamples.java
index 439f0a470b69..f6e675e0a45f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class RouteFiltersListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * RouteFilterListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListSamples.java
index 8d5e3848ea70..dd4745b0ee0e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersListSamples.java
@@ -10,7 +10,7 @@
 public final class RouteFiltersListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterList.json
      */
     /**
      * Sample code: RouteFilterList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersUpdateTagsSamples.java
index c89b5e88aee5..0b397354d7d9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteFiltersUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class RouteFiltersUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteFilterUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteFilterUpdateTags.json
      */
     /**
      * Sample code: Update route filter tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsCreateOrUpdateSamples.java
index 6298fd527ab5..f107413ba172 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsCreateOrUpdateSamples.java
@@ -20,7 +20,7 @@
 public final class RouteMapsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteMapPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteMapPut.json
      */
     /**
      * Sample code: RouteMapPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsDeleteSamples.java
index 3efd15277dc1..1373ab7f67e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RouteMapsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteMapDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteMapDelete.json
      */
     /**
      * Sample code: RouteMapDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsGetSamples.java
index 38238e0fb352..90eaa743ca1f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsGetSamples.java
@@ -10,7 +10,7 @@
 public final class RouteMapsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteMapGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteMapGet.json
      */
     /**
      * Sample code: RouteMapGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsListSamples.java
index f1381b80fb0d..97e727e052aa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteMapsListSamples.java
@@ -10,7 +10,7 @@
 public final class RouteMapsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteMapList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteMapList.json
      */
     /**
      * Sample code: RouteMapList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesCreateOrUpdateSamples.java
index b077e4c4f2b8..3d156e2bc7b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class RouteTablesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableCreate.json
      */
     /**
      * Sample code: Create route table.
@@ -33,7 +33,7 @@ public static void createRouteTable(com.azure.resourcemanager.AzureResourceManag
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableCreateWithRoute.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableCreateWithRoute.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesDeleteSamples.java
index 89673b04a8d3..1e76be0b658d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RouteTablesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableDelete.json
      */
     /**
      * Sample code: Delete route table.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesGetByResourceGroupSamples.java
index 400e970d8caa..03c4a84cf2ca 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class RouteTablesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableGet.json
      */
     /**
      * Sample code: Get route table.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListByResourceGroupSamples.java
index 3c35d6250a9c..a3ff4a5d2180 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class RouteTablesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableList.json
      */
     /**
      * Sample code: List route tables in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListSamples.java
index 77ee31d2b803..8e1edf760e04 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesListSamples.java
@@ -10,7 +10,7 @@
 public final class RouteTablesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableListAll.json
      */
     /**
      * Sample code: List all route tables.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesUpdateTagsSamples.java
index 8ab286315aa8..3a01237dacad 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RouteTablesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class RouteTablesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableUpdateTags.json
      */
     /**
      * Sample code: Update route table tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesCreateOrUpdateSamples.java
index a558242b6ea1..63a62e54e6e9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class RoutesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableRouteCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableRouteCreate.json
      */
     /**
      * Sample code: Create route.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesDeleteSamples.java
index e0a852d9ee6f..0562fa6b4132 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RoutesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableRouteDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableRouteDelete.json
      */
     /**
      * Sample code: Delete route.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesGetSamples.java
index e3e0329d8497..34d00ff04076 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesGetSamples.java
@@ -10,7 +10,7 @@
 public final class RoutesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableRouteGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableRouteGet.json
      */
     /**
      * Sample code: Get route.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesListSamples.java
index b535dba438aa..47d18841943b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutesListSamples.java
@@ -10,7 +10,7 @@
 public final class RoutesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RouteTableRouteList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RouteTableRouteList.json
      */
     /**
      * Sample code: List routes.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentCreateOrUpdateSamples.java
index d7af83cc55d6..1797f91b76ff 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class RoutingIntentCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RoutingIntentPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RoutingIntentPut.json
      */
     /**
      * Sample code: RouteTablePut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentDeleteSamples.java
index 452f812112a1..d0f23b0f9083 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class RoutingIntentDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RoutingIntentDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RoutingIntentDelete.json
      */
     /**
      * Sample code: RouteTableDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentGetSamples.java
index 148ccb17d98c..d1e88922c314 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentGetSamples.java
@@ -10,7 +10,7 @@
 public final class RoutingIntentGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RoutingIntentGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RoutingIntentGet.json
      */
     /**
      * Sample code: RouteTableGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentListSamples.java
index 2324865d68d5..c35bd934ee2f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingIntentListSamples.java
@@ -10,7 +10,7 @@
 public final class RoutingIntentListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/RoutingIntentList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/RoutingIntentList.json
      */
     /**
      * Sample code: RoutingIntentList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsCreateOrUpdateSamples.java
index 607e1970b014..21de14313dcb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class RoutingRuleCollectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingRuleCollectionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsDeleteSamples.java
index 1bc77a4c0cf7..0fb02eb51232 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class RoutingRuleCollectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingRuleCollectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsGetSamples.java
index 8097015d91cc..cb7c89daf9d8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class RoutingRuleCollectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingRuleCollectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsListSamples.java
index b417ddd84486..0d6b09da406f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRuleCollectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class RoutingRuleCollectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingRuleCollectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesCreateOrUpdateSamples.java
index 00ca936b4faa..ab09d1a7bb83 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
 public final class RoutingRulesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerRoutingRulePut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerRoutingRulePut.
      * json
      */
     /**
@@ -42,7 +42,7 @@ public static void createAnRoutingRule(com.azure.resourcemanager.AzureResourceMa
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerRoutingRulePut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerRoutingRulePut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesDeleteSamples.java
index 9e2f369b016a..87acc060f0db 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class RoutingRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerRoutingRuleDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesGetSamples.java
index b8561bfb4466..f87ea74ecd83 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class RoutingRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerRoutingRuleGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerRoutingRuleGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesListSamples.java
index 279b573650cb..27b7f5d00686 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/RoutingRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class RoutingRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerRoutingRuleList
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerRoutingRuleList
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsCreateOrUpdateSamples.java
index 7e2ce777e868..db18b8dcb1e1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class ScopeConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerScopeConnectionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsDeleteSamples.java
index e4ead8e464cb..11178d45f49e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ScopeConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerScopeConnectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsGetSamples.java
index 5946d06c23c6..a6a689ebb8c4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ScopeConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerScopeConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsListSamples.java
index b89cecf1dfd3..3ffcfff07cb1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ScopeConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ScopeConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerScopeConnectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsCreateOrUpdateSamples.java
index 6899779c0b16..1f83073082c5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
  */
 public final class SecurityAdminConfigurationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityAdminConfigurationPut_ManualAggregation.json
      */
     /**
@@ -37,7 +37,7 @@ public final class SecurityAdminConfigurationsCreateOrUpdateSamples {
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityAdminConfigurationPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsDeleteSamples.java
index e381e79e6a44..c16b21a72c3f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityAdminConfigurationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityAdminConfigurationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsGetSamples.java
index 3a1fbc37db36..d8612076eb65 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityAdminConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityAdminConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsListSamples.java
index 30a73c50635a..a7abe2baf2ca 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityAdminConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityAdminConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityAdminConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersCreateOrUpdateSamples.java
index 4128c3d4befa..e3f9196d3f18 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
 public final class SecurityPartnerProvidersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SecurityPartnerProviderPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SecurityPartnerProviderPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersDeleteSamples.java
index fc8971074cd6..281256e849cf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class SecurityPartnerProvidersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SecurityPartnerProviderDelete
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SecurityPartnerProviderDelete
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersGetByResourceGroupSamples.java
index d101e63c04c4..b8a257e951d8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class SecurityPartnerProvidersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SecurityPartnerProviderGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SecurityPartnerProviderGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListByResourceGroupSamples.java
index 02021ca18448..f4c1cff71924 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityPartnerProvidersListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * SecurityPartnerProviderListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListSamples.java
index 7596f74fc308..0015c00500f7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityPartnerProvidersListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * SecurityPartnerProviderListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersUpdateTagsSamples.java
index 16ed5da0ae3e..420fb92d4e38 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityPartnerProvidersUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class SecurityPartnerProvidersUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * SecurityPartnerProviderUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesCreateOrUpdateSamples.java
index 94eeb1eb8534..e76a120ddbac 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
  */
 public final class SecurityRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkSecurityGroupRuleCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesDeleteSamples.java
index 29e6ef228320..d7cc2ac01463 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkSecurityGroupRuleDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesGetSamples.java
index a74526c1e884..6e48587c0f43 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesGetSamples.java
@@ -10,7 +10,7 @@
 public final class SecurityRulesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupRuleGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupRuleGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesListSamples.java
index 10db2681b5c0..571eed2d4358 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityRulesListSamples.java
@@ -10,7 +10,7 @@
 public final class SecurityRulesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkSecurityGroupRuleList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkSecurityGroupRuleList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsCreateOrUpdateSamples.java
index 6a61cce98d0c..214cb2f44881 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class SecurityUserConfigurationsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserConfigurationPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsDeleteSamples.java
index ae54d66c2a39..0e2949977fc2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserConfigurationsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserConfigurationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsGetSamples.java
index f51222581ab4..2c155c2ff218 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserConfigurationsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserConfigurationGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsListSamples.java
index f9a3188821c2..319d9f2fec33 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserConfigurationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserConfigurationsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserConfigurationList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsCreateOrUpdateSamples.java
index 60d222abf8f8..d0e7f633dc00 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class SecurityUserRuleCollectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleCollectionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsDeleteSamples.java
index e9a92e7804f0..b4d01ebd70b0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserRuleCollectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleCollectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsGetSamples.java
index 2a8e46ccb153..bd023eea9c5b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserRuleCollectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleCollectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsListSamples.java
index a413e01e849d..1201a665fd08 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRuleCollectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserRuleCollectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleCollectionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesCreateOrUpdateSamples.java
index d244e981ef40..c8d454e4ecac 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesCreateOrUpdateSamples.java
@@ -16,7 +16,7 @@
  */
 public final class SecurityUserRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRulePut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesDeleteSamples.java
index edeec0a605df..aacae5ac3c3e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesGetSamples.java
index a55e7044b69b..bbeb63940725 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserRulesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesListSamples.java
index ce1d3eae9cfe..ce484a5674eb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SecurityUserRulesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SecurityUserRulesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerSecurityUserRuleList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceAssociationLinksListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceAssociationLinksListSamples.java
index 26f240536a33..62ae5d1e4188 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceAssociationLinksListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceAssociationLinksListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ServiceAssociationLinksListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGetServiceAssociationLinks.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesCreateOrUpdateSamples.java
index 1a96b3f51556..0c6262b8544a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class ServiceEndpointPoliciesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceEndpointPolicyCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceEndpointPolicyCreate.
      * json
      */
     /**
@@ -32,7 +32,7 @@ public static void createServiceEndpointPolicy(com.azure.resourcemanager.AzureRe
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceEndpointPolicyCreateWithDefinition.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesDeleteSamples.java
index d63019a4f309..9b4f646a4dd1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class ServiceEndpointPoliciesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceEndpointPolicyDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceEndpointPolicyDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesGetByResourceGroupSamples.java
index 44a9761fa7a6..63c721ee3367 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ServiceEndpointPoliciesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceEndpointPolicyGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceEndpointPolicyGet.json
      */
     /**
      * Sample code: Get service endPoint Policy.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListByResourceGroupSamples.java
index 9c025bb3c789..c3a506876d3a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class ServiceEndpointPoliciesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceEndpointPolicyList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceEndpointPolicyList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListSamples.java
index 92fc10db3bd3..63cf60e3ed12 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesListSamples.java
@@ -10,7 +10,7 @@
 public final class ServiceEndpointPoliciesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceEndpointPolicyListAll.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceEndpointPolicyListAll.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesUpdateTagsSamples.java
index 07a5d75aab8d..e50c3cbcb66c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPoliciesUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class ServiceEndpointPoliciesUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceEndpointPolicyUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsCreateOrUpdateSamples.java
index 5f5fcf01175c..70f75f668d9e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class ServiceEndpointPolicyDefinitionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceEndpointPolicyDefinitionCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsDeleteSamples.java
index 1e20c80e9128..c66485594fda 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ServiceEndpointPolicyDefinitionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceEndpointPolicyDefinitionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsGetSamples.java
index 5b7f2a1b7079..ceeee3fa7e25 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ServiceEndpointPolicyDefinitionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceEndpointPolicyDefinitionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsListByResourceGroupSamples.java
index 1fcfa5d27f17..1ec78fcf72d6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceEndpointPolicyDefinitionsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ServiceEndpointPolicyDefinitionsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceEndpointPolicyDefinitionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagInformationListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagInformationListSamples.java
index 2a82c8bdb39d..c1c569b93009 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagInformationListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagInformationListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class ServiceTagInformationListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceTagInformationListResultWithNoAddressPrefixes.json
      */
     /**
@@ -26,7 +26,7 @@ public static void getListOfServiceTagsWithNoAddressPrefixes(com.azure.resourcem
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceTagInformationListResult.json
      */
     /**
@@ -43,7 +43,7 @@ public static void getListOfServiceTags(com.azure.resourcemanager.AzureResourceM
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * ServiceTagInformationListResultWithTagname.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagsListSamples.java
index 56000adff41c..46ac21529c61 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/ServiceTagsListSamples.java
@@ -10,7 +10,7 @@
 public final class ServiceTagsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/ServiceTagsList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/ServiceTagsList.json
      */
     /**
      * Sample code: Get list of service tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsCreateSamples.java
index 23dff14e2bc3..16b258686a81 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsCreateSamples.java
@@ -10,7 +10,7 @@
 public final class StaticCidrsCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/StaticCidrs_Create.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/StaticCidrs_Create.json
      */
     /**
      * Sample code: StaticCidrs_Create.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsDeleteSamples.java
index f3c7ca8df3d6..2cddb2520662 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class StaticCidrsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/StaticCidrs_Delete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/StaticCidrs_Delete.json
      */
     /**
      * Sample code: StaticCidrs_Delete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsGetSamples.java
index 0c5498638081..37fb875ee64f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsGetSamples.java
@@ -10,7 +10,7 @@
 public final class StaticCidrsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/StaticCidrs_Get.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/StaticCidrs_Get.json
      */
     /**
      * Sample code: StaticCidrs_Get.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsListSamples.java
index 339e9a6643df..8a9740b07524 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticCidrsListSamples.java
@@ -10,7 +10,7 @@
 public final class StaticCidrsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/StaticCidrs_List.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/StaticCidrs_List.json
      */
     /**
      * Sample code: StaticCidrs_List.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersCreateOrUpdateSamples.java
index 5ca9676396e3..12560d43f810 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class StaticMembersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerStaticMemberPut
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerStaticMemberPut
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersDeleteSamples.java
index 105f22a2b272..5f92bd3d72c7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class StaticMembersDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerStaticMemberDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersGetSamples.java
index a863223feb19..96096ff50330 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersGetSamples.java
@@ -10,7 +10,7 @@
 public final class StaticMembersGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkManagerStaticMemberGet
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkManagerStaticMemberGet
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersListSamples.java
index 4eb60b2dfbdf..2ffa84d5b631 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/StaticMembersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class StaticMembersListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerStaticMemberList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsCreateOrUpdateSamples.java
index 548f93f59377..c5b4782f6ce5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class SubnetsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetCreate.json
      */
     /**
      * Sample code: Create subnet.
@@ -32,7 +32,7 @@ public static void createSubnet(com.azure.resourcemanager.AzureResourceManager a
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * SubnetCreateServiceEndpointNetworkIdentifier.json
      */
     /**
@@ -56,7 +56,7 @@ public static void createSubnet(com.azure.resourcemanager.AzureResourceManager a
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetCreateServiceEndpoint.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetCreateServiceEndpoint.
      * json
      */
     /**
@@ -78,7 +78,7 @@ public static void createSubnetWithServiceEndpoints(com.azure.resourcemanager.Az
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetCreateWithDelegation.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetCreateWithDelegation.
      * json
      */
     /**
@@ -97,7 +97,7 @@ public static void createSubnetWithADelegation(com.azure.resourcemanager.AzureRe
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetCreateWithSharingScope.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetCreateWithSharingScope.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsDeleteSamples.java
index 2dc9ebf2f416..f7478e8f1115 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class SubnetsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetDelete.json
      */
     /**
      * Sample code: Delete subnet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsGetSamples.java
index 2cd5c879f1b1..844e48a28591 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsGetSamples.java
@@ -10,7 +10,7 @@
 public final class SubnetsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetGetWithSharingScope.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetGetWithSharingScope.
      * json
      */
     /**
@@ -28,7 +28,7 @@ public static void getSubnetWithSharingScope(com.azure.resourcemanager.AzureReso
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetGet.json
      */
     /**
      * Sample code: Get subnet.
@@ -45,7 +45,7 @@ public static void getSubnet(com.azure.resourcemanager.AzureResourceManager azur
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetGetWithDelegation.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetGetWithDelegation.json
      */
     /**
      * Sample code: Get subnet with a delegation.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsListSamples.java
index b8ab957ae273..325b269b6f5c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsListSamples.java
@@ -10,7 +10,7 @@
 public final class SubnetsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetList.json
      */
     /**
      * Sample code: List subnets.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsPrepareNetworkPoliciesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsPrepareNetworkPoliciesSamples.java
index b2ab1187c690..e538692300c3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsPrepareNetworkPoliciesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsPrepareNetworkPoliciesSamples.java
@@ -12,7 +12,7 @@
 public final class SubnetsPrepareNetworkPoliciesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/SubnetPrepareNetworkPolicies.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/SubnetPrepareNetworkPolicies.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsUnprepareNetworkPoliciesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsUnprepareNetworkPoliciesSamples.java
index 440b1611f324..cb979b05c659 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsUnprepareNetworkPoliciesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubnetsUnprepareNetworkPoliciesSamples.java
@@ -11,7 +11,7 @@
  */
 public final class SubnetsUnprepareNetworkPoliciesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * SubnetUnprepareNetworkPolicies.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsCreateOrUpdateSamples.java
index bd55934640e9..8b44d5dcc498 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsCreateOrUpdateSamples.java
@@ -11,7 +11,7 @@
  */
 public final class SubscriptionNetworkManagerConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionSubscriptionPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsDeleteSamples.java
index 02466c72db91..dcc85d9f8523 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SubscriptionNetworkManagerConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionSubscriptionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsGetSamples.java
index de0075e842ce..20f50d9b824f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SubscriptionNetworkManagerConnectionsGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionSubscriptionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsListSamples.java
index e29f609b3022..467e20c70c9e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/SubscriptionNetworkManagerConnectionsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class SubscriptionNetworkManagerConnectionsListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkManagerConnectionSubscriptionList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/UsagesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/UsagesListSamples.java
index 968555dd9005..90b9d1dbb812 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/UsagesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/UsagesListSamples.java
@@ -10,7 +10,7 @@
 public final class UsagesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/UsageList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/UsageList.json
      */
     /**
      * Sample code: List usages.
@@ -23,7 +23,7 @@ public static void listUsages(com.azure.resourcemanager.AzureResourceManager azu
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/UsageListSpacedLocation.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/UsageListSpacedLocation.json
      */
     /**
      * Sample code: List usages spaced location.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesCreateSamples.java
index c222e82c399b..c5407e2c092a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesCreateSamples.java
@@ -13,7 +13,7 @@
 public final class VerifierWorkspacesCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VerifierWorkspacePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VerifierWorkspacePut.json
      */
     /**
      * Sample code: VerifierWorkspaceCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesDeleteSamples.java
index 97369f5efdc3..868724970500 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VerifierWorkspacesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VerifierWorkspaceDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VerifierWorkspaceDelete.json
      */
     /**
      * Sample code: VerifierWorkspaceDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesGetSamples.java
index f95b9526a371..e3724621dffe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesGetSamples.java
@@ -10,7 +10,7 @@
 public final class VerifierWorkspacesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VerifierWorkspaceGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VerifierWorkspaceGet.json
      */
     /**
      * Sample code: VerifierWorkspaceGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesListSamples.java
index 20ea92665c24..988cdfd1293d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesListSamples.java
@@ -10,7 +10,7 @@
 public final class VerifierWorkspacesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VerifierWorkspaceList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VerifierWorkspaceList.json
      */
     /**
      * Sample code: VerifierWorkspaceList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesUpdateSamples.java
index e480b17bce68..f0d12bbe2516 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VerifierWorkspacesUpdateSamples.java
@@ -10,7 +10,7 @@
 public final class VerifierWorkspacesUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VerifierWorkspacePatch.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VerifierWorkspacePatch.json
      */
     /**
      * Sample code: VerifierWorkspacePatch.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapCreateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapCreateSamples.java
index dd740dd90e23..21d70fa5064f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapCreateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapCreateSamples.java
@@ -14,7 +14,7 @@
 public final class VipSwapCreateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CloudServiceSwapPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CloudServiceSwapPut.json
      */
     /**
      * Sample code: Put vip swap operation.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapGetSamples.java
index e7fbdbe128fd..a1af1fb5cc6f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapGetSamples.java
@@ -10,7 +10,7 @@
 public final class VipSwapGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CloudServiceSwapGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CloudServiceSwapGet.json
      */
     /**
      * Sample code: Get swap resource.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapListSamples.java
index 94dbced1133d..dac423a34429 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VipSwapListSamples.java
@@ -10,7 +10,7 @@
 public final class VipSwapListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/CloudServiceSwapList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/CloudServiceSwapList.json
      */
     /**
      * Sample code: Get swap resource list.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesCreateOrUpdateSamples.java
index 7fba927b0143..c95aea03c534 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class VirtualApplianceSitesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSitePut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesDeleteSamples.java
index 20ec39b843fb..688f737dc5a3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualApplianceSitesDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSiteDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesGetSamples.java
index d4cd31a6a74b..4816946a4de9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualApplianceSitesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSiteGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesListSamples.java
index 18492944da2e..768134ae5e4c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSitesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualApplianceSitesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSiteList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusGetSamples.java
index 559b3e9aa675..c027ff79a158 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusGetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualApplianceSkusGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/NetworkVirtualApplianceSkuGet
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/NetworkVirtualApplianceSkuGet
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusListSamples.java
index 2f567e7aa047..b7c891681d7c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualApplianceSkusListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualApplianceSkusListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * NetworkVirtualApplianceSkuList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsCreateOrUpdateSamples.java
index 756444c22dee..955ffe2cbc34 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class VirtualHubBgpConnectionsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubBgpConnectionPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubBgpConnectionPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsDeleteSamples.java
index 11062f299cd6..1b019f3e19b3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubBgpConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubBgpConnectionDelete
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubBgpConnectionDelete
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsGetSamples.java
index d8d2519ac5d2..13d2bd3904c9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubBgpConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubBgpConnectionGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubBgpConnectionGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListAdvertisedRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListAdvertisedRoutesSamples.java
index df4b6f6eba98..3a8ecf803aa6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListAdvertisedRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListAdvertisedRoutesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualHubBgpConnectionsListAdvertisedRoutesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualRouterPeerListAdvertisedRoute.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListLearnedRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListLearnedRoutesSamples.java
index 6a322e994f5e..628480a24a60 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListLearnedRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListLearnedRoutesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualHubBgpConnectionsListLearnedRoutesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualRouterPeerListLearnedRoute.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListSamples.java
index f8309bc751bc..f88886e7b1b3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubBgpConnectionsListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubBgpConnectionsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubBgpConnectionList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubBgpConnectionList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationCreateOrUpdateSamples.java
index 98c287474b7a..f9a2c6eef61a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class VirtualHubIpConfigurationCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubIpConfigurationPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubIpConfigurationPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationDeleteSamples.java
index 55b8611116a5..8e2aeea6b4d2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualHubIpConfigurationDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualHubIpConfigurationDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationGetSamples.java
index abfebd8d4ec0..3a99905854e9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationGetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubIpConfigurationGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubIpConfigurationGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubIpConfigurationGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationListSamples.java
index 040e72dafca6..8c8dddba6e52 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubIpConfigurationListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubIpConfigurationListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubIpConfigurationList
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubIpConfigurationList
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SCreateOrUpdateSamples.java
index e2a757fd01c5..1a5b476c14c4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class VirtualHubRouteTableV2SCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubRouteTableV2Put.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubRouteTableV2Put.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SDeleteSamples.java
index ab1a0422fb9f..7df52f8e64d9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubRouteTableV2SDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubRouteTableV2Delete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubRouteTableV2Delete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SGetSamples.java
index f3570fc76229..ec5f4a4bfda7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SGetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubRouteTableV2SGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubRouteTableV2Get.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubRouteTableV2Get.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SListSamples.java
index dc274ebaa76b..6caf24728f10 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubRouteTableV2SListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubRouteTableV2SListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubRouteTableV2List.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubRouteTableV2List.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsCreateOrUpdateSamples.java
index bd701ff34702..aa91ecb5a264 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class VirtualHubsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubPut.json
      */
     /**
      * Sample code: VirtualHubPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsDeleteSamples.java
index 60920fc24b5d..9483ea165bf5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubDelete.json
      */
     /**
      * Sample code: VirtualHubDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetByResourceGroupSamples.java
index e572d64969d8..97a83381724d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubGet.json
      */
     /**
      * Sample code: VirtualHubGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetEffectiveVirtualHubRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetEffectiveVirtualHubRoutesSamples.java
index 02beb213a88e..32fc47d7bbbe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetEffectiveVirtualHubRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetEffectiveVirtualHubRoutesSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualHubsGetEffectiveVirtualHubRoutesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * EffectiveRoutesListForRouteTable.json
      */
     /**
@@ -30,7 +30,7 @@ public static void effectiveRoutesForARouteTableResource(com.azure.resourcemanag
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * EffectiveRoutesListForConnection.json
      */
     /**
@@ -49,7 +49,7 @@ public static void effectiveRoutesForAConnectionResource(com.azure.resourcemanag
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * EffectiveRoutesListForVirtualHub.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetInboundRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetInboundRoutesSamples.java
index 988722204df5..4f7253c16e17 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetInboundRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetInboundRoutesSamples.java
@@ -12,7 +12,7 @@
 public final class VirtualHubsGetInboundRoutesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/GetInboundRoutes.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/GetInboundRoutes.json
      */
     /**
      * Sample code: Inbound Routes for the Virtual Hub on a Particular Connection.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetOutboundRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetOutboundRoutesSamples.java
index 77408dfe753e..e329527d899b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetOutboundRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsGetOutboundRoutesSamples.java
@@ -12,7 +12,7 @@
 public final class VirtualHubsGetOutboundRoutesSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/GetOutboundRoutes.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/GetOutboundRoutes.json
      */
     /**
      * Sample code: Outbound Routes for the Virtual Hub on a Particular Connection.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListByResourceGroupSamples.java
index 077bd8a6c469..932d0683e2e5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubListByResourceGroup
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubListByResourceGroup
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListSamples.java
index ff3febb954c6..1938c2bc39ab 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualHubsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubList.json
      */
     /**
      * Sample code: VirtualHubList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsUpdateTagsSamples.java
index 6d93e62d1939..ed7315d04d6e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualHubsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class VirtualHubsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualHubUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualHubUpdateTags.json
      */
     /**
      * Sample code: VirtualHubUpdate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsCreateOrUpdateSamples.java
index 605b4ba42a8d..01f1b130eb50 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsCreateOrUpdateSamples.java
@@ -31,7 +31,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionCreate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsDeleteSamples.java
index 8289c8ff7380..05cc5e4bfcfc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetByResourceGroupSamples.java
index c663a3548c62..151489582b0f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetIkeSasSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetIkeSasSamples.java
index 575a5fcb30a2..98f20957c8c8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetIkeSasSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetIkeSasSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsGetIkeSasSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionGetIkeSas.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetSharedKeySamples.java
index d1f7b36becee..0d1a7903aee0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsGetSharedKeySamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsGetSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionGetSharedKey.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsListByResourceGroupSamples.java
index b7bf5c38ceca..6a736508da69 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionsList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetConnectionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetConnectionSamples.java
index 7fe3b6f255f0..95233207305d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetConnectionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetConnectionSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsResetConnectionSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionReset.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetSharedKeySamples.java
index 7423f0d1c358..4593b20b18c6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsResetSharedKeySamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsResetSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionResetSharedKey.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsSetSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsSetSharedKeySamples.java
index 271ea8eb6cb3..3e646de72811 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsSetSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsSetSharedKeySamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsSetSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionSetSharedKey.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStartPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStartPacketCaptureSamples.java
index 4927f0da127a..1660b19c9a81 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStartPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStartPacketCaptureSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsStartPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionStartPacketCapture.json
      */
     /**
@@ -29,7 +29,7 @@ public static void startPacketCaptureOnVirtualNetworkGatewayConnectionWithoutFil
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionStartPacketCaptureFilterData.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStopPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStopPacketCaptureSamples.java
index 5777d2d6dd9e..286f5d007687 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStopPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsStopPacketCaptureSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsStopPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionStopPacketCapture.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsUpdateTagsSamples.java
index 632d69d5f30a..97d88f15e4c9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayConnectionsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class VirtualNetworkGatewayConnectionsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayConnectionUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesCreateOrUpdateSamples.java
index 9a77634c3029..832a9de222ee 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
  */
 public final class VirtualNetworkGatewayNatRulesCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayNatRulePut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesDeleteSamples.java
index 9e3e63714cdc..143d77bb3704 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayNatRulesDeleteSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayNatRuleDelete.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesGetSamples.java
index 6d2aaf6053c3..95a333adbd96 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayNatRulesGetSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayNatRuleGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesListByVirtualNetworkGatewaySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesListByVirtualNetworkGatewaySamples.java
index 80ee2cbcf9de..66ea043afaf4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesListByVirtualNetworkGatewaySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewayNatRulesListByVirtualNetworkGatewaySamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewayNatRulesListByVirtualNetworkGatewaySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayNatRuleList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysCreateOrUpdateSamples.java
index df88e83bd26e..5d2b0a92ca51 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysCreateOrUpdateSamples.java
@@ -30,7 +30,7 @@
 public final class VirtualNetworkGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkGatewayUpdate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkGatewayUpdate.
      * json
      */
     /**
@@ -90,7 +90,7 @@ public static void updateVirtualNetworkGateway(com.azure.resourcemanager.AzureRe
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkScalableGatewayUpdate.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDeleteSamples.java
index 272ae67db7ca..1d43c9a26d25 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkGatewayDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkGatewayDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsSamples.java
index 0feaf5fad0e6..e3dcd4cc87cc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsSamples.java
@@ -12,7 +12,7 @@
  */
 public final class VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewaysDisconnectP2sVpnConnections.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGenerateVpnProfileSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGenerateVpnProfileSamples.java
index dd95e9f9b2b7..40953bef9d19 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGenerateVpnProfileSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGenerateVpnProfileSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewaysGenerateVpnProfileSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGenerateVpnProfile.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGeneratevpnclientpackageSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGeneratevpnclientpackageSamples.java
index 1190efc9163e..089bf1b4b9c0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGeneratevpnclientpackageSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGeneratevpnclientpackageSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewaysGeneratevpnclientpackageSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGenerateVpnClientPackage.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetAdvertisedRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetAdvertisedRoutesSamples.java
index abdbf401361d..4ea9b9296ba8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetAdvertisedRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetAdvertisedRoutesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetAdvertisedRoutesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetAdvertisedRoutes.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetBgpPeerStatusSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetBgpPeerStatusSamples.java
index 6ed396b5aa94..f4fba9c3f6d9 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetBgpPeerStatusSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetBgpPeerStatusSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetBgpPeerStatusSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetBGPPeerStatus.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetByResourceGroupSamples.java
index 268b8adbbe33..3c226c8b76d2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkGatewayGet.json
      */
     /**
      * Sample code: GetVirtualNetworkGateway.
@@ -26,7 +26,7 @@ public static void getVirtualNetworkGateway(com.azure.resourcemanager.AzureResou
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkScalableGatewayGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverAllTestDetailsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverAllTestDetailsSamples.java
index 44905c04a796..56752a2621d5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverAllTestDetailsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverAllTestDetailsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetFailoverAllTestDetailsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetFailoverAllTestsDetails.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverSingleTestDetailsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverSingleTestDetailsSamples.java
index 4f79a7d39c7f..afa2d44ea5e3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverSingleTestDetailsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetFailoverSingleTestDetailsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetFailoverSingleTestDetailsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetFailoverSingleTestDetails.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetLearnedRoutesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetLearnedRoutesSamples.java
index 74787a18cc95..364e0cd3b057 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetLearnedRoutesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetLearnedRoutesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetLearnedRoutesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayLearnedRoutes.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetResiliencyInformationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetResiliencyInformationSamples.java
index 58f424bf33f2..89c29610d986 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetResiliencyInformationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetResiliencyInformationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetResiliencyInformationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetResiliencyInformation.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetRoutesInformationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetRoutesInformationSamples.java
index a138317a3bcf..bbc65d20b6ab 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetRoutesInformationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetRoutesInformationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetRoutesInformationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetRoutesInformation.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnProfilePackageUrlSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnProfilePackageUrlSamples.java
index 92b7ecdec3df..17557232227a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnProfilePackageUrlSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnProfilePackageUrlSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetVpnProfilePackageUrlSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetVpnProfilePackageUrl.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientConnectionHealthSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientConnectionHealthSamples.java
index 0cc095a522e6..68cb84bbffd5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientConnectionHealthSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientConnectionHealthSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetVpnclientConnectionHealthSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetVpnclientConnectionHealth.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientIpsecParametersSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientIpsecParametersSamples.java
index 96ef29eb8009..5874dc52c2b2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientIpsecParametersSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysGetVpnclientIpsecParametersSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysGetVpnclientIpsecParametersSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayGetVpnClientIpsecParameters.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeAbortMigrationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeAbortMigrationSamples.java
index 18416f02a31b..1403ff82e7a4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeAbortMigrationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeAbortMigrationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysInvokeAbortMigrationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayAbortMigration.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeCommitMigrationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeCommitMigrationSamples.java
index 9ff485b29020..c7e80893f430 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeCommitMigrationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeCommitMigrationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysInvokeCommitMigrationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayCommitMigration.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeExecuteMigrationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeExecuteMigrationSamples.java
index acb2aae1902c..c9f5c8e4a92f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeExecuteMigrationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokeExecuteMigrationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysInvokeExecuteMigrationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayExecuteMigration.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokePrepareMigrationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokePrepareMigrationSamples.java
index c64d5e012259..54939652512c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokePrepareMigrationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysInvokePrepareMigrationSamples.java
@@ -12,7 +12,7 @@
  */
 public final class VirtualNetworkGatewaysInvokePrepareMigrationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayPrepareMigration.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListByResourceGroupSamples.java
index c682074a206d..4b6624d866e5 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkGatewaysListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkGatewayList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkGatewayList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListConnectionsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListConnectionsSamples.java
index 3f5406bd63eb..f7dbe2e8d5b6 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListConnectionsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListConnectionsSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysListConnectionsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewaysListConnections.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListRadiusSecretsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListRadiusSecretsSamples.java
new file mode 100644
index 000000000000..bc77a724b369
--- /dev/null
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysListRadiusSecretsSamples.java
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.generated;
+
+/**
+ * Samples for VirtualNetworkGateways ListRadiusSecrets.
+ */
+public final class VirtualNetworkGatewaysListRadiusSecretsSamples {
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * AllVirtualNetworkGatewayRadiusServerSecretsList.json
+     */
+    /**
+     * Sample code: ListAllVirtualNetworkGatewayRadiusServerSecrets.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void
+        listAllVirtualNetworkGatewayRadiusServerSecrets(com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getVirtualNetworkGateways()
+            .listRadiusSecretsWithResponse("rg1", "vpngw", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetSamples.java
index d8e1df58f1e8..862abbbb61bb 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkGatewaysResetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkGatewayReset.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkGatewayReset.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetVpnClientSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetVpnClientSharedKeySamples.java
index 405eeed41868..80906e13a7da 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetVpnClientSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysResetVpnClientSharedKeySamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysResetVpnClientSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayResetVpnClientSharedKey.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSetVpnclientIpsecParametersSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSetVpnclientIpsecParametersSamples.java
index ecf3d550569e..1e9cbac05636 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSetVpnclientIpsecParametersSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSetVpnclientIpsecParametersSamples.java
@@ -17,7 +17,7 @@
  */
 public final class VirtualNetworkGatewaysSetVpnclientIpsecParametersSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewaySetVpnClientIpsecParameters.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartExpressRouteSiteFailoverSimulationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartExpressRouteSiteFailoverSimulationSamples.java
index 0ee06d22ebec..38e088a4dca8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartExpressRouteSiteFailoverSimulationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartExpressRouteSiteFailoverSimulationSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysStartExpressRouteSiteFailoverSimulationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayStartSiteFailoverSimulation.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartPacketCaptureSamples.java
index 4103f50d2ace..7b9c5a0ef665 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStartPacketCaptureSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewaysStartPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayStartPacketCaptureFilterData.json
      */
     /**
@@ -31,7 +31,7 @@ public final class VirtualNetworkGatewaysStartPacketCaptureSamples {
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayStartPacketCapture.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopExpressRouteSiteFailoverSimulationSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopExpressRouteSiteFailoverSimulationSamples.java
index 83c78de23c68..3ae6a342b676 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopExpressRouteSiteFailoverSimulationSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopExpressRouteSiteFailoverSimulationSamples.java
@@ -13,7 +13,7 @@
  */
 public final class VirtualNetworkGatewaysStopExpressRouteSiteFailoverSimulationSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayStopSiteFailoverSimulation.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopPacketCaptureSamples.java
index a8ff498e4d94..2fdc6d66efe0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysStopPacketCaptureSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewaysStopPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayStopPacketCapture.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSupportedVpnDevicesSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSupportedVpnDevicesSamples.java
index de4c957d9be7..9bdbf3e56455 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSupportedVpnDevicesSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysSupportedVpnDevicesSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworkGatewaysSupportedVpnDevicesSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewaySupportedVpnDevice.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysUpdateTagsSamples.java
index e6dcf67f7533..cbfe3eb33ca8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class VirtualNetworkGatewaysUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysVpnDeviceConfigurationScriptSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysVpnDeviceConfigurationScriptSamples.java
index 7d4c7cb48c11..da690fdce464 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysVpnDeviceConfigurationScriptSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkGatewaysVpnDeviceConfigurationScriptSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VirtualNetworkGatewaysVpnDeviceConfigurationScriptSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGatewayVpnDeviceConfigurationScript.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsCreateOrUpdateSamples.java
index defd93ec5808..0b94849ed6fe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
  */
 public final class VirtualNetworkPeeringsCreateOrUpdateSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkSubnetPeeringSync.json
      */
     /**
@@ -39,7 +39,7 @@ public static void syncSubnetPeering(com.azure.resourcemanager.AzureResourceMana
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkV6SubnetPeeringCreate.json
      */
     /**
@@ -67,7 +67,7 @@ public static void createV6SubnetPeering(com.azure.resourcemanager.AzureResource
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkPeeringSync.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkPeeringSync.
      * json
      */
     /**
@@ -92,7 +92,7 @@ public static void syncPeering(com.azure.resourcemanager.AzureResourceManager az
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkPeeringCreate.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkPeeringCreate.
      * json
      */
     /**
@@ -116,7 +116,7 @@ public static void createPeering(com.azure.resourcemanager.AzureResourceManager
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkPeeringCreateWithRemoteVirtualNetworkEncryption.json
      */
     /**
@@ -141,7 +141,7 @@ public static void createPeering(com.azure.resourcemanager.AzureResourceManager
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkSubnetPeeringCreate.json
      */
     /**
@@ -168,7 +168,7 @@ public static void createSubnetPeering(com.azure.resourcemanager.AzureResourceMa
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkV6SubnetPeeringSync.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsDeleteSamples.java
index 4f06126265e0..e06f1af661d7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkPeeringsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkPeeringDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkPeeringDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsGetSamples.java
index 11100ede5d21..dbd1b1ea9318 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsGetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkPeeringsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkPeeringGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkPeeringGet.json
      */
     /**
      * Sample code: Get peering.
@@ -26,7 +26,7 @@ public static void getPeering(com.azure.resourcemanager.AzureResourceManager azu
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkPeeringGetWithRemoteVirtualNetworkEncryption.json
      */
     /**
@@ -44,7 +44,7 @@ public static void getPeering(com.azure.resourcemanager.AzureResourceManager azu
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkSubnetPeeringGet.json
      */
     /**
@@ -61,7 +61,7 @@ public static void getSubnetPeering(com.azure.resourcemanager.AzureResourceManag
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkV6SubnetPeeringGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsListSamples.java
index d2a7d99ab36f..466f5e0e9a96 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkPeeringsListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkPeeringsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkPeeringList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkPeeringList.
      * json
      */
     /**
@@ -27,7 +27,7 @@ public static void listPeerings(com.azure.resourcemanager.AzureResourceManager a
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkPeeringListWithRemoteVirtualNetworkEncryption.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsCreateOrUpdateSamples.java
index eee4d67be5ac..ff8601808a6b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsCreateOrUpdateSamples.java
@@ -13,7 +13,7 @@
 public final class VirtualNetworkTapsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkTapCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkTapCreate.json
      */
     /**
      * Sample code: Create Virtual Network Tap.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsDeleteSamples.java
index 63a0584092f8..33e42f66961b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkTapsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkTapDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkTapDelete.json
      */
     /**
      * Sample code: Delete Virtual Network Tap resource.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsGetByResourceGroupSamples.java
index 1845e4a5c60f..1bc3e3a4b89f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkTapsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkTapGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkTapGet.json
      */
     /**
      * Sample code: Get Virtual Network Tap.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListByResourceGroupSamples.java
index 17f590dd74c8..85beb50fc57e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkTapsListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkTapList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkTapList.json
      */
     /**
      * Sample code: List virtual network taps in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListSamples.java
index 25c3c101a044..ae885f5f4c4b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworkTapsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkTapListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkTapListAll.json
      */
     /**
      * Sample code: List all virtual network taps.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsUpdateTagsSamples.java
index 3295420c7693..938d87b52bb4 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworkTapsUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class VirtualNetworkTapsUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkTapUpdateTags.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkTapUpdateTags.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCheckIpAddressAvailabilitySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCheckIpAddressAvailabilitySamples.java
index 3d574f370aa1..cc3075d591cc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCheckIpAddressAvailabilitySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCheckIpAddressAvailabilitySamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworksCheckIpAddressAvailabilitySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCheckIPAddressAvailability.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCreateOrUpdateSamples.java
index af36f5446408..a7d717c2683c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksCreateOrUpdateSamples.java
@@ -22,7 +22,7 @@
 public final class VirtualNetworksCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkCreateSubnet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkCreateSubnet.
      * json
      */
     /**
@@ -43,7 +43,7 @@ public static void createVirtualNetworkWithSubnet(com.azure.resourcemanager.Azur
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateWithIpamPool.json
      */
     /**
@@ -70,7 +70,7 @@ public static void createVirtualNetworkWithIpamPool(com.azure.resourcemanager.Az
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateWithBgpCommunities.json
      */
     /**
@@ -92,7 +92,7 @@ public static void createVirtualNetworkWithBgpCommunities(com.azure.resourcemana
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateSubnetWithAddressPrefixes.json
      */
     /**
@@ -115,7 +115,7 @@ public static void createVirtualNetworkWithBgpCommunities(com.azure.resourcemana
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateSubnetWithDelegation.json
      */
     /**
@@ -138,7 +138,7 @@ public static void createVirtualNetworkWithDelegatedSubnets(com.azure.resourcema
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateWithEncryption.json
      */
     /**
@@ -162,7 +162,7 @@ public static void createVirtualNetworkWithEncryption(com.azure.resourcemanager.
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkCreate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkCreate.json
      */
     /**
      * Sample code: Create virtual network.
@@ -182,7 +182,7 @@ public static void createVirtualNetwork(com.azure.resourcemanager.AzureResourceM
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateServiceEndpointPolicy.json
      */
     /**
@@ -208,7 +208,7 @@ public static void createVirtualNetworkWithServiceEndpointsAndServiceEndpointPol
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkCreateServiceEndpoints.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksDeleteSamples.java
index f3d50d71e036..aaa87be08bfa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworksDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkDelete.json
      */
     /**
      * Sample code: Delete virtual network.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksGetByResourceGroupSamples.java
index b958650cc3ea..3ea95bb4b0e2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworksGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGetWithSubnetDelegation.json
      */
     /**
@@ -26,7 +26,7 @@ public static void getVirtualNetworkWithADelegatedSubnet(com.azure.resourcemanag
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGetWithServiceAssociationLink.json
      */
     /**
@@ -45,7 +45,7 @@ public static void getVirtualNetworkWithADelegatedSubnet(com.azure.resourcemanag
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkGet.json
      */
     /**
      * Sample code: Get virtual network.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListByResourceGroupSamples.java
index e47855063e91..bf38537e7cfa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworksListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkList.json
      */
     /**
      * Sample code: List virtual networks in resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListDdosProtectionStatusSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListDdosProtectionStatusSamples.java
index dc671d044893..224922181b79 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListDdosProtectionStatusSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListDdosProtectionStatusSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualNetworksListDdosProtectionStatusSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualNetworkGetDdosProtectionStatus.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListSamples.java
index abdeb6787481..d907f16dfe38 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworksListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkListAll.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkListAll.json
      */
     /**
      * Sample code: List all virtual networks.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListUsageSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListUsageSamples.java
index 494d68749a3c..24b2fbf91f55 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListUsageSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksListUsageSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualNetworksListUsageSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkListUsage.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkListUsage.json
      */
     /**
      * Sample code: VnetGetUsage.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksUpdateTagsSamples.java
index b5662cf7b1d0..45d3931b956e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualNetworksUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class VirtualNetworksUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualNetworkUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualNetworkUpdateTags.json
      */
     /**
      * Sample code: Update virtual network tags.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsCreateOrUpdateSamples.java
index a3d679784d3a..c9573ac30527 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsCreateOrUpdateSamples.java
@@ -12,7 +12,7 @@
 public final class VirtualRouterPeeringsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterPeeringPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterPeeringPut.json
      */
     /**
      * Sample code: Create Virtual Router Peering.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsDeleteSamples.java
index 84b1fa2f5147..336413e7fccf 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualRouterPeeringsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterPeeringDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterPeeringDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsGetSamples.java
index e9f18302e27d..897e9f731eac 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsGetSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualRouterPeeringsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterPeeringGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterPeeringGet.json
      */
     /**
      * Sample code: Get Virtual Router Peering.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsListSamples.java
index c29326e3d653..dadd73ed97b3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRouterPeeringsListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualRouterPeeringsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterPeeringList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterPeeringList.json
      */
     /**
      * Sample code: List all Virtual Router Peerings for a given Virtual Router.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersCreateOrUpdateSamples.java
index 561b2032e34c..b7b00ed47898 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersCreateOrUpdateSamples.java
@@ -15,7 +15,7 @@
 public final class VirtualRoutersCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterPut.json
      */
     /**
      * Sample code: Create VirtualRouter.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersDeleteSamples.java
index bc6257c1bde0..6d06a1eda397 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualRoutersDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterDelete.json
      */
     /**
      * Sample code: Delete VirtualRouter.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersGetByResourceGroupSamples.java
index dfebdf11fdce..e663bf7f929a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualRoutersGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualRouterGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualRouterGet.json
      */
     /**
      * Sample code: Get VirtualRouter.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListByResourceGroupSamples.java
index 968d3e5b510a..6a08928d1a80 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualRoutersListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualRouterListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListSamples.java
index 94730888de45..60a88f929cb8 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualRoutersListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VirtualRoutersListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VirtualRouterListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansCreateOrUpdateSamples.java
index f6d54f8c0352..7b52d1552472 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansCreateOrUpdateSamples.java
@@ -14,7 +14,7 @@
 public final class VirtualWansCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualWANPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualWANPut.json
      */
     /**
      * Sample code: VirtualWANCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansDeleteSamples.java
index bdc252f0c349..67fead12cec3 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualWansDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualWANDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualWANDelete.json
      */
     /**
      * Sample code: VirtualWANDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansGetByResourceGroupSamples.java
index ed1df0d03363..cb10baedb4f7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualWansGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualWANGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualWANGet.json
      */
     /**
      * Sample code: VirtualWANGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListByResourceGroupSamples.java
index 0d8a5a978cd0..a783ca58c7b2 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualWansListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualWANListByResourceGroup
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualWANListByResourceGroup
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListSamples.java
index 7a8c9d427e4c..b571349e237f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansListSamples.java
@@ -10,7 +10,7 @@
 public final class VirtualWansListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualWANList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualWANList.json
      */
     /**
      * Sample code: VirtualWANList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansUpdateTagsSamples.java
index 928a51401ba6..217cf472cc99 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VirtualWansUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class VirtualWansUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VirtualWANUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VirtualWANUpdateTags.json
      */
     /**
      * Sample code: VirtualWANUpdate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsCreateOrUpdateSamples.java
index 0e4473222177..f38c828e2c9a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsCreateOrUpdateSamples.java
@@ -19,7 +19,7 @@
 public final class VpnConnectionsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnConnectionPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnConnectionPut.json
      */
     /**
      * Sample code: VpnConnectionPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsDeleteSamples.java
index 75b514c2b74e..bfebccd576b7 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VpnConnectionsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnConnectionDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnConnectionDelete.json
      */
     /**
      * Sample code: VpnConnectionDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsGetSamples.java
index f9b792a872c3..8142bb7a7a92 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class VpnConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnConnectionGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnConnectionGet.json
      */
     /**
      * Sample code: VpnConnectionGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsListByVpnGatewaySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsListByVpnGatewaySamples.java
index a8cc6ce92ecd..aa1b4db681ff 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsListByVpnGatewaySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsListByVpnGatewaySamples.java
@@ -10,7 +10,7 @@
 public final class VpnConnectionsListByVpnGatewaySamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnConnectionList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnConnectionList.json
      */
     /**
      * Sample code: VpnConnectionList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStartPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStartPacketCaptureSamples.java
index a95de9d52383..07fa50c9e4de 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStartPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStartPacketCaptureSamples.java
@@ -12,7 +12,7 @@
  */
 public final class VpnConnectionsStartPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnConnectionStartPacketCaptureFilterData.json
      */
     /**
@@ -34,7 +34,7 @@ public final class VpnConnectionsStartPacketCaptureSamples {
     }
 
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnConnectionStartPacketCapture.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStopPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStopPacketCaptureSamples.java
index 3af2a442ce36..5fd76b373a49 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStopPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnConnectionsStopPacketCaptureSamples.java
@@ -12,7 +12,7 @@
  */
 public final class VpnConnectionsStopPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnConnectionStopPacketCapture.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysCreateOrUpdateSamples.java
index c1c370c83daa..7edb9bc2c35b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysCreateOrUpdateSamples.java
@@ -25,7 +25,7 @@
 public final class VpnGatewaysCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayPut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayPut.json
      */
     /**
      * Sample code: VpnGatewayPut.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysDeleteSamples.java
index a68331ff2fa6..779795b9e4dc 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VpnGatewaysDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayDelete.json
      */
     /**
      * Sample code: VpnGatewayDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysGetByResourceGroupSamples.java
index 7fa72b1660dd..126b1b99ac99 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VpnGatewaysGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayGet.json
      */
     /**
      * Sample code: VpnGatewayGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListByResourceGroupSamples.java
index 35e60008d934..4ab01cc6d8aa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VpnGatewaysListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayListByResourceGroup
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayListByResourceGroup
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListSamples.java
index f26f985b4184..1c6152e94157 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysListSamples.java
@@ -10,7 +10,7 @@
 public final class VpnGatewaysListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayList.json
      */
     /**
      * Sample code: VpnGatewayListBySubscription.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysResetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysResetSamples.java
index 0b04950e9aac..d13028f52f69 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysResetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysResetSamples.java
@@ -10,7 +10,7 @@
 public final class VpnGatewaysResetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayReset.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayReset.json
      */
     /**
      * Sample code: ResetVpnGateway.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStartPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStartPacketCaptureSamples.java
index 1fbbd61b37af..c8e3c49f3f83 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStartPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStartPacketCaptureSamples.java
@@ -11,7 +11,7 @@
  */
 public final class VpnGatewaysStartPacketCaptureSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnGatewayStartPacketCaptureFilterData.json
      */
     /**
@@ -31,7 +31,7 @@ public static void startPacketCaptureOnVpnGatewayWithFilter(com.azure.resourcema
 
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayStartPacketCapture.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayStartPacketCapture.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStopPacketCaptureSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStopPacketCaptureSamples.java
index 97df0c69c417..d08ffc6b2046 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStopPacketCaptureSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysStopPacketCaptureSamples.java
@@ -12,7 +12,7 @@
 public final class VpnGatewaysStopPacketCaptureSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayStopPacketCapture.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayStopPacketCapture.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysUpdateTagsSamples.java
index 15b16909f644..3f93a1299692 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnGatewaysUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class VpnGatewaysUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnGatewayUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnGatewayUpdateTags.json
      */
     /**
      * Sample code: VpnGatewayUpdate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetAllSharedKeysSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetAllSharedKeysSamples.java
index 41f3abdf43d3..d4cb786d4b2a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetAllSharedKeysSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetAllSharedKeysSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VpnLinkConnectionsGetAllSharedKeysSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnSiteLinkConnectionSharedKeysGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetDefaultSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetDefaultSharedKeySamples.java
index 4c0a9f3c6585..cf5d408b3430 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetDefaultSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetDefaultSharedKeySamples.java
@@ -9,7 +9,7 @@
  */
 public final class VpnLinkConnectionsGetDefaultSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnSiteLinkConnectionDefaultSharedKeyGet.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetIkeSasSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetIkeSasSamples.java
index 9635cf54ea57..6fcb9786c07c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetIkeSasSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsGetIkeSasSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VpnLinkConnectionsGetIkeSasSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnSiteLinkConnectionGetIkeSas.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListByVpnConnectionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListByVpnConnectionSamples.java
index b0a2eddca480..6758677f251a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListByVpnConnectionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListByVpnConnectionSamples.java
@@ -10,7 +10,7 @@
 public final class VpnLinkConnectionsListByVpnConnectionSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteLinkConnectionList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteLinkConnectionList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListDefaultSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListDefaultSharedKeySamples.java
index 95552a3e82ce..9a0f95cd7345 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListDefaultSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsListDefaultSharedKeySamples.java
@@ -9,7 +9,7 @@
  */
 public final class VpnLinkConnectionsListDefaultSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnSiteLinkConnectionDefaultSharedKeyList.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsResetConnectionSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsResetConnectionSamples.java
index 0bdaa5067aa0..a1bc20eb042b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsResetConnectionSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsResetConnectionSamples.java
@@ -10,7 +10,7 @@
 public final class VpnLinkConnectionsResetConnectionSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteLinkConnectionReset.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteLinkConnectionReset.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsSetOrInitDefaultSharedKeySamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsSetOrInitDefaultSharedKeySamples.java
index d80eaa0302e2..a90b904e3157 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsSetOrInitDefaultSharedKeySamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnLinkConnectionsSetOrInitDefaultSharedKeySamples.java
@@ -12,7 +12,7 @@
  */
 public final class VpnLinkConnectionsSetOrInitDefaultSharedKeySamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnSiteLinkConnectionDefaultSharedKeyPut.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsAssociatedWithVirtualWanListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsAssociatedWithVirtualWanListSamples.java
index 68d4c1edfc1d..21a1ba91220f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsAssociatedWithVirtualWanListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsAssociatedWithVirtualWanListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VpnServerConfigurationsAssociatedWithVirtualWanListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * GetVirtualWanVpnServerConfigurations.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsCreateOrUpdateSamples.java
index 6aa8b3b34b1f..1e5e55b5105f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsCreateOrUpdateSamples.java
@@ -31,7 +31,7 @@
 public final class VpnServerConfigurationsCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnServerConfigurationPut.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnServerConfigurationPut.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsDeleteSamples.java
index 2222239b7535..3c01cd33ddaa 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VpnServerConfigurationsDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnServerConfigurationDelete.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnServerConfigurationDelete.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsGetByResourceGroupSamples.java
index 986614caa523..15d122207182 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VpnServerConfigurationsGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnServerConfigurationGet.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnServerConfigurationGet.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListByResourceGroupSamples.java
index e512c2dc373d..1d6ac5bd851c 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class VpnServerConfigurationsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnServerConfigurationListByResourceGroup.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListRadiusSecretsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListRadiusSecretsSamples.java
new file mode 100644
index 000000000000..270eeef00d16
--- /dev/null
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListRadiusSecretsSamples.java
@@ -0,0 +1,28 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+
+package com.azure.resourcemanager.network.generated;
+
+/**
+ * Samples for VpnServerConfigurations ListRadiusSecrets.
+ */
+public final class VpnServerConfigurationsListRadiusSecretsSamples {
+    /*
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
+     * AllVpnServerConfigurationRadiusServerSecretsList.json
+     */
+    /**
+     * Sample code: ListAllVpnServerConfigurationRadiusServerSecrets.
+     * 
+     * @param azure The entry point for accessing resource management APIs in Azure.
+     */
+    public static void
+        listAllVpnServerConfigurationRadiusServerSecrets(com.azure.resourcemanager.AzureResourceManager azure) {
+        azure.networks()
+            .manager()
+            .serviceClient()
+            .getVpnServerConfigurations()
+            .listRadiusSecretsWithResponse("rg1", "vpnserverconfig", com.azure.core.util.Context.NONE);
+    }
+}
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListSamples.java
index 89eea833dcf6..6d69c01ef27f 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsListSamples.java
@@ -10,7 +10,7 @@
 public final class VpnServerConfigurationsListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnServerConfigurationList.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnServerConfigurationList.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsUpdateTagsSamples.java
index 1d4cd02292a3..1b2210659fae 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnServerConfigurationsUpdateTagsSamples.java
@@ -13,7 +13,7 @@
  */
 public final class VpnServerConfigurationsUpdateTagsSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * VpnServerConfigurationUpdateTags.json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinkConnectionsGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinkConnectionsGetSamples.java
index 0643ffa9e261..206e7dab2717 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinkConnectionsGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinkConnectionsGetSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSiteLinkConnectionsGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteLinkConnectionGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteLinkConnectionGet.json
      */
     /**
      * Sample code: VpnSiteLinkConnectionGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksGetSamples.java
index e154e4f09565..b38482d84407 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksGetSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSiteLinksGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteLinkGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteLinkGet.json
      */
     /**
      * Sample code: VpnSiteGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksListByVpnSiteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksListByVpnSiteSamples.java
index 5d924491f6ee..bbf72462ef1b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksListByVpnSiteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSiteLinksListByVpnSiteSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSiteLinksListByVpnSiteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteLinkListByVpnSite.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteLinkListByVpnSite.json
      */
     /**
      * Sample code: VpnSiteLinkListByVpnSite.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesConfigurationDownloadSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesConfigurationDownloadSamples.java
index b739e2c66c29..88ad39edfef1 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesConfigurationDownloadSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesConfigurationDownloadSamples.java
@@ -13,7 +13,7 @@
 public final class VpnSitesConfigurationDownloadSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSitesConfigurationDownload
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSitesConfigurationDownload
      * .json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesCreateOrUpdateSamples.java
index 708f05974d89..e2154c9c9e5e 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesCreateOrUpdateSamples.java
@@ -22,7 +22,7 @@
 public final class VpnSitesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSitePut.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSitePut.json
      */
     /**
      * Sample code: VpnSiteCreate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesDeleteSamples.java
index 529ca7847f70..8fd8d920faab 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSitesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteDelete.json
      */
     /**
      * Sample code: VpnSiteDelete.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesGetByResourceGroupSamples.java
index 00ead7f6c4d3..f8f6940753ad 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSitesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteGet.json
      */
     /**
      * Sample code: VpnSiteGet.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListByResourceGroupSamples.java
index 29fa68d6a353..9d14e8a8b81a 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSitesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteListByResourceGroup.
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteListByResourceGroup.
      * json
      */
     /**
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListSamples.java
index 384230d15273..035b7ba29288 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesListSamples.java
@@ -10,7 +10,7 @@
 public final class VpnSitesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteList.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteList.json
      */
     /**
      * Sample code: VpnSiteList.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesUpdateTagsSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesUpdateTagsSamples.java
index 8f04cba79547..aaf45e7a1485 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesUpdateTagsSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/VpnSitesUpdateTagsSamples.java
@@ -14,7 +14,7 @@
 public final class VpnSitesUpdateTagsSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/VpnSiteUpdateTags.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/VpnSiteUpdateTags.json
      */
     /**
      * Sample code: VpnSiteUpdate.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesCreateOrUpdateSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesCreateOrUpdateSamples.java
index 339486babafd..e21b360ff91d 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesCreateOrUpdateSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesCreateOrUpdateSamples.java
@@ -48,7 +48,7 @@
 public final class WebApplicationFirewallPoliciesCreateOrUpdateSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/WafPolicyCreateOrUpdate.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/WafPolicyCreateOrUpdate.json
      */
     /**
      * Sample code: Creates or updates a WAF policy within a resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesDeleteSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesDeleteSamples.java
index ff6e2b7cc89d..9bd54f21df0b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesDeleteSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesDeleteSamples.java
@@ -10,7 +10,7 @@
 public final class WebApplicationFirewallPoliciesDeleteSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/WafPolicyDelete.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/WafPolicyDelete.json
      */
     /**
      * Sample code: Deletes a WAF policy within a resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesGetByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesGetByResourceGroupSamples.java
index 92ec8195b481..850e10c865fe 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesGetByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesGetByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class WebApplicationFirewallPoliciesGetByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/WafPolicyGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/WafPolicyGet.json
      */
     /**
      * Sample code: Gets a WAF policy within a resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListByResourceGroupSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListByResourceGroupSamples.java
index aaa63521f40d..267b7b1fef8b 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListByResourceGroupSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListByResourceGroupSamples.java
@@ -10,7 +10,7 @@
 public final class WebApplicationFirewallPoliciesListByResourceGroupSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/WafListPolicies.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/WafListPolicies.json
      */
     /**
      * Sample code: Lists all WAF policies in a resource group.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListSamples.java
index 247e6f245741..8d5d6bb3a352 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebApplicationFirewallPoliciesListSamples.java
@@ -10,7 +10,7 @@
 public final class WebApplicationFirewallPoliciesListSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/WafListAllPolicies.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/WafListAllPolicies.json
      */
     /**
      * Sample code: Lists all WAF policies in a subscription.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesGetSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesGetSamples.java
index 4bbb3b314709..762224d5f3d0 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesGetSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesGetSamples.java
@@ -10,7 +10,7 @@
 public final class WebCategoriesGetSamples {
     /*
      * x-ms-original-file:
-     * specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/AzureWebCategoryGet.json
+     * specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/AzureWebCategoryGet.json
      */
     /**
      * Sample code: Get Azure Web Category by name.
diff --git a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesListSamples.java b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesListSamples.java
index 7fabb8a4b9f2..82b135e251ca 100644
--- a/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesListSamples.java
+++ b/sdk/resourcemanager/azure-resourcemanager/src/samples/java/com/azure/resourcemanager/network/generated/WebCategoriesListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class WebCategoriesListSamples {
     /*
-     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-07-01/examples/
+     * x-ms-original-file: specification/network/resource-manager/Microsoft.Network/stable/2024-10-01/examples/
      * AzureWebCategoriesListBySubscription.json
      */
     /**
diff --git a/sdk/resourcemanagerhybrid/README.md b/sdk/resourcemanagerhybrid/README.md
index 748dde082119..6f807afbedac 100644
--- a/sdk/resourcemanagerhybrid/README.md
+++ b/sdk/resourcemanagerhybrid/README.md
@@ -85,7 +85,7 @@ Azure Management Libraries require a `TokenCredential` implementation for authen
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-identity</artifactId>
-  <version>1.15.3</version>
+  <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml
index 28d98fdfcc36..872781b1a3e2 100644
--- a/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml
+++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml b/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml
index 53e03fa4d146..1ea5070f05b2 100644
--- a/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml
+++ b/sdk/resourcemover/azure-resourcemanager-resourcemover/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/resources/azure-resourcemanager-resources-bicep/pom.xml b/sdk/resources/azure-resourcemanager-resources-bicep/pom.xml
index 4a83feb01ee0..3224af1aed08 100644
--- a/sdk/resources/azure-resourcemanager-resources-bicep/pom.xml
+++ b/sdk/resources/azure-resourcemanager-resources-bicep/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/resources/azure-resourcemanager-resources-deploymentstacks/pom.xml b/sdk/resources/azure-resourcemanager-resources-deploymentstacks/pom.xml
index 60872e3e3155..a2533b5d4779 100644
--- a/sdk/resources/azure-resourcemanager-resources-deploymentstacks/pom.xml
+++ b/sdk/resources/azure-resourcemanager-resources-deploymentstacks/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/README.md b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/README.md
index f3eda2aab530..81d3b2ecf387 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/README.md
+++ b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/README.md
@@ -51,7 +51,7 @@ with the Azure SDK, please include the `azure-identity` package:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 
diff --git a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml
index 9cb3dd3e51e2..43a2ead2bf7f 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml
+++ b/sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/README.md b/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/README.md
index b3492bd3e5d7..631179526e9e 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/README.md
+++ b/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/README.md
@@ -50,7 +50,7 @@ with the Azure SDK, please include the `azure-identity` package:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 
diff --git a/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/pom.xml
index d577fcb0aff3..49fd7bb9c4e4 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/pom.xml
+++ b/sdk/schemaregistry/azure-data-schemaregistry-jsonschema/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/schemaregistry/azure-data-schemaregistry/README.md b/sdk/schemaregistry/azure-data-schemaregistry/README.md
index b8d67acf16f1..7e455253f3ef 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry/README.md
+++ b/sdk/schemaregistry/azure-data-schemaregistry/README.md
@@ -79,7 +79,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 
diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml
index c340995abd14..dbcdaac6864b 100644
--- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml
+++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/scvmm/azure-resourcemanager-scvmm/pom.xml b/sdk/scvmm/azure-resourcemanager-scvmm/pom.xml
index 6372315908ba..c5882831ec80 100644
--- a/sdk/scvmm/azure-resourcemanager-scvmm/pom.xml
+++ b/sdk/scvmm/azure-resourcemanager-scvmm/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/search/azure-search-documents/CHANGELOG.md b/sdk/search/azure-search-documents/CHANGELOG.md
index 6846dde9e5a7..9078cf580779 100644
--- a/sdk/search/azure-search-documents/CHANGELOG.md
+++ b/sdk/search/azure-search-documents/CHANGELOG.md
@@ -1,13 +1,52 @@
 # Release History
 
-## 11.8.0-beta.9 (Unreleased)
+## 11.9.0-beta.1 (Unreleased)
 
 ### Features Added
 
+- Added back all service preview features dropped in `2025-09-01` service version release.
+
 ### Breaking Changes
 
+- Updated `RescoringOptions` to match what was changed in `11.8.0` release.
+    - `isEnableRescoring` -> `isRescoringEnabled`
+    - `setEnableRescoring` -> `setRescoringEnabled`
+- Changed `RankingOrder.RE_RANKER_SCORE` to `RankingOrder.RERANKER_SCORE`.
+- Changed `SearchOptions.getDebug` and `.setDebug` to `.getDebugMode` and `.setDebugMode`.
+- Default `SearchServiceVersion` changed from `2025_09_01` to `V2025_08_01_PREVIEW`.
+
 ### Bugs Fixed
 
+## 11.8.0 (2025-10-10)
+
+### Features Added
+
+- Added support for `2025-09-01` service version.
+    - Support for reranker boosted scores in search results and the ability to sort results on either reranker or reranker
+      boosted scores in `SemanticConfiguration.rankingOrder`.
+    - Support for `VectorSearchCompression.RescoringOptions` to configure how vector compression handles the original
+      vector when indexing and how vectors are used during rescoring.
+    - Added `SearchIndex.description` to provide a textual description of the index.
+    - Support for `LexicalNormalizer` when defining `SearchIndex`, `SimpleField`, and `SearchableField` and the ability to
+      use it when analyzing text with `SearchIndexClient.analyzeText` and `SearchIndexAsyncClient.analyzeText`.
+    - Support `DocumentIntelligenceLayoutSkill` skillset skill and `OneLake` `SearchIndexerDataSourceConnection` data source.
+    - Support for `QueryDebugMode` in searching to retrieve detailed information about search processing. Only `vector` is
+      supported for `QueryDebugMode`.
+
+### Breaking Changes
+
+- All features from `11.8.0-beta.x` versions that weren't GA'd in `2025-09-01` were removed.
+- `VectorSearchCompression.rerankWithOriginalVectors` and `VectorSearchCompression.defaultOversampling` don't work with
+  `2025-09-01` and were replaced by `VectorSearchCompression.RescoringOptions.enabledRescoring` and
+  `VectorSearchCompression.RescoringOptions.defaultOversampling`. If using `2024-07-01` continue using the old properties,
+  otherwise if using `2025-09-01` use the new properties in `RescoringOptions`.
+
+### Other Changes
+
+- Upgraded `azure-core` from `1.56.1` to version `1.57.0`.
+- Upgraded `azure-core-http-netty` from `1.16.1` to version `1.16.2`.
+- Upgraded `azure-core-serializer-json-jackson` from `1.6.1` to version `1.6.2`.
+
 ## 11.7.10 (2025-09-25)
 
 ### Other Changes
diff --git a/sdk/search/azure-search-documents/README.md b/sdk/search/azure-search-documents/README.md
index e83877e0495a..d6a84b45680b 100644
--- a/sdk/search/azure-search-documents/README.md
+++ b/sdk/search/azure-search-documents/README.md
@@ -75,7 +75,7 @@ add the direct dependency to your project as follows.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-search-documents</artifactId>
-    <version>11.8.0-beta.8</version>
+    <version>11.8.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml
index 470e7a6f1f61..0ae219c7eb22 100644
--- a/sdk/search/azure-search-documents/pom.xml
+++ b/sdk/search/azure-search-documents/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-search-documents</artifactId>
-  <version>11.8.0-beta.9</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
+  <version>11.9.0-beta.1</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
   <packaging>jar</packaging>
 
   <properties>
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchAsyncClient.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchAsyncClient.java
index cd157da66932..63c810cbe94f 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchAsyncClient.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchAsyncClient.java
@@ -1502,7 +1502,7 @@ static SearchRequest createSearchRequest(String searchText, SearchOptions option
             .setTop(options.getTop())
             .setQueryLanguage(options.getQueryLanguage())
             .setSpeller(options.getSpeller())
-            .setDebug(options.getDebug());
+            .setDebug(options.getDebugMode());
 
         SemanticSearchOptions semanticSearchOptions = options.getSemanticSearchOptions();
         if (semanticSearchOptions != null) {
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchServiceVersion.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchServiceVersion.java
index 5498815f327b..e7df78b3d536 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchServiceVersion.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/SearchServiceVersion.java
@@ -24,6 +24,11 @@ public enum SearchServiceVersion implements ServiceVersion {
      */
     V2024_07_01("2024-07-01"),
 
+    /**
+     * {@code 2025-09-01} service version.
+     */
+    V2025_09_01("2025-09-01"),
+
     /**
      * {@code 2025-08-01-preview} service version.
      */
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/AnalyzeTextOptions.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/AnalyzeTextOptions.java
index 3d7b3b0ee4f4..f8acc59b9739 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/AnalyzeTextOptions.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/AnalyzeTextOptions.java
@@ -40,6 +40,11 @@ public final class AnalyzeTextOptions {
      */
     private List<CharFilterName> charFilters;
 
+    /*
+     * The name of the normalizer to use to normalize the given text.
+     */
+    private LexicalNormalizerName normalizerName;
+
     /**
      * Constructor to {@link AnalyzeTextOptions} which takes analyzerName.
      *
@@ -130,4 +135,24 @@ public AnalyzeTextOptions setCharFilters(CharFilterName... charFilters) {
         this.charFilters = (charFilters == null) ? null : Arrays.asList(charFilters);
         return this;
     }
+
+    /**
+     * Get the normalizer property: The name of the normalizer to use to normalize the given text.
+     *
+     * @return the normalizer value.
+     */
+    public LexicalNormalizerName getNormalizerName() {
+        return this.normalizerName;
+    }
+
+    /**
+     * Set the normalizer property: The name of the normalizer to use to normalize the given text.
+     *
+     * @param normalizerName the normalizer value to set.
+     * @return the AnalyzeRequest object itself.
+     */
+    public AnalyzeTextOptions setNormalizerName(LexicalNormalizerName normalizerName) {
+        this.normalizerName = normalizerName;
+        return this;
+    }
 }
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RankingOrder.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RankingOrder.java
index 9f0d2518a2e2..f3d1aa4491f2 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RankingOrder.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RankingOrder.java
@@ -24,7 +24,7 @@ public final class RankingOrder extends ExpandableStringEnum<RankingOrder> {
      * Sets sort order as ReRankerScore.
      */
     @Generated
-    public static final RankingOrder RE_RANKER_SCORE = fromString("RerankerScore");
+    public static final RankingOrder RERANKER_SCORE = fromString("RerankerScore");
 
     /**
      * Creates a new instance of RankingOrder value.
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RescoringOptions.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RescoringOptions.java
index a076af5cf76e..8461284d64d0 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RescoringOptions.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/RescoringOptions.java
@@ -24,7 +24,7 @@ public final class RescoringOptions implements JsonSerializable<RescoringOptions
      * the full-precision vectors. This will improve recall at the expense of latency.
      */
     @Generated
-    private Boolean enableRescoring;
+    private Boolean rescoringEnabled;
 
     /*
      * Default oversampling factor. Oversampling retrieves a greater set of potential documents to offset the resolution
@@ -49,28 +49,28 @@ public RescoringOptions() {
     }
 
     /**
-     * Get the enableRescoring property: If set to true, after the initial search on the compressed vectors, the
+     * Get the rescoringEnabled property: If set to true, after the initial search on the compressed vectors, the
      * similarity scores are recalculated using the full-precision vectors. This will improve recall at the expense of
      * latency.
      * 
-     * @return the enableRescoring value.
+     * @return the rescoringEnabled value.
      */
     @Generated
-    public Boolean isEnableRescoring() {
-        return this.enableRescoring;
+    public Boolean isRescoringEnabled() {
+        return this.rescoringEnabled;
     }
 
     /**
-     * Set the enableRescoring property: If set to true, after the initial search on the compressed vectors, the
+     * Set the rescoringEnabled property: If set to true, after the initial search on the compressed vectors, the
      * similarity scores are recalculated using the full-precision vectors. This will improve recall at the expense of
      * latency.
      * 
-     * @param enableRescoring the enableRescoring value to set.
+     * @param rescoringEnabled the rescoringEnabled value to set.
      * @return the RescoringOptions object itself.
      */
     @Generated
-    public RescoringOptions setEnableRescoring(Boolean enableRescoring) {
-        this.enableRescoring = enableRescoring;
+    public RescoringOptions setRescoringEnabled(Boolean rescoringEnabled) {
+        this.rescoringEnabled = rescoringEnabled;
         return this;
     }
 
@@ -133,7 +133,7 @@ public RescoringOptions setRescoreStorageMethod(VectorSearchCompressionRescoreSt
     @Override
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
-        jsonWriter.writeBooleanField("enableRescoring", this.enableRescoring);
+        jsonWriter.writeBooleanField("enableRescoring", this.rescoringEnabled);
         jsonWriter.writeNumberField("defaultOversampling", this.defaultOversampling);
         jsonWriter.writeStringField("rescoreStorageMethod",
             this.rescoreStorageMethod == null ? null : this.rescoreStorageMethod.toString());
@@ -157,7 +157,7 @@ public static RescoringOptions fromJson(JsonReader jsonReader) throws IOExceptio
                 reader.nextToken();
 
                 if ("enableRescoring".equals(fieldName)) {
-                    deserializedRescoringOptions.enableRescoring = reader.getNullable(JsonReader::getBoolean);
+                    deserializedRescoringOptions.rescoringEnabled = reader.getNullable(JsonReader::getBoolean);
                 } else if ("defaultOversampling".equals(fieldName)) {
                     deserializedRescoringOptions.defaultOversampling = reader.getNullable(JsonReader::getDouble);
                 } else if ("rescoreStorageMethod".equals(fieldName)) {
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VectorSearchCompression.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VectorSearchCompression.java
index 0d4101cb03f1..8ac6488a6aa6 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VectorSearchCompression.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/indexes/models/VectorSearchCompression.java
@@ -35,6 +35,8 @@ public class VectorSearchCompression implements JsonSerializable<VectorSearchCom
      * If set to true, once the ordered set of results calculated using compressed vectors are obtained, they will be
      * reranked again by recalculating the full-precision similarity scores. This will improve recall at the expense of
      * latency.
+     * For use with only service version 2024-07-01. If using 2025-09-01 or later, use
+     * RescoringOptions.rescoringEnabled.
      */
     @Generated
     private Boolean rerankWithOriginalVectors;
@@ -44,6 +46,8 @@ public class VectorSearchCompression implements JsonSerializable<VectorSearchCom
      * in the initial search. This increases the set of results that will be reranked using recomputed similarity scores
      * from full-precision vectors. Minimum value is 1, meaning no oversampling (1x). This parameter can only be set
      * when rerankWithOriginalVectors is true. Higher values improve recall at the expense of latency.
+     * For use with only service version 2024-07-01. If using 2025-09-01 or later, use
+     * RescoringOptions.defaultOversampling.
      */
     @Generated
     private Double defaultOversampling;
@@ -98,6 +102,8 @@ public String getCompressionName() {
      * Get the rerankWithOriginalVectors property: If set to true, once the ordered set of results calculated using
      * compressed vectors are obtained, they will be reranked again by recalculating the full-precision similarity
      * scores. This will improve recall at the expense of latency.
+     * For use with only service version 2024-07-01. If using 2025-09-01 or later, use
+     * RescoringOptions.rescoringEnabled.
      * 
      * @return the rerankWithOriginalVectors value.
      */
@@ -110,6 +116,8 @@ public Boolean isRerankWithOriginalVectors() {
      * Set the rerankWithOriginalVectors property: If set to true, once the ordered set of results calculated using
      * compressed vectors are obtained, they will be reranked again by recalculating the full-precision similarity
      * scores. This will improve recall at the expense of latency.
+     * For use with only service version 2024-07-01. If using 2025-09-01 or later, use
+     * RescoringOptions.rescoringEnabled.
      * 
      * @param rerankWithOriginalVectors the rerankWithOriginalVectors value to set.
      * @return the VectorSearchCompression object itself.
@@ -126,6 +134,8 @@ public VectorSearchCompression setRerankWithOriginalVectors(Boolean rerankWithOr
      * reranked using recomputed similarity scores from full-precision vectors. Minimum value is 1, meaning no
      * oversampling (1x). This parameter can only be set when rerankWithOriginalVectors is true. Higher values improve
      * recall at the expense of latency.
+     * For use with only service version 2024-07-01. If using 2025-09-01 or later, use
+     * RescoringOptions.defaultOversampling.
      * 
      * @return the defaultOversampling value.
      */
@@ -140,6 +150,8 @@ public Double getDefaultOversampling() {
      * reranked using recomputed similarity scores from full-precision vectors. Minimum value is 1, meaning no
      * oversampling (1x). This parameter can only be set when rerankWithOriginalVectors is true. Higher values improve
      * recall at the expense of latency.
+     * For use with only service version 2024-07-01. If using 2025-09-01 or later, use
+     * RescoringOptions.defaultOversampling.
      * 
      * @param defaultOversampling the defaultOversampling value to set.
      * @return the VectorSearchCompression object itself.
diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/models/SearchOptions.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/models/SearchOptions.java
index 98cae7068f55..7e2aabcc0cda 100644
--- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/models/SearchOptions.java
+++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/models/SearchOptions.java
@@ -575,7 +575,7 @@ public SearchOptions setTop(Integer top) {
      *
      * @return the debug value.
      */
-    public QueryDebugMode getDebug() {
+    public QueryDebugMode getDebugMode() {
         return this.debug;
     }
 
@@ -585,7 +585,7 @@ public QueryDebugMode getDebug() {
      * @param debug the debug value to set.
      * @return the SearchOptions object itself.
      */
-    public SearchOptions setDebug(QueryDebugMode debug) {
+    public SearchOptions setDebugMode(QueryDebugMode debug) {
         this.debug = debug;
         return this;
     }
diff --git a/sdk/search/azure-search-documents/src/samples/README.md b/sdk/search/azure-search-documents/src/samples/README.md
index 06613250ddb1..ead6ec2fbdbf 100644
--- a/sdk/search/azure-search-documents/src/samples/README.md
+++ b/sdk/search/azure-search-documents/src/samples/README.md
@@ -61,7 +61,7 @@ add the direct dependency to your project as follows.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-search-documents</artifactId>
-    <version>11.8.0-beta.8</version>
+    <version>11.8.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/VectorSearchTests.java b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/VectorSearchTests.java
index ef53897b0589..d5397d59e997 100644
--- a/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/VectorSearchTests.java
+++ b/sdk/search/azure-search-documents/src/test/java/com/azure/search/documents/VectorSearchTests.java
@@ -352,7 +352,7 @@ public void testVectorSearchCompressionBinaryQuantizationSync() {
     public void testVectorSearchCompressionsEnableRescoringDiscardOriginalsSync() {
         String indexName = randomIndexName("compressiontruncationdimension");
         String compressionName = "vector-compression-100";
-        RescoringOptions rescoringOptions = new RescoringOptions().setEnableRescoring(true)
+        RescoringOptions rescoringOptions = new RescoringOptions().setRescoringEnabled(true)
             .setRescoreStorageMethod(VectorSearchCompressionRescoreStorageMethod.DISCARD_ORIGINALS);
 
         SearchIndex searchIndex = new SearchIndex(indexName)
@@ -380,7 +380,7 @@ public void testVectorSearchCompressionsEnableRescoringDiscardOriginalsSync() {
         BinaryQuantizationCompression compression
             = (BinaryQuantizationCompression) retrievedIndex.getVectorSearch().getCompressions().get(0);
         assertEquals(compressionName, compression.getCompressionName());
-        assertEquals(true, compression.getRescoringOptions().isEnableRescoring());
+        assertEquals(true, compression.getRescoringOptions().isRescoringEnabled());
         assertEquals(VectorSearchCompressionRescoreStorageMethod.DISCARD_ORIGINALS,
             compression.getRescoringOptions().getRescoreStorageMethod());
     }
@@ -389,7 +389,7 @@ public void testVectorSearchCompressionsEnableRescoringDiscardOriginalsSync() {
     public void testVectorSearchCompressionsEnableRescoringDiscardOriginalsAsync() {
         String indexName = randomIndexName("compressiontruncationdimension");
         String compressionName = "vector-compression-100";
-        RescoringOptions rescoringOptions = new RescoringOptions().setEnableRescoring(true)
+        RescoringOptions rescoringOptions = new RescoringOptions().setRescoringEnabled(true)
             .setRescoreStorageMethod(VectorSearchCompressionRescoreStorageMethod.DISCARD_ORIGINALS);
 
         SearchIndex searchIndex = new SearchIndex(indexName)
@@ -417,7 +417,7 @@ public void testVectorSearchCompressionsEnableRescoringDiscardOriginalsAsync() {
             BinaryQuantizationCompression compression
                 = (BinaryQuantizationCompression) retrievedIndex.getVectorSearch().getCompressions().get(0);
             assertEquals(compressionName, compression.getCompressionName());
-            assertEquals(true, compression.getRescoringOptions().isEnableRescoring());
+            assertEquals(true, compression.getRescoringOptions().isRescoringEnabled());
             assertEquals(VectorSearchCompressionRescoreStorageMethod.DISCARD_ORIGINALS,
                 compression.getRescoringOptions().getRescoreStorageMethod());
         }).verifyComplete();
diff --git a/sdk/search/azure-search-documents/swagger/README.md b/sdk/search/azure-search-documents/swagger/README.md
index a8719a6a5edf..bf9ed94249fd 100644
--- a/sdk/search/azure-search-documents/swagger/README.md
+++ b/sdk/search/azure-search-documents/swagger/README.md
@@ -498,3 +498,49 @@ directive:
     transform: >
       delete $.KnowledgeAgentOutputOptimization;
 ```
+
+### Retain `rerankWithOriginalVectors` and `defaultOversampling` in `VectorSearchCompressionConfiguration`
+
+```yaml $(tag) == 'searchservice'
+directive:
+- from: swagger-document
+  where: $.definitions.VectorSearchCompressionConfiguration
+  transform: >
+    $.properties.rerankWithOriginalVectors = {
+      "type": "boolean",
+      "description": "If set to true, once the ordered set of results calculated using compressed vectors are obtained, they will be reranked again by recalculating the full-precision similarity scores. This will improve recall at the expense of latency.\nFor use with only service version 2024-07-01. If using 2025-09-01 or later, use RescoringOptions.rescoringEnabled.",
+      "x-nullable": true
+    };
+    $.properties.defaultOversampling = {
+      "type": "number",
+      "format": "double",
+      "description": "Default oversampling factor. Oversampling will internally request more documents (specified by this multiplier) in the initial search. This increases the set of results that will be reranked using recomputed similarity scores from full-precision vectors. Minimum value is 1, meaning no oversampling (1x). This parameter can only be set when rerankWithOriginalVectors is true. Higher values improve recall at the expense of latency.\nFor use with only service version 2024-07-01. If using 2025-09-01 or later, use RescoringOptions.defaultOversampling.",
+      "x-nullable": true
+    };
+```
+
+### Archboard feedback for 2025-09-01
+
+#### `RE_RANKER_SCORE` -> `RERANKER_SCORE`
+
+```yaml $(tag) == 'searchservice'
+directive:
+- from: swagger-document
+  where: $.definitions.RankingOrder
+  transform: >
+    $["x-ms-enum"].values = $["x-ms-enum"].values.map((v) => ({
+      value: v.value,
+      name: v.name === "ReRankerScore" ? "RerankerScore" : v.name,
+      description: v.description
+    }));
+```
+
+#### `RescoringOptions.isEnableRescoring` -> `RescoringOptions.isRescoringEnabled`
+
+```yaml $(tag) == 'searchservice'
+directive:
+- from: swagger-document
+  where: $.definitions.RescoringOptions
+  transform: >
+    $.properties["enableRescoring"]["x-ms-client-name"] = "rescoringEnabled";
+```
diff --git a/sdk/search/azure-search-perf/pom.xml b/sdk/search/azure-search-perf/pom.xml
index 78466bd11a19..8a3145049aad 100644
--- a/sdk/search/azure-search-perf/pom.xml
+++ b/sdk/search/azure-search-perf/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-search-documents</artifactId>
-      <version>11.8.0-beta.9</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
+      <version>11.9.0-beta.1</version> <!-- {x-version-update;com.azure:azure-search-documents;current} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/secretsstoreextension/azure-resourcemanager-secretsstoreextension/pom.xml b/sdk/secretsstoreextension/azure-resourcemanager-secretsstoreextension/pom.xml
index 1739f8a852df..26db0353df74 100644
--- a/sdk/secretsstoreextension/azure-resourcemanager-secretsstoreextension/pom.xml
+++ b/sdk/secretsstoreextension/azure-resourcemanager-secretsstoreextension/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/security/azure-resourcemanager-security/pom.xml b/sdk/security/azure-resourcemanager-security/pom.xml
index f0dabc905a5e..9178cfa176af 100644
--- a/sdk/security/azure-resourcemanager-security/pom.xml
+++ b/sdk/security/azure-resourcemanager-security/pom.xml
@@ -67,7 +67,7 @@ Code generated by Microsoft (R) AutoRest Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/securitydevops/azure-resourcemanager-securitydevops/pom.xml b/sdk/securitydevops/azure-resourcemanager-securitydevops/pom.xml
index 026389ca7777..4f3a85ae484d 100644
--- a/sdk/securitydevops/azure-resourcemanager-securitydevops/pom.xml
+++ b/sdk/securitydevops/azure-resourcemanager-securitydevops/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml b/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml
index d91e57269b0f..7f4d8df262a0 100644
--- a/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml
+++ b/sdk/securityinsights/azure-resourcemanager-securityinsights/pom.xml
@@ -67,7 +67,7 @@ Code generated by Microsoft (R) AutoRest Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/selfhelp/azure-resourcemanager-selfhelp/pom.xml b/sdk/selfhelp/azure-resourcemanager-selfhelp/pom.xml
index 2c9e218ebfa1..1e3526f9739e 100644
--- a/sdk/selfhelp/azure-resourcemanager-selfhelp/pom.xml
+++ b/sdk/selfhelp/azure-resourcemanager-selfhelp/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/servicebus/azure-messaging-servicebus/README.md b/sdk/servicebus/azure-messaging-servicebus/README.md
index 26493bc89e9d..2ca83c02e404 100644
--- a/sdk/servicebus/azure-messaging-servicebus/README.md
+++ b/sdk/servicebus/azure-messaging-servicebus/README.md
@@ -90,7 +90,7 @@ First, add the package:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml
index 085ddf9015ba..77f6580fd547 100644
--- a/sdk/servicebus/azure-messaging-servicebus/pom.xml
+++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/servicebus/version-overrides-matrix.json b/sdk/servicebus/version-overrides-matrix.json
index c12c9653f38d..c04b2c263b50 100644
--- a/sdk/servicebus/version-overrides-matrix.json
+++ b/sdk/servicebus/version-overrides-matrix.json
@@ -3,7 +3,7 @@
     "Agent": {
       "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
     },
-    "JavaTestVersion": "1.21",
+    "JavaTestVersion": "1.25",
     "TestGoals": "surefire:test",
     "VersionOverride": [
       "reactor_2020",
diff --git a/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml b/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml
index c73b133ee0e7..ded1f56da209 100644
--- a/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml
+++ b/sdk/servicefabric/azure-resourcemanager-servicefabric/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/servicefabricmanagedclusters/azure-resourcemanager-servicefabricmanagedclusters/pom.xml b/sdk/servicefabricmanagedclusters/azure-resourcemanager-servicefabricmanagedclusters/pom.xml
index 5db7f7bb7571..6d8e8f974d15 100644
--- a/sdk/servicefabricmanagedclusters/azure-resourcemanager-servicefabricmanagedclusters/pom.xml
+++ b/sdk/servicefabricmanagedclusters/azure-resourcemanager-servicefabricmanagedclusters/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/servicelinker/azure-resourcemanager-servicelinker/pom.xml b/sdk/servicelinker/azure-resourcemanager-servicelinker/pom.xml
index ba4a48e9fe1c..a8d153232d24 100644
--- a/sdk/servicelinker/azure-resourcemanager-servicelinker/pom.xml
+++ b/sdk/servicelinker/azure-resourcemanager-servicelinker/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/servicenetworking/azure-resourcemanager-servicenetworking/pom.xml b/sdk/servicenetworking/azure-resourcemanager-servicenetworking/pom.xml
index d68e1b32d594..06fcfa95d3aa 100644
--- a/sdk/servicenetworking/azure-resourcemanager-servicenetworking/pom.xml
+++ b/sdk/servicenetworking/azure-resourcemanager-servicenetworking/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/signalr/azure-resourcemanager-signalr/pom.xml b/sdk/signalr/azure-resourcemanager-signalr/pom.xml
index c64d4e306718..313256544412 100644
--- a/sdk/signalr/azure-resourcemanager-signalr/pom.xml
+++ b/sdk/signalr/azure-resourcemanager-signalr/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/sitemanager/azure-resourcemanager-sitemanager/pom.xml b/sdk/sitemanager/azure-resourcemanager-sitemanager/pom.xml
index b6d0ba0ea4e6..be46eab41550 100644
--- a/sdk/sitemanager/azure-resourcemanager-sitemanager/pom.xml
+++ b/sdk/sitemanager/azure-resourcemanager-sitemanager/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/sphere/azure-resourcemanager-sphere/pom.xml b/sdk/sphere/azure-resourcemanager-sphere/pom.xml
index d4984d647de5..01ccd1d79b5e 100644
--- a/sdk/sphere/azure-resourcemanager-sphere/pom.xml
+++ b/sdk/sphere/azure-resourcemanager-sphere/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/spring/pipeline/cosmos-integration-matrix-compatible.json b/sdk/spring/pipeline/cosmos-integration-matrix-compatible.json
index 838439ee8dce..849c5d605a8c 100644
--- a/sdk/spring/pipeline/cosmos-integration-matrix-compatible.json
+++ b/sdk/spring/pipeline/cosmos-integration-matrix-compatible.json
@@ -13,7 +13,7 @@
       }
     },
     "TestFromSource": true,
-    "JavaTestVersion": ["1.17", "1.21"],
+    "JavaTestVersion": ["1.17", "1.25"],
     "SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION": [
 
     ]
diff --git a/sdk/spring/pipeline/cosmos-integration-matrix.json b/sdk/spring/pipeline/cosmos-integration-matrix.json
index 16e3de43876d..96b8c521fe3b 100644
--- a/sdk/spring/pipeline/cosmos-integration-matrix.json
+++ b/sdk/spring/pipeline/cosmos-integration-matrix.json
@@ -10,6 +10,6 @@
       }
     },
     "TestFromSource": [true, false],
-    "JavaTestVersion": ["1.17", "1.21"]
+    "JavaTestVersion": ["1.17", "1.25"]
   }
 }
diff --git a/sdk/spring/pipeline/monitor-supported-version-matrix.json b/sdk/spring/pipeline/monitor-supported-version-matrix.json
index 54fa662ae7c9..54fc960214fd 100644
--- a/sdk/spring/pipeline/monitor-supported-version-matrix.json
+++ b/sdk/spring/pipeline/monitor-supported-version-matrix.json
@@ -6,7 +6,7 @@
     "Agent": {
       "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
     },
-    "JavaTestVersion": "1.21",
+    "JavaTestVersion": "1.25",
     "TEST_SPRING_BOOT_VERSION": [
 
     ]
diff --git a/sdk/spring/pipeline/supported-version-matrix.json b/sdk/spring/pipeline/supported-version-matrix.json
index b2ee7b4e9602..665f125f7dd6 100644
--- a/sdk/spring/pipeline/supported-version-matrix.json
+++ b/sdk/spring/pipeline/supported-version-matrix.json
@@ -8,7 +8,7 @@
       "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" },
       "macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
     },
-    "JavaTestVersion": [ "1.17", "1.21" ],
+    "JavaTestVersion": [ "1.17", "1.25" ],
     "SPRING_CLOUD_AZURE_TEST_SUPPORTED_SPRING_BOOT_VERSION": [
 
     ]
diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
index 527375b8b387..e5a2b6f66545 100644
--- a/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
+++ b/sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
index 31e0edfd5347..6aab8846628e 100644
--- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
+++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
@@ -190,7 +190,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <optional>true</optional>
       <exclusions>
         <exclusion>
diff --git a/sdk/spring/spring-cloud-azure-core/pom.xml b/sdk/spring/spring-cloud-azure-core/pom.xml
index 5f1828f26143..524f57cb9dd4 100644
--- a/sdk/spring/spring-cloud-azure-core/pom.xml
+++ b/sdk/spring/spring-cloud-azure-core/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml
index 633661af1df2..50dd466d6e25 100644
--- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml
+++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
   </dependencies>
 
diff --git a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
index b43a8f7e8e49..2d30f1fd491a 100644
--- a/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
+++ b/sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
@@ -129,7 +129,7 @@ currently released version and a lower version is resolved. -->
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <optional>true</optional>
     </dependency>
     <!-- We should keep these netty dependencies, for the netty version in qpid-jms-client is lower than the ones in azure sdks.  -->
diff --git a/sdk/springappdiscovery/azure-resourcemanager-springappdiscovery/pom.xml b/sdk/springappdiscovery/azure-resourcemanager-springappdiscovery/pom.xml
index f02580937415..12b0347e56f9 100644
--- a/sdk/springappdiscovery/azure-resourcemanager-springappdiscovery/pom.xml
+++ b/sdk/springappdiscovery/azure-resourcemanager-springappdiscovery/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml
index d51ccdfd5989..a9a109a2b5ab 100644
--- a/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml
+++ b/sdk/sqlvirtualmachine/azure-resourcemanager-sqlvirtualmachine/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/pom.xml b/sdk/standbypool/azure-resourcemanager-standbypool/pom.xml
index 1ec67f999f6a..969f6abccadd 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/pom.xml
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage-v2/platform-matrix-ci.json b/sdk/storage-v2/platform-matrix-ci.json
index adc9a427db03..6cb8afe3260e 100644
--- a/sdk/storage-v2/platform-matrix-ci.json
+++ b/sdk/storage-v2/platform-matrix-ci.json
@@ -5,7 +5,7 @@
   "include": [
     {
       "Agent": { "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } },
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false,
       "RunAggregateReports": false,
diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml
index 880912ca6b5c..98d8a8cc3ef4 100644
--- a/sdk/storage/azure-storage-blob-batch/pom.xml
+++ b/sdk/storage/azure-storage-blob-batch/pom.xml
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml
index 5a2eaae6f613..2d9cd6ae0624 100644
--- a/sdk/storage/azure-storage-blob-changefeed/pom.xml
+++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml
index e2a498eaee25..f9a68f774221 100644
--- a/sdk/storage/azure-storage-blob-cryptography/pom.xml
+++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml
index f308ad828a4f..78830b10e870 100644
--- a/sdk/storage/azure-storage-blob/pom.xml
+++ b/sdk/storage/azure-storage-blob/pom.xml
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml
index d7b15226724a..9153f536c8b4 100644
--- a/sdk/storage/azure-storage-common/pom.xml
+++ b/sdk/storage/azure-storage-common/pom.xml
@@ -87,7 +87,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml
index ccd737ab12f5..bcebb047c161 100644
--- a/sdk/storage/azure-storage-file-datalake/pom.xml
+++ b/sdk/storage/azure-storage-file-datalake/pom.xml
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml
index c6ffd2767bf5..1453ec9e765d 100644
--- a/sdk/storage/azure-storage-file-share/pom.xml
+++ b/sdk/storage/azure-storage-file-share/pom.xml
@@ -109,7 +109,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml
index 98470e61d6ec..a33978166dae 100644
--- a/sdk/storage/azure-storage-queue/pom.xml
+++ b/sdk/storage/azure-storage-queue/pom.xml
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storage/platform-matrix-all-versions.json b/sdk/storage/platform-matrix-all-versions.json
index d751b1850579..ce2a34c13488 100644
--- a/sdk/storage/platform-matrix-all-versions.json
+++ b/sdk/storage/platform-matrix-all-versions.json
@@ -4,7 +4,7 @@
       "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" },
       "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" }
     },
-    "JavaTestVersion": [ "1.8", "1.21" ],
+    "JavaTestVersion": [ "1.8", "1.25" ],
     "AZURE_TEST_HTTP_CLIENTS": [ "okhttp", "netty" ],
     "TestGoals": "surefire:test",
     "AZURE_LIVE_TEST_SERVICE_VERSION": [
diff --git a/sdk/storage/platform-matrix-ci.json b/sdk/storage/platform-matrix-ci.json
index adc9a427db03..6cb8afe3260e 100644
--- a/sdk/storage/platform-matrix-ci.json
+++ b/sdk/storage/platform-matrix-ci.json
@@ -5,7 +5,7 @@
   "include": [
     {
       "Agent": { "windows-2022": { "OSVmImage": "env:WINDOWSVMIMAGE", "Pool": "env:WINDOWSPOOL" } },
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false,
       "RunAggregateReports": false,
diff --git a/sdk/storage/platform-matrix.json b/sdk/storage/platform-matrix.json
index f5531829c5b5..2c191c8ad647 100644
--- a/sdk/storage/platform-matrix.json
+++ b/sdk/storage/platform-matrix.json
@@ -28,7 +28,7 @@
       "Agent": {
         "ubuntu-24.04": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
-      "JavaTestVersion": ["1.8", "1.21"],
+      "JavaTestVersion": ["1.8", "1.25"],
       "AZURE_TEST_HTTP_CLIENTS": "netty",
       "TestFromSource": false,
       "StorageRunStressScenarios" : "true",
diff --git a/sdk/storage/tests-template.yml b/sdk/storage/tests-template.yml
index 05a555dc4b3c..deb8fdffcae2 100644
--- a/sdk/storage/tests-template.yml
+++ b/sdk/storage/tests-template.yml
@@ -75,8 +75,8 @@ stages:
             targetType: 'filePath'
             filePath: sdk/storage/azure-storage-perf/memory-stress-scenarios.ps1
           env:
-            ${{ if eq(variables['JavaTestVersion'], '1.21') }}:
-              JAVA_HOME: $(JAVA_HOME_21_X64)
+            ${{ if eq(variables['JavaTestVersion'], '1.25') }}:
+              JAVA_HOME: $(JAVA_HOME_25_X64)
             ${{ if eq(variables['JavaTestVersion'], '1.8') }}:
               JAVA_HOME: $(JAVA_HOME_8_X64)
           condition: and(succeeded(), eq(variables['StorageRunStressScenarios'], 'true'))
diff --git a/sdk/storageactions/azure-resourcemanager-storageactions/pom.xml b/sdk/storageactions/azure-resourcemanager-storageactions/pom.xml
index 126e62e1b2f7..d12523d1fa69 100644
--- a/sdk/storageactions/azure-resourcemanager-storageactions/pom.xml
+++ b/sdk/storageactions/azure-resourcemanager-storageactions/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml b/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml
index 919e741fde76..821d44458350 100644
--- a/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml
+++ b/sdk/storagecache/azure-resourcemanager-storagecache/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storagediscovery/azure-resourcemanager-storagediscovery/pom.xml b/sdk/storagediscovery/azure-resourcemanager-storagediscovery/pom.xml
index 78047cb41537..45e546d3da9f 100644
--- a/sdk/storagediscovery/azure-resourcemanager-storagediscovery/pom.xml
+++ b/sdk/storagediscovery/azure-resourcemanager-storagediscovery/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/storagemover/azure-resourcemanager-storagemover/CHANGELOG.md b/sdk/storagemover/azure-resourcemanager-storagemover/CHANGELOG.md
index 779e04db545d..fb3f9f550541 100644
--- a/sdk/storagemover/azure-resourcemanager-storagemover/CHANGELOG.md
+++ b/sdk/storagemover/azure-resourcemanager-storagemover/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Release History
 
+## 1.5.0-beta.1 (Unreleased)
+
+### Features Added
+
+### Breaking Changes
+
+### Bugs Fixed
+
+### Other Changes
+
 ## 1.4.0 (2025-08-29)
 
 - Azure Resource Manager Storage Mover client library for Java. This package contains Microsoft Azure SDK for Storage Mover Management SDK. The Azure Storage Mover REST API. Package api-version 2025-07-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
diff --git a/sdk/storagemover/azure-resourcemanager-storagemover/pom.xml b/sdk/storagemover/azure-resourcemanager-storagemover/pom.xml
index 3585b1ab7324..a7683c0b68ec 100644
--- a/sdk/storagemover/azure-resourcemanager-storagemover/pom.xml
+++ b/sdk/storagemover/azure-resourcemanager-storagemover/pom.xml
@@ -14,7 +14,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-storagemover</artifactId>
-  <version>1.4.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storagemover;current} -->
+  <version>1.5.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storagemover;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Storage Mover Management</name>
@@ -67,7 +67,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/storagepool/azure-resourcemanager-storagepool/pom.xml b/sdk/storagepool/azure-resourcemanager-storagepool/pom.xml
index 3bcee84d87f0..543fa48fb9eb 100644
--- a/sdk/storagepool/azure-resourcemanager-storagepool/pom.xml
+++ b/sdk/storagepool/azure-resourcemanager-storagepool/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml b/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml
index e433951d4473..d1c06bdd68c3 100644
--- a/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml
+++ b/sdk/streamanalytics/azure-resourcemanager-streamanalytics/pom.xml
@@ -67,7 +67,7 @@ Code generated by Microsoft (R) AutoRest Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/subscription/azure-resourcemanager-subscription/pom.xml b/sdk/subscription/azure-resourcemanager-subscription/pom.xml
index ee7f714fbf8d..7b29e6dabdd4 100644
--- a/sdk/subscription/azure-resourcemanager-subscription/pom.xml
+++ b/sdk/subscription/azure-resourcemanager-subscription/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/support/azure-resourcemanager-support/pom.xml b/sdk/support/azure-resourcemanager-support/pom.xml
index 52b1c78587b5..a395645f93d1 100644
--- a/sdk/support/azure-resourcemanager-support/pom.xml
+++ b/sdk/support/azure-resourcemanager-support/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml b/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml
index 80b0b3394f2b..723e8560d45c 100644
--- a/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml
+++ b/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml b/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml
index 549a28f176c6..8d88698470f9 100644
--- a/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml
+++ b/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml b/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml
index f8d41cc6859a..c0ef8bc6f67c 100644
--- a/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml
+++ b/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml b/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml
index da77d7be6e7f..8163fb312cf5 100644
--- a/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml
+++ b/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/synapse/azure-analytics-synapse-spark/pom.xml b/sdk/synapse/azure-analytics-synapse-spark/pom.xml
index 0dcba3eea886..fa247e08ab4a 100644
--- a/sdk/synapse/azure-analytics-synapse-spark/pom.xml
+++ b/sdk/synapse/azure-analytics-synapse-spark/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/synapse/azure-resourcemanager-synapse/pom.xml b/sdk/synapse/azure-resourcemanager-synapse/pom.xml
index 2fffce214d3d..068c155ed85b 100644
--- a/sdk/synapse/azure-resourcemanager-synapse/pom.xml
+++ b/sdk/synapse/azure-resourcemanager-synapse/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml
index d1aa7f2a6214..27bc469db67d 100644
--- a/sdk/tables/azure-data-tables/pom.xml
+++ b/sdk/tables/azure-data-tables/pom.xml
@@ -77,7 +77,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/tables/platform-matrix.json b/sdk/tables/platform-matrix.json
index 92d8100a5949..3d9976b8bcfc 100644
--- a/sdk/tables/platform-matrix.json
+++ b/sdk/tables/platform-matrix.json
@@ -12,7 +12,7 @@
     },
     "ArmTemplateParameters": [ "@{endpointType='storage'}", "@{endpointType='cosmos'}" ],
     "AZURE_TEST_HTTP_CLIENTS": "netty",
-    "JavaTestVersion": [ "1.8", "1.21" ]
+    "JavaTestVersion": [ "1.8", "1.25" ]
   },
   "include": [
     {
@@ -25,7 +25,7 @@
     },
     {
       "AZURE_TEST_HTTP_CLIENTS": "okhttp",
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "Agent": {
         "macos-latest": { "OSVmImage": "env:MACVMIMAGE", "Pool": "env:MACPOOL" }
       },
@@ -33,7 +33,7 @@
     },
     {
       "AZURE_TEST_HTTP_CLIENTS": "netty",
-      "JavaTestVersion": "1.21",
+      "JavaTestVersion": "1.25",
       "Agent": {
         "ubuntu-2204": { "OSVmImage": "env:LINUXVMIMAGE", "Pool": "env:LINUXPOOL" }
       },
diff --git a/sdk/terraform/azure-resourcemanager-terraform/pom.xml b/sdk/terraform/azure-resourcemanager-terraform/pom.xml
index b643f63dcea4..18e5b0dd613d 100644
--- a/sdk/terraform/azure-resourcemanager-terraform/pom.xml
+++ b/sdk/terraform/azure-resourcemanager-terraform/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/textanalytics/azure-ai-textanalytics/README.md b/sdk/textanalytics/azure-ai-textanalytics/README.md
index 4a654e166661..b975682d4e0f 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/README.md
+++ b/sdk/textanalytics/azure-ai-textanalytics/README.md
@@ -142,7 +142,7 @@ Authentication with AAD requires some initial setup:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/textanalytics/azure-ai-textanalytics/pom.xml b/sdk/textanalytics/azure-ai-textanalytics/pom.xml
index 3edabb41155f..922be1558ea5 100644
--- a/sdk/textanalytics/azure-ai-textanalytics/pom.xml
+++ b/sdk/textanalytics/azure-ai-textanalytics/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml b/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml
index 21744090de4e..b1bd5235d255 100644
--- a/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml
+++ b/sdk/timeseriesinsights/azure-resourcemanager-timeseriesinsights/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/tools/azure-openrewrite/pom.xml b/sdk/tools/azure-openrewrite/pom.xml
index 4bb75c2a56bd..6a95674b76ee 100644
--- a/sdk/tools/azure-openrewrite/pom.xml
+++ b/sdk/tools/azure-openrewrite/pom.xml
@@ -168,15 +168,15 @@
         </dependency>
 
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.18.4.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+          <version>2.18.4.1</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-core;external_dependency} -->
         </dependency>
         <!-- Jackson Dataformat Smile -->
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-smile</artifactId>
-            <version>2.18.4</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-smile;external_dependency} -->
+          <groupId>com.fasterxml.jackson.dataformat</groupId>
+          <artifactId>jackson-dataformat-smile</artifactId>
+          <version>2.18.4</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-smile;external_dependency} -->
         </dependency>
         <dependency>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -223,7 +223,7 @@
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-identity</artifactId>
-          <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+          <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
           <scope>test</scope>
         </dependency>
 
@@ -276,6 +276,12 @@
           <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure.v2:azure-core;dependency} -->
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>com.azure.v2</groupId>
+          <artifactId>azure-data-appconfiguration</artifactId>
+          <version>2.0.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure.v2:azure-data-appconfiguration;dependency} -->
+          <scope>test</scope>
+        </dependency>
       </dependencies>
     </profile>
 
@@ -287,7 +293,7 @@
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-identity</artifactId>
-          <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+          <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
           <scope>provided</scope>
         </dependency>
         <dependency>
@@ -372,6 +378,12 @@
           <version>2.0.0-beta.1</version> <!-- {x-version-update;com.azure.v2:azure-identity;dependency} -->
           <scope>provided</scope>
         </dependency>
+        <dependency>
+          <groupId>com.azure.v2</groupId>
+          <artifactId>azure-data-appconfiguration</artifactId>
+          <version>2.0.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure.v2:azure-data-appconfiguration;dependency} -->
+          <scope>provided</scope>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>
diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/LibraryMigration.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/LibraryMigration.yml
new file mode 100644
index 000000000000..0d50f2c529a5
--- /dev/null
+++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/LibraryMigration.yml
@@ -0,0 +1,13 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+# --------------------------------------------------------------------
+# Migration Recipes for Azure appconfiguration Library
+# --------------------------------------------------------------------
+type: specs.openrewrite.org/v1beta/recipe
+name: com.azure.openrewrite.migration.data.appconfiguration
+displayName: Migrate from azure-appconfiguration to next generation stack
+description: This recipe migrates the Azure appconfiguration library to the next generation stack.
+recipeList:
+
+  - com.azure.openrewrite.recipe.azure.data.appconfiguration
+  - com.azure.openrewrite.recipe.azure.data.appconfiguration.models
diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.models.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.models.yml
new file mode 100644
index 000000000000..b0d28d8e1a49
--- /dev/null
+++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.models.yml
@@ -0,0 +1,126 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+# --------------------------------------------------------------------
+# Migration Recipes for azure.core.credential
+# --------------------------------------------------------------------
+type: specs.openrewrite.org/v1beta/recipe
+name: com.azure.openrewrite.recipe.azure.data.appconfiguration.models
+displayName: Migrate from azure.data.appconfiguration.models to next generation stack
+description: This recipe migrates the azure.data.appconfiguration.models package to the next generation stack.
+recipeList:
+
+  # --------------------------------------------------------------------
+  # ConfigurationAudience
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # ConfigurationSetting
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.ConfigurationSetting
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.ConfigurationSetting
+
+  # --------------------------------------------------------------------
+  # SettingLabelSelector
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.SettingLabelSelector
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.SettingLabelSelector
+
+  # --------------------------------------------------------------------
+  # ConfigurationSettingsFilter
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.ConfigurationSettingsFilter
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.ConfigurationSettingsFilter
+
+  # --------------------------------------------------------------------
+  # ConfigurationSnapshot
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.ConfigurationSnapshot
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.ConfigurationSnapshot
+
+  # --------------------------------------------------------------------
+  # ConfigurationSnapshotStatus
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # FeatureFlagConfigurationSetting
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.FeatureFlagConfigurationSetting
+
+  # --------------------------------------------------------------------
+  # FeatureFlagFilter
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.FeatureFlagFilter
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.FeatureFlagFilter
+
+  # --------------------------------------------------------------------
+  # SecretReferenceConfigurationSetting
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.SecretReferenceConfigurationSetting
+
+  # --------------------------------------------------------------------
+  # SettingFields
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # SettingLabel
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # SettingLabelFields
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # SettingLabelSelector
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # SettingSelector
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.models.SettingSelector
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.models.SettingSelector
+
+  # --------------------------------------------------------------------
+  # SnapshotComposition
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # SnapshotFields
+  # --------------------------------------------------------------------
+
+
+
+  # --------------------------------------------------------------------
+  # SnapshotSelector
+  # --------------------------------------------------------------------
diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.yml
new file mode 100644
index 000000000000..c00b5cef2259
--- /dev/null
+++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/migrationRecipes/appconfiguration/com.azure.data.appconfiguration.yml
@@ -0,0 +1,41 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+type: specs.openrewrite.org/v1beta/recipe
+name: com.azure.openrewrite.recipe.azure.data.appconfiguration
+displayName: Migrate from azure.data.appconfiguration to next generation stack
+description: This recipe migrates the azure.data.appconfiguration package to the next generation stack.
+recipeList:
+
+
+
+  # --------------------------------------------------------------------
+  # ConfigurationAsyncClient
+  # --------------------------------------------------------------------
+
+
+
+
+
+  # --------------------------------------------------------------------
+  # ConfigurationClient
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.ConfigurationClient
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.ConfigurationClient
+
+
+  # --------------------------------------------------------------------
+  # ConfigurationClientBuilder
+  # --------------------------------------------------------------------
+
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: com.azure.data.appconfiguration.ConfigurationClientBuilder
+      newFullyQualifiedTypeName: com.azure.v2.data.appconfiguration.ConfigurationClientBuilder
+
+
+  # --------------------------------------------------------------------
+  # ConfigurationServiceVersion
+  # --------------------------------------------------------------------
+
+
diff --git a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml
index e8b0f81fa909..305abd7f08e2 100644
--- a/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml
+++ b/sdk/tools/azure-openrewrite/src/main/resources/META-INF/rewrite/rewrite.yml
@@ -12,6 +12,7 @@ recipeList:
   # Code Migration Recipes
   - com.azure.openrewrite.migration.core
   - com.azure.openrewrite.migration.identity
+  - com.azure.openrewrite.migration.data.appconfiguration
 
   # Code Styling recipes
   - org.openrewrite.java.OrderImports:
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java
index 3f52b14050b4..75645b5969ac 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v1/AadAuthentication.java
@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.identity.DefaultAzureCredential;
 import com.azure.identity.DefaultAzureCredentialBuilder;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java
index 3f52b14050b4..2958c4d5e3ae 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/AadAuthentication/v2/AadAuthentication.java
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
-import com.azure.identity.DefaultAzureCredential;
-import com.azure.identity.DefaultAzureCredentialBuilder;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.identity.DefaultAzureCredential;
+import com.azure.v2.identity.DefaultAzureCredentialBuilder;
 
 /**
  * Sample demonstrates how to use AAD token to build a configuration client.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java
index b6aafadcc407..f4376911ccba 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v1/ConditionalRequest.java
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.Response;
 import com.azure.core.util.Context;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 /**
  * Sample demonstrates how to add, get, and delete a configuration setting by conditional request.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java
index b6aafadcc407..bdbd44c6875d 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequest/v2/ConditionalRequest.java
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.core.http.rest.Response;
-import com.azure.core.util.Context;
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
+import io.clientcore.core.http.models.RequestContext;
+import io.clientcore.core.http.models.Response;
 
 /**
  * Sample demonstrates how to add, get, and delete a configuration setting by conditional request.
@@ -31,21 +31,21 @@ public static void main(String[] args) {
         // given setting matches the one in the service, then the setting is updated. Otherwise, it is
         // not updated.
         // If the given setting is not exist in the service, the setting will be added to the service.
-        Response<ConfigurationSetting> settingResponse = client.setConfigurationSettingWithResponse(setting, true, Context.NONE);
+        Response<ConfigurationSetting> settingResponse = client.setConfigurationSettingWithResponse(setting, true, RequestContext.none());
         System.out.printf("Status code: %s, Key: %s, Value: %s", settingResponse.getStatusCode(),
             settingResponse.getValue().getKey(), settingResponse.getValue().getValue());
 
         // If you want to conditionally retrieve the setting, set `ifChanged` to true. If the ETag of the
         // given setting matches the one in the service, then 304 status code with null value returned in the response.
         // Otherwise, a setting with new ETag returned, which is the latest setting retrieved from the service.
-        settingResponse = client.getConfigurationSettingWithResponse(setting, null, true, Context.NONE);
+        settingResponse = client.getConfigurationSettingWithResponse(setting, null, true, RequestContext.none());
         System.out.printf("Status code: %s, Key: %s, Value: %s", settingResponse.getStatusCode(),
             settingResponse.getValue().getKey(), settingResponse.getValue().getValue());
 
         // If you want to conditionally delete the setting, set `ifUnchanged` to true. If the ETag of the
         // given setting matches the one in the service, then the setting is deleted. Otherwise, it is
         // not deleted.
-        client.deleteConfigurationSettingWithResponse(settingResponse.getValue(), true, Context.NONE);
+        client.deleteConfigurationSettingWithResponse(settingResponse.getValue(), true, RequestContext.none());
         System.out.printf("Status code: %s, Key: %s, Value: %s", settingResponse.getStatusCode(),
             settingResponse.getValue().getKey(), settingResponse.getValue().getValue());
     }
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java
index 104ec65ab2b6..a73ee3b73ed2 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v1/ConditionalRequestForSettingsPagination.java
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.HttpHeaderName;
 import com.azure.core.http.MatchConditions;
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Configuration;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java
index 104ec65ab2b6..eab7c792394a 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ConditionalRequestForSettingsPagination/v2/ConditionalRequestForSettingsPagination.java
@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.core.http.HttpHeaderName;
-import com.azure.core.http.MatchConditions;
-import com.azure.core.http.rest.PagedIterable;
-import com.azure.core.util.Configuration;
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
-import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.models.SettingSelector;
+import io.clientcore.core.http.models.HttpHeaderName;
+import io.clientcore.core.http.models.HttpMatchConditions;
+import io.clientcore.core.http.paging.PagedIterable;
+import io.clientcore.core.utils.configuration.Configuration;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -32,20 +32,20 @@ public static void main(String[] args) {
 
         // Instantiate a client that will be used to call the service.
         ConfigurationClient client = new ConfigurationClientBuilder()
-                .connectionString(connectionString)
-                .buildClient();
+            .connectionString(connectionString)
+            .buildClient();
 
         // list all settings and get their page ETags
-        List<MatchConditions> matchConditionsList = client.listConfigurationSettings(null)
-                .streamByPage()
-                .collect(Collectors.toList())
-                .stream()
-                .map(pagedResponse -> new MatchConditions().setIfNoneMatch(
-                        pagedResponse.getHeaders().getValue(HttpHeaderName.ETAG)))
-                .collect(Collectors.toList());
+        List<HttpMatchConditions> matchConditionsList = client.listConfigurationSettings(null)
+            .streamByPage()
+            .collect(Collectors.toList())
+            .stream()
+            .map(pagedResponse -> new HttpMatchConditions().setIfNoneMatch(
+                pagedResponse.getHeaders().getValue(HttpHeaderName.ETAG)))
+            .collect(Collectors.toList());
 
         PagedIterable<ConfigurationSetting> settings = client.listConfigurationSettings(
-                new SettingSelector().setMatchConditions(matchConditionsList));
+            new SettingSelector().setMatchConditions(matchConditionsList));
 
         settings.iterableByPage().forEach(pagedResponse -> {
             int statusCode = pagedResponse.getStatusCode();
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java
index 0e2805e9a75f..7b16c9999745 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v1/FeatureFlagConfigurationSettingSample.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting;
 import com.azure.data.appconfiguration.models.FeatureFlagFilter;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java
index 0e2805e9a75f..b4038f4bc926 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/FeatureFlagConfigurationSettingSample/v2/FeatureFlagConfigurationSettingSample.java
@@ -1,13 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.core.http.rest.PagedIterable;
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
-import com.azure.data.appconfiguration.models.FeatureFlagConfigurationSetting;
-import com.azure.data.appconfiguration.models.FeatureFlagFilter;
-import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.models.FeatureFlagConfigurationSetting;
+import com.azure.v2.data.appconfiguration.models.FeatureFlagFilter;
+import com.azure.v2.data.appconfiguration.models.SettingSelector;
+import io.clientcore.core.http.paging.PagedIterable;
 
 import java.util.Arrays;
 import java.util.List;
@@ -28,8 +28,8 @@ public static void main(String[] args) {
         // and navigating to "Access Keys" page under the "Settings" section.
         String connectionString = "endpoint={endpoint_value};id={id_value};secret={secret_value}";
         final ConfigurationClient client = new ConfigurationClientBuilder()
-                                               .connectionString(connectionString)
-                                               .buildClient();
+            .connectionString(connectionString)
+            .buildClient();
 
         // Name of the key to add to the configuration service.
         final String key = "hello";
@@ -37,7 +37,7 @@ public static void main(String[] args) {
         System.out.println("Beginning of synchronous sample...");
 
         FeatureFlagFilter percentageFilter = new FeatureFlagFilter("Microsoft.Percentage")
-                                                 .addParameter("Value", 30);
+            .addParameter("Value", 30);
         FeatureFlagConfigurationSetting featureFlagConfigurationSetting =
             new FeatureFlagConfigurationSetting(key, true)
                 .setClientFilters(Arrays.asList(percentageFilter));
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java
index 536fcae286a0..63fa2eebcc55 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v1/HelloWorld.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 /**
  * Sample demonstrates how to add, get, and delete a configuration setting.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java
index 536fcae286a0..ab68288f5794 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/HelloWorld/v2/HelloWorld.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
 
 /**
  * Sample demonstrates how to add, get, and delete a configuration setting.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java
index 23dd670f19d6..de10f2a683f4 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v1/ListLabels.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.util.Configuration;
 import com.azure.core.util.Context;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingLabelSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 /**
  * A sample demonstrate how to list labels.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java
index 23dd670f19d6..d13866767f3e 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListLabels/v2/ListLabels.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.core.util.Configuration;
-import com.azure.core.util.Context;
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
-import com.azure.data.appconfiguration.models.SettingLabelSelector;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.models.SettingLabelSelector;
+import io.clientcore.core.http.models.RequestContext;
+import io.clientcore.core.utils.configuration.Configuration;
 
 /**
  * A sample demonstrate how to list labels.
@@ -23,8 +23,8 @@ public static void main(String[] args) {
         String connectionString = Configuration.getGlobalConfiguration().get("AZURE_APPCONFIG_CONNECTION_STRING");
 
         final ConfigurationClient client = new ConfigurationClientBuilder()
-                .connectionString(connectionString)
-                .buildClient();
+            .connectionString(connectionString)
+            .buildClient();
 
         // Prepare three settings with different labels, prod1, prod2, prod3
         ConfigurationSetting setting = client.setConfigurationSetting("prod:prod1", "prod1", "prod1");
@@ -38,15 +38,15 @@ public static void main(String[] args) {
         // If you want to list labels by exact match, use the exact label name as the filter.
         // If you want to list all labels by wildcard, pass wildcard where AppConfig supports, such as "prod*",
         System.out.println("List all labels:");
-        client.listLabels(null, Context.NONE)
-                .forEach(label -> System.out.println("\tLabel name = " + label.getName()));
+        client.listLabels(null, RequestContext.none())
+            .forEach(label -> System.out.println("\tLabel name = " + label.getName()));
 
         System.out.println("List label by exact match:");
-        client.listLabels(new SettingLabelSelector().setNameFilter("prod2"), Context.NONE)
-                .forEach(label -> System.out.println("\tLabel name = " + label.getName()));
+        client.listLabels(new SettingLabelSelector().setNameFilter("prod2"), RequestContext.none())
+            .forEach(label -> System.out.println("\tLabel name = " + label.getName()));
 
         System.out.println("List labels by wildcard:");
-        client.listLabels(new SettingLabelSelector().setNameFilter("prod*"), Context.NONE)
-                .forEach(label -> System.out.println("\tLabel name = " + label.getName()));
+        client.listLabels(new SettingLabelSelector().setNameFilter("prod*"), RequestContext.none())
+            .forEach(label -> System.out.println("\tLabel name = " + label.getName()));
     }
 }
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java
index c7754a0376a1..5c2d7bf24ae3 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v1/ListSettingsWithTagsFilter.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Configuration;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import javax.net.ssl.SSLException;
 import java.util.HashMap;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java
index c7754a0376a1..5c2d7bf24ae3 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ListSettingsWithTagsFilter/v2/ListSettingsWithTagsFilter.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Configuration;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import javax.net.ssl.SSLException;
 import java.util.HashMap;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java
index 45e82d78e838..f95e2b21b087 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v1/ReadOnlySample.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 /**
  * Sample demonstrates how to set and clear read-only a configuration setting.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java
index 45e82d78e838..5d49c3eae176 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadOnlySample/v2/ReadOnlySample.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
 
 /**
  * Sample demonstrates how to set and clear read-only a configuration setting.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java
index b13bcecf5e13..f10d23221390 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v1/ReadRevisionHistoryWIthTagsFilter.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Configuration;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import javax.net.ssl.SSLException;
 import java.util.HashMap;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java
index b13bcecf5e13..f10d23221390 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/ReadRevisionHistoryWIthTagsFilter/v2/ReadRevisionHistoryWIthTagsFilter.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Configuration;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import javax.net.ssl.SSLException;
 import java.util.HashMap;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java
index 62e05464111b..b77bc7f241d1 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v1/SecretReferenceConfigurationSettingSample.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
 import com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting;
 import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 /**
  * Sample demonstrates how to add, get, list, and delete a secret reference configuration setting.
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java
index 62e05464111b..2bafcf096b75 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/SecretReferenceConfigurationSettingSample/v2/SecretReferenceConfigurationSettingSample.java
@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.core.http.rest.PagedIterable;
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
-import com.azure.data.appconfiguration.models.SecretReferenceConfigurationSetting;
-import com.azure.data.appconfiguration.models.SettingSelector;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.models.SecretReferenceConfigurationSetting;
+import com.azure.v2.data.appconfiguration.models.SettingSelector;
+import io.clientcore.core.http.paging.PagedIterable;
 
 /**
  * Sample demonstrates how to add, get, list, and delete a secret reference configuration setting.
@@ -23,8 +23,8 @@ public static void main(String[] args) {
         // and navigating to "Access Keys" page under the "Settings" section.
         String connectionString = "endpoint={endpoint_value};id={id_value};secret={secret_value}";
         final ConfigurationClient client = new ConfigurationClientBuilder()
-                                               .connectionString(connectionString)
-                                               .buildClient();
+            .connectionString(connectionString)
+            .buildClient();
 
         // Name of the key to add to the configuration service.
         final String key = "hello";
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java
index 11f1061af724..65343144f584 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v1/WatchFeature.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
 import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java
index 11f1061af724..6eb36f877341 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/WatchFeature/v2/WatchFeature.java
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration;
-
-import com.azure.data.appconfiguration.models.ConfigurationSetting;
+import com.azure.v2.data.appconfiguration.ConfigurationClient;
+import com.azure.v2.data.appconfiguration.ConfigurationClientBuilder;
+import com.azure.v2.data.appconfiguration.models.ConfigurationSetting;
 
 import java.util.Arrays;
 import java.util.List;
@@ -22,8 +22,8 @@ public static void main(String[] args) {
 
         // Instantiate a client that will be used to call the service.
         ConfigurationClient client = new ConfigurationClientBuilder()
-                                         .connectionString(connectionString)
-                                         .buildClient();
+            .connectionString(connectionString)
+            .buildClient();
 
         // Prepare a list of watching settings and update one same setting value to the service.
         String prodDBConnectionKey = "prodDBConnection";
@@ -74,24 +74,24 @@ public static void main(String[] args) {
      * @return a list of updated settings that doesn't match previous ETag value.
      */
     private static List<ConfigurationSetting> refresh(ConfigurationClient client,
-        List<ConfigurationSetting> watchSettings) {
+                                                      List<ConfigurationSetting> watchSettings) {
         return watchSettings
-                   .stream()
-                   .filter(setting -> {
-                       ConfigurationSetting retrievedSetting = client.getConfigurationSetting(setting.getKey(),
-                           setting.getLabel());
-                       String latestETag = retrievedSetting.getETag();
-                       String watchingETag = setting.getETag();
-                       if (!latestETag.equals(watchingETag)) {
-                           System.out.printf(
-                               "Some keys in watching key store matching the key [%s] and label [%s] is updated, "
-                                   + "preview ETag value [%s] not equals to current value [%s].%n",
-                               retrievedSetting.getKey(), retrievedSetting.getLabel(), watchingETag, latestETag);
-                           setting.setETag(latestETag).setValue(retrievedSetting.getValue());
-                           return true;
-                       }
-                       return false;
-                   })
-                   .collect(Collectors.toList());
+            .stream()
+            .filter(setting -> {
+                ConfigurationSetting retrievedSetting = client.getConfigurationSetting(setting.getKey(),
+                    setting.getLabel());
+                String latestETag = retrievedSetting.getETag();
+                String watchingETag = setting.getETag();
+                if (!latestETag.equals(watchingETag)) {
+                    System.out.printf(
+                        "Some keys in watching key store matching the key [%s] and label [%s] is updated, "
+                            + "preview ETag value [%s] not equals to current value [%s].%n",
+                        retrievedSetting.getKey(), retrievedSetting.getLabel(), watchingETag, latestETag);
+                    setting.setETag(latestETag).setValue(retrievedSetting.getValue());
+                    return true;
+                }
+                return false;
+            })
+            .collect(Collectors.toList());
     }
 }
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java
index 544d2cea3686..c606ee153546 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v1/ComplexConfiguration.java
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration.models;
-
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
diff --git a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java
index 544d2cea3686..c606ee153546 100644
--- a/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java
+++ b/sdk/tools/azure-openrewrite/src/test/resources/migrationExamples/azure-data-appconfiguration/sample36/v2/ComplexConfiguration.java
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.data.appconfiguration.models;
-
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
diff --git a/sdk/tools/openrewrite-sample-compiler-ci.yml b/sdk/tools/openrewrite-sample-compiler-ci.yml
index 6cdce5e84d29..c831c95ae975 100644
--- a/sdk/tools/openrewrite-sample-compiler-ci.yml
+++ b/sdk/tools/openrewrite-sample-compiler-ci.yml
@@ -45,6 +45,7 @@ extends:
                     - "/sdk/tools/"
                     - "/sdk/core-v2/"
                     - "/sdk/identity-v2/"
+                    - "/sdk/appconfiguration-v2/"
                     - "/eng/"
                     - "/common/perf-test-core/"
                     - "**/*.xml"
@@ -55,7 +56,7 @@ extends:
                 displayName: 'Build and Install Necesssary Dependencies'
                 inputs:
                   goals: 'install'
-                  options: '-pl com.azure.v2:azure-core,com.azure.v2:azure-identity,com.azure:perf-test-core,com.azure:azure-openrewrite-compiler-maven-plugin -am -T 1C -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -DskipTests -Dspotbugs.skip -Djacoco.skip -Dspotless.skip --no-transfer-progress'
+                  options: '-pl com.azure.v2:azure-core,com.azure.v2:azure-identity,com.azure.v2:azure-data-appconfiguration,com.azure:perf-test-core,com.azure:azure-openrewrite-compiler-maven-plugin -am -T 1C -Dcheckstyle.skip -Dgpg.skip -Dmaven.javadoc.skip -Drevapi.skip -DskipTests -Dspotbugs.skip -Djacoco.skip -Dspotless.skip --no-transfer-progress'
                   javaHomeOption: 'JDKVersion'
                   jdkVersionOption: '1.8'
 
diff --git a/sdk/translation/azure-ai-documenttranslator/pom.xml b/sdk/translation/azure-ai-documenttranslator/pom.xml
index 4c1580392868..4e8b1de6895a 100644
--- a/sdk/translation/azure-ai-documenttranslator/pom.xml
+++ b/sdk/translation/azure-ai-documenttranslator/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/translation/azure-ai-translation-document/README.md b/sdk/translation/azure-ai-translation-document/README.md
index f9b4fc05934b..3e4acb91c711 100644
--- a/sdk/translation/azure-ai-translation-document/README.md
+++ b/sdk/translation/azure-ai-translation-document/README.md
@@ -52,7 +52,7 @@ Authentication with AAD requires some initial setup:
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/translation/azure-ai-translation-document/pom.xml b/sdk/translation/azure-ai-translation-document/pom.xml
index 7fe01bfa4191..7528773c3cb7 100644
--- a/sdk/translation/azure-ai-translation-document/pom.xml
+++ b/sdk/translation/azure-ai-translation-document/pom.xml
@@ -74,7 +74,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/translation/azure-ai-translation-text/pom.xml b/sdk/translation/azure-ai-translation-text/pom.xml
index 864bebacb93b..37308ddbab4a 100644
--- a/sdk/translation/azure-ai-translation-text/pom.xml
+++ b/sdk/translation/azure-ai-translation-text/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/CHANGELOG.md b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/CHANGELOG.md
index 079894bb1e13..a550d7232ac0 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/CHANGELOG.md
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/CHANGELOG.md
@@ -1,14 +1,73 @@
 # Release History
 
-## 1.0.0-beta.2 (Unreleased)
+## 1.0.0 (2025-10-07)
 
-### Features Added
+- Azure Resource Manager Trusted Signing client library for Java. This package contains Microsoft Azure SDK for Trusted Signing Management SDK. Code Signing resource provider api. Package api-version 2025-10-13. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ### Breaking Changes
 
-### Bugs Fixed
+#### `models.RevokeCertificate` was modified
+
+* `validate()` was removed
+
+#### `models.OperationDisplay` was modified
+
+* `validate()` was removed
+
+#### `models.CheckNameAvailability` was modified
+
+* `validate()` was removed
+
+#### `models.CodeSigningAccountPatch` was modified
+
+* `withSku(models.AccountSku)` was removed
+* `models.AccountSku sku()` -> `models.AccountSkuPatch sku()`
+* `validate()` was removed
+
+#### `models.AccountSku` was modified
+
+* `validate()` was removed
+
+#### `models.CodeSigningAccount$Update` was modified
+
+* `withSku(models.AccountSku)` was removed
+
+#### `models.CodeSigningAccountProperties` was modified
+
+* `validate()` was removed
+
+#### `models.Certificate` was modified
+
+* `validate()` was removed
+
+#### `models.CertificateProfileProperties` was modified
+
+* `validate()` was removed
+* `country()` was removed
+* `state()` was removed
+* `commonName()` was removed
+* `enhancedKeyUsage()` was removed
+* `organizationUnit()` was removed
+* `city()` was removed
+* `organization()` was removed
+* `postalCode()` was removed
+* `streetAddress()` was removed
+
+### Features Added
+
+* `models.AccountSkuPatch` was added
+
+#### `models.CodeSigningAccountPatch` was modified
+
+* `withSku(models.AccountSkuPatch)` was added
+
+#### `models.CodeSigningAccount$Update` was modified
+
+* `withSku(models.AccountSkuPatch)` was added
+
+#### `models.Certificate` was modified
 
-### Other Changes
+* `enhancedKeyUsage()` was added
 
 ## 1.0.0-beta.1 (2024-09-27)
 
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/README.md b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/README.md
index 8cf70d4bbedc..c540df8cc8b6 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/README.md
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/README.md
@@ -2,7 +2,7 @@
 
 Azure Resource Manager Trusted Signing client library for Java.
 
-This package contains Microsoft Azure SDK for Trusted Signing Management SDK. Code Signing resource provider api. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for Trusted Signing Management SDK. Code Signing resource provider api. Package api-version 2025-10-13. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -32,7 +32,7 @@ Various documentation is available to help you get started
 <dependency>
     <groupId>com.azure.resourcemanager</groupId>
     <artifactId>azure-resourcemanager-trustedsigning</artifactId>
-    <version>1.0.0-beta.2</version>
+    <version>1.0.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
@@ -52,7 +52,7 @@ Azure subscription ID can be configured via `AZURE_SUBSCRIPTION_ID` environment
 Assuming the use of the `DefaultAzureCredential` credential class, the client can be authenticated using the following code:
 
 ```java
-AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
+AzureProfile profile = new AzureProfile(AzureCloud.AZURE_PUBLIC_CLOUD);
 TokenCredential credential = new DefaultAzureCredentialBuilder()
     .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
     .build();
@@ -60,7 +60,7 @@ TrustedSigningManager manager = TrustedSigningManager
     .authenticate(credential, profile);
 ```
 
-The sample code assumes global Azure. Please change `AzureEnvironment.AZURE` variable if otherwise.
+The sample code assumes global Azure. Please change the `AzureCloud.AZURE_PUBLIC_CLOUD` variable if otherwise.
 
 See [Authentication][authenticate] for more options.
 
@@ -100,5 +100,3 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
 [cg]: https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md
 [coc]: https://opensource.microsoft.com/codeofconduct/
 [coc_faq]: https://opensource.microsoft.com/codeofconduct/faq/
-
-
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/SAMPLE.md b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/SAMPLE.md
index fcfb4696a22b..d543454172d6 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/SAMPLE.md
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/SAMPLE.md
@@ -33,7 +33,7 @@ import com.azure.resourcemanager.trustedsigning.models.ProfileType;
  */
 public final class CertificateProfilesCreateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Create.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_Create.json
      */
     /**
      * Sample code: Create a certificate profile.
@@ -62,7 +62,7 @@ public final class CertificateProfilesCreateSamples {
  */
 public final class CertificateProfilesDeleteSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Delete.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_Delete.json
      */
     /**
      * Sample code: Delete a certificate profile.
@@ -85,7 +85,7 @@ public final class CertificateProfilesDeleteSamples {
  */
 public final class CertificateProfilesGetSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Get.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_Get.json
      */
     /**
      * Sample code: Get details of a certificate profile.
@@ -108,7 +108,7 @@ public final class CertificateProfilesGetSamples {
  */
 public final class CertificateProfilesListByCodeSigningAccountSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_ListByCodeSigningAccount.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_ListByCodeSigningAccount.json
      */
     /**
      * Sample code: List certificate profiles under a trusted signing account.
@@ -134,7 +134,7 @@ import java.time.OffsetDateTime;
  */
 public final class CertificateProfilesRevokeCertificateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_RevokeCertificate.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_RevokeCertificate.json
      */
     /**
      * Sample code: Revoke a certificate under a certificate profile.
@@ -165,7 +165,7 @@ import com.azure.resourcemanager.trustedsigning.models.CheckNameAvailability;
  */
 public final class CodeSigningAccountsCheckNameAvailabilitySamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_CheckNameAvailability.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_CheckNameAvailability.json
      */
     /**
      * Sample code: Checks that the trusted signing account name is available.
@@ -193,7 +193,7 @@ import com.azure.resourcemanager.trustedsigning.models.SkuName;
  */
 public final class CodeSigningAccountsCreateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Create.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Create.json
      */
     /**
      * Sample code: Create a trusted Signing Account.
@@ -220,7 +220,7 @@ public final class CodeSigningAccountsCreateSamples {
  */
 public final class CodeSigningAccountsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Delete.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Delete.json
      */
     /**
      * Sample code: Delete a trusted signing account.
@@ -242,7 +242,7 @@ public final class CodeSigningAccountsDeleteSamples {
  */
 public final class CodeSigningAccountsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Get.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Get.json
      */
     /**
      * Sample code: Get a Trusted Signing Account.
@@ -265,7 +265,7 @@ public final class CodeSigningAccountsGetByResourceGroupSamples {
  */
 public final class CodeSigningAccountsListSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_ListBySubscription.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_ListBySubscription.json
      */
     /**
      * Sample code: Lists trusted signing accounts within a subscription.
@@ -287,7 +287,7 @@ public final class CodeSigningAccountsListSamples {
  */
 public final class CodeSigningAccountsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_ListByResourceGroup.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_ListByResourceGroup.json
      */
     /**
      * Sample code: Lists trusted signing accounts within a resource group.
@@ -313,7 +313,7 @@ import java.util.Map;
  */
 public final class CodeSigningAccountsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Update.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Update.json
      */
     /**
      * Sample code: Update a trusted signing account.
@@ -350,7 +350,7 @@ public final class CodeSigningAccountsUpdateSamples {
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/Operations_List.json
+     * x-ms-original-file: 2025-10-13/Operations_List.json
      */
     /**
      * Sample code: List trusted signing account operations.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/pom.xml b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/pom.xml
index 71544c7a3e22..e8ce8f1dbc3c 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/pom.xml
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/pom.xml
@@ -14,11 +14,11 @@
 
   <groupId>com.azure.resourcemanager</groupId>
   <artifactId>azure-resourcemanager-trustedsigning</artifactId>
-  <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-trustedsigning;current} -->
+  <version>1.0.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-trustedsigning;current} -->
   <packaging>jar</packaging>
 
   <name>Microsoft Azure SDK for Trusted Signing Management</name>
-  <description>This package contains Microsoft Azure SDK for Trusted Signing Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Code Signing resource provider api.</description>
+  <description>This package contains Microsoft Azure SDK for Trusted Signing Management SDK. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt. Code Signing resource provider api. Package api-version 2025-10-13.</description>
   <url>https://github.com/Azure/azure-sdk-for-java</url>
 
   <licenses>
@@ -45,14 +45,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jacoco.min.linecoverage>0</jacoco.min.linecoverage>
     <jacoco.min.branchcoverage>0</jacoco.min.branchcoverage>
-    <revapi.skip>true</revapi.skip>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-json</artifactId>
-      <version>1.5.0</version> <!-- {x-version-update;com.azure:azure-json;dependency} -->
-    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
@@ -72,8 +66,13 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-json</artifactId>
+      <version>1.5.0</version> <!-- {x-version-update;com.azure:azure-json;dependency} -->
+    </dependency>
   </dependencies>
 </project>
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientImpl.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientImpl.java
index a11c86476fac..d5c1c4a8fad7 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientImpl.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientImpl.java
@@ -187,7 +187,7 @@ public CertificateProfilesClient getCertificateProfiles() {
         this.defaultPollInterval = defaultPollInterval;
         this.endpoint = endpoint;
         this.subscriptionId = subscriptionId;
-        this.apiVersion = "2024-09-30-preview";
+        this.apiVersion = "2025-10-13";
         this.operations = new OperationsClientImpl(this);
         this.codeSigningAccounts = new CodeSigningAccountsClientImpl(this);
         this.certificateProfiles = new CertificateProfilesClientImpl(this);
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/resources/META-INF/azure-resourcemanager-trustedsigning_metadata.json b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/resources/META-INF/azure-resourcemanager-trustedsigning_metadata.json
index f8e72005b87b..e4048619a118 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/resources/META-INF/azure-resourcemanager-trustedsigning_metadata.json
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/main/resources/META-INF/azure-resourcemanager-trustedsigning_metadata.json
@@ -1 +1 @@
-{"flavor":"azure","apiVersion":"2024-09-30-preview","crossLanguageDefinitions":{"com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient":"Microsoft.CodeSigning.CertificateProfiles","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.beginCreate":"Microsoft.CodeSigning.CertificateProfiles.create","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.beginDelete":"Microsoft.CodeSigning.CertificateProfiles.delete","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.create":"Microsoft.CodeSigning.CertificateProfiles.create","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.delete":"Microsoft.CodeSigning.CertificateProfiles.delete","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.get":"Microsoft.CodeSigning.CertificateProfiles.get","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.getWithResponse":"Microsoft.CodeSigning.CertificateProfiles.get","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.listByCodeSigningAccount":"Microsoft.CodeSigning.CertificateProfiles.listByCodeSigningAccount","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.revokeCertificate":"Microsoft.CodeSigning.CertificateProfiles.revokeCertificate","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.revokeCertificateWithResponse":"Microsoft.CodeSigning.CertificateProfiles.revokeCertificate","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient":"Microsoft.CodeSigning.CodeSigningAccounts","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.beginCreate":"Microsoft.CodeSigning.CodeSigningAccounts.create","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.beginDelete":"Microsoft.CodeSigning.CodeSigningAccounts.delete","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.beginUpdate":"Microsoft.CodeSigning.CodeSigningAccounts.update","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.checkNameAvailability":"Microsoft.CodeSigning.CodeSigningAccounts.checkNameAvailability","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.checkNameAvailabilityWithResponse":"Microsoft.CodeSigning.CodeSigningAccounts.checkNameAvailability","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.create":"Microsoft.CodeSigning.CodeSigningAccounts.create","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.delete":"Microsoft.CodeSigning.CodeSigningAccounts.delete","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.getByResourceGroup":"Microsoft.CodeSigning.CodeSigningAccounts.get","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.getByResourceGroupWithResponse":"Microsoft.CodeSigning.CodeSigningAccounts.get","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.list":"Microsoft.CodeSigning.CodeSigningAccounts.listBySubscription","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.listByResourceGroup":"Microsoft.CodeSigning.CodeSigningAccounts.listByResourceGroup","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.update":"Microsoft.CodeSigning.CodeSigningAccounts.update","com.azure.resourcemanager.trustedsigning.fluent.OperationsClient":"Microsoft.CodeSigning.Operations","com.azure.resourcemanager.trustedsigning.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","com.azure.resourcemanager.trustedsigning.fluent.TrustedSigningManagementClient":"Microsoft.CodeSigning","com.azure.resourcemanager.trustedsigning.fluent.models.CertificateProfileInner":"Microsoft.CodeSigning.CertificateProfile","com.azure.resourcemanager.trustedsigning.fluent.models.CheckNameAvailabilityResultInner":"Microsoft.CodeSigning.CheckNameAvailabilityResult","com.azure.resourcemanager.trustedsigning.fluent.models.CodeSigningAccountInner":"Microsoft.CodeSigning.CodeSigningAccount","com.azure.resourcemanager.trustedsigning.fluent.models.CodeSigningAccountPatchProperties":"Microsoft.CodeSigning.CodeSigningAccountPatchProperties","com.azure.resourcemanager.trustedsigning.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","com.azure.resourcemanager.trustedsigning.fluent.models.Revocation":"Microsoft.CodeSigning.Revocation","com.azure.resourcemanager.trustedsigning.implementation.TrustedSigningManagementClientBuilder":"Microsoft.CodeSigning","com.azure.resourcemanager.trustedsigning.implementation.models.CertificateProfileListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.trustedsigning.implementation.models.CodeSigningAccountListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.trustedsigning.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","com.azure.resourcemanager.trustedsigning.models.AccountSku":"Microsoft.CodeSigning.AccountSku","com.azure.resourcemanager.trustedsigning.models.AccountSkuPatch":"Microsoft.CodeSigning.AccountSkuPatch","com.azure.resourcemanager.trustedsigning.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","com.azure.resourcemanager.trustedsigning.models.Certificate":"Microsoft.CodeSigning.Certificate","com.azure.resourcemanager.trustedsigning.models.CertificateProfileProperties":"Microsoft.CodeSigning.CertificateProfileProperties","com.azure.resourcemanager.trustedsigning.models.CertificateProfileStatus":"Microsoft.CodeSigning.CertificateProfileStatus","com.azure.resourcemanager.trustedsigning.models.CertificateStatus":"Microsoft.CodeSigning.CertificateStatus","com.azure.resourcemanager.trustedsigning.models.CheckNameAvailability":"Microsoft.CodeSigning.CheckNameAvailability","com.azure.resourcemanager.trustedsigning.models.CodeSigningAccountPatch":"Microsoft.CodeSigning.CodeSigningAccountPatch","com.azure.resourcemanager.trustedsigning.models.CodeSigningAccountProperties":"Microsoft.CodeSigning.CodeSigningAccountProperties","com.azure.resourcemanager.trustedsigning.models.NameUnavailabilityReason":"Microsoft.CodeSigning.NameUnavailabilityReason","com.azure.resourcemanager.trustedsigning.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","com.azure.resourcemanager.trustedsigning.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","com.azure.resourcemanager.trustedsigning.models.ProfileType":"Microsoft.CodeSigning.ProfileType","com.azure.resourcemanager.trustedsigning.models.ProvisioningState":"Microsoft.CodeSigning.ProvisioningState","com.azure.resourcemanager.trustedsigning.models.RevocationStatus":"Microsoft.CodeSigning.RevocationStatus","com.azure.resourcemanager.trustedsigning.models.RevokeCertificate":"Microsoft.CodeSigning.RevokeCertificate","com.azure.resourcemanager.trustedsigning.models.SkuName":"Microsoft.CodeSigning.SkuName"},"generatedFiles":["src/main/java/com/azure/resourcemanager/trustedsigning/TrustedSigningManager.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/CertificateProfilesClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/CodeSigningAccountsClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/OperationsClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/TrustedSigningManagementClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CertificateProfileInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CheckNameAvailabilityResultInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CodeSigningAccountInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CodeSigningAccountPatchProperties.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/OperationInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/Revocation.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CertificateProfileImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CertificateProfilesClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CertificateProfilesImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CheckNameAvailabilityResultImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CodeSigningAccountImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CodeSigningAccountsClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CodeSigningAccountsImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/OperationImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/OperationsClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/OperationsImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/ResourceManagerUtils.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientBuilder.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/models/CertificateProfileListResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/models/CodeSigningAccountListResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/models/OperationListResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/AccountSku.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/AccountSkuPatch.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/ActionType.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Certificate.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfile.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfileProperties.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfileStatus.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfiles.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateStatus.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CheckNameAvailability.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CheckNameAvailabilityResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccount.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccountPatch.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccountProperties.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccounts.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/NameUnavailabilityReason.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Operation.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/OperationDisplay.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Operations.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Origin.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/ProfileType.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/ProvisioningState.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/RevocationStatus.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/RevokeCertificate.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/SkuName.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/package-info.java","src/main/java/module-info.java"]}
\ No newline at end of file
+{"flavor":"azure","apiVersion":"2025-10-13","crossLanguageDefinitions":{"com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient":"Microsoft.CodeSigning.CertificateProfiles","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.beginCreate":"Microsoft.CodeSigning.CertificateProfiles.create","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.beginDelete":"Microsoft.CodeSigning.CertificateProfiles.delete","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.create":"Microsoft.CodeSigning.CertificateProfiles.create","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.delete":"Microsoft.CodeSigning.CertificateProfiles.delete","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.get":"Microsoft.CodeSigning.CertificateProfiles.get","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.getWithResponse":"Microsoft.CodeSigning.CertificateProfiles.get","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.listByCodeSigningAccount":"Microsoft.CodeSigning.CertificateProfiles.listByCodeSigningAccount","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.revokeCertificate":"Microsoft.CodeSigning.CertificateProfiles.revokeCertificate","com.azure.resourcemanager.trustedsigning.fluent.CertificateProfilesClient.revokeCertificateWithResponse":"Microsoft.CodeSigning.CertificateProfiles.revokeCertificate","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient":"Microsoft.CodeSigning.CodeSigningAccounts","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.beginCreate":"Microsoft.CodeSigning.CodeSigningAccounts.create","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.beginDelete":"Microsoft.CodeSigning.CodeSigningAccounts.delete","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.beginUpdate":"Microsoft.CodeSigning.CodeSigningAccounts.update","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.checkNameAvailability":"Microsoft.CodeSigning.CodeSigningAccounts.checkNameAvailability","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.checkNameAvailabilityWithResponse":"Microsoft.CodeSigning.CodeSigningAccounts.checkNameAvailability","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.create":"Microsoft.CodeSigning.CodeSigningAccounts.create","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.delete":"Microsoft.CodeSigning.CodeSigningAccounts.delete","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.getByResourceGroup":"Microsoft.CodeSigning.CodeSigningAccounts.get","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.getByResourceGroupWithResponse":"Microsoft.CodeSigning.CodeSigningAccounts.get","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.list":"Microsoft.CodeSigning.CodeSigningAccounts.listBySubscription","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.listByResourceGroup":"Microsoft.CodeSigning.CodeSigningAccounts.listByResourceGroup","com.azure.resourcemanager.trustedsigning.fluent.CodeSigningAccountsClient.update":"Microsoft.CodeSigning.CodeSigningAccounts.update","com.azure.resourcemanager.trustedsigning.fluent.OperationsClient":"Microsoft.CodeSigning.Operations","com.azure.resourcemanager.trustedsigning.fluent.OperationsClient.list":"Azure.ResourceManager.Operations.list","com.azure.resourcemanager.trustedsigning.fluent.TrustedSigningManagementClient":"Microsoft.CodeSigning","com.azure.resourcemanager.trustedsigning.fluent.models.CertificateProfileInner":"Microsoft.CodeSigning.CertificateProfile","com.azure.resourcemanager.trustedsigning.fluent.models.CheckNameAvailabilityResultInner":"Microsoft.CodeSigning.CheckNameAvailabilityResult","com.azure.resourcemanager.trustedsigning.fluent.models.CodeSigningAccountInner":"Microsoft.CodeSigning.CodeSigningAccount","com.azure.resourcemanager.trustedsigning.fluent.models.CodeSigningAccountPatchProperties":"Microsoft.CodeSigning.CodeSigningAccountPatchProperties","com.azure.resourcemanager.trustedsigning.fluent.models.OperationInner":"Azure.ResourceManager.CommonTypes.Operation","com.azure.resourcemanager.trustedsigning.fluent.models.Revocation":"Microsoft.CodeSigning.Revocation","com.azure.resourcemanager.trustedsigning.implementation.TrustedSigningManagementClientBuilder":"Microsoft.CodeSigning","com.azure.resourcemanager.trustedsigning.implementation.models.CertificateProfileListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.trustedsigning.implementation.models.CodeSigningAccountListResult":"Azure.ResourceManager.ResourceListResult","com.azure.resourcemanager.trustedsigning.implementation.models.OperationListResult":"Azure.ResourceManager.CommonTypes.OperationListResult","com.azure.resourcemanager.trustedsigning.models.AccountSku":"Microsoft.CodeSigning.AccountSku","com.azure.resourcemanager.trustedsigning.models.AccountSkuPatch":"Microsoft.CodeSigning.AccountSkuPatch","com.azure.resourcemanager.trustedsigning.models.ActionType":"Azure.ResourceManager.CommonTypes.ActionType","com.azure.resourcemanager.trustedsigning.models.Certificate":"Microsoft.CodeSigning.Certificate","com.azure.resourcemanager.trustedsigning.models.CertificateProfileProperties":"Microsoft.CodeSigning.CertificateProfileProperties","com.azure.resourcemanager.trustedsigning.models.CertificateProfileStatus":"Microsoft.CodeSigning.CertificateProfileStatus","com.azure.resourcemanager.trustedsigning.models.CertificateStatus":"Microsoft.CodeSigning.CertificateStatus","com.azure.resourcemanager.trustedsigning.models.CheckNameAvailability":"Microsoft.CodeSigning.CheckNameAvailability","com.azure.resourcemanager.trustedsigning.models.CodeSigningAccountPatch":"Microsoft.CodeSigning.CodeSigningAccountPatch","com.azure.resourcemanager.trustedsigning.models.CodeSigningAccountProperties":"Microsoft.CodeSigning.CodeSigningAccountProperties","com.azure.resourcemanager.trustedsigning.models.NameUnavailabilityReason":"Microsoft.CodeSigning.NameUnavailabilityReason","com.azure.resourcemanager.trustedsigning.models.OperationDisplay":"Azure.ResourceManager.CommonTypes.OperationDisplay","com.azure.resourcemanager.trustedsigning.models.Origin":"Azure.ResourceManager.CommonTypes.Origin","com.azure.resourcemanager.trustedsigning.models.ProfileType":"Microsoft.CodeSigning.ProfileType","com.azure.resourcemanager.trustedsigning.models.ProvisioningState":"Microsoft.CodeSigning.ProvisioningState","com.azure.resourcemanager.trustedsigning.models.RevocationStatus":"Microsoft.CodeSigning.RevocationStatus","com.azure.resourcemanager.trustedsigning.models.RevokeCertificate":"Microsoft.CodeSigning.RevokeCertificate","com.azure.resourcemanager.trustedsigning.models.SkuName":"Microsoft.CodeSigning.SkuName"},"generatedFiles":["src/main/java/com/azure/resourcemanager/trustedsigning/TrustedSigningManager.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/CertificateProfilesClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/CodeSigningAccountsClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/OperationsClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/TrustedSigningManagementClient.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CertificateProfileInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CheckNameAvailabilityResultInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CodeSigningAccountInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/CodeSigningAccountPatchProperties.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/OperationInner.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/Revocation.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/models/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/fluent/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CertificateProfileImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CertificateProfilesClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CertificateProfilesImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CheckNameAvailabilityResultImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CodeSigningAccountImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CodeSigningAccountsClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/CodeSigningAccountsImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/OperationImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/OperationsClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/OperationsImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/ResourceManagerUtils.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientBuilder.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/TrustedSigningManagementClientImpl.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/models/CertificateProfileListResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/models/CodeSigningAccountListResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/models/OperationListResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/implementation/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/AccountSku.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/AccountSkuPatch.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/ActionType.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Certificate.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfile.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfileProperties.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfileStatus.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateProfiles.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CertificateStatus.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CheckNameAvailability.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CheckNameAvailabilityResult.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccount.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccountPatch.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccountProperties.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/CodeSigningAccounts.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/NameUnavailabilityReason.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Operation.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/OperationDisplay.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Operations.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/Origin.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/ProfileType.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/ProvisioningState.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/RevocationStatus.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/RevokeCertificate.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/SkuName.java","src/main/java/com/azure/resourcemanager/trustedsigning/models/package-info.java","src/main/java/com/azure/resourcemanager/trustedsigning/package-info.java","src/main/java/module-info.java"]}
\ No newline at end of file
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesCreateSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesCreateSamples.java
index c1dc037d06b3..2cd0a43d9b77 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesCreateSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesCreateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class CertificateProfilesCreateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Create.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_Create.json
      */
     /**
      * Sample code: Create a certificate profile.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesDeleteSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesDeleteSamples.java
index d8efdda3020b..c42550008fe7 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesDeleteSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CertificateProfilesDeleteSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Delete.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_Delete.json
      */
     /**
      * Sample code: Delete a certificate profile.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesGetSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesGetSamples.java
index e82d78d09a9a..6172d6dcb267 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesGetSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesGetSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CertificateProfilesGetSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_Get.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_Get.json
      */
     /**
      * Sample code: Get details of a certificate profile.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesListByCodeSigningAccountSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesListByCodeSigningAccountSamples.java
index ef449f5d376c..ebb1060ae0ae 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesListByCodeSigningAccountSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesListByCodeSigningAccountSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CertificateProfilesListByCodeSigningAccountSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_ListByCodeSigningAccount.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_ListByCodeSigningAccount.json
      */
     /**
      * Sample code: List certificate profiles under a trusted signing account.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesRevokeCertificateSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesRevokeCertificateSamples.java
index 6ad283c29160..15ed9c4f05a1 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesRevokeCertificateSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CertificateProfilesRevokeCertificateSamples.java
@@ -12,7 +12,7 @@
  */
 public final class CertificateProfilesRevokeCertificateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CertificateProfiles_RevokeCertificate.json
+     * x-ms-original-file: 2025-10-13/CertificateProfiles_RevokeCertificate.json
      */
     /**
      * Sample code: Revoke a certificate under a certificate profile.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCheckNameAvailabilitySamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCheckNameAvailabilitySamples.java
index b131c9bcd7fb..e1e41ce6e05a 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCheckNameAvailabilitySamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCheckNameAvailabilitySamples.java
@@ -11,7 +11,7 @@
  */
 public final class CodeSigningAccountsCheckNameAvailabilitySamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_CheckNameAvailability.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_CheckNameAvailability.json
      */
     /**
      * Sample code: Checks that the trusted signing account name is available.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCreateSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCreateSamples.java
index a32c1a5d52fa..adc2804acb07 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCreateSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsCreateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class CodeSigningAccountsCreateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Create.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Create.json
      */
     /**
      * Sample code: Create a trusted Signing Account.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsDeleteSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsDeleteSamples.java
index 25d10518099e..159a36f15b5d 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsDeleteSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsDeleteSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CodeSigningAccountsDeleteSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Delete.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Delete.json
      */
     /**
      * Sample code: Delete a trusted signing account.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsGetByResourceGroupSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsGetByResourceGroupSamples.java
index 8bdadf8c2d38..9d507d5a4522 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsGetByResourceGroupSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsGetByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CodeSigningAccountsGetByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Get.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Get.json
      */
     /**
      * Sample code: Get a Trusted Signing Account.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListByResourceGroupSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListByResourceGroupSamples.java
index 3788304a7ad2..ae60a52c39cb 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListByResourceGroupSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListByResourceGroupSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CodeSigningAccountsListByResourceGroupSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_ListByResourceGroup.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_ListByResourceGroup.json
      */
     /**
      * Sample code: Lists trusted signing accounts within a resource group.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListSamples.java
index d8d0abac8b7b..31ec3da00e6d 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class CodeSigningAccountsListSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_ListBySubscription.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_ListBySubscription.json
      */
     /**
      * Sample code: Lists trusted signing accounts within a subscription.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsUpdateSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsUpdateSamples.java
index fc52649766e3..d01680d5d604 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsUpdateSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/CodeSigningAccountsUpdateSamples.java
@@ -13,7 +13,7 @@
  */
 public final class CodeSigningAccountsUpdateSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/CodeSigningAccounts_Update.json
+     * x-ms-original-file: 2025-10-13/CodeSigningAccounts_Update.json
      */
     /**
      * Sample code: Update a trusted signing account.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/OperationsListSamples.java b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/OperationsListSamples.java
index 6c6ff09431c9..acd1a5796104 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/OperationsListSamples.java
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/src/samples/java/com/azure/resourcemanager/trustedsigning/generated/OperationsListSamples.java
@@ -9,7 +9,7 @@
  */
 public final class OperationsListSamples {
     /*
-     * x-ms-original-file: 2024-09-30-preview/Operations_List.json
+     * x-ms-original-file: 2025-10-13/Operations_List.json
      */
     /**
      * Sample code: List trusted signing account operations.
diff --git a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/tsp-location.yaml b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/tsp-location.yaml
index 2d76bcb8f41c..7a8e9f754856 100644
--- a/sdk/trustedsigning/azure-resourcemanager-trustedsigning/tsp-location.yaml
+++ b/sdk/trustedsigning/azure-resourcemanager-trustedsigning/tsp-location.yaml
@@ -1,4 +1,4 @@
 directory: specification/codesigning/CodeSigning.Management
-commit: 05584a1019e75159b0dc70a6751afaa2c77868e6
+commit: 8052426d23bf87cd8a3ad29a2fd5127e6054c434
 repo: Azure/azure-rest-api-specs
 additionalDirectories: 
diff --git a/sdk/vision/azure-ai-vision-imageanalysis/README.md b/sdk/vision/azure-ai-vision-imageanalysis/README.md
index b0767e916e57..519028c7959b 100644
--- a/sdk/vision/azure-ai-vision-imageanalysis/README.md
+++ b/sdk/vision/azure-ai-vision-imageanalysis/README.md
@@ -95,7 +95,7 @@ provider, or other credential providers, add an additional dependency on `azure-
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-identity</artifactId>
-    <version>1.15.3</version>
+    <version>1.18.1</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})
diff --git a/sdk/vision/azure-ai-vision-imageanalysis/pom.xml b/sdk/vision/azure-ai-vision-imageanalysis/pom.xml
index ddd08644fbbc..cc5ba7991744 100644
--- a/sdk/vision/azure-ai-vision-imageanalysis/pom.xml
+++ b/sdk/vision/azure-ai-vision-imageanalysis/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml b/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml
index 39749a4c46bd..572ce01e1c79 100644
--- a/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml
+++ b/sdk/vmwarecloudsimple/azure-resourcemanager-vmwarecloudsimple/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/voiceservices/azure-resourcemanager-voiceservices/pom.xml b/sdk/voiceservices/azure-resourcemanager-voiceservices/pom.xml
index df3ee95ea198..733a9c5cf5f8 100644
--- a/sdk/voiceservices/azure-resourcemanager-voiceservices/pom.xml
+++ b/sdk/voiceservices/azure-resourcemanager-voiceservices/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml b/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml
index 435a81fb1a9f..f02094579e35 100644
--- a/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml
+++ b/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/webpubsub/azure-messaging-webpubsub/pom.xml b/sdk/webpubsub/azure-messaging-webpubsub/pom.xml
index 114a8de7362a..3da548d258e7 100644
--- a/sdk/webpubsub/azure-messaging-webpubsub/pom.xml
+++ b/sdk/webpubsub/azure-messaging-webpubsub/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
 
diff --git a/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml b/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml
index 9c893d334dcb..41a6aae49e35 100644
--- a/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml
+++ b/sdk/webpubsub/azure-resourcemanager-webpubsub/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/weightsandbiases/azure-resourcemanager-weightsandbiases/pom.xml b/sdk/weightsandbiases/azure-resourcemanager-weightsandbiases/pom.xml
index d02ace039d39..e6d824881921 100644
--- a/sdk/weightsandbiases/azure-resourcemanager-weightsandbiases/pom.xml
+++ b/sdk/weightsandbiases/azure-resourcemanager-weightsandbiases/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/pom.xml b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/pom.xml
index 85921ea5eea4..8912eea49937 100644
--- a/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/pom.xml
+++ b/sdk/workloadorchestration/azure-resourcemanager-workloadorchestration/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/sdk/workloads/azure-resourcemanager-workloads/pom.xml b/sdk/workloads/azure-resourcemanager-workloads/pom.xml
index bc9037f2b8c2..977a7617a138 100644
--- a/sdk/workloads/azure-resourcemanager-workloads/pom.xml
+++ b/sdk/workloads/azure-resourcemanager-workloads/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk/workloadssapvirtualinstance/azure-resourcemanager-workloadssapvirtualinstance/pom.xml b/sdk/workloadssapvirtualinstance/azure-resourcemanager-workloadssapvirtualinstance/pom.xml
index c45b6535d96d..67fbbc58efd1 100644
--- a/sdk/workloadssapvirtualinstance/azure-resourcemanager-workloadssapvirtualinstance/pom.xml
+++ b/sdk/workloadssapvirtualinstance/azure-resourcemanager-workloadssapvirtualinstance/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.18.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.18.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>